apigee · ssvaidyanathan · Jun 8, 2023 · Jun 8, 2023
diff --git a/.golangci.yml b/.golangci.yml
@@ -87,7 +87,6 @@ linters:
     - typecheck
     - unused
     - bodyclose
-    - depguard
     - goconst
     - gofmt
     - goimports

diff --git a/cmd/apis/delapi.go b/cmd/apis/delapi.go
@@ -37,7 +37,7 @@ var DelCmd = &cobra.Command{
 		} else {
 			_, err = apis.DeleteProxyRevision(name, revision)
 		}
-		return
+		return err
 	},
 }
 

diff --git a/cmd/apis/depapi.go b/cmd/apis/depapi.go
@@ -39,7 +39,7 @@ var DepCmd = &cobra.Command{
 	RunE: func(cmd *cobra.Command, args []string) (err error) {
 		if revision == -1 {
 			if revision, err = apis.GetHighestProxyRevision(name); err != nil {
-				return
+				return err
 			}
 		}
 		if _, err = apis.DeployProxy(name,
@@ -48,7 +48,7 @@ var DepCmd = &cobra.Command{
 			sequencedRollout,
 			safeDeploy,
 			serviceAccountName); err != nil {
-			return
+			return err
 		}
 
 		apiclient.DisableCmdPrintHttpResponse()
@@ -82,7 +82,7 @@ var DepCmd = &cobra.Command{
 			<-stop
 		}
 
-		return
+		return err
 	},
 }
 

diff --git a/cmd/apis/fetchapi.go b/cmd/apis/fetchapi.go
@@ -33,7 +33,7 @@ var FetCmd = &cobra.Command{
 	RunE: func(cmd *cobra.Command, args []string) (err error) {
 		if revision == -1 {
 			if revision, err = apis.GetHighestProxyRevision(name); err != nil {
-				return
+				return err
 			}
 		}
 		return apis.FetchProxy(name, revision)

diff --git a/cmd/apis/listdeploy.go b/cmd/apis/listdeploy.go
@@ -56,7 +56,7 @@ var ListDepCmd = &cobra.Command{
 		} else {
 			_, err = apis.ListProxyDeployments(name)
 		}
-		return
+		return err
 	},
 }
 

diff --git a/cmd/apis/undepapi.go b/cmd/apis/undepapi.go
@@ -34,11 +34,11 @@ var UndepCmd = &cobra.Command{
 	RunE: func(cmd *cobra.Command, args []string) (err error) {
 		if revision == -1 {
 			if revision, err = apis.GetHighestProxyRevision(name); err != nil {
-				return
+				return err
 			}
 		}
 		_, err = apis.UndeployProxy(name, revision, safeUndeploy)
-		return
+		return err
 	},
 }
 

diff --git a/cmd/apps/expapp.go b/cmd/apps/expapp.go
@@ -34,7 +34,7 @@ var ExpCmd = &cobra.Command{
 		const exportFileName = "apps.json"
 		payload, err := apps.Export(conn)
 		if err != nil {
-			return
+			return err
 		}
 		return apiclient.WriteArrayByteArrayToFile(exportFileName, false, payload)
 	},

diff --git a/cmd/apps/getapp.go b/cmd/apps/getapp.go
@@ -41,7 +41,7 @@ var GetCmd = &cobra.Command{
 	RunE: func(cmd *cobra.Command, args []string) (err error) {
 		if appID != "" {
 			_, err = apps.Get(appID)
-			return
+			return err
 		}
 
 		if name != "" {
@@ -54,7 +54,7 @@ var GetCmd = &cobra.Command{
 		}
 
 		_, err = apps.ListApps(productName)
-		return
+		return err
 	},
 }
 

diff --git a/cmd/env/crtarchive.go b/cmd/env/crtarchive.go
@@ -74,7 +74,7 @@ var CreateArchiveCmd = &cobra.Command{
 		if wait {
 			archiveResponse := op{}
 			if err = json.Unmarshal(respBody, &archiveResponse); err != nil {
-				return
+				return err
 			}
 
 			s := strings.Split(archiveResponse.Name, "/")
@@ -115,7 +115,7 @@ var CreateArchiveCmd = &cobra.Command{
 			<-stop
 
 		}
-		return
+		return err
 	},
 }
 

diff --git a/cmd/env/getdeployments.go b/cmd/env/getdeployments.go
@@ -37,7 +37,7 @@ var GetDeployCmd = &cobra.Command{
 		} else {
 			_, err = environments.GetDeployments(sharedflows)
 		}
-		return
+		return err
 	},
 }
 

diff --git a/cmd/eptattachment/crteptattachment.go b/cmd/eptattachment/crteptattachment.go
@@ -42,7 +42,7 @@ var CreateCmd = &cobra.Command{
 				"projects/{project-id}/regions/{location}/serviceAttachments/{sa-name}")
 		}
 		_, err = eptattachment.Create(name, serviceAttachment, location)
-		return
+		return err
 	},
 }
 

diff --git a/cmd/instances/crtinstance.go b/cmd/instances/crtinstance.go
@@ -61,7 +61,7 @@ var CreateCmd = &cobra.Command{
 
 		_, err = instances.Create(name, location, diskEncryptionKeyName, ipRange, consumerAcceptList)
 
-		return
+		return err
 	},
 }
 

diff --git a/cmd/keyaliases/crtka.go b/cmd/keyaliases/crtka.go
@@ -78,7 +78,7 @@ var CreateCmd = &cobra.Command{
 		default:
 			return fmt.Errorf("invalid format key alias for %s", format)
 		}
-		return
+		return err
 	},
 }
 

diff --git a/cmd/keyaliases/updateka.go b/cmd/keyaliases/updateka.go
@@ -78,7 +78,7 @@ var UpdateCmd = &cobra.Command{
 		default:
 			return fmt.Errorf("invalid format key alias for %s", format)
 		}
-		return
+		return err
 	},
 }
 

diff --git a/cmd/kvm/expentries.go b/cmd/kvm/expentries.go
@@ -45,7 +45,7 @@ var ExpEntryCmd = &cobra.Command{
 		var fileName string
 
 		if payload, err = kvm.ExportEntries(proxyName, mapName); err != nil {
-			return
+			return err
 		}
 
 		if env != "" {
@@ -58,10 +58,10 @@ var ExpEntryCmd = &cobra.Command{
 
 		for i := range payload {
 			if err = apiclient.WriteByteArrayToFile(fileName+"_"+strconv.Itoa(i)+".json", false, payload[i]); err != nil {
-				return
+				return err
 			}
 		}
-		return
+		return err
 	},
 }
 

diff --git a/cmd/kvm/expkvm.go b/cmd/kvm/expkvm.go
@@ -59,7 +59,7 @@ var ExpCmd = &cobra.Command{
 
 		for _, mapName := range listKVM {
 			if payload, err = kvm.ExportEntries(proxyName, mapName); err != nil {
-				return
+				return err
 			}
 
 			if env != "" {
@@ -72,13 +72,13 @@ var ExpCmd = &cobra.Command{
 
 			for i := range payload {
 				if err = apiclient.WriteByteArrayToFile(fileName+"_"+strconv.Itoa(i)+".json", false, payload[i]); err != nil {
-					return
+					return err
 				}
 			}
 		}
 
 		clilog.Info.Println("KVMs exported successfully")
-		return
+		return err
 	},
 }
 

diff --git a/cmd/ops/listops.go b/cmd/ops/listops.go
@@ -49,7 +49,7 @@ var ListCmd = &cobra.Command{
 		} else {
 			_, err = operations.List(state, operations.Both)
 		}
-		return
+		return err
 	},
 }
 

diff --git a/cmd/org/export.go b/cmd/org/export.go
@@ -245,7 +245,7 @@ var ExportCmd = &cobra.Command{
 
 		}
 
-		return
+		return err
 	},
 }
 

diff --git a/cmd/org/reportmonthly.go b/cmd/org/reportmonthly.go
@@ -43,7 +43,7 @@ var MonthlyCmd = &cobra.Command{
 		clilog.Warning.Println("This API is rate limited to 1 API Call per second")
 
 		if _, err = time.Parse("1/2006", fmt.Sprintf("%d/%d", month, year)); err != nil {
-			return
+			return err
 		}
 
 		if envDetails {
@@ -52,7 +52,7 @@ var MonthlyCmd = &cobra.Command{
 		}
 
 		if apiCalls, err = orgs.TotalAPICallsInMonth(month, year, envDetails, conn); err != nil {
-			return
+			return err
 		}
 
 		if envDetails {
@@ -64,7 +64,7 @@ var MonthlyCmd = &cobra.Command{
 		fmt.Fprintln(w)
 		w.Flush()
 
-		return
+		return err
 	},
 }
 

diff --git a/cmd/org/reportyearly.go b/cmd/org/reportyearly.go
@@ -43,7 +43,7 @@ var YearlyCmd = &cobra.Command{
 		clilog.Warning.Println("This API is rate limited to 1 API Call per second")
 
 		if _, err = time.Parse("2006", fmt.Sprintf("%d", year)); err != nil {
-			return
+			return err
 		}
 
 		if envDetails {
@@ -52,7 +52,7 @@ var YearlyCmd = &cobra.Command{
 		}
 
 		if apiCalls, err = orgs.TotalAPICallsInYear(year, envDetails, conn); err != nil {
-			return
+			return err
 		}
 
 		if envDetails {
@@ -64,7 +64,7 @@ var YearlyCmd = &cobra.Command{
 		fmt.Fprintln(w)
 		w.Flush()
 
-		return
+		return err
 	},
 }
 

diff --git a/cmd/overrides/apply.go b/cmd/overrides/apply.go
@@ -98,7 +98,7 @@ var ApplyCmd = &cobra.Command{
 			}
 		}
 
-		return
+		return err
 	},
 }
 

diff --git a/cmd/overrides/delete.go b/cmd/overrides/delete.go
@@ -70,7 +70,7 @@ var DeleteCmd = &cobra.Command{
 			}
 		}
 
-		return
+		return err
 	},
 }
 

diff --git a/cmd/overrides/overridestype.go b/cmd/overrides/overridestype.go
@@ -60,7 +60,7 @@ func readOverrides(filepath string) (err error) {
 	if err != nil {
 		return err
 	}
-	return
+	return err
 }
 
 func getOrg() string {

diff --git a/cmd/products/crtprod.go b/cmd/products/crtprod.go
@@ -63,7 +63,7 @@ var CreateCmd = &cobra.Command{
 
 		_, err = products.Create(p)
 
-		return
+		return err
 	},
 }
 

diff --git a/cmd/products/crtrateplan.go b/cmd/products/crtrateplan.go
@@ -37,10 +37,10 @@ var CreateRateplanCmd = &cobra.Command{
 	RunE: func(cmd *cobra.Command, args []string) (err error) {
 		if rateplanData, err = os.ReadFile(rateplanFile); err != nil {
 			clilog.Debug.Println(err)
-			return
+			return err
 		}
 		_, err = products.CreateRatePlan(apiproduct, rateplanData)
-		return
+		return err
 	},
 }
 

diff --git a/cmd/products/expprod.go b/cmd/products/expprod.go
@@ -34,7 +34,7 @@ var ExpCmd = &cobra.Command{
 		const exportFileName = "products.json"
 		payload, err := products.Export(conn)
 		if err != nil {
-			return
+			return err
 		}
 		return apiclient.WriteArrayByteArrayToFile(exportFileName, false, payload)
 	},

diff --git a/cmd/products/exprateplan.go b/cmd/products/exprateplan.go
@@ -34,7 +34,7 @@ var ExpRateplanCmd = &cobra.Command{
 		exportFileName := "rateplan_" + name + ".json"
 		respBody, err := products.ExportRateplan(name)
 		if err != nil {
-			return
+			return err
 		}
 		return apiclient.WriteByteArrayToFile(exportFileName, false, respBody)
 	},

diff --git a/cmd/products/listproducts.go b/cmd/products/listproducts.go
@@ -45,7 +45,7 @@ var ListCmd = &cobra.Command{
 		} else {
 			_, err = products.List(count, startKey, expand)
 		}
-		return
+		return err
 	},
 }
 

diff --git a/cmd/products/updprod.go b/cmd/products/updprod.go
@@ -63,7 +63,7 @@ var UpdateCmd = &cobra.Command{
 
 		_, err = products.Update(p)
 
-		return
+		return err
 	},
 }
 

diff --git a/cmd/projects/testiam.go b/cmd/projects/testiam.go
@@ -37,7 +37,7 @@ var TestCmd = &cobra.Command{
 		u.Path = path.Join(u.Path, apiclient.GetProjectID()+":testIamPermissions")
 		payload := "{\"permissions\":[\"resourcemanager.projects.get\"]}"
 		_, err = apiclient.HttpClient(u.String(), payload)
-		return
+		return err
 	},
 }
 

diff --git a/cmd/sharedflows/crtsf.go b/cmd/sharedflows/crtsf.go
@@ -71,7 +71,7 @@ var CreateCmd = &cobra.Command{
 			}
 			return os.Remove(sfBundlePath)
 		}
-		return
+		return err
 	},
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,7 +37,7 @@ var DelCmd = &cobra.Command{ @@
     		} else {
     			_, err = apis.DeleteProxyRevision(name, revision)
     		}
-    		return
+    		return err
     	},
     }
@@ Expand Down @@