diff --git a/internal/az/group.go b/internal/az/group.go index d03a7b9e..beb06b6b 100644 --- a/internal/az/group.go +++ b/internal/az/group.go @@ -1,6 +1,8 @@ package az import ( + "fmt" + "github.com/Azure/InnovationEngine/internal/logging" "github.com/Azure/InnovationEngine/internal/patterns" "github.com/Azure/InnovationEngine/internal/shells" @@ -37,3 +39,7 @@ func FindResourceGroupName(commandOutput string) string { } return "" } + +func BuildResourceGroupId(subscription string, resourceGroup string) string { + return fmt.Sprintf("/subscriptions/%s/resourceGroups/%s", subscription, resourceGroup) +} diff --git a/internal/engine/environments/azure.go b/internal/engine/environments/azure.go index 8155c5fb..b964bece 100644 --- a/internal/engine/environments/azure.go +++ b/internal/engine/environments/azure.go @@ -126,7 +126,7 @@ func AttachResourceURIsToAzureStatus( if len(resourceURIs) > 0 { logging.GlobalLogger.WithField("resourceURIs", resourceURIs). Info("Found deployed resources.") - status.ResourceURIs = resourceURIs + status.ResourceURIs = append(status.ResourceURIs, resourceURIs...) } else { logging.GlobalLogger.Warn("No deployed resources found.") } diff --git a/internal/engine/execution.go b/internal/engine/execution.go index f98b0234..7a07ab68 100644 --- a/internal/engine/execution.go +++ b/internal/engine/execution.go @@ -216,6 +216,7 @@ func (e *Engine) ExecuteAndRenderSteps(steps []common.Step, env map[string]strin if tmpResourceGroup != "" { logging.GlobalLogger.WithField("resourceGroup", tmpResourceGroup).Info("Found resource group") resourceGroupName = tmpResourceGroup + azureStatus.AddResourceURI(az.BuildResourceGroupId(e.Configuration.Subscription, resourceGroupName)) } }