Merge branch 'v2.1.x' into develop

.github/workflows/01-steampipe-release.yaml

@@ -196,6 +196,7 @@ jobs:
         with:
           repository: turbot/homebrew-tap
           token: ${{ secrets.GH_ACCESS_TOKEN }}
+          ref: v${{ github.event.inputs.version }}
 
       - name: Update live version
         if: steps.semver_parser.outputs.prerelease == ''

cmd/plugin.go

@@ -161,7 +161,6 @@ Examples:
 		AddBoolFlag(pconstants.ArgAll, false, "Update all plugins to its latest available version").
 		AddBoolFlag(pconstants.ArgProgress, true, "Display installation progress").
 		AddBoolFlag(pconstants.ArgHelp, false, "Help for plugin update", cmdconfig.FlagOptions.WithShortHand("h"))
-
 	return cmd
 }
 
@@ -594,8 +593,14 @@ func installPlugin(ctx context.Context, resolvedPlugin pplugin.ResolvedPluginVer
 			bar.Incr()
 		}
 	}()
+	
+	skipConfig := viper.GetBool(pconstants.ArgSkipConfig)
+	// we should never install the config file for plugin updates; config files should only be installed during plugin install
+	if isUpdate {
+		skipConfig = true
+	}
 
-	image, err := plugin.Install(ctx, resolvedPlugin, progress, constants.BaseImageRef, ociinstaller.SteampipeMediaTypeProvider{}, putils.WithSkipConfig(viper.GetBool(pconstants.ArgSkipConfig)))
+	image, err := plugin.Install(ctx, resolvedPlugin, progress, constants.BaseImageRef, ociinstaller.SteampipeMediaTypeProvider{}, putils.WithSkipConfig(skipConfig))
 	if err != nil {
 		msg := ""
 		// used to build data for the plugin install report to be used for display purposes

pkg/plugin/plugin_remove.go

@@ -47,9 +47,11 @@ func (r PluginRemoveReports) Print() {
 			}
 
 			str := append([]string{}, fmt.Sprintf(
-				"Please remove %s %s to continue using steampipe:",
-				utils.Pluralize("this", len(uniqueFiles)),
+				"The following %s %s no longer needed since %s %s been uninstalled and can be safely removed:",
 				utils.Pluralize("connection", len(uniqueFiles)),
+				utils.Pluralize("is", len(uniqueFiles)),
+				utils.Pluralize("the associated plugin", len(uniqueFiles)),
+				utils.Pluralize("has", len(uniqueFiles)),
 			))
 
 			str = append(str, "")