Skip to content

Commit 8c71496

Browse files
committed
fix: use correct db identifier in the mvp-backup
1 parent 7ccaa2e commit 8c71496

3 files changed

Lines changed: 6 additions & 1 deletion

File tree

.github/workflows/deploy-to-environment.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ jobs:
5757
run: |
5858
pulumi stack select ${{ secrets.PULUMI_ORGANIZATION }}/${{ inputs.environment }}
5959
echo "DBIdentifier=$(pulumi stack output DBIdentifier)" >> $GITHUB_OUTPUT
60+
echo "DBClusterIdentifier=$(pulumi stack output DBClusterIdentifier)" >> $GITHUB_OUTPUT
6061
echo "AdminFunctionArn=$(pulumi stack output AdminFunctionArn)" >> $GITHUB_OUTPUT
6162
echo "StackExists=true" >> $GITHUB_OUTPUT
6263
env:
@@ -87,7 +88,7 @@ jobs:
8788
- name: Create database backup snapshot on PRE-deployment
8889
if: ${{ steps.deployment-database-events.outputs.Migrations == 'true' && env.IS_MVP_DEPLOYMENT }}
8990
run: |
90-
aws rds create-db-cluster-snapshot --db-cluster-identifier ${{ steps.get-pulumi-outputs.outputs.DBIdentifier }} --db-cluster-snapshot-identifier PRE-${{ env.DEPLOYMENT_EVENT_IDENT }}
91+
aws rds create-db-cluster-snapshot --db-cluster-identifier ${{ steps.get-pulumi-outputs.outputs.DBClusterIdentifier }} --db-cluster-snapshot-identifier PRE-${{ env.DEPLOYMENT_EVENT_IDENT }}
9192
- name: Wait for the database snapshot to be ready
9293
if: ${{ steps.deployment-database-events.outputs.Migrations == 'true' && env.IS_MVP_DEPLOYMENT }}
9394
run: |

VirtualFinland.UsersAPI.Deployment/Features/PostgresDatabase.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ public void SetupProductionPostgresDatabase(Config config, StackSetup stackSetup
114114
DatabaseConnectionString = Output.Format($"Host={DbEndpoint};Database={DbName};Username={DbUsername};Password={DbPassword}");
115115
DatabaseAdminConnectionString = Output.Format($"Host={DbEndpoint};Database={DbName};Username={DbAdminUsername};Password={DbAdminPassword}");
116116
DBIdentifier = dbInstance.Identifier;
117+
DBClusterIdentifier = auroraCluster.ClusterIdentifier;
117118

118119
LogGroup = cloudwatch.CreateLogGroup(stackSetup, "database", Output.Format($"/aws/rds/cluster/{auroraCluster.ClusterIdentifier}/postgresql"), 3);
119120
}
@@ -215,6 +216,7 @@ public void InvokeInitialDatabaseAuditLogTriggersSetupFunction(StackSetup stackS
215216
}
216217

217218
public Output<string> DBIdentifier = default!;
219+
public Output<string> DBClusterIdentifier = default!;
218220
public string DbUsername = default!;
219221
public Output<string> DbPassword = default!;
220222
public Output<string> DatabaseConnectionString = default!;

VirtualFinland.UsersAPI.Deployment/UsersAPIStack.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ public UsersApiStack()
5050
ApplicationUrl = apiProvider.ApplicationUrl;
5151
LambdaId = usersApiFunction.LambdaFunctionId;
5252
DBIdentifier = database.DBIdentifier;
53+
DBClusterIdentifier = database.DBClusterIdentifier;
5354
AuditLogSubscriptionFunctionArn = auditLogSubscriptionFunction.LambdaFunctionArn;
5455

5556
var adminFunction = new AdminFunction(config, stackSetup, vpcSetup, dbAdminConnectionStringSecret, analyticsSqS);
@@ -80,6 +81,7 @@ private static bool IsProductionEnvironment()
8081
[Output] public Output<string>? ApplicationUrl { get; set; }
8182
[Output] public Output<string>? LambdaId { get; set; }
8283
[Output] public Output<string>? DBIdentifier { get; set; }
84+
[Output] public Output<string>? DBClusterIdentifier { get; set; }
8385
[Output] public Output<string>? AdminFunctionArn { get; set; }
8486
[Output] public Output<string>? AuditLogSubscriptionFunctionArn { get; set; }
8587
[Output] public Output<string>? ElastiCacheClusterId { get; set; }

0 commit comments

Comments
 (0)