From f2d6bcdbe6807a368076519a440e0154c39d0b95 Mon Sep 17 00:00:00 2001 From: Universe Ops Date: Wed, 24 Dec 2025 00:02:22 +0300 Subject: [PATCH 1/2] fix rds compute proc for custom stacks --- pkg/clouds/pulumi/aws/compute_proc.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/clouds/pulumi/aws/compute_proc.go b/pkg/clouds/pulumi/aws/compute_proc.go index 227d2079..fc87d07c 100644 --- a/pkg/clouds/pulumi/aws/compute_proc.go +++ b/pkg/clouds/pulumi/aws/compute_proc.go @@ -47,7 +47,8 @@ func RdsPostgresComputeProcessor(ctx *sdk.Context, stack api.Stack, input api.Re postgresCfg.AccountConfig = *accountConfig postgresResName := lo.If(postgresCfg.Name == "", input.Descriptor.Name).Else(postgresCfg.Name) - postgresName := toRdsPostgresName(postgresResName, input.StackParams.Environment) + postgresEnv := lo.If(params.ParentStack.ParentEnv != "", params.ParentStack.ParentEnv).Else(input.StackParams.Environment) + postgresName := toRdsPostgresName(postgresResName, postgresEnv) // Create a StackReference to the parent stack suffix := lo.If(params.ParentStack.DependsOnResource != nil, "--"+lo.FromPtr(params.ParentStack.DependsOnResource).Name).Else("") @@ -205,7 +206,8 @@ func RdsMysqlComputeProcessor(ctx *sdk.Context, stack api.Stack, input api.Resou mysqlCfg.AccountConfig = *accountConfig dbCfg := mysqlCfg mysqlResName := lo.If(dbCfg.Name == "", input.Descriptor.Name).Else(dbCfg.Name) - mysqlName := toRdsMysqlName(mysqlResName, input.StackParams.Environment) + mysqlEnv := lo.If(params.ParentStack.ParentEnv != "", params.ParentStack.ParentEnv).Else(input.StackParams.Environment) + mysqlName := toRdsMysqlName(mysqlResName, mysqlEnv) // Create a StackReference to the parent stack suffix := lo.If(params.ParentStack.DependsOnResource != nil, "--"+lo.FromPtr(params.ParentStack.DependsOnResource).Name).Else("") From bdbfb634e42f27969c9c37898ea4210d0c8111b5 Mon Sep 17 00:00:00 2001 From: Universe Ops Date: Wed, 24 Dec 2025 00:14:57 +0300 Subject: [PATCH 2/2] fix concurrent map writes in test --- pkg/clouds/pulumi/gcp/gke_autopilot_mocks_test.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/clouds/pulumi/gcp/gke_autopilot_mocks_test.go b/pkg/clouds/pulumi/gcp/gke_autopilot_mocks_test.go index 53ca7371..56df30ba 100644 --- a/pkg/clouds/pulumi/gcp/gke_autopilot_mocks_test.go +++ b/pkg/clouds/pulumi/gcp/gke_autopilot_mocks_test.go @@ -2,6 +2,7 @@ package gcp import ( "fmt" + "sync" "github.com/pulumi/pulumi/sdk/v3/go/common/resource" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" @@ -9,6 +10,7 @@ import ( // gkeAutopilotMocks implements pulumi.MockResourceMonitor for testing GKE Autopilot type gkeAutopilotMocks struct { + mu sync.Mutex // Track resource creation counts by type resourceCounts map[string]int // Store created resources for validation @@ -28,6 +30,9 @@ func newGkeAutopilotMocks() *gkeAutopilotMocks { // NewResource mocks the creation of GCP resources func (m *gkeAutopilotMocks) NewResource(args pulumi.MockResourceArgs) (string, resource.PropertyMap, error) { + m.mu.Lock() + defer m.mu.Unlock() + // Check for simulated failures if m.simulateFailures[args.TypeToken] { return "", nil, fmt.Errorf("simulated failure for %s", args.TypeToken)