Merge pull request #93 from dkeohane/OSD-5505

openshift-merge-robot · web-flow · commit e0efbf0db94e · 2021-05-19T11:45:54.000-04:00
[OSD-5505] Add flag to open AWS console url upon generation
diff --git a/README.md b/README.md
@@ -112,6 +112,9 @@ osdctl account console -a test-cr
 
 # generate console URL via AWS Account ID
 osdctl account console -i 1111111111
+
+# The --launch flag will open the url in the browser
+osdctl account console -i 1111111111 --launch
 ```
 
 ### Cleanup Velero managed snapshots
@@ -129,14 +132,14 @@ osdctl account clean-velero-snapshots -p <profile name> -c <config file path>
 
 ### AWS Account IAM User Credentials validation
 
-`check-secrets` command checks the IAM User Secret associated with Account Accout CR.
+`verify-secrets` command verifies the IAM User Secret associated with Account Accout CR.
 
 ```bash
-# no argument, check all account secrets
-osdctl account check-secrets
+# no argument, verify all account secrets
+osdctl account verify-secrets
 
-# specify the Account CR name, then only check the IAM User Secret for that Account.
-osdctl account check-secrets <Account CR Name>
+# specify the Account CR name, then only verify the IAM User Secret for that Account.
+osdctl account verify-secrets <Account CR Name>
 ```
 
 ### Match AWS Account with AWS Account Operator related resources
diff --git a/cmd/account/console.go b/cmd/account/console.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	"github.com/aws/aws-sdk-go/aws"
+	"github.com/pkg/browser"
 	"github.com/spf13/cobra"
 
 	"k8s.io/cli-runtime/pkg/genericclioptions"
@@ -30,6 +31,7 @@ func newCmdConsole(streams genericclioptions.IOStreams, flags *genericclioptions
 	ops.k8sclusterresourcefactory.AttachCobraCliFlags(consoleCmd)
 
 	consoleCmd.Flags().BoolVarP(&ops.verbose, "verbose", "", false, "Verbose output")
+	consoleCmd.Flags().BoolVar(&ops.launch, "launch", false, "Launch web browser directly")
 
 	return consoleCmd
 }
@@ -39,6 +41,7 @@ type consoleOptions struct {
 	k8sclusterresourcefactory k8spkg.ClusterResourceFactoryOptions
 
 	verbose bool
+	launch  bool
 
 	genericclioptions.IOStreams
 }
@@ -84,5 +87,9 @@ func (o *consoleOptions) run() error {
 	}
 	fmt.Fprintf(o.IOStreams.Out, "The AWS Console URL is:\n%s\n", consoleURL)
 
+	if o.launch {
+		return browser.OpenURL(consoleURL)
+	}
+
 	return nil
 }
diff --git a/docs/command/osdctl_account_check-secrets.md b/docs/command/osdctl_account_check-secrets.md
diff --git a/go.mod b/go.mod
@@ -13,6 +13,7 @@ require (
 	github.com/openshift/api v3.9.1-0.20191111211345-a27ff30ebf09+incompatible
 	github.com/openshift/aws-account-operator v0.0.0-20200914143350-bbda1c91242b
 	github.com/openshift/hive v1.0.5
+	github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/common v0.11.1
 	github.com/sirupsen/logrus v1.6.0
diff --git a/go.sum b/go.sum
@@ -1641,6 +1641,7 @@ github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi
 github.com/pierrec/lz4 v2.2.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 github.com/pierrec/lz4 v2.2.6+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 github.com/pierrec/lz4 v2.3.0+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
+github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4 h1:49lOXmGaUpV9Fz3gd7TFZY106KVlPVa5jcYD1gaQf98=
 github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod h1:4OwLy04Bl9Ef3GJJCoec+30X3LQs/0/m4HFRt/2LUSA=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ import (`
`4`	`4`	`"fmt"`
`5`	`5`
`6`	`6`	`"github.com/aws/aws-sdk-go/aws"`
	`7`	`+ "github.com/pkg/browser"`
`7`	`8`	`"github.com/spf13/cobra"`
`8`	`9`
`9`	`10`	`"k8s.io/cli-runtime/pkg/genericclioptions"`
`@@ -30,6 +31,7 @@ func newCmdConsole(streams genericclioptions.IOStreams, flags *genericclioptions`
`30`	`31`	`ops.k8sclusterresourcefactory.AttachCobraCliFlags(consoleCmd)`
`31`	`32`
`32`	`33`	`consoleCmd.Flags().BoolVarP(&ops.verbose, "verbose", "", false, "Verbose output")`
	`34`	`+ consoleCmd.Flags().BoolVar(&ops.launch, "launch", false, "Launch web browser directly")`
`33`	`35`
`34`	`36`	`return consoleCmd`
`35`	`37`	`}`
`@@ -39,6 +41,7 @@ type consoleOptions struct {`
`39`	`41`	`k8sclusterresourcefactory k8spkg.ClusterResourceFactoryOptions`
`40`	`42`
`41`	`43`	`verbose bool`
	`44`	`+ launch bool`
`42`	`45`
`43`	`46`	`genericclioptions.IOStreams`
`44`	`47`	`}`
`@@ -84,5 +87,9 @@ func (o *consoleOptions) run() error {`
`84`	`87`	`}`
`85`	`88`	`fmt.Fprintf(o.IOStreams.Out, "The AWS Console URL is:\n%s\n", consoleURL)`
`86`	`89`
	`90`	`+ if o.launch {`
	`91`	`+ return browser.OpenURL(consoleURL)`
	`92`	`+ }`
	`93`	`+`
`87`	`94`	`return nil`
`88`	`95`	`}`