Change GetTranslatedStackType to use StackType instead of Stack

client/portainerTypes.go

@@ -7,11 +7,11 @@ import (
 )
 
 // GetTranslatedStackType returns a stack's Type field (int) translated to it's human readable form (string)
-func GetTranslatedStackType(s portainer.Stack) string {
+func GetTranslatedStackType(t portainer.StackType) string {
-	switch s.Type {
+	switch t {
-	case 1:
+	case portainer.DockerSwarmStack:
 		return "swarm"
-	case 2:
+	case portainer.DockerComposeStack:
 		return "compose"
 	default:
 		return ""

client/portainerTypes_test.go

@@ -9,7 +9,7 @@ import (
 
 func TestGetTranslatedStackType(t *testing.T) {
 	type args struct {
-		s portainer.Stack
+		t portainer.StackType
 	}
 	tests := []struct {
 		name string
@@ -19,34 +19,28 @@ func TestGetTranslatedStackType(t *testing.T) {
 		{
 			name: "swarm stack type",
 			args: args{
-				s: portainer.Stack{
+				t: portainer.DockerSwarmStack,
-					Type: 1,
-				},
 			},
 			want: "swarm",
 		},
 		{
 			name: "compose stack type",
 			args: args{
-				s: portainer.Stack{
+				t: portainer.DockerComposeStack,
-					Type: 2,
-				},
 			},
 			want: "compose",
 		},
 		{
 			name: "unknown stack type",
 			args: args{
-				s: portainer.Stack{
+				t: 100,
-					Type: 100,
-				},
 			},
 			want: "",
 		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			assert.Equal(t, tt.want, GetTranslatedStackType(tt.args.s))
+			assert.Equal(t, tt.want, GetTranslatedStackType(tt.args.t))
 		})
 	}
 }

cmd/stackInspect.go

@@ -87,7 +87,7 @@ var stackInspectCmd = &cobra.Command{
 					"%v\t%s\t%v\t%s",
 					stack.ID,
 					stack.Name,
-					client.GetTranslatedStackType(stack),
+					client.GetTranslatedStackType(stack.Type),
 					endpoint.Name,
 				))
 				common.CheckError(err)

cmd/stackList.go

@@ -89,7 +89,7 @@ var stackListCmd = &cobra.Command{
 					"%v\t%s\t%v\t%s",
 					s.ID,
 					s.Name,
-					client.GetTranslatedStackType(s),
+					client.GetTranslatedStackType(s.Type),
 					stackEndpoint.Name,
 				))
 				common.CheckError(err)