Pārlūkot izejas kodu

retrieve status with get group by name

Signed-off-by: aiordache <[email protected]>
aiordache 5 gadi atpakaļ
vecāks
revīzija
b155fe0f2e
2 mainītis faili ar 9 papildinājumiem un 10 dzēšanām
  1. 9 1
      aci/backend.go
  2. 0 9
      aci/convert/convert.go

+ 9 - 1
aci/backend.go

@@ -172,7 +172,15 @@ func getContainerGroups(ctx context.Context, subscriptionID string, resourceGrou
 			return []containerinstance.ContainerGroup{}, err
 		}
 	}
-	return containerGroups, nil
+	var groups []containerinstance.ContainerGroup
+	for _, group := range containerGroups {
+		group, err := groupsClient.Get(ctx, resourceGroup, *group.Name)
+		if err != nil {
+			return []containerinstance.ContainerGroup{}, err
+		}
+		groups = append(groups, group)
+	}
+	return groups, nil
 }
 
 func getContainerID(group containerinstance.ContainerGroup, container containerinstance.Container) string {

+ 0 - 9
aci/convert/convert.go

@@ -452,15 +452,6 @@ func ContainerGroupToContainer(containerID string, cg containerinstance.Containe
 // GetStatus returns status for the specified container
 func GetStatus(container containerinstance.Container, group containerinstance.ContainerGroup) string {
 	status := compose.UNKNOWN
-	if group.ContainerGroupProperties != nil && group.ContainerGroupProperties.ProvisioningState != nil {
-		status = *group.ContainerGroupProperties.ProvisioningState
-		switch status {
-		case "Succeeded":
-			status = compose.RUNNING
-		case "Failed":
-			status = compose.FAILED
-		}
-	}
 	if group.InstanceView != nil && group.InstanceView.State != nil {
 		status = "Node " + *group.InstanceView.State
 	}