feat(aws): Allow stack configuration of Aurora RDS scaling (#727)

* fix: update Aurora Postgres Engine to 13.16, to enable auto-pause feature
* chore: update pulumi aws rds to v6

Author: jyecusch

cloud/aws/common/config.go

@@ -51,12 +51,19 @@ type BatchComputeEnvConfig struct {
 	LaunchTemplate *EcsLaunchTemplate `mapstructure:"launch-template,omitempty"`
 }
 
+type AuroraRdsClusterConfig struct {
+	MinCapacity           float64 `mapstructure:"min-capacity"`
+	MaxCapacity           float64 `mapstructure:"max-capacity"`
+	SecondsUntilAutoPause *int    `mapstructure:"seconds-until-auto-pause"`
+}
+
 type AwsConfig struct {
 	ScheduleTimezone                      string `mapstructure:"schedule-timezone,omitempty"`
 	Import                                AwsImports
 	Refresh                               bool
 	Apis                                  map[string]*AwsApiConfig
-	BatchComputeEnvConfig                 *BatchComputeEnvConfig `mapstructure:"batch-compute-env,omitempty"`
+	BatchComputeEnvConfig                 *BatchComputeEnvConfig  `mapstructure:"batch-compute-env,omitempty"`
+	AuroraRdsClusterConfig                *AuroraRdsClusterConfig `mapstructure:"aurora-rds-cluster,omitempty"`
 	config.AbstractConfig[*AwsConfigItem] `mapstructure:"config,squash"`
 }
 
@@ -92,6 +99,11 @@ var defaultBatchComputeEnvConfig = &BatchComputeEnvConfig{
 	LaunchTemplate: nil,
 }
 
+var defaultAuroraRdsClusterConfig = &AuroraRdsClusterConfig{
+	MinCapacity: 0.5,
+	MaxCapacity: 1,
+}
+
 var defaultAwsConfigItem = AwsConfigItem{
 	Telemetry: 0,
 }
@@ -140,6 +152,10 @@ func ConfigFromAttributes(attributes map[string]interface{}) (*AwsConfig, error)
 		return nil, err
 	}
 
+	if awsConfig.AuroraRdsClusterConfig == nil {
+		awsConfig.AuroraRdsClusterConfig = defaultAuroraRdsClusterConfig
+	}
+
 	for configName, configVal := range awsConfig.Config {
 		// Add omitted values from default configs where needed.
 		err := mergo.Merge(configVal, defaultAwsConfigItem)

cloud/aws/deploy/deploy.go

@@ -40,14 +40,14 @@ import (
 	"github.com/pulumi/pulumi-aws/sdk/v5/go/aws/ecr"
 	"github.com/pulumi/pulumi-aws/sdk/v5/go/aws/iam"
 	"github.com/pulumi/pulumi-aws/sdk/v5/go/aws/lambda"
-	"github.com/pulumi/pulumi-aws/sdk/v5/go/aws/rds"
 	"github.com/pulumi/pulumi-aws/sdk/v5/go/aws/resourcegroups"
 	"github.com/pulumi/pulumi-aws/sdk/v5/go/aws/s3"
 	"github.com/pulumi/pulumi-aws/sdk/v5/go/aws/scheduler"
 	"github.com/pulumi/pulumi-aws/sdk/v5/go/aws/secretsmanager"
 	"github.com/pulumi/pulumi-aws/sdk/v5/go/aws/sqs"
 	"github.com/pulumi/pulumi-aws/sdk/v6/go/aws/codebuild"
 	awsec2 "github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2"
+	"github.com/pulumi/pulumi-aws/sdk/v6/go/aws/rds"
 	"github.com/pulumi/pulumi-awsx/sdk/go/awsx/ec2"
 	"github.com/pulumi/pulumi-docker/sdk/v4/go/docker"
 	"github.com/pulumi/pulumi-random/sdk/v4/go/random"
@@ -107,7 +107,7 @@ type NitricAwsPulumiProvider struct {
 
 var _ provider.NitricPulumiProvider = (*NitricAwsPulumiProvider)(nil)
 
-const pulumiAwsVersion = "6.6.0"
+const pulumiAwsVersion = "6.67.0"
 
 func (a *NitricAwsPulumiProvider) Config() (auto.ConfigMap, error) {
 	return auto.ConfigMap{

cloud/aws/deploy/sql.go

@@ -31,8 +31,8 @@ import (
 	deploymentspb "github.com/nitrictech/nitric/core/pkg/proto/deployments/v1"
 	"github.com/pulumi/pulumi-aws/sdk/v5/go/aws/ecr"
 	"github.com/pulumi/pulumi-aws/sdk/v5/go/aws/iam"
-	"github.com/pulumi/pulumi-aws/sdk/v5/go/aws/rds"
 	"github.com/pulumi/pulumi-aws/sdk/v6/go/aws/codebuild"
+	"github.com/pulumi/pulumi-aws/sdk/v6/go/aws/rds"
 	"github.com/pulumi/pulumi-docker/sdk/v4/go/docker"
 	"github.com/pulumi/pulumi-random/sdk/v4/go/random"
 	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
@@ -83,23 +83,33 @@ func (a *NitricAwsPulumiProvider) rds(ctx *pulumi.Context) error {
 		return err
 	}
 
+	scaling := rds.ClusterServerlessv2ScalingConfigurationArgs{
+		MinCapacity: pulumi.Float64(a.AwsConfig.AuroraRdsClusterConfig.MinCapacity),
+		MaxCapacity: pulumi.Float64(a.AwsConfig.AuroraRdsClusterConfig.MaxCapacity),
+	}
+
+	if a.AwsConfig.AuroraRdsClusterConfig.SecondsUntilAutoPause != nil && *a.AwsConfig.AuroraRdsClusterConfig.SecondsUntilAutoPause > 0 {
+		if a.AwsConfig.AuroraRdsClusterConfig.MinCapacity != 0 {
+			return fmt.Errorf("seconds-until-auto-pause can only be set when min-capacity is 0")
+		}
+		scaling.SecondsUntilAutoPause = pulumi.Int(*a.AwsConfig.AuroraRdsClusterConfig.SecondsUntilAutoPause)
+	}
+
 	a.DatabaseCluster, err = rds.NewCluster(ctx, "postgresql", &rds.ClusterArgs{
-		Engine:        pulumi.String(rds.EngineTypeAuroraPostgresql),
-		EngineVersion: pulumi.String("13.14"),
+		ApplyImmediately: pulumi.Bool(true),
+		Engine:           pulumi.String(rds.EngineTypeAuroraPostgresql),
+		EngineVersion:    pulumi.String("13.16"),
 		// TODO: limit number of availability zones
-		AvailabilityZones: pulumi.ToStringArray(a.VpcAzs),
-		DatabaseName:      pulumi.String("nitric"),
-		MasterUsername:    pulumi.String("nitric"),
-		MasterPassword:    a.DbMasterPassword.Result,
-		EngineMode:        pulumi.String(rds.EngineModeProvisioned),
-		Serverlessv2ScalingConfiguration: &rds.ClusterServerlessv2ScalingConfigurationArgs{
-			MaxCapacity: pulumi.Float64(1),
-			MinCapacity: pulumi.Float64(0.5),
-		},
-		VpcSecurityGroupIds: pulumi.StringArray{a.RdsSecurityGroup.ID()},
-		DbSubnetGroupName:   dbSubnetGroup.Name,
-		SkipFinalSnapshot:   pulumi.Bool(true),
-		Tags:                pulumi.ToStringMap(tags.Tags(a.StackId, "database-cluster", "DatabaseCluster")),
+		AvailabilityZones:                pulumi.ToStringArray(a.VpcAzs),
+		DatabaseName:                     pulumi.String("nitric"),
+		MasterUsername:                   pulumi.String("nitric"),
+		MasterPassword:                   a.DbMasterPassword.Result,
+		EngineMode:                       pulumi.String(rds.EngineModeProvisioned),
+		Serverlessv2ScalingConfiguration: &scaling,
+		VpcSecurityGroupIds:              pulumi.StringArray{a.RdsSecurityGroup.ID()},
+		DbSubnetGroupName:                dbSubnetGroup.Name,
+		SkipFinalSnapshot:                pulumi.Bool(true),
+		Tags:                             pulumi.ToStringMap(tags.Tags(a.StackId, "database-cluster", "DatabaseCluster")),
 		// NOTE: Workaround for https://github.com/pulumi/pulumi-aws/issues/2426
 		// Aurora instances don't support StorageType so we need to ignore changes otherwise we'll get unsolicited replacements
 	}, pulumi.IgnoreChanges([]string{"storageType"}))

cloud/aws/go.mod

@@ -41,12 +41,12 @@ require (
 	github.com/onsi/ginkgo v1.16.5
 	github.com/onsi/gomega v1.34.2
 	github.com/pkg/errors v0.9.1
-	github.com/pulumi/pulumi-aws/sdk/v5 v5.35.0
-	github.com/pulumi/pulumi-aws/sdk/v6 v6.32.0
+	github.com/pulumi/pulumi-aws/sdk/v5 v5.43.0
+	github.com/pulumi/pulumi-aws/sdk/v6 v6.67.0
 	github.com/pulumi/pulumi-awsx/sdk v1.0.6
 	github.com/pulumi/pulumi-docker/sdk/v4 v4.1.0
 	github.com/pulumi/pulumi-random/sdk/v4 v4.8.2
-	github.com/pulumi/pulumi/sdk/v3 v3.137.0
+	github.com/pulumi/pulumi/sdk/v3 v3.148.0
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/samber/lo v1.38.1
 	github.com/uw-labs/lichen v0.1.7
@@ -75,7 +75,7 @@ require (
 	github.com/Masterminds/semver/v3 v3.3.0 // indirect
 	github.com/Microsoft/go-winio v0.6.2 // indirect
 	github.com/OpenPeeDeeP/depguard/v2 v2.2.0 // indirect
-	github.com/ProtonMail/go-crypto v1.0.0 // indirect
+	github.com/ProtonMail/go-crypto v1.1.3 // indirect
 	github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect
 	github.com/agext/levenshtein v1.2.3 // indirect
 	github.com/alecthomas/go-check-sumtype v0.1.4 // indirect
@@ -131,7 +131,7 @@ require (
 	github.com/containerd/log v0.1.0 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
 	github.com/curioswitch/go-reassign v0.2.0 // indirect
-	github.com/cyphar/filepath-securejoin v0.2.4 // indirect
+	github.com/cyphar/filepath-securejoin v0.3.6 // indirect
 	github.com/daixiang0/gci v0.13.5 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/denis-tingaikin/go-header v0.5.0 // indirect
@@ -151,8 +151,8 @@ require (
 	github.com/ghostiam/protogetter v0.3.6 // indirect
 	github.com/go-critic/go-critic v0.11.4 // indirect
 	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
-	github.com/go-git/go-billy/v5 v5.5.0 // indirect
-	github.com/go-git/go-git/v5 v5.12.0 // indirect
+	github.com/go-git/go-billy/v5 v5.6.1 // indirect
+	github.com/go-git/go-git/v5 v5.13.1 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-openapi/jsonpointer v0.19.5 // indirect
@@ -196,6 +196,7 @@ require (
 	github.com/hexops/gotextdiff v1.0.3 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/invopop/yaml v0.1.0 // indirect
+	github.com/iwdgo/sigintwindows v0.2.2 // indirect
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
 	github.com/jgautheron/goconst v1.7.1 // indirect
 	github.com/jingyugao/rowserrcheck v1.1.1 // indirect
@@ -288,7 +289,7 @@ require (
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/sivchari/containedctx v1.0.3 // indirect
 	github.com/sivchari/tenv v1.10.0 // indirect
-	github.com/skeema/knownhosts v1.2.2 // indirect
+	github.com/skeema/knownhosts v1.3.0 // indirect
 	github.com/sonatard/noctx v0.0.2 // indirect
 	github.com/sourcegraph/go-diff v0.7.0 // indirect
 	github.com/spf13/afero v1.11.0 // indirect
@@ -300,7 +301,7 @@ require (
 	github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
 	github.com/stbenjam/no-sprintf-host-port v0.1.1 // indirect
 	github.com/stretchr/objx v0.5.2 // indirect
-	github.com/stretchr/testify v1.9.0 // indirect
+	github.com/stretchr/testify v1.10.0 // indirect
 	github.com/subosito/gotenv v1.4.1 // indirect
 	github.com/tdakkota/asciicheck v0.2.0 // indirect
 	github.com/tetafro/godot v1.4.17 // indirect