feat(azure): Resource Group Imports (#648)

Co-authored-by: Jye Cusch <[email protected]>
nitrictech · Jul 23, 2024 · 8dbddb7 · 8dbddb7
1 parent 213c850
commit 8dbddb7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/cloud/azure/deploy/config.go b/cloud/azure/deploy/config.go
@@ -36,6 +36,7 @@ type AzureContainerAppsConfig struct {
 
 type AzureConfig struct {
 	Refresh                                 bool
+	ResourceGroup                           string `mapstructure:"resource-group"`
 	Org                                     string `mapstructure:"org"`
 	AdminEmail                              string `mapstructure:"adminemail"`
 	config.AbstractConfig[*AzureConfigItem] `mapstructure:"config,squash"`

diff --git a/cloud/azure/deploy/containerenv.go b/cloud/azure/deploy/containerenv.go
@@ -66,7 +66,7 @@ func (p *NitricAzurePulumiProvider) newContainerEnv(ctx *pulumi.Context, name st
 	res.ManagedUser, err = managedidentity.NewUserAssignedIdentity(ctx, "managed-identity", &managedidentity.UserAssignedIdentityArgs{
 		Location:          p.ResourceGroup.Location,
 		ResourceGroupName: p.ResourceGroup.Name,
-		ResourceName:      pulumi.String("managed-identity"),
+		ResourceName:      pulumi.Sprintf("managed-identity-%s", p.StackId),
 	}, pulumi.Parent(res))
 	if err != nil {
 		return nil, err

diff --git a/cloud/azure/deploy/deploy.go b/cloud/azure/deploy/deploy.go
@@ -335,10 +335,16 @@ func (a *NitricAzurePulumiProvider) Pre(ctx *pulumi.Context, nitricResources []*
 		return err
 	}
 
-	a.ResourceGroup, err = resources.NewResourceGroup(ctx, ResourceName(ctx, "", ResourceGroupRT), &resources.ResourceGroupArgs{
-		Location: pulumi.String(a.Region),
-		Tags:     pulumi.ToStringMap(tags.Tags(a.StackId, ctx.Stack(), commonresources.Stack)),
-	})
+	if a.AzureConfig.ResourceGroup != "" {
+		rgId := fmt.Sprintf("/subscriptions/%s/resourceGroups/%s", a.ClientConfig.SubscriptionId, a.AzureConfig.ResourceGroup)
+		a.ResourceGroup, err = resources.GetResourceGroup(ctx, ResourceName(ctx, "", ResourceGroupRT), pulumi.ID(rgId), nil, pulumi.RetainOnDelete(true))
+	} else {
+		a.ResourceGroup, err = resources.NewResourceGroup(ctx, ResourceName(ctx, "", ResourceGroupRT), &resources.ResourceGroupArgs{
+			Location: pulumi.String(a.Region),
+			Tags:     pulumi.ToStringMap(tags.Tags(a.StackId, ctx.Stack(), commonresources.Stack)),
+		})
+	}
+
 	if err != nil {
 		return errors.WithMessage(err, "resource group create")
 	}