fix linter error (#4039)

jremy42 · web-flow · commit a73b8d2d7124 · 2024-08-14T13:50:13.000Z
diff --git a/internal/core/error.go b/internal/core/error.go
@@ -43,7 +43,7 @@ func (s *CliError) MarshalHuman() (string, error) {
 	if s.Err != nil {
 		humanError := s.Err
 		if s.Message != "" {
-			humanError = fmt.Errorf(s.Message)
+			humanError = fmt.Errorf("%s", s.Message)
 		}
 		str, err := human.Marshal(humanError, nil)
 		if err != nil {
diff --git a/internal/namespaces/baremetal/v1/helpers_test.go b/internal/namespaces/baremetal/v1/helpers_test.go
@@ -25,11 +25,11 @@ func createServer(metaKey string) core.BeforeFunc {
 //
 //nolint:unparam
 func deleteServer(metaKey string) core.AfterFunc {
-	return core.ExecAfterCmd(fmt.Sprintf("scw baremetal server delete zone=nl-ams-1 {{ ." + metaKey + ".ID }}"))
+	return core.ExecAfterCmd(fmt.Sprintf("scw baremetal server delete zone=nl-ams-1 {{ .%s.ID }}", metaKey))
 }
 
 func deleteServerDefault(metaKey string) core.AfterFunc {
-	return core.ExecAfterCmd(fmt.Sprintf("scw baremetal server delete {{ ." + metaKey + ".ID }}"))
+	return core.ExecAfterCmd(fmt.Sprintf("scw baremetal server delete {{ .%s.ID }}", metaKey))
 }
 
 // add an ssh key with a given meta key
@@ -44,5 +44,5 @@ func addSSH(metaKey string, key string) core.BeforeFunc {
 
 // delete an ssh key with a given meta key
 func deleteSSH(metaKey string) core.AfterFunc {
-	return core.ExecAfterCmd(fmt.Sprintf("scw iam ssh-key delete {{ ." + metaKey + ".ID }}"))
+	return core.ExecAfterCmd(fmt.Sprintf("scw iam ssh-key delete {{ .%s.ID }}", metaKey))
 }
diff --git a/internal/namespaces/iam/v1alpha1/error.go b/internal/namespaces/iam/v1alpha1/error.go
@@ -15,7 +15,7 @@ func installationCanceled(addKeyInstructions string) *core.CliError {
 
 func sshKeyNotFound(filename string, addKeyInstructions string) *core.CliError {
 	return &core.CliError{
-		Err:  fmt.Errorf("could not find an SSH key at " + filename),
+		Err:  fmt.Errorf("could not find an SSH key at %s", filename),
 		Hint: "You can add one later using " + addKeyInstructions,
 	}
 }
diff --git a/internal/namespaces/instance/v1/custom_server_create.go b/internal/namespaces/instance/v1/custom_server_create.go
@@ -552,14 +552,14 @@ func validateLocalVolumeSizes(volumes map[string]*instance.VolumeServerTemplate,
 	}
 
 	if localVolumeTotalSize < volumeConstraint.MinSize || localVolumeTotalSize > volumeConstraint.MaxSize {
-		min := humanize.Bytes(uint64(volumeConstraint.MinSize))
+		minSize := humanize.Bytes(uint64(volumeConstraint.MinSize))
 		computedLocal := humanize.Bytes(uint64(localVolumeTotalSize))
 		if volumeConstraint.MinSize == volumeConstraint.MaxSize {
-			return fmt.Errorf("%s total local volume size must be equal to %s, got %s", commercialType, min, computedLocal)
+			return fmt.Errorf("%s total local volume size must be equal to %s, got %s", commercialType, minSize, computedLocal)
 		}
 
-		max := humanize.Bytes(uint64(volumeConstraint.MaxSize))
-		return fmt.Errorf("%s total local volume size must be between %s and %s, got %s", commercialType, min, max, computedLocal)
+		maxSize := humanize.Bytes(uint64(volumeConstraint.MaxSize))
+		return fmt.Errorf("%s total local volume size must be between %s and %s, got %s", commercialType, minSize, maxSize, computedLocal)
 	}
 
 	return nil
diff --git a/internal/namespaces/rdb/v1/custom_instance.go b/internal/namespaces/rdb/v1/custom_instance.go
@@ -706,7 +706,7 @@ func getPublicEndpoint(endpoints []*rdbSDK.Endpoint) (*rdbSDK.Endpoint, error) {
 		}
 	}
 
-	return nil, fmt.Errorf(errorMessagePublicEndpointNotFound)
+	return nil, fmt.Errorf("%s", errorMessagePublicEndpointNotFound)
 }
 
 func getPrivateEndpoint(endpoints []*rdbSDK.Endpoint) (*rdbSDK.Endpoint, error) {
@@ -716,7 +716,7 @@ func getPrivateEndpoint(endpoints []*rdbSDK.Endpoint) (*rdbSDK.Endpoint, error)
 		}
 	}
 
-	return nil, fmt.Errorf(errorMessagePrivateEndpointNotFound)
+	return nil, fmt.Errorf("%s", errorMessagePrivateEndpointNotFound)
 }
 
 func createConnectCommandLineArgs(endpoint *rdbSDK.Endpoint, family engineFamily, args *instanceConnectArgs) ([]string, error) {
@@ -815,7 +815,7 @@ func instanceConnectCommand() *core.Command {
 			}
 
 			if len(instance.Endpoints) == 0 {
-				return nil, fmt.Errorf(errorMessageEndpointNotFound)
+				return nil, fmt.Errorf("%s", errorMessageEndpointNotFound)
 			}
 
 			var endpoint *rdbSDK.Endpoint

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ func (s *CliError) MarshalHuman() (string, error) {`
`43`	`43`	`if s.Err != nil {`
`44`	`44`	`humanError := s.Err`
`45`	`45`	`if s.Message != "" {`
`46`		`- humanError = fmt.Errorf(s.Message)`
	`46`	`+ humanError = fmt.Errorf("%s", s.Message)`
`47`	`47`	`}`
`48`	`48`	`str, err := human.Marshal(humanError, nil)`
`49`	`49`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -25,11 +25,11 @@ func createServer(metaKey string) core.BeforeFunc {`
`25`	`25`	`//`
`26`	`26`	`//nolint:unparam`
`27`	`27`	`func deleteServer(metaKey string) core.AfterFunc {`
`28`		`- return core.ExecAfterCmd(fmt.Sprintf("scw baremetal server delete zone=nl-ams-1 {{ ." + metaKey + ".ID }}"))`
	`28`	`+ return core.ExecAfterCmd(fmt.Sprintf("scw baremetal server delete zone=nl-ams-1 {{ .%s.ID }}", metaKey))`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`func deleteServerDefault(metaKey string) core.AfterFunc {`
`32`		`- return core.ExecAfterCmd(fmt.Sprintf("scw baremetal server delete {{ ." + metaKey + ".ID }}"))`
	`32`	`+ return core.ExecAfterCmd(fmt.Sprintf("scw baremetal server delete {{ .%s.ID }}", metaKey))`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`// add an ssh key with a given meta key`
`@@ -44,5 +44,5 @@ func addSSH(metaKey string, key string) core.BeforeFunc {`
`44`	`44`
`45`	`45`	`// delete an ssh key with a given meta key`
`46`	`46`	`func deleteSSH(metaKey string) core.AfterFunc {`
`47`		`- return core.ExecAfterCmd(fmt.Sprintf("scw iam ssh-key delete {{ ." + metaKey + ".ID }}"))`
	`47`	`+ return core.ExecAfterCmd(fmt.Sprintf("scw iam ssh-key delete {{ .%s.ID }}", metaKey))`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ func installationCanceled(addKeyInstructions string) *core.CliError {`
`15`	`15`
`16`	`16`	`func sshKeyNotFound(filename string, addKeyInstructions string) *core.CliError {`
`17`	`17`	`return &core.CliError{`
`18`		`- Err: fmt.Errorf("could not find an SSH key at " + filename),`
	`18`	`+ Err: fmt.Errorf("could not find an SSH key at %s", filename),`
`19`	`19`	`Hint: "You can add one later using " + addKeyInstructions,`
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -552,14 +552,14 @@ func validateLocalVolumeSizes(volumes map[string]*instance.VolumeServerTemplate,`
`552`	`552`	`}`
`553`	`553`
`554`	`554`	`if localVolumeTotalSize < volumeConstraint.MinSize \|\| localVolumeTotalSize > volumeConstraint.MaxSize {`
`555`		`- min := humanize.Bytes(uint64(volumeConstraint.MinSize))`
	`555`	`+ minSize := humanize.Bytes(uint64(volumeConstraint.MinSize))`
`556`	`556`	`computedLocal := humanize.Bytes(uint64(localVolumeTotalSize))`
`557`	`557`	`if volumeConstraint.MinSize == volumeConstraint.MaxSize {`
`558`		`- return fmt.Errorf("%s total local volume size must be equal to %s, got %s", commercialType, min, computedLocal)`
	`558`	`+ return fmt.Errorf("%s total local volume size must be equal to %s, got %s", commercialType, minSize, computedLocal)`
`559`	`559`	`}`
`560`	`560`
`561`		`- max := humanize.Bytes(uint64(volumeConstraint.MaxSize))`
`562`		`- return fmt.Errorf("%s total local volume size must be between %s and %s, got %s", commercialType, min, max, computedLocal)`
	`561`	`+ maxSize := humanize.Bytes(uint64(volumeConstraint.MaxSize))`
	`562`	`+ return fmt.Errorf("%s total local volume size must be between %s and %s, got %s", commercialType, minSize, maxSize, computedLocal)`
`563`	`563`	`}`
`564`	`564`
`565`	`565`	`return nil`
Original file line number	Diff line number	Diff line change
`@@ -706,7 +706,7 @@ func getPublicEndpoint(endpoints []rdbSDK.Endpoint) (rdbSDK.Endpoint, error) {`
`706`	`706`	`}`
`707`	`707`	`}`
`708`	`708`
`709`		`- return nil, fmt.Errorf(errorMessagePublicEndpointNotFound)`
	`709`	`+ return nil, fmt.Errorf("%s", errorMessagePublicEndpointNotFound)`
`710`	`710`	`}`
`711`	`711`
`712`	`712`	`func getPrivateEndpoint(endpoints []rdbSDK.Endpoint) (rdbSDK.Endpoint, error) {`
`@@ -716,7 +716,7 @@ func getPrivateEndpoint(endpoints []rdbSDK.Endpoint) (rdbSDK.Endpoint, error)`
`716`	`716`	`}`
`717`	`717`	`}`
`718`	`718`
`719`		`- return nil, fmt.Errorf(errorMessagePrivateEndpointNotFound)`
	`719`	`+ return nil, fmt.Errorf("%s", errorMessagePrivateEndpointNotFound)`
`720`	`720`	`}`
`721`	`721`
`722`	`722`	`func createConnectCommandLineArgs(endpoint rdbSDK.Endpoint, family engineFamily, args instanceConnectArgs) ([]string, error) {`
`@@ -815,7 +815,7 @@ func instanceConnectCommand() *core.Command {`
`815`	`815`	`}`
`816`	`816`
`817`	`817`	`if len(instance.Endpoints) == 0 {`
`818`		`- return nil, fmt.Errorf(errorMessageEndpointNotFound)`
	`818`	`+ return nil, fmt.Errorf("%s", errorMessageEndpointNotFound)`
`819`	`819`	`}`
`820`	`820`
`821`	`821`	`var endpoint *rdbSDK.Endpoint`