From 26e8e548e740df0ff0309db37f3da25ebb242e3f Mon Sep 17 00:00:00 2001 From: srinandan <13950006+srinandan@users.noreply.github.com> Date: Sat, 23 Jul 2022 20:01:42 -0700 Subject: [PATCH] fix linting issues #39 --- apiclient/clifile.go | 3 +-- apiclient/token.go | 2 +- bundlegen/generateapi.go | 4 ++-- client/developers/developers.go | 4 ++++ client/operations/operations.go | 4 ++-- cmd/apis/depwaitapi.go | 3 +-- cmd/env/crtarchive.go | 4 +++- cmd/iam/iam.go | 2 +- cmd/org/export.go | 4 ++-- cmd/org/import.go | 8 ++++++-- cmd/overrides/apply.go | 13 ++----------- cmd/overrides/delete.go | 2 +- cmd/overrides/overrides.go | 2 -- 13 files changed, 26 insertions(+), 29 deletions(-) diff --git a/apiclient/clifile.go b/apiclient/clifile.go index b058819d6..284c1e4c0 100644 --- a/apiclient/clifile.go +++ b/apiclient/clifile.go @@ -212,8 +212,7 @@ func GetPreferences() (err error) { return err } - PrettyPrint(output) - return nil + return PrettyPrint(output) } //WritePreferencesFile diff --git a/apiclient/token.go b/apiclient/token.go index f79bd9520..690c2e9e4 100644 --- a/apiclient/token.go +++ b/apiclient/token.go @@ -145,7 +145,7 @@ func generateAccessToken(privateKey string) (string, error) { if err != nil { clilog.Error.Println("error in response: ", err) - return "", fmt.Errorf("error in response: ", err) + return "", fmt.Errorf("error in response: %v", err) } else if resp.StatusCode > 399 { clilog.Error.Printf("status code %d, error in response: %s\n", resp.StatusCode, string(respBody)) return "", fmt.Errorf("status code %d, error in response: %s\n", resp.StatusCode, string(respBody)) diff --git a/bundlegen/generateapi.go b/bundlegen/generateapi.go index 962305a97..eb5ae6f72 100644 --- a/bundlegen/generateapi.go +++ b/bundlegen/generateapi.go @@ -227,7 +227,7 @@ func GenerateAPIProxyDefFromOAS(name string, targets.NewTargetEndpoint(u.Scheme+"://"+u.Hostname(), oasGoogleAcessTokenScopeLiteral, oasGoogleIdTokenAudLiteral, oasGoogleIdTokenAudRef) } else { //an explicit target url is set if _, err = url.Parse(targetUrl); err != nil { - return fmt.Errorf("Invalid target url: ", err) + return fmt.Errorf("Invalid target url: %v", err) } targets.NewTargetEndpoint(targetUrl, oasGoogleAcessTokenScopeLiteral, oasGoogleIdTokenAudLiteral, oasGoogleIdTokenAudRef) } @@ -335,7 +335,7 @@ func GenerateAPIProxyDefFromGQL(name string, targets.NewTargetEndpoint("https://api.example.com", "", "", "") } else { //an explicit target url is set if _, err = url.Parse(targetUrl); err != nil { - return fmt.Errorf("Invalid target url: ", err) + return fmt.Errorf("Invalid target url: %v", err) } targets.NewTargetEndpoint(targetUrl, "", "", "") } diff --git a/client/developers/developers.go b/client/developers/developers.go index b03576733..a9ca67a05 100644 --- a/client/developers/developers.go +++ b/client/developers/developers.go @@ -99,6 +99,10 @@ func GetDeveloperId(email string) (developerId string, err error) { u, _ := url.Parse(apiclient.BaseURL) u.Path = path.Join(u.Path, apiclient.GetApigeeOrg(), "developers", url.QueryEscape(email)) //since developer emails can have + respBody, err := apiclient.HttpClient(apiclient.GetPrintOutput(), u.String()) + if err != nil { + return "", err + } + apiclient.SetPrintOutput(true) err = json.Unmarshal(respBody, &developerMap) if err != nil { diff --git a/client/operations/operations.go b/client/operations/operations.go index 7431b5078..659be1215 100644 --- a/client/operations/operations.go +++ b/client/operations/operations.go @@ -55,8 +55,8 @@ type OperationCompleteState string const ( Success OperationCompleteState = "Success" - Failed = "Failed" - Both = "Both" + Failed OperationCompleteState = "Failed" + Both OperationCompleteState = "Both" ) //Get diff --git a/cmd/apis/depwaitapi.go b/cmd/apis/depwaitapi.go index fe00ed2c6..619c5e571 100644 --- a/cmd/apis/depwaitapi.go +++ b/cmd/apis/depwaitapi.go @@ -30,9 +30,8 @@ var DepWaitCmd = &cobra.Command{ Short: "Deploys a revision of an existing API proxy and waits for deployment status", Long: "Deploys a revision of an existing API proxy to an environment and waits for deployment status", Args: func(cmd *cobra.Command, args []string) (err error) { - apiclient.SetApigeeOrg(org) apiclient.SetApigeeEnv(env) - return nil + return apiclient.SetApigeeOrg(org) }, RunE: func(cmd *cobra.Command, args []string) (err error) { if revision == -1 { diff --git a/cmd/env/crtarchive.go b/cmd/env/crtarchive.go index 17c05c98f..1ef93f89f 100644 --- a/cmd/env/crtarchive.go +++ b/cmd/env/crtarchive.go @@ -62,7 +62,9 @@ var CreateArchiveCmd = &cobra.Command{ if folder != "" { zipfile = name + ".zip" - proxybundle.GenerateArchiveBundle(folder, zipfile) + if err = proxybundle.GenerateArchiveBundle(folder, zipfile); err != nil { + return err + } } respBody, err := env.CreateArchive(name, zipfile) diff --git a/cmd/iam/iam.go b/cmd/iam/iam.go index 6bd248b3a..c899d1ae2 100644 --- a/cmd/iam/iam.go +++ b/cmd/iam/iam.go @@ -27,7 +27,7 @@ var Cmd = &cobra.Command{ } var name, projectID, roleType string -var generateName, wid bool +var generateName bool var roles = []string{"mart", "analytics", "all", "logger", "connect", "cassandra", "watcher", "sync", "admin", "api-admin", "env-admin", "dev-admin", "readonly-admin"} diff --git a/cmd/org/export.go b/cmd/org/export.go index ff881f6c9..0b0b52682 100644 --- a/cmd/org/export.go +++ b/cmd/org/export.go @@ -77,7 +77,7 @@ var ExportCmd = &cobra.Command{ return err } - fmt.Println("\tExporting KV Map names for org %s", org) + fmt.Printf("\tExporting KV Map names for org %s\n", org) if respBody, err = kvm.List(""); err != nil { return err } @@ -158,7 +158,7 @@ var ExportCmd = &cobra.Command{ return err } - fmt.Println("\tExporting KV Map names for environment %s...", environment) + fmt.Printf("\tExporting KV Map names for environment %s...\n", environment) if respBody, err = kvm.List(""); err != nil { return err } diff --git a/cmd/org/import.go b/cmd/org/import.go index 871b62ba4..4ec1a6753 100644 --- a/cmd/org/import.go +++ b/cmd/org/import.go @@ -77,7 +77,9 @@ var ImportCmd = &cobra.Command{ return err } if orgKVMFileList[kvmName] != "" { - kvm.ImportEntries("", kvmName, conn, orgKVMFileList[kvmName]) + if err = kvm.ImportEntries("", kvmName, conn, orgKVMFileList[kvmName]); err != nil { + return err + } } } } @@ -157,7 +159,9 @@ var ImportCmd = &cobra.Command{ return err } if envKVMFileList[kvmName] != "" { - kvm.ImportEntries("", kvmName, conn, envKVMFileList[kvmName]) + if err = kvm.ImportEntries("", kvmName, conn, envKVMFileList[kvmName]); err != nil { + return err + } } } } diff --git a/cmd/overrides/apply.go b/cmd/overrides/apply.go index 268e8309b..c0087270f 100644 --- a/cmd/overrides/apply.go +++ b/cmd/overrides/apply.go @@ -15,7 +15,6 @@ package overrides import ( - "encoding/json" "fmt" "github.com/apigee/apigeecli/apiclient" @@ -40,8 +39,9 @@ var ApplyCmd = &cobra.Command{ if err = readOverrides(overridesFile); err != nil { return err } + apiclient.SetProjectID(getOrg()) - apiclient.SetApigeeOrg(getOrg()) + _ = apiclient.SetApigeeOrg(getOrg()) apiclient.SetPrintOutput(false) //check if the org exists @@ -115,12 +115,3 @@ func getDomainName(index int) []string { domainNames = append(domainNames, domainName) return domainNames } - -func getSyncIdentityCount(response []byte) (count int, err error) { - syncResponse := make(map[string]interface{}) - err = json.Unmarshal(response, &syncResponse) - if err != nil { - return 0, err - } - return len(syncResponse["identities"].([]interface{})), nil -} diff --git a/cmd/overrides/delete.go b/cmd/overrides/delete.go index 42c0c0c54..c6706250d 100644 --- a/cmd/overrides/delete.go +++ b/cmd/overrides/delete.go @@ -35,7 +35,7 @@ var DeleteCmd = &cobra.Command{ return err } apiclient.SetProjectID(getOrg()) - apiclient.SetApigeeOrg(getOrg()) + _ = apiclient.SetApigeeOrg(getOrg()) apiclient.SetPrintOutput(false) //delete environments diff --git a/cmd/overrides/overrides.go b/cmd/overrides/overrides.go index 898cbe0b9..d8ac21e5a 100644 --- a/cmd/overrides/overrides.go +++ b/cmd/overrides/overrides.go @@ -26,8 +26,6 @@ var Cmd = &cobra.Command{ Long: "Manage Apigee hybrid through overrides", } -var org string - func init() { Cmd.AddCommand(ApplyCmd) Cmd.AddCommand(DeleteCmd)