fix(aws): alias original domain name pulumi resources

Author: jyecusch

cloud/aws/deploy/api.go

@@ -250,7 +250,11 @@ func (a *NitricAwsPulumiProvider) Api(ctx *pulumi.Context, parent pulumi.Resourc
 }
 
 func (a *NitricAwsPulumiProvider) createApiDomainName(ctx *pulumi.Context, name string, domainName string, stage *apigatewayv2.Stage, api *apigatewayv2.Api) error {
-	domain, err := a.newPulumiDomainName(ctx, domainName)
+	domain, err := a.newPulumiDomainName(ctx, domainArgs{
+		DomainName: domainName,
+		// Required for backwards compatibility with provider versions < 1.26.1
+		AliasName: name,
+	})
 	if err != nil {
 		return err
 	}

cloud/aws/deploy/domain.go

@@ -18,6 +18,7 @@ package deploy
 
 import (
 	"fmt"
+	"slices"
 
 	awsprovider "github.com/pulumi/pulumi-aws/sdk/v5/go/aws"
 
@@ -35,16 +36,22 @@ type Domain struct {
 	CertificateValidation *acm.CertificateValidation
 }
 
-func (a *NitricAwsPulumiProvider) newPulumiDomainName(ctx *pulumi.Context, domainName string) (*Domain, error) {
+type domainArgs struct {
+	DomainName string
+	// Required for backwards compatibility with provider versions < 1.26.1
+	AliasName string
+}
+
+func (a *NitricAwsPulumiProvider) newPulumiDomainName(ctx *pulumi.Context, args domainArgs) (*Domain, error) {
 	var err error
-	res := &Domain{Name: domainName}
+	res := &Domain{Name: args.DomainName}
 
-	res.ZoneLookup, err = resources.GetZoneID(domainName)
+	res.ZoneLookup, err = resources.GetZoneID(args.DomainName)
 	if err != nil {
 		return nil, err
 	}
 
-	err = ctx.RegisterComponentResource("nitric:api:DomainName", fmt.Sprintf("%s-%s", domainName, a.StackId), res)
+	err = ctx.RegisterComponentResource("nitric:api:DomainName", fmt.Sprintf("%s-%s", args.DomainName, a.StackId), res)
 	if err != nil {
 		return nil, err
 	}
@@ -64,9 +71,14 @@ func (a *NitricAwsPulumiProvider) newPulumiDomainName(ctx *pulumi.Context, domai
 	}
 
 	cert, err := acm.NewCertificate(ctx, fmt.Sprintf("cert-%s", a.StackId), &acm.CertificateArgs{
-		DomainName:       pulumi.String(domainName),
+		DomainName:       pulumi.String(args.DomainName),
 		ValidationMethod: pulumi.String("DNS"),
-	}, defaultOptions...)
+	},
+		slices.Concat(defaultOptions, []pulumi.ResourceOption{pulumi.Aliases([]pulumi.Alias{
+			// Required for backwards compatibility with provider versions < 1.26.1
+			{Name: pulumi.String(fmt.Sprintf("%s-%s-cert", args.AliasName, args.DomainName))},
+		})})...,
+	)
 	if err != nil {
 		return nil, err
 	}
@@ -75,6 +87,8 @@ func (a *NitricAwsPulumiProvider) newPulumiDomainName(ctx *pulumi.Context, domai
 		return options[0]
 	})
 
+	//	certValidationDns, err := route53.NewRecord(ctx, fmt.Sprintf("%s-%s-certvalidationdns", name, args.domainName), &route53.RecordArgs{
+
 	cdnRecord, err := route53.NewRecord(ctx, fmt.Sprintf("cdn-record-%s", a.StackId), &route53.RecordArgs{
 		Name: domainValidationOption.ApplyT(func(option interface{}) string {
 			return *option.(acm.CertificateDomainValidationOption).ResourceRecordName
@@ -89,7 +103,13 @@ func (a *NitricAwsPulumiProvider) newPulumiDomainName(ctx *pulumi.Context, domai
 		},
 		Ttl:    pulumi.Int(10 * 60),
 		ZoneId: pulumi.String(res.ZoneLookup.ZoneID),
-	}, []pulumi.ResourceOption{pulumi.Parent(res)}...)
+	}, []pulumi.ResourceOption{
+		pulumi.Parent(res),
+		pulumi.Aliases([]pulumi.Alias{
+			// Required for backwards compatibility with provider versions < 1.26.1
+			{Name: pulumi.String(fmt.Sprintf("%s-%s-certvalidationdns", args.AliasName, args.DomainName))},
+		}),
+	}...)
 	if err != nil {
 		return nil, err
 	}
@@ -99,7 +119,14 @@ func (a *NitricAwsPulumiProvider) newPulumiDomainName(ctx *pulumi.Context, domai
 		ValidationRecordFqdns: pulumi.StringArray{
 			cdnRecord.Fqdn,
 		},
-	}, defaultOptions...)
+	},
+		slices.Concat(defaultOptions, []pulumi.ResourceOption{
+			pulumi.Aliases([]pulumi.Alias{
+				// Required for backwards compatibility with provider versions < 1.26.1
+				{Name: pulumi.String(fmt.Sprintf("%s-%s-certvalidation", args.AliasName, args.DomainName))},
+			}),
+		})...,
+	)
 	if err != nil {
 		return nil, err
 	}

cloud/aws/deploy/website.go

@@ -335,7 +335,7 @@ func (a *NitricAwsPulumiProvider) deployCloudfrontDistribution(ctx *pulumi.Conte
 	if domainName != "" {
 		aliases = []string{domainName}
 
-		domain, err := a.newPulumiDomainName(ctx, domainName)
+		domain, err := a.newPulumiDomainName(ctx, domainArgs{DomainName: domainName})
 		if err != nil {
 			return err
 		}