Add a new flag to match account claim by the given account cr name

Signed-off-by: Ben Ye <yb532204897@gmail.com>

Author: yeya24

README.md

@@ -138,6 +138,9 @@ osdctl account check-secrets <Account CR Name>
 # Get Account Name by AWS Account ID, output to json
 osdctl account get account -i <Account ID> -o json
 
+# Get Account Claim CR by Account CR Name
+osdctl account get account-claim -a <Account CR Name>
+
 # Get Account Claim CR by AWS Account ID, output to yaml
 osdctl account get account-claim -i <Account ID> -o yaml
 

cmd/account/get/account-claim.go

@@ -35,13 +35,15 @@ func newCmdGetAccountClaim(streams genericclioptions.IOStreams, flags *genericcl
 	getAccountClaimCmd.Flags().StringVarP(&ops.output, "output", "o", "", "Output format. One of: json|yaml|jsonpath=...|jsonpath-file=... see jsonpath template [http://kubernetes.io/docs/user-guide/jsonpath].")
 	getAccountClaimCmd.Flags().StringVar(&ops.accountNamespace, "account-namespace", common.AWSAccountNamespace,
 		"The namespace to keep AWS accounts. The default value is aws-account-operator.")
+	getAccountClaimCmd.Flags().StringVarP(&ops.accountName, "account", "a", "", "Account CR Name")
 	getAccountClaimCmd.Flags().StringVarP(&ops.accountID, "account-id", "i", "", "AWS account ID")
 
 	return getAccountClaimCmd
 }
 
 // getAccountClaimOptions defines the struct for running get account-claim command
 type getAccountClaimOptions struct {
+	accountName      string
 	accountID        string
 	accountNamespace string
 
@@ -62,8 +64,11 @@ func newGetAccountClaimOptions(streams genericclioptions.IOStreams, flags *gener
 }
 
 func (o *getAccountClaimOptions) complete(cmd *cobra.Command, _ []string) error {
-	if o.accountID == "" {
-		return cmdutil.UsageErrorf(cmd, accountIDRequired)
+	if o.accountID == "" && o.accountName == "" {
+		return cmdutil.UsageErrorf(cmd, "AWS account ID and Account CR Name cannot be empty at the same time")
+	}
+	if o.accountID != "" && o.accountName != "" {
+		return cmdutil.UsageErrorf(cmd, "AWS account ID and Account CR Name cannot be set at the same time")
 	}
 
 	var err error
@@ -85,20 +90,25 @@ func (o *getAccountClaimOptions) run() error {
 		accountClaimName string
 		accountClaim     awsv1alpha1.AccountClaim
 	)
-	if err := o.kubeCli.List(ctx, &accounts, &client.ListOptions{
-		Namespace: o.accountNamespace,
-	}); err != nil {
-		return nil
-	}
 
-	for _, a := range accounts.Items {
-		if a.Spec.AwsAccountID == o.accountID {
-			accountCRName = a.Name
-			break
+	if o.accountName != "" {
+		accountCRName = o.accountName
+	} else {
+		if err := o.kubeCli.List(ctx, &accounts, &client.ListOptions{
+			Namespace: o.accountNamespace,
+		}); err != nil {
+			return nil
+		}
+
+		for _, a := range accounts.Items {
+			if a.Spec.AwsAccountID == o.accountID {
+				accountCRName = a.Name
+				break
+			}
+		}
+		if accountCRName == "" {
+			return fmt.Errorf("Account matched for AWS Account ID %s not found\n", o.accountID)
 		}
-	}
-	if accountCRName == "" {
-		return fmt.Errorf("Account matched for AWS Account ID %s not found\n", o.accountID)
 	}
 
 	if err := o.kubeCli.List(ctx, &accountClaims); err != nil {

cmd/account/get/account-claim_test.go

@@ -21,12 +21,22 @@ func TestGetAccountClaimCmdComplete(t *testing.T) {
 		errContent  string
 	}{
 		{
-			title: "empty account ID",
+			title: "account id and account cr name empty at the same time",
 			option: &getAccountClaimOptions{
-				accountID: "",
+				accountID:   "",
+				accountName: "",
 			},
 			errExpected: true,
-			errContent:  accountIDRequired,
+			errContent:  "AWS account ID and Account CR Name cannot be empty at the same time",
+		},
+		{
+			title: "account id and account cr name set at the same time",
+			option: &getAccountClaimOptions{
+				accountID:   "foo",
+				accountName: "bar",
+			},
+			errExpected: true,
+			errContent:  "AWS account ID and Account CR Name cannot be set at the same time",
 		},
 		{
 			title: "succeed",

docs/command/osdctl_account_get_account-claim.md

@@ -13,6 +13,7 @@ osdctl account get account-claim [flags]
 ### Options
 
 ```
+  -a, --account string             Account CR Name
   -i, --account-id string          AWS account ID
       --account-namespace string   The namespace to keep AWS accounts. The default value is aws-account-operator. (default "aws-account-operator")
   -h, --help                       help for account-claim