adam/forgejo
1
0
Fork 0
mirror of https://github.com/Sea-Haven-Industries/forgejo.git synced 2026-10-03 18:53:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename SECRET_ARN env vars to SECRET_NAME to match actual values

Browse source
This commit is contained in:
Adam Moussa 2026-05-14 11:38:31 -04:00
parent d59623599c
commit c771ed4f08
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lambda/backup-verification/app.py
View file

@ -18,8 +18,8 @@ secrets = boto3.client("secretsmanager")
SOURCE_BUCKET = os.environ["SOURCE_BUCKET"] SOURCE_BUCKET = os.environ["SOURCE_BUCKET"]
REPLICA_BUCKET = os.environ["REPLICA_BUCKET"] REPLICA_BUCKET = os.environ["REPLICA_BUCKET"]
GCS_BUCKET = os.environ["GCS_BUCKET"] GCS_BUCKET = os.environ["GCS_BUCKET"]
GCS_SA_SECRET_ARN = os.environ["GCS_SA_SECRET_ARN"] GCS_SA_SECRET_NAME = os.environ["GCS_SA_SECRET_NAME"]
SLACK_WEBHOOK_SECRET_ARN = os.environ["SLACK_WEBHOOK_SECRET_ARN"] SLACK_WEBHOOK_SECRET_NAME = os.environ["SLACK_WEBHOOK_SECRET_NAME"]
_gcs_client = None _gcs_client = None
@ -27,7 +27,7 @@ _gcs_client = None
def _get_gcs_client(): def _get_gcs_client():
global _gcs_client global _gcs_client
if _gcs_client is None: if _gcs_client is None:
raw = secrets.get_secret_value(SecretId=GCS_SA_SECRET_ARN)["SecretString"] raw = secrets.get_secret_value(SecretId=GCS_SA_SECRET_NAME)["SecretString"]
info = json.loads(raw) info = json.loads(raw)
creds = service_account.Credentials.from_service_account_info(info) creds = service_account.Credentials.from_service_account_info(info)
_gcs_client = gcs.Client(credentials=creds, project=info.get("project_id")) _gcs_client = gcs.Client(credentials=creds, project=info.get("project_id"))
@ -167,7 +167,7 @@ def _restore_test():
def _post_slack(blocks): def _post_slack(blocks):
raw = secrets.get_secret_value(SecretId=SLACK_WEBHOOK_SECRET_ARN)["SecretString"] raw = secrets.get_secret_value(SecretId=SLACK_WEBHOOK_SECRET_NAME)["SecretString"]
webhook_url = raw.strip() webhook_url = raw.strip()
payload = json.dumps({"blocks": blocks}).encode() payload = json.dumps({"blocks": blocks}).encode()
req = urllib.request.Request( req = urllib.request.Request(

4
lib/constructs/backup-verification.ts
View file

@ -33,8 +33,8 @@ export class BackupVerification extends Construct {
SOURCE_BUCKET: props.sourceBucket.bucketName, SOURCE_BUCKET: props.sourceBucket.bucketName,
REPLICA_BUCKET: props.replicaBucketName, REPLICA_BUCKET: props.replicaBucketName,
GCS_BUCKET: props.gcsBucket, GCS_BUCKET: props.gcsBucket,
GCS_SA_SECRET_ARN: props.gcsSaSecretName, GCS_SA_SECRET_NAME: props.gcsSaSecretName,
SLACK_WEBHOOK_SECRET_ARN: props.slackWebhookSecretName, SLACK_WEBHOOK_SECRET_NAME: props.slackWebhookSecretName,
}, },
logRetention: logs.RetentionDays.TWO_MONTHS, logRetention: logs.RetentionDays.TWO_MONTHS,
}); });