Skip to content

Commit 15a8de0

Browse files
ssvaidyanathanssvaidyanathan
authored
Merge pull request #476 from apigee/issue473
feat: silences usage when apis fail #473
2 parents b59f160 + 636d1b0 commit 15a8de0

File tree

275 files changed

+550
-0
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

275 files changed

+550
-0
lines changed

‎internal/cmd/apicategories/create.go

+2
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ var CreateCmd = &cobra.Command{
3434
return apiclient.SetApigeeOrg(org)
3535
},
3636
RunE: func(cmd *cobra.Command, args []string) (err error) {
37+
cmd.SilenceUsage = true
38+
3739
if siteid == "" {
3840
return fmt.Errorf("siteid is a mandatory parameter")
3941
}

‎internal/cmd/apicategories/delete.go

+2
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ var DelCmd = &cobra.Command{
4242
return apiclient.SetApigeeOrg(org)
4343
},
4444
RunE: func(cmd *cobra.Command, args []string) (err error) {
45+
cmd.SilenceUsage = true
46+
4547
if name != "" {
4648
if id, err = apicategories.GetIDByName(siteid, name); err != nil {
4749
return err

‎internal/cmd/apicategories/export.go

+2
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ var ExpCmd = &cobra.Command{
3434
return apiclient.SetApigeeOrg(org)
3535
},
3636
RunE: func(cmd *cobra.Command, args []string) (err error) {
37+
cmd.SilenceUsage = true
38+
3739
if folder == "" {
3840
folder, _ = os.Getwd()
3941
}

‎internal/cmd/apicategories/get.go

+2
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ var GetCmd = &cobra.Command{
4343
return apiclient.SetApigeeOrg(org)
4444
},
4545
RunE: func(cmd *cobra.Command, args []string) (err error) {
46+
cmd.SilenceUsage = true
47+
4648
if name != "" {
4749
var payload []byte
4850
if payload, err = apicategories.GetByName(siteid, name); err != nil {

‎internal/cmd/apicategories/list.go

+2
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ var ListCmd = &cobra.Command{
3636
return apiclient.SetApigeeOrg(org)
3737
},
3838
RunE: func(cmd *cobra.Command, args []string) (err error) {
39+
cmd.SilenceUsage = true
40+
3941
_, err = apicategories.List(siteid)
4042
return
4143
},

‎internal/cmd/apidocs/create.go

+2
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ var CreateCmd = &cobra.Command{
6464
return apiclient.SetApigeeOrg(org)
6565
},
6666
RunE: func(cmd *cobra.Command, args []string) (err error) {
67+
cmd.SilenceUsage = true
68+
6769
_, err = apidocs.Create(siteid, title, description, published,
6870
anonAllowed, apiProductName, requireCallbackUrl, imageUrl, categoryIds)
6971
return

‎internal/cmd/apidocs/delete.go

+2
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ var DelCmd = &cobra.Command{
3636
return apiclient.SetApigeeOrg(org)
3737
},
3838
RunE: func(cmd *cobra.Command, args []string) (err error) {
39+
cmd.SilenceUsage = true
40+
3941
_, err = apidocs.Delete(siteid, id)
4042
return
4143
},

‎internal/cmd/apidocs/export.go

+2
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ var ExpCmd = &cobra.Command{
3434
return apiclient.SetApigeeOrg(org)
3535
},
3636
RunE: func(cmd *cobra.Command, args []string) (err error) {
37+
cmd.SilenceUsage = true
38+
3739
if folder == "" {
3840
folder, _ = os.Getwd()
3941
}

‎internal/cmd/apidocs/get.go

+2
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ var GetCmd = &cobra.Command{
4242
return apiclient.SetApigeeOrg(org)
4343
},
4444
RunE: func(cmd *cobra.Command, args []string) (err error) {
45+
cmd.SilenceUsage = true
46+
4547
if name != "" {
4648
var payload []byte
4749
if payload, err = apidocs.GetByTitle(siteid, name); err != nil {

‎internal/cmd/apidocs/getdocs.go

+2
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ var GetDocCmd = &cobra.Command{
3636
return apiclient.SetApigeeOrg(org)
3737
},
3838
RunE: func(cmd *cobra.Command, args []string) (err error) {
39+
cmd.SilenceUsage = true
40+
3941
_, err = apidocs.GetDocumentation(siteid, id)
4042
return
4143
},

‎internal/cmd/apidocs/list.go

+2
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ var ListCmd = &cobra.Command{
3636
return apiclient.SetApigeeOrg(org)
3737
},
3838
RunE: func(cmd *cobra.Command, args []string) (err error) {
39+
cmd.SilenceUsage = true
40+
3941
_, err = apidocs.List(siteid, pageSize, pageToken)
4042
return
4143
},

‎internal/cmd/apidocs/update.go

+2
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ var UpdateCmd = &cobra.Command{
5151
return apiclient.SetApigeeOrg(org)
5252
},
5353
RunE: func(cmd *cobra.Command, args []string) (err error) {
54+
cmd.SilenceUsage = true
55+
5456
_, err = apidocs.Update(siteid, id, title, description, published,
5557
anonAllowed, apiProductName, requireCallbackUrl, imageUrl, categoryIds)
5658
return

‎internal/cmd/apidocs/updatedocs.go

+2
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ var UpdateDocCmd = &cobra.Command{
4444
return apiclient.SetApigeeOrg(org)
4545
},
4646
RunE: func(cmd *cobra.Command, args []string) (err error) {
47+
cmd.SilenceUsage = true
48+
4749
var openAPIDoc, graphQLDoc []byte
4850

4951
if openAPIPath != "" {

‎internal/cmd/apis/bundlecrtapis.go

+2
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ var BundleCreateCmd = &cobra.Command{
5555
return apiclient.SetApigeeOrg(org)
5656
},
5757
RunE: func(cmd *cobra.Command, args []string) (err error) {
58+
cmd.SilenceUsage = true
59+
5860
var respBody []byte
5961
if proxyZip != "" {
6062
respBody, err = apis.CreateProxy(name, proxyZip)

‎internal/cmd/apis/cleanapi.go

+2
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ var CleanCmd = &cobra.Command{
3232
return apiclient.SetApigeeOrg(org)
3333
},
3434
RunE: func(cmd *cobra.Command, args []string) (err error) {
35+
cmd.SilenceUsage = true
36+
3537
return apis.CleanProxy(name, reportOnly, keepList)
3638
},
3739
}

‎internal/cmd/apis/cloneapi.go

+2
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ var CloneCmd = &cobra.Command{
5757
return apiclient.SetApigeeOrg(org)
5858
},
5959
RunE: func(cmd *cobra.Command, args []string) (err error) {
60+
cmd.SilenceUsage = true
61+
6062
if proxyZip != "" {
6163
// extract the zip to a tmp folder and assign to proxyFolder
6264
if proxyFolder, err = unzipBundle(); err != nil {

‎internal/cmd/apis/crtapikvm.go

+2
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ var CreateKvmCmd = &cobra.Command{
3232
return apiclient.SetApigeeOrg(org)
3333
},
3434
RunE: func(cmd *cobra.Command, args []string) (err error) {
35+
cmd.SilenceUsage = true
36+
3537
_, err = apis.CreateProxyKVM(proxyName, name, encrypted)
3638
return
3739
},

‎internal/cmd/apis/crttrcapi.go

+2
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ var CreateTrcCmd = &cobra.Command{
3333
return apiclient.SetApigeeOrg(org)
3434
},
3535
RunE: func(cmd *cobra.Command, args []string) (err error) {
36+
cmd.SilenceUsage = true
37+
3638
if revision == -1 {
3739
if revision, err = apis.GetHighestProxyRevision(name); err != nil {
3840
return err

‎internal/cmd/apis/delapi.go

+2
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ var DelCmd = &cobra.Command{
3333
return apiclient.SetApigeeOrg(org)
3434
},
3535
RunE: func(cmd *cobra.Command, args []string) (err error) {
36+
cmd.SilenceUsage = true
37+
3638
if revision == -1 {
3739
_, err = apis.DeleteProxy(name)
3840
} else {

‎internal/cmd/apis/delapikvm.go

+2
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ var DelKvmCmd = &cobra.Command{
3232
return apiclient.SetApigeeOrg(org)
3333
},
3434
RunE: func(cmd *cobra.Command, args []string) (err error) {
35+
cmd.SilenceUsage = true
36+
3537
_, err = apis.DeleteProxyKVM(proxyName, name)
3638
return
3739
},

‎internal/cmd/apis/depapi.go

+2
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ var DepCmd = &cobra.Command{
3434
return apiclient.SetApigeeOrg(org)
3535
},
3636
RunE: func(cmd *cobra.Command, args []string) (err error) {
37+
cmd.SilenceUsage = true
38+
3739
if revision == -1 {
3840
if revision, err = apis.GetHighestProxyRevision(name); err != nil {
3941
return err

‎internal/cmd/apis/expapis.go

+2
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ var ExpCmd = &cobra.Command{
3232
return apiclient.SetApigeeOrg(org)
3333
},
3434
RunE: func(cmd *cobra.Command, args []string) (err error) {
35+
cmd.SilenceUsage = true
36+
3537
if err = apiclient.FolderExists(folder); err != nil {
3638
return err
3739
}

‎internal/cmd/apis/fetchapi.go

+2
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ var FetCmd = &cobra.Command{
3232
return apiclient.SetApigeeOrg(org)
3333
},
3434
RunE: func(cmd *cobra.Command, args []string) (err error) {
35+
cmd.SilenceUsage = true
36+
3537
if revision == -1 {
3638
if revision, err = apis.GetHighestProxyRevision(name); err != nil {
3739
return err

‎internal/cmd/apis/getapi.go

+2
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ var GetCmd = &cobra.Command{
3232
return apiclient.SetApigeeOrg(org)
3333
},
3434
RunE: func(cmd *cobra.Command, args []string) (err error) {
35+
cmd.SilenceUsage = true
36+
3537
_, err = apis.GetProxy(name, revision)
3638
return
3739
},

‎internal/cmd/apis/gettrcapi.go

+2
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ var GetTrcCmd = &cobra.Command{
3333
return apiclient.SetApigeeOrg(org)
3434
},
3535
RunE: func(cmd *cobra.Command, args []string) (err error) {
36+
cmd.SilenceUsage = true
37+
3638
if revision == -1 {
3739
if revision, err = apis.GetHighestProxyRevision(name); err != nil {
3840
return err

‎internal/cmd/apis/ghcrtapis.go

+2
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ var GhCreateCmd = &cobra.Command{
4747
return apiclient.SetApigeeOrg(org)
4848
},
4949
RunE: func(cmd *cobra.Command, args []string) (err error) {
50+
cmd.SilenceUsage = true
51+
5052
if os.Getenv("GITHUB_TOKEN") == "" {
5153
clilog.Debug.Println("github token is not set as an env var. Running unauthenticated")
5254
}

‎internal/cmd/apis/gqlcrtapis.go

+2
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ var GqlCreateCmd = &cobra.Command{
5353
return apiclient.SetApigeeOrg(org)
5454
},
5555
RunE: func(cmd *cobra.Command, args []string) (err error) {
56+
cmd.SilenceUsage = true
57+
5658
var content []byte
5759
var gqlDocName string
5860
if gqlFile != "" {

‎internal/cmd/apis/impapis.go

+2
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ var ImpCmd = &cobra.Command{
3737
return apiclient.SetApigeeOrg(org)
3838
},
3939
RunE: func(cmd *cobra.Command, args []string) (err error) {
40+
cmd.SilenceUsage = true
41+
4042
if stat, err := os.Stat(folder); err == nil && !stat.IsDir() {
4143
return fmt.Errorf("supplied path is not a folder")
4244
}

‎internal/cmd/apis/integrationapis.go

+2
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ var IntegrationCmd = &cobra.Command{
3737
return apiclient.SetApigeeOrg(org)
3838
},
3939
RunE: func(cmd *cobra.Command, args []string) (err error) {
40+
cmd.SilenceUsage = true
41+
4042
tmpDir, err := os.MkdirTemp("", "proxy")
4143
if err != nil {
4244
return err

‎internal/cmd/apis/listapikvm.go

+2
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ var ListKvmCmd = &cobra.Command{
3232
return apiclient.SetApigeeOrg(org)
3333
},
3434
RunE: func(cmd *cobra.Command, args []string) (err error) {
35+
cmd.SilenceUsage = true
36+
3537
_, err = apis.ListProxyKVM(proxyName)
3638
return
3739
},

‎internal/cmd/apis/listapis.go

+2
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ var ListCmd = &cobra.Command{
3232
return apiclient.SetApigeeOrg(org)
3333
},
3434
RunE: func(cmd *cobra.Command, args []string) (err error) {
35+
cmd.SilenceUsage = true
36+
3537
_, err = apis.ListProxies(includeRevisions)
3638
return
3739
},

‎internal/cmd/apis/listdeploy.go

+2
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ var ListDepCmd = &cobra.Command{
4444
return apiclient.SetApigeeOrg(org)
4545
},
4646
RunE: func(cmd *cobra.Command, args []string) (err error) {
47+
cmd.SilenceUsage = true
48+
4749
if apiclient.GetApigeeEnv() != "" {
4850
if revision != -1 {
4951
if !report {

‎internal/cmd/apis/listtrcapi.go

+2
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ var ListTrcCmd = &cobra.Command{
3333
return apiclient.SetApigeeOrg(org)
3434
},
3535
RunE: func(cmd *cobra.Command, args []string) (err error) {
36+
cmd.SilenceUsage = true
37+
3638
_, err = apis.ListTraceSession(name, revision)
3739
return
3840
},

‎internal/cmd/apis/oascrtapisv2.go

+2
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ Create an API Proxy from OAS and deploy the proxy to an environment:
6767
return apiclient.SetApigeeOrg(org)
6868
},
6969
RunE: func(cmd *cobra.Command, args []string) (err error) {
70+
cmd.SilenceUsage = true
71+
7072
var content []byte
7173

7274
if oasFile != "" {

‎internal/cmd/apis/swaggerapis.go

+2
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ var SwaggerCreateCmd = &cobra.Command{
3939
return apiclient.SetApigeeOrg(org)
4040
},
4141
RunE: func(cmd *cobra.Command, args []string) (err error) {
42+
cmd.SilenceUsage = true
43+
4244
// var content []byte
4345
var oasDocName string
4446

‎internal/cmd/apis/undepapi.go

+2
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ var UndepCmd = &cobra.Command{
3333
return apiclient.SetApigeeOrg(org)
3434
},
3535
RunE: func(cmd *cobra.Command, args []string) (err error) {
36+
cmd.SilenceUsage = true
37+
3638
if revision == -1 {
3739
if revision, err = apis.GetHighestProxyRevision(name); err != nil {
3840
return err

‎internal/cmd/apis/updapis.go

+2
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ var UpdateCmd = &cobra.Command{
3232
return apiclient.SetApigeeOrg(org)
3333
},
3434
RunE: func(cmd *cobra.Command, args []string) (err error) {
35+
cmd.SilenceUsage = true
36+
3537
_, err = apis.Update(name, labels)
3638
return
3739
},

‎internal/cmd/appgroups/createkey.go

+2
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ var CreateKeyCmd = &cobra.Command{
3737
return apiclient.SetApigeeOrg(org)
3838
},
3939
RunE: func(cmd *cobra.Command, args []string) (err error) {
40+
cmd.SilenceUsage = true
41+
4042
if expires != "" {
4143
if _, err = strconv.Atoi(expires); err != nil {
4244
return fmt.Errorf("expires must be an integer: %v", err)

‎internal/cmd/appgroups/crtapp.go

+2
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ var CreateAppCmd = &cobra.Command{
3535
return apiclient.SetApigeeOrg(org)
3636
},
3737
RunE: func(cmd *cobra.Command, args []string) (err error) {
38+
cmd.SilenceUsage = true
39+
3840
if expires != "" {
3941
if _, err = strconv.Atoi(expires); err != nil {
4042
return fmt.Errorf("expires must be an integer: %v", err)

‎internal/cmd/appgroups/crtappgroup.go

+2
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ var CreateCmd = &cobra.Command{
3131
return apiclient.SetApigeeOrg(org)
3232
},
3333
RunE: func(cmd *cobra.Command, args []string) (err error) {
34+
cmd.SilenceUsage = true
35+
3436
_, err = appgroups.Create(name, channelURI, channelID, displayName, attrs, devs)
3537
return
3638
},

‎internal/cmd/appgroups/delapp.go

+2
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ var DelAppCmd = &cobra.Command{
3131
return apiclient.SetApigeeOrg(org)
3232
},
3333
RunE: func(cmd *cobra.Command, args []string) (err error) {
34+
cmd.SilenceUsage = true
35+
3436
_, err = appgroups.DeleteApp(name, appName)
3537
return err
3638
},

‎internal/cmd/appgroups/delappgroup.go

+2
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ var DelCmd = &cobra.Command{
3131
return apiclient.SetApigeeOrg(org)
3232
},
3333
RunE: func(cmd *cobra.Command, args []string) (err error) {
34+
cmd.SilenceUsage = true
35+
3436
_, err = appgroups.Delete(name)
3537
return err
3638
},

‎internal/cmd/appgroups/delkey.go

+2
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ var DelKeyCmd = &cobra.Command{
3232
return apiclient.SetApigeeOrg(org)
3333
},
3434
RunE: func(cmd *cobra.Command, args []string) (err error) {
35+
cmd.SilenceUsage = true
36+
3537
_, err = appgroups.DeleteKey(name, appName, key)
3638
return
3739
},

‎internal/cmd/appgroups/delkeyprod.go

+2
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ var DelProdKeyCmd = &cobra.Command{
3232
return apiclient.SetApigeeOrg(org)
3333
},
3434
RunE: func(cmd *cobra.Command, args []string) (err error) {
35+
cmd.SilenceUsage = true
36+
3537
_, err = appgroups.DeleteKeyProduct(name, appName, key, productName)
3638
return
3739
},

0 commit comments

Comments
 (0)