mirror of
https://github.com/Sea-Haven-Industries/forgejo.git
synced 2026-09-30 06:33:11 +00:00
Fix backup strategy bug findings
This commit is contained in:
parent
fa51085578
commit
b9726e5176
2 changed files with 16 additions and 10 deletions
|
|
@ -199,7 +199,13 @@ def handler(event, context):
|
||||||
blocks.append({"type": "section", "text": {"type": "mrkdwn", "text": f"*Overall:* {overall}"}})
|
blocks.append({"type": "section", "text": {"type": "mrkdwn", "text": f"*Overall:* {overall}"}})
|
||||||
|
|
||||||
else:
|
else:
|
||||||
raise ValueError(f"Unknown mode: {mode!r} (expected 'daily' or 'restore-test')")
|
return {
|
||||||
|
"statusCode": 400,
|
||||||
|
"body": json.dumps({
|
||||||
|
"mode": mode,
|
||||||
|
"error": f"Unsupported backup verification mode: {mode}",
|
||||||
|
}),
|
||||||
|
}
|
||||||
|
|
||||||
_post_slack(blocks)
|
_post_slack(blocks)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@ import * as cdk from "aws-cdk-lib";
|
||||||
import * as ec2 from "aws-cdk-lib/aws-ec2";
|
import * as ec2 from "aws-cdk-lib/aws-ec2";
|
||||||
import * as iam from "aws-cdk-lib/aws-iam";
|
import * as iam from "aws-cdk-lib/aws-iam";
|
||||||
import * as s3 from "aws-cdk-lib/aws-s3";
|
import * as s3 from "aws-cdk-lib/aws-s3";
|
||||||
|
import * as secretsmanager from "aws-cdk-lib/aws-secretsmanager";
|
||||||
import * as elbv2 from "aws-cdk-lib/aws-elasticloadbalancingv2";
|
import * as elbv2 from "aws-cdk-lib/aws-elasticloadbalancingv2";
|
||||||
import * as elbv2_targets from "aws-cdk-lib/aws-elasticloadbalancingv2-targets";
|
import * as elbv2_targets from "aws-cdk-lib/aws-elasticloadbalancingv2-targets";
|
||||||
import * as route53 from "aws-cdk-lib/aws-route53";
|
import * as route53 from "aws-cdk-lib/aws-route53";
|
||||||
|
|
@ -145,16 +146,15 @@ export class ForgejoStack extends cdk.Stack {
|
||||||
user: gcsTransferUser,
|
user: gcsTransferUser,
|
||||||
});
|
});
|
||||||
|
|
||||||
new cdk.aws_secretsmanager.CfnSecret(this, "GcsTransferCredentials", {
|
const gcsTransferCredentials = new secretsmanager.Secret(this, "GcsTransferCredentials", {
|
||||||
name: "forgejo/gcs-transfer-credentials",
|
secretName: "forgejo/gcs-transfer-credentials",
|
||||||
secretString: cdk.Fn.join("", [
|
secretObjectValue: {
|
||||||
'{"accessKeyId":"',
|
accessKeyId: cdk.SecretValue.unsafePlainText(gcsTransferKey.accessKeyId),
|
||||||
gcsTransferKey.accessKeyId,
|
secretAccessKey: gcsTransferKey.secretAccessKey,
|
||||||
'","secretAccessKey":"',
|
},
|
||||||
gcsTransferKey.secretAccessKey.unsafeUnwrap(),
|
|
||||||
'"}',
|
|
||||||
]),
|
|
||||||
});
|
});
|
||||||
|
const gcsTransferCredentialsResource = gcsTransferCredentials.node.defaultChild as secretsmanager.CfnSecret;
|
||||||
|
gcsTransferCredentialsResource.overrideLogicalId("GcsTransferCredentials");
|
||||||
|
|
||||||
const userData = ec2.UserData.forLinux();
|
const userData = ec2.UserData.forLinux();
|
||||||
userData.addCommands(
|
userData.addCommands(
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue