STACKITRCO-186 - update PR 1213 per comments

Signed-off-by: Adrian Nackov <adrian.nackov@mail.schwarz>

Author: aeter

internal/cmd/server/create/create_test.go

@@ -346,6 +346,16 @@ func TestParseInput(t *testing.T) {
 				model.AgentProvisioned = nil
 			}),
 		},
+		{
+			description: "agent-provisioned flag properly handled",
+			flagValues: fixtureFlagValues(func(flagValues map[string]string) {
+				flagValues[agentProvisionedFlag] = "true"
+			}),
+			isValid: true,
+			expectedModel: fixtureInputModel(func(model *inputModel) {
+				model.AgentProvisioned = utils.Ptr(true)
+			}),
+		},
 	}
 
 	for _, tt := range tests {

internal/cmd/server/describe/describe.go

@@ -161,6 +161,11 @@ func outputResult(p *print.Printer, outputFormat string, server *iaas.Server) er
 			table.AddSeparator()
 		}
 
+		if server.Agent != nil && server.Agent.Provisioned != nil {
+			table.AddRow("AGENT", *server.Agent.Provisioned)
+			table.AddSeparator()
+		}
+
 		if server.MachineType != nil {
 			table.AddRow("MACHINE TYPE", *server.MachineType)
 			table.AddSeparator()

internal/pkg/utils/utils.go

@@ -191,6 +191,7 @@ type Base64PatchedServer struct {
 	UpdatedAt           *time.Time              `json:"updatedAt,omitempty"`
 	UserData            *Base64Bytes            `json:"userData,omitempty"`
 	Volumes             *[]string               `json:"volumes,omitempty"`
+	Agent               *iaas.ServerAgent       `json:"agent,omitempty"`
 }
 
 // ConvertToBase64PatchedServer converts an iaas.Server to Base64PatchedServer
@@ -231,6 +232,7 @@ func ConvertToBase64PatchedServer(server *iaas.Server) *Base64PatchedServer {
 		UpdatedAt:           server.UpdatedAt,
 		UserData:            userData,
 		Volumes:             server.Volumes,
+		Agent:               server.Agent,
 	}
 }
 

internal/pkg/utils/utils_test.go

@@ -333,6 +333,27 @@ func TestConvertToBase64PatchedServer(t *testing.T) {
 				UserData:         nil,
 			},
 		},
+		{
+			name: "server with agent",
+			input: &iaas.Server{
+				Id:               Ptr("server-456"),
+				Name:             Ptr("test-server-2"),
+				Status:           Ptr("STOPPED"),
+				AvailabilityZone: Ptr("eu01-2"),
+				MachineType:      Ptr("t1.2"),
+				UserData:         &emptyUserData,
+				Agent:            &iaas.ServerAgent{Provisioned: Ptr(true)},
+			},
+			expected: &Base64PatchedServer{
+				Id:               Ptr("server-456"),
+				Name:             Ptr("test-server-2"),
+				Status:           Ptr("STOPPED"),
+				AvailabilityZone: Ptr("eu01-2"),
+				MachineType:      Ptr("t1.2"),
+				UserData:         Ptr(Base64Bytes(emptyUserData)),
+				Agent:            Ptr(iaas.ServerAgent{Provisioned: Ptr(true)}),
+			},
+		},
 	}
 
 	for _, tt := range tests {