chore: fix lint issues

Author: ravisuhag

cmd/client.go

@@ -58,8 +58,7 @@ func loadClientConfig(cmd *cobra.Command, cmdxConfig *config.Loader) (*ClientCon
 	if err := cmdxConfig.Load(
 		&clientConfig,
 	); err != nil {
-			return nil, err
-		
+		return nil, err
 	}
 
 	return &clientConfig, nil

cmd/help.go

@@ -2,16 +2,20 @@ package cmd
 
 import (
 	"github.com/MakeNowJust/heredoc"
+	"github.com/raystack/salt/cli/commander"
 )
 
-var envHelp = map[string]string{
-	"short": "List of supported environment variables",
-	"long": heredoc.Doc(`
-			RAYSTACK_CONFIG_DIR: the directory where stencil will store configuration files. Default:
-			"$XDG_CONFIG_HOME/raystack" or "$HOME/.config/raystack".
+var envHelpTopics = []commander.HelpTopic{
+	{
+		Name:  "environment",
+		Short: "List of supported environment variables",
+		Long: heredoc.Doc(`
+            RAYSTACK_CONFIG_DIR: the directory where stencil will store configuration files. Default:
+            "$XDG_CONFIG_HOME/raystack" or "$HOME/.config/raystack".
 
-			NO_COLOR: set to any value to avoid printing ANSI escape sequences for color output.
+            NO_COLOR: set to any value to avoid printing ANSI escape sequences for color output.
 
-			CLICOLOR: set to "0" to disable printing ANSI colors in output.
-		`),
+            CLICOLOR: set to "0" to disable printing ANSI colors in output.
+        `),
+	},
 }

cmd/root.go

@@ -45,18 +45,22 @@ func New() *cobra.Command {
 	cmd.AddCommand(SchemaCmd(cdk))
 	cmd.AddCommand(SearchCmd(cdk))
 
+	hooks := []commander.HookBehavior{
+		{
+			Name: "client",
+			Behavior: func(cmd *cobra.Command) {
+				cmd.PersistentFlags().String("host", "", "Server host address")
+			},
+		},
+	}
+
 	// Help topics
-	cmdr := commander.New(cmd)
+	cmdr := commander.New(
+		cmd,
+		commander.WithTopics(envHelpTopics),
+		commander.WithHooks(hooks),
+	)
 	cmdr.Init()
-	// cmdx.SetHelp(cmd)
-	// cmd.AddCommand(cmdx.SetCompletionCmd("stencil"))
-	// cmd.AddCommand(cmdx.SetHelpTopicCmd("environment", envHelp))
-	// cmd.AddCommand(cmdx.SetRefCmd(cmd))
-
-	// cmdx.SetClientHook(cmd, func(cmd *cobra.Command) {
-	// 	// client config
-	// 	cmd.PersistentFlags().String("host", "", "Server host address")
-	// })
 
 	return cmd
 }

formats/json/compatibility.go

@@ -127,7 +127,7 @@ func TypeCheckExecutor(spec TypeCheckSpec) SchemaCompareCheck {
 		currTypes := currSchema.Types
 		err := elementsMatch(prevTypes, currTypes) // special case of integer being allowed to changed to number is not respected due to additional code complexity
 		if err != nil {
-			diffs.add(subSchemaTypeModification, currSchema.Location, err.Error())
+			diffs.add(subSchemaTypeModification, currSchema.Location, "%s", err.Error())
 			return
 		}
 		if len(currTypes) == 0 {

formats/json/compatibility_helper.go

@@ -168,7 +168,7 @@ func checkRequiredProperties(prevSchema, currSchema *jsonschema.Schema, diffs *c
 	currReqiredProperties := currSchema.Required
 	err := elementsMatch(prevRequiredProperties, currReqiredProperties)
 	if err != nil {
-		diffs.add(requiredFieldChanged, currSchema.Location, err.Error())
+		diffs.add(requiredFieldChanged, currSchema.Location, "%s", err.Error())
 	}
 }
 

internal/store/postgres/namespace_repository.go

@@ -44,25 +44,25 @@ func NewNamespaceRepository(dbc *DB) *NamespaceRepository {
 func (r *NamespaceRepository) Create(ctx context.Context, ns namespace.Namespace) (namespace.Namespace, error) {
 	newNamespace := namespace.Namespace{}
 	err := pgxscan.Get(ctx, r.db, &newNamespace, namespaceInsertQuery, ns.ID, ns.Format, ns.Compatibility, ns.Description)
-	return newNamespace, wrapError(err, ns.ID)
+	return newNamespace, wrapError(err, "%s", ns.ID)
 }
 
 func (r *NamespaceRepository) Update(ctx context.Context, ns namespace.Namespace) (namespace.Namespace, error) {
 	newNamespace := namespace.Namespace{}
 	err := pgxscan.Get(ctx, r.db, &newNamespace, namespaceUpdateQuery, ns.ID, ns.Format, ns.Compatibility, ns.Description)
-	return newNamespace, wrapError(err, ns.ID)
+	return newNamespace, wrapError(err, "%s", ns.ID)
 }
 
 func (r *NamespaceRepository) Get(ctx context.Context, id string) (namespace.Namespace, error) {
 	newNamespace := namespace.Namespace{}
 	err := pgxscan.Get(ctx, r.db, &newNamespace, namespaceGetQuery, id)
-	return newNamespace, wrapError(err, id)
+	return newNamespace, wrapError(err, "%s", id)
 }
 
 func (r *NamespaceRepository) Delete(ctx context.Context, id string) error {
 	_, err := r.db.Exec(ctx, namespaceDeleteQuery, id)
 	r.db.Exec(ctx, deleteOrphanedData)
-	return wrapError(err, id)
+	return wrapError(err, "%s", id)
 }
 
 func (r *NamespaceRepository) List(ctx context.Context) ([]namespace.Namespace, error) {