Linter updates and fixes (#457)

* Fix long line * Update golangci-lint config * Fix all long line after change to 120 char limit
vultr · Jun 11, 2024 · 9628bae · 9628bae
1 parent 91fba88
commit 9628bae
Show file tree

Hide file tree

Showing 26 changed files with 500 additions and 142 deletions.
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -23,7 +23,7 @@ linters-settings:
     min-complexity: 15
   goimports:
     local-prefixes: github.com/golangci/golangci-lint
-  gomnd:
+  mnd:
     # don't include the "operation" and "assign"
     checks:
       - argument
@@ -37,9 +37,7 @@ linters-settings:
       - '3'
     ignored-functions:
       - strings.SplitN
-
   govet:
-    check-shadowing: true
     settings:
       printf:
         funcs:
@@ -48,7 +46,7 @@ linters-settings:
           - (github.com/golangci/golangci-lint/pkg/logutils.Log).Errorf
           - (github.com/golangci/golangci-lint/pkg/logutils.Log).Fatalf
   lll:
-    line-length: 140
+    line-length: 120
   misspell:
     locale: US
   nolintlint:
@@ -59,7 +57,6 @@ linters-settings:
     rules:
       - name: unexported-return
         disabled: true
-
 linters:
   disable-all: true
   enable:
@@ -71,7 +68,7 @@ linters:
     - gocyclo
     - gofmt
     - goimports
-    - gomnd
+    - mnd
     - goprintffuncname
     - gosec
     - gosimple

diff --git a/cmd/applications/applications.go b/cmd/applications/applications.go
@@ -73,7 +73,10 @@ func NewCmdApplications(base *cli.Base) *cobra.Command {
 		"per-page",
 		"p",
 		utils.PerPageDefault,
-		fmt.Sprintf("(optional) Number of items requested per page. Default is %d and Max is 500.", utils.PerPageDefault),
+		fmt.Sprintf(
+			"(optional) Number of items requested per page. Default is %d and Max is 500.",
+			utils.PerPageDefault,
+		),
 	)
 
 	cmd.AddCommand(list)

diff --git a/cmd/backups/backups.go b/cmd/backups/backups.go
@@ -64,7 +64,10 @@ func NewCmdBackups(base *cli.Base) *cobra.Command {
 		"per-page",
 		"p",
 		utils.PerPageDefault,
-		fmt.Sprintf("(optional) Number of items requested per page. Default is %d and Max is 500.", utils.PerPageDefault),
+		fmt.Sprintf(
+			"(optional) Number of items requested per page. Default is %d and Max is 500.",
+			utils.PerPageDefault,
+		),
 	)
 
 	// Get

diff --git a/cmd/baremetal/baremetal.go b/cmd/baremetal/baremetal.go
@@ -112,7 +112,8 @@ There is no going back from this call.`
 	ipv4Example = ``
 
 	ipv6Long = `
-List the IPv6 information of a bare metal server. IP information is only available for bare metal servers in the "active" state.
+List the IPv6 information of a bare metal server. 
+IP information is only available for bare metal servers in the "active" state.
 `
 	ipv6Example = ``
 
@@ -165,7 +166,10 @@ func NewCmdBareMetal(base *cli.Base) *cobra.Command { //nolint:funlen,gocyclo
 		"per-page",
 		"p",
 		utils.PerPageDefault,
-		fmt.Sprintf("(optional) Number of items requested per page. Default is %d and Max is 500.", utils.PerPageDefault),
+		fmt.Sprintf(
+			"(optional) Number of items requested per page. Default is %d and Max is 500.",
+			utils.PerPageDefault,
+		),
 	)
 
 	// Get
@@ -254,25 +258,53 @@ func NewCmdBareMetal(base *cli.Base) *cobra.Command { //nolint:funlen,gocyclo
 		0,
 		"(optional) ID of the application that will be installed on the server.",
 	)
-	create.Flags().StringP("image", "", "", "(optional) Image ID of the application that will be installed on the server.")
+	create.Flags().StringP(
+		"image",
+		"",
+		"",
+		"(optional) Image ID of the application that will be installed on the server.",
+	)
 	create.Flags().StringP(
 		"userdata",
 		"u",
 		"",
-		"(optional) A generic data store, which some provisioning tools and cloud operating systems use as a configuration file.",
+		`(optional) A generic data store, which some provisioning tools and cloud operating 
+systems use as a configuration file.`,
 	)
 	create.Flags().StringP(
 		"notify",
 		"n",
 		"",
-		"(optional) Whether an activation email will be sent when the server is ready. Possible values: 'yes', 'no'. Defaults to 'yes'.",
+		`(optional) Whether an activation email will be sent when the server is ready. Possible values: 'yes', 'no'. 
+Defaults to 'yes'.`,
 	)
 	create.Flags().StringP("hostname", "m", "", "(optional) The hostname to assign to the server.")
-	create.Flags().StringP("tag", "t", "", "Deprecated: use `tags` instead. (optional) The tag to assign to the server.")
-	create.Flags().StringSliceP("tags", "", []string{}, "(optional) A comma separated list of tags to assign to the server.")
-	create.Flags().StringP("ripv4", "v", "", "(optional) IP address of the floating IP to use as the main IP of this server.")
+	create.Flags().StringP(
+		"tag",
+		"t",
+		"",
+		"Deprecated: use `tags` instead. (optional) The tag to assign to the server.",
+	)
+	create.Flags().StringSliceP(
+		"tags",
+		"",
+		[]string{},
+		"(optional) A comma separated list of tags to assign to the server.",
+	)
+	create.Flags().StringP(
+		"ripv4",
+		"v",
+		"",
+		"(optional) IP address of the floating IP to use as the main IP of this server.",
+	)
 	create.Flags().BoolP("persistent_pxe", "x", false, "enable persistent_pxe | true or false")
-	create.Flags().StringP("mdisk_mode", "", "", "(optional) The raid configuration to use when provisioning this server. Possible values: 'raid1', 'jbod', 'none''. Defaults to 'none'.")
+	create.Flags().StringP(
+		"mdisk_mode",
+		"",
+		"",
+		`(optional) The raid configuration to use when provisioning this server. 
+Possible values: 'raid1', 'jbod', 'none''. Defaults to 'none'.`,
+	)
 	if err := create.MarkFlagRequired("region"); err != nil {
 		fmt.Printf("error marking bare metal create 'region' flag required: %v", err)
 		os.Exit(1)
@@ -913,7 +945,12 @@ func NewCmdBareMetal(base *cli.Base) *cobra.Command { //nolint:funlen,gocyclo
 	}
 
 	vpc2Attach.Flags().StringP("vpc-id", "v", "", "the ID of the VPC 2.0 network you wish to attach")
-	vpc2Attach.Flags().StringP("ip-address", "i", "", "the IP address to use for this server on the attached VPC 2.0 network")
+	vpc2Attach.Flags().StringP(
+		"ip-address",
+		"i",
+		"",
+		"the IP address to use for this server on the attached VPC 2.0 network",
+	)
 	if errVPC := vpc2Attach.MarkFlagRequired("vpc-id"); errVPC != nil {
 		fmt.Printf("error marking bare metal 'vpc-id' flag required for attach : %v", errVPC)
 		os.Exit(1)

diff --git a/cmd/billing/billing.go b/cmd/billing/billing.go
@@ -125,7 +125,10 @@ func NewCmdBilling(base *cli.Base) *cobra.Command {
 		"per-page",
 		"p",
 		utils.PerPageDefault,
-		fmt.Sprintf("(optional) Number of items requested per page. Default is %d and Max is 500.", utils.PerPageDefault),
+		fmt.Sprintf(
+			"(optional) Number of items requested per page. Default is %d and Max is 500.",
+			utils.PerPageDefault,
+		),
 	)
 
 	// Invoice Get
@@ -192,7 +195,10 @@ func NewCmdBilling(base *cli.Base) *cobra.Command {
 		"per-page",
 		"p",
 		utils.PerPageDefault,
-		fmt.Sprintf("(optional) Number of items requested per page. Default is %d and Max is 500.", utils.PerPageDefault),
+		fmt.Sprintf(
+			"(optional) Number of items requested per page. Default is %d and Max is 500.",
+			utils.PerPageDefault,
+		),
 	)
 
 	invoice.AddCommand(
@@ -235,7 +241,10 @@ func NewCmdBilling(base *cli.Base) *cobra.Command {
 		"per-page",
 		"p",
 		utils.PerPageDefault,
-		fmt.Sprintf("(optional) Number of items requested per page. Default is %d and Max is 500.", utils.PerPageDefault),
+		fmt.Sprintf(
+			"(optional) Number of items requested per page. Default is %d and Max is 500.",
+			utils.PerPageDefault,
+		),
 	)
 
 	history.AddCommand(

diff --git a/cmd/blockstorage/blockstorage.go b/cmd/blockstorage/blockstorage.go
@@ -138,7 +138,10 @@ func NewCmdBlockStorage(base *cli.Base) *cobra.Command { //nolint:gocyclo
 		"per-page",
 		"p",
 		utils.PerPageDefault,
-		fmt.Sprintf("(optional) Number of items requested per page. Default is %d and Max is 500.", utils.PerPageDefault),
+		fmt.Sprintf(
+			"(optional) Number of items requested per page. Default is %d and Max is 500.",
+			utils.PerPageDefault,
+		),
 	)
 
 	// Get

diff --git a/cmd/containerregistry/containerregistry.go b/cmd/containerregistry/containerregistry.go
@@ -86,7 +86,8 @@ var (
 	repoUpdateLong    = `Update the details of registry's repository`
 	repoUpdateExample = `
 	# Full example
-	vultr-cli container-registry repository update 4dcdc52e-9c63-401e-8c5f-1582490fe09c --image-name="my-thing" --description="new description"
+	vultr-cli container-registry repository update 4dcdc52e-9c63-401e-8c5f-1582490fe09c --image-name="my-thing" 
+	--description="new description"
 
 	# Shortened example with aliases
 	vultr-cli cr r u 4dcdc52e-9c63-401e-8c5f-1582490fe09c -i="my-thing" -d="new description"
@@ -162,7 +163,10 @@ func NewCmdContainerRegistry(base *cli.Base) *cobra.Command { //nolint:funlen,go
 		"per-page",
 		"p",
 		utils.PerPageDefault,
-		fmt.Sprintf("(optional) Number of items requested per page. Default is %d and Max is 500.", utils.PerPageDefault),
+		fmt.Sprintf(
+			"(optional) Number of items requested per page. Default is %d and Max is 500.",
+			utils.PerPageDefault,
+		),
 	)
 
 	// Get
@@ -250,7 +254,12 @@ func NewCmdContainerRegistry(base *cli.Base) *cobra.Command { //nolint:funlen,go
 		os.Exit(1)
 	}
 
-	create.Flags().BoolP("public", "p", false, "If the registry is publicly available. Should be true | false (default is false)")
+	create.Flags().BoolP(
+		"public",
+		"p",
+		false,
+		"If the registry is publicly available. Should be true | false (default is false)",
+	)
 	if err := create.MarkFlagRequired("public"); err != nil {
 		fmt.Printf("error marking container registry create 'public' flag required: %v", err)
 		os.Exit(1)
@@ -462,12 +471,18 @@ func NewCmdContainerRegistry(base *cli.Base) *cobra.Command { //nolint:funlen,go
 		RunE: func(cmd *cobra.Command, args []string) error {
 			name, errIm := cmd.Flags().GetString("image-name")
 			if errIm != nil {
-				return fmt.Errorf("error parsing 'image-name' flag for container registry repository update : %v", errIm)
+				return fmt.Errorf(
+					"error parsing 'image-name' flag for container registry repository update : %v",
+					errIm,
+				)
 			}
 
 			description, errDe := cmd.Flags().GetString("description")
 			if errDe != nil {
-				return fmt.Errorf("error parsing 'description' flag for container registry repository update : %v", errDe)
+				return fmt.Errorf(
+					"error parsing 'description' flag for container registry repository update : %v",
+					errDe,
+				)
 			}
 
 			o.RepoName = name
@@ -513,7 +528,10 @@ func NewCmdContainerRegistry(base *cli.Base) *cobra.Command { //nolint:funlen,go
 		RunE: func(cmd *cobra.Command, args []string) error {
 			name, errIm := cmd.Flags().GetString("image-name")
 			if errIm != nil {
-				return fmt.Errorf("error parsing 'image-name' flag for container registry repository delete : %v", errIm)
+				return fmt.Errorf(
+					"error parsing 'image-name' flag for container registry repository delete : %v",
+					errIm,
+				)
 			}
 
 			o.RepoName = name
@@ -560,7 +578,10 @@ func NewCmdContainerRegistry(base *cli.Base) *cobra.Command { //nolint:funlen,go
 		RunE: func(cmd *cobra.Command, args []string) error {
 			expiry, errEx := cmd.Flags().GetInt("expiry-seconds")
 			if errEx != nil {
-				return fmt.Errorf("error parsing 'expiry-seconds' flag for container registry docker creds : %v", errEx)
+				return fmt.Errorf(
+					"error parsing 'expiry-seconds' flag for container registry docker creds : %v",
+					errEx,
+				)
 			}
 
 			access, errAc := cmd.Flags().GetBool("read-write")
@@ -662,7 +683,7 @@ func (o *options) regions() ([]govultr.ContainerRegistryRegion, *govultr.Meta, e
 }
 
 func (o *options) repositoryList() ([]govultr.ContainerRegistryRepo, *govultr.Meta, error) {
-	repos, meta, _, err := o.Base.Client.ContainerRegistry.ListRepositories(o.Base.Context, o.Base.Args[0], o.Base.Options)
+	repos, meta, _, err := o.Base.Client.ContainerRegistry.ListRepositories(o.Base.Context, o.Base.Args[0], o.Base.Options) //nolint:lll
 	return repos, meta, err
 }
 

diff --git a/cmd/containerregistry/printer.go b/cmd/containerregistry/printer.go
@@ -116,7 +116,11 @@ func (c *ContainerRegistriesPrinter) Data() [][]string {
 
 	var data [][]string
 	for i := range c.Registries {
-		usage := fmt.Sprintf("%vGB / %vGB", c.Registries[i].Storage.Used.GigaBytes, c.Registries[i].Storage.Allowed.GigaBytes)
+		usage := fmt.Sprintf(
+			"%vGB / %vGB",
+			c.Registries[i].Storage.Used.GigaBytes,
+			c.Registries[i].Storage.Allowed.GigaBytes,
+		)
 		data = append(data, []string{
 			c.Registries[i].ID,
 			c.Registries[i].Name,
@@ -171,7 +175,7 @@ func (c *ContainerRegistryPlansPrinter) Data() [][]string {
 
 		data = append(data, []string{
 			botVals.FieldByName("VanityName").String(),
-			fmt.Sprintf("%vGB", botVals.FieldByName("MaxStorageMB").Int()/1024), //nolint:gomnd
+			fmt.Sprintf("%vGB", botVals.FieldByName("MaxStorageMB").Int()/1024), //nolint:mnd
 			strconv.FormatInt(botVals.FieldByName("MonthlyPrice").Int(), 10),
 		})
 	}