chore(workflow-cli): remove uuid display

duanhongyi · duanhongyi · commit 44b45033b51c · 2024-05-28T11:30:45.000+08:00
diff --git a/cmd/apps.go b/cmd/apps.go
@@ -78,11 +78,10 @@ func (d *DryccCmd) AppsList(results int) error {
 		return err
 	}
 	if count > 0 {
-		table := d.getDefaultFormatTable([]string{"ID", "UUID", "OWNER", "CREATED", "UPDATED"})
+		table := d.getDefaultFormatTable([]string{"ID", "OWNER", "CREATED", "UPDATED"})
 		for _, app := range apps {
 			table.Append([]string{
 				app.ID,
-				app.UUID,
 				app.Owner,
 				d.formatTime(app.Created),
 				d.formatTime(app.Updated),
diff --git a/cmd/apps_test.go b/cmd/apps_test.go
@@ -62,9 +62,9 @@ func TestAppsList(t *testing.T) {
 
 	err = cmdr.AppsList(-1)
 	assert.NoError(t, err)
-	assert.Equal(t, b.String(), `ID             UUID                                    OWNER             CREATED                 UPDATED              
-lorem-ipsum    c4aed81c-d1ca-4ff1-ab89-d2151264e1a3    dolar-sit-amet    2016-08-22T17:40:16Z    2016-08-22T17:40:16Z    
-consectetur    c4aed81c-d1ca-4ff1-ab89-d2151264e1a3    adipiscing        2016-08-22T17:40:16Z    2016-08-22T17:40:16Z    
+	assert.Equal(t, b.String(), `ID             OWNER             CREATED                 UPDATED              
+lorem-ipsum    dolar-sit-amet    2016-08-22T17:40:16Z    2016-08-22T17:40:16Z    
+consectetur    adipiscing        2016-08-22T17:40:16Z    2016-08-22T17:40:16Z    
 `, "output")
 }
 
@@ -101,8 +101,8 @@ func TestAppsListLimit(t *testing.T) {
 
 	err = cmdr.AppsList(1)
 	assert.NoError(t, err)
-	assert.Equal(t, b.String(), `ID             UUID                                    OWNER             CREATED                 UPDATED              
-lorem-ipsum    c4aed81c-d1ca-4ff1-ab89-d2151264e1a3    dolar-sit-amet    2016-08-22T17:40:16Z    2016-08-22T17:40:16Z    
+	assert.Equal(t, b.String(), `ID             OWNER             CREATED                 UPDATED              
+lorem-ipsum    dolar-sit-amet    2016-08-22T17:40:16Z    2016-08-22T17:40:16Z    
 `, "output")
 }
 
diff --git a/cmd/autoscale.go b/cmd/autoscale.go
@@ -22,10 +22,9 @@ func (d *DryccCmd) AutoscaleList(appID string) error {
 	if appSettings.Autoscale == nil {
 		d.Println("No autoscale rules found.")
 	} else {
-		table := d.getDefaultFormatTable([]string{"UUID", "PTYPE", "PERCENT", "MIN", "MAX"})
+		table := d.getDefaultFormatTable([]string{"PTYPE", "PERCENT", "MIN", "MAX"})
 		for process, kv := range appSettings.Autoscale {
 			table.Append([]string{
-				appSettings.UUID,
 				process,
 				fmt.Sprintf("%d", (*kv).CPUPercent),
 				fmt.Sprintf("%d", (*kv).Min),
diff --git a/cmd/autoscale_test.go b/cmd/autoscale_test.go
@@ -35,8 +35,8 @@ func TestAutoscaleList(t *testing.T) {
 
 	err = cmdr.AutoscaleList("rivendell")
 	assert.NoError(t, err)
-	assert.Equal(t, b.String(), `UUID                                    PTYPE    PERCENT    MIN    MAX 
-de1bf5b5-4a72-4f94-a10c-d2a3741cdf75    cmd      40         3      8      
+	assert.Equal(t, b.String(), `PTYPE    PERCENT    MIN    MAX 
+cmd      40         3      8      
 `, "output")
 
 	server.Mux.HandleFunc("/v2/apps/mordor/settings/", func(w http.ResponseWriter, _ *http.Request) {
diff --git a/cmd/builds.go b/cmd/builds.go
@@ -26,10 +26,9 @@ func (d *DryccCmd) BuildsList(appID string, results int) error {
 		return err
 	}
 	if count > 0 {
-		table := d.getDefaultFormatTable([]string{"UUID", "OWNER", "SHA", "CREATED"})
+		table := d.getDefaultFormatTable([]string{"OWNER", "SHA", "CREATED"})
 		for _, build := range builds {
 			table.Append([]string{
-				build.UUID,
 				safeGetString(build.Owner),
 				safeGetString(build.Sha),
 				d.formatTime(build.Created),
diff --git a/cmd/builds_test.go b/cmd/builds_test.go
@@ -72,9 +72,9 @@ func TestBuildsList(t *testing.T) {
 
 	err = cmdr.BuildsList("foo", -1)
 	assert.NoError(t, err)
-	assert.Equal(t, b.String(), `UUID                                    OWNER     SHA       CREATED                
-de1bf5b5-4a72-4f94-a10c-d2a3741cdf75    <none>    <none>    2014-01-01T00:00:00UTC    
-c4aed81c-d1ca-4ff1-ab89-d2151264e1a3    <none>    <none>    2014-01-05T00:00:00UTC    
+	assert.Equal(t, b.String(), `OWNER     SHA       CREATED                
+<none>    <none>    2014-01-01T00:00:00UTC    
+<none>    <none>    2014-01-05T00:00:00UTC    
 `, "output")
 }
 
@@ -112,8 +112,8 @@ func TestBuildsListLimit(t *testing.T) {
 
 	err = cmdr.BuildsList("foo", 1)
 	assert.NoError(t, err)
-	assert.Equal(t, b.String(), `UUID                                    OWNER     SHA       CREATED                
-de1bf5b5-4a72-4f94-a10c-d2a3741cdf75    <none>    <none>    2014-01-01T00:00:00UTC    
+	assert.Equal(t, b.String(), `OWNER     SHA       CREATED                
+<none>    <none>    2014-01-01T00:00:00UTC    
 `, "output")
 }
 
diff --git a/cmd/canary.go b/cmd/canary.go
@@ -21,10 +21,9 @@ func (d *DryccCmd) CanaryInfo(appID string) error {
 		return err
 	}
 	if len(appSettings.Canaries) > 0 {
-		table := d.getDefaultFormatTable([]string{"UUID", "OWNER", "PTYPE", "CREATED", "UPDATED"})
+		table := d.getDefaultFormatTable([]string{"OWNER", "PTYPE", "CREATED", "UPDATED"})
 		for _, procType := range appSettings.Canaries {
 			table.Append([]string{
-				appSettings.UUID,
 				appSettings.Owner,
 				procType,
 				d.formatTime(appSettings.Created),
diff --git a/cmd/canary_test.go b/cmd/canary_test.go
@@ -35,8 +35,8 @@ func TestCanaryInfo(t *testing.T) {
 
 	err = cmdr.CanaryInfo("rivendell")
 	assert.NoError(t, err)
-	assert.Equal(t, b.String(), `UUID                                    OWNER     PTYPE    CREATED                   UPDATED                
-de1bf5b5-4a72-4f94-a10c-d2a3741cdf75    elrond    cmd      2014-01-01T00:00:00UTC    2014-01-01T00:00:00UTC    
+	assert.Equal(t, b.String(), `OWNER     PTYPE    CREATED                   UPDATED                
+elrond    cmd      2014-01-01T00:00:00UTC    2014-01-01T00:00:00UTC    
 `, "output")
 
 	server.Mux.HandleFunc("/v2/apps/mordor/settings/", func(w http.ResponseWriter, _ *http.Request) {
diff --git a/cmd/labels.go b/cmd/labels.go
@@ -24,10 +24,9 @@ func (d *DryccCmd) LabelsList(appID string) error {
 	if len(appSettings.Label) == 0 {
 		d.Println(fmt.Sprintf("No labels found in %s app.", appID))
 	} else {
-		table := d.getDefaultFormatTable([]string{"UUID", "OWNER", "KEY", "VALUE"})
+		table := d.getDefaultFormatTable([]string{"OWNER", "KEY", "VALUE"})
 		for _, key := range *sortKeys(appSettings.Label) {
 			table.Append([]string{
-				appSettings.UUID,
 				appSettings.Owner,
 				key,
 				fmt.Sprintf("%v", appSettings.Label[key]),
diff --git a/cmd/labels_test.go b/cmd/labels_test.go
@@ -35,9 +35,9 @@ func TestLabelsList(t *testing.T) {
 
 	err = cmdr.LabelsList("rivendell")
 	assert.NoError(t, err)
-	assert.Equal(t, b.String(), `UUID                                    OWNER    KEY         VALUE                                      
-de1bf5b5-4a72-4f94-a10c-d2a3741cdf75    jim      git_repo    https://github.com/drycc/controller-sdk-go    
-de1bf5b5-4a72-4f94-a10c-d2a3741cdf75    jim      team        drycc                                         
+	assert.Equal(t, b.String(), `OWNER    KEY         VALUE                                      
+jim      git_repo    https://github.com/drycc/controller-sdk-go    
+jim      team        drycc                                         
 `, "output")
 
 	server.Mux.HandleFunc("/v2/apps/mordor/settings/", func(w http.ResponseWriter, _ *http.Request) {
diff --git a/cmd/releases.go b/cmd/releases.go
@@ -25,13 +25,13 @@ func (d *DryccCmd) ReleasesList(appID string, results int) error {
 	if count == 0 {
 		d.Println(fmt.Sprintf("No releases found in %s app.", appID))
 	} else {
-		table := d.getDefaultFormatTable([]string{"UUID", "OWNER", "STATE", "VERSION", "CREATED", "SUMMARY"})
+		table := d.getDefaultFormatTable([]string{"OWNER", "STATE", "VERSION", "CREATED", "SUMMARY"})
 		for _, r := range releases {
 			summary := r.Summary
 			if len(summary) > 64 {
 				summary = fmt.Sprintf("%s[...]", summary[:64])
 			}
-			table.Append([]string{r.UUID, r.Owner, r.State, fmt.Sprintf("v%d", r.Version), d.formatTime(r.Created), summary})
+			table.Append([]string{r.Owner, r.State, fmt.Sprintf("v%d", r.Version), d.formatTime(r.Created), summary})
 		}
 		table.Render()
 	}
diff --git a/cmd/releases_test.go b/cmd/releases_test.go
@@ -59,9 +59,9 @@ func TestReleasesList(t *testing.T) {
 
 	err = cmdr.ReleasesList("numenor", -1)
 	assert.NoError(t, err)
-	assert.Equal(t, b.String(), `UUID                                    OWNER     STATE      VERSION    CREATED                   SUMMARY                        
-c4aed81c-d1ca-4ff1-ab89-d2151264e1a3    nazgul    succeed    v2         2016-08-22T17:40:16Z      khamul added ANGMAR               
-de1bf5b5-4a72-4f94-a10c-d2a3741cdf75    nazgul    succeed    v1         2014-01-01T00:00:00UTC    nazgul created initial release    
+	assert.Equal(t, b.String(), `OWNER     STATE      VERSION    CREATED                   SUMMARY                        
+nazgul    succeed    v2         2016-08-22T17:40:16Z      khamul added ANGMAR               
+nazgul    succeed    v1         2014-01-01T00:00:00UTC    nazgul created initial release    
 `, "output")
 }
 
@@ -100,8 +100,8 @@ func TestReleasesListLimit(t *testing.T) {
 
 	err = cmdr.ReleasesList("numenor", 1)
 	assert.NoError(t, err)
-	assert.Equal(t, b.String(), `UUID                                    OWNER     STATE      VERSION    CREATED                 SUMMARY             
-c4aed81c-d1ca-4ff1-ab89-d2151264e1a3    nazgul    succeed    v2         2016-08-22T17:40:16Z    khamul added ANGMAR    
+	assert.Equal(t, b.String(), `OWNER     STATE      VERSION    CREATED                 SUMMARY             
+nazgul    succeed    v2         2016-08-22T17:40:16Z    khamul added ANGMAR    
 `, "output")
 }
 
diff --git a/cmd/resources.go b/cmd/resources.go
@@ -149,10 +149,9 @@ func (d *DryccCmd) ResourcesList(appID string, results int) error {
 	if count == 0 {
 		d.Println(fmt.Sprintf("No resources found in %s app.", appID))
 	} else {
-		table := d.getDefaultFormatTable([]string{"UUID", "NAME", "OWNER", "PLAN", "UPDATED"})
+		table := d.getDefaultFormatTable([]string{"NAME", "OWNER", "PLAN", "UPDATED"})
 		for _, resource := range resources {
 			table.Append([]string{
-				resource.UUID,
 				resource.Name,
 				resource.Owner,
 				resource.Plan,
diff --git a/cmd/resources_test.go b/cmd/resources_test.go
@@ -135,8 +135,8 @@ func TestResourcesList(t *testing.T) {
 	err = cmdr.ResourcesList("example-go", -1)
 	assert.NoError(t, err)
 
-	assert.Equal(t, b.String(), `UUID                                    NAME     OWNER    PLAN         UPDATED                
-de1bf5b5-4a72-4f94-a10c-d2a3741cdf75    mysql    test     mysql:5.6    2020-09-08T00:00:00UTC    
+	assert.Equal(t, b.String(), `NAME     OWNER    PLAN         UPDATED                
+mysql    test     mysql:5.6    2020-09-08T00:00:00UTC    
 `, "output")
 }
 
diff --git a/cmd/token.go b/cmd/token.go
@@ -30,10 +30,9 @@ func (d *DryccCmd) TokensList(results int) error {
 	if d.checkAPICompatibility(s.Client, err) != nil {
 		return err
 	}
-	table := d.getDefaultFormatTable([]string{"UUID", "OWNER", "ALIAS", "KEY", "CREATE", "UPDATED"})
+	table := d.getDefaultFormatTable([]string{"OWNER", "ALIAS", "KEY", "CREATE", "UPDATED"})
 	for _, token := range tokens {
 		table.Append([]string{
-			token.UUID,
 			token.Owner,
 			safeGetString(token.Alias),
 			token.Key,
diff --git a/cmd/token_test.go b/cmd/token_test.go
@@ -51,9 +51,9 @@ func TestTokensList(t *testing.T) {
 	err = cmdr.TokensList(-1)
 	assert.NoError(t, err)
 
-	assert.Equal(t, b.String(), `UUID                                    OWNER    ALIAS     KEY                                 CREATE                    UPDATED                
-f71e3b18-e702-409e-bd7f-8fb0a66d7b12    test     <none>    c8e74fa4cbf...e4954d602ec5ed19ba    2023-04-18T00:00:00UTC    2023-04-19T00:00:00UTC    
-f71e3b18-e702-499e-bd7f-8fb0a66d7b12    test     test      c8e74fa4cbf...e4954d60cec5ed19ba    2023-04-18T10:00:00UTC    2023-04-19T12:00:00UTC    
+	assert.Equal(t, b.String(), `OWNER    ALIAS     KEY                                 CREATE                    UPDATED                
+test     <none>    c8e74fa4cbf...e4954d602ec5ed19ba    2023-04-18T00:00:00UTC    2023-04-19T00:00:00UTC    
+test     test      c8e74fa4cbf...e4954d60cec5ed19ba    2023-04-18T10:00:00UTC    2023-04-19T12:00:00UTC    
 `, "output")
 }
 
