Update list domain CLI command to list deprecated domains (cadence-wo…

…rkflow#4039)
zshni · Mar 6, 2021 · 1e8b738 · 1e8b738
1 parent b399bd5
commit 1e8b738
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/tools/cli/admin.go b/tools/cli/admin.go
@@ -388,6 +388,10 @@ func newAdminDomainCommands() []cli.Command {
 					Name:  FlagAllWithAlias,
 					Usage: "List all domains, by default only domains in REGISTERED status are listed",
 				},
+				cli.BoolFlag{
+					Name: FlagDeprecatedWithAlias,
+					Usage: "List deprecated domains only, by default only domains in REGISTERED status are listed",
+				},
 				cli.BoolFlag{
 					Name:  FlagPrintFullyDetailWithAlias,
 					Usage: "Print full domain detail",

diff --git a/tools/cli/domainCommands.go b/tools/cli/domainCommands.go
@@ -443,16 +443,26 @@ func (d *domainCLIImpl) DescribeDomain(c *cli.Context) {
 }
 
 func (d *domainCLIImpl) ListDomains(c *cli.Context) {
-	domains := d.getAllDomains(c)
 	pageSize := c.Int(FlagPageSize)
 	printAll := c.Bool(FlagAll)
+	printDeprecated := c.Bool(FlagDeprecated)
 	printFull := c.Bool(FlagPrintFullyDetail)
 
+	if printAll && printDeprecated {
+		ErrorAndExit(fmt.Sprintf("Cannot specify %s and %s flags at the same time.", FlagAll, FlagDeprecated), nil)
+	}
+
+	domains := d.getAllDomains(c)
+
 	table := createTableForListDomains(printAll, printFull)
 
 	currentPageSize := 0
 	for i, domain := range domains {
-		if !printAll && *domain.DomainInfo.Status != types.DomainStatusRegistered {
+		if printDeprecated {
+			if *domain.DomainInfo.Status != types.DomainStatusDeprecated {
+				continue
+			}
+		} else if !printAll && *domain.DomainInfo.Status != types.DomainStatusRegistered {
 			continue
 		}
 

diff --git a/tools/cli/flags.go b/tools/cli/flags.go
@@ -112,6 +112,8 @@ const (
 	FlagMoreWithAlias                     = FlagMore + ", m"
 	FlagAll                               = "all"
 	FlagAllWithAlias                      = FlagAll + ", a"
+	FlagDeprecated                        = "deprecated"
+	FlagDeprecatedWithAlias               = FlagDeprecated + ", dep"
 	FlagPageSize                          = "pagesize"
 	FlagPageSizeWithAlias                 = FlagPageSize + ", ps"
 	FlagEarliestTime                      = "earliest_time"