From b319a77cfe53d08a138c8c2554a0d758905866ff Mon Sep 17 00:00:00 2001 From: Chris Kalafarski Date: Wed, 23 Oct 2024 11:45:26 -0400 Subject: [PATCH] Fix Beta template --- spire/templates/apps-200A.yml | 1 + spire/templates/apps/beta.yml | 11 +++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/spire/templates/apps-200A.yml b/spire/templates/apps-200A.yml index ef65bd5d..2a4bae57 100644 --- a/spire/templates/apps-200A.yml +++ b/spire/templates/apps-200A.yml @@ -112,6 +112,7 @@ Resources: CodeS3Bucket: !Ref DeploymentPackageBucketName StaticSiteArchiveS3ObjectKey: !Sub /prx/${EnvironmentTypeAbbreviation}/Spire/Beta/pkg/s3-object-key EnvironmentType: !Ref EnvironmentType + EnvironmentTypeAbbreviation: !Ref EnvironmentTypeAbbreviation StaticSiteCloudFrontOai: !Sub /prx/${EnvironmentTypeAbbreviation}/Spire/Beta/cloudfront-oai FeederHostname: !Ref FeederHostname ExchangeHostname: !Ref ExchangeHostname diff --git a/spire/templates/apps/beta.yml b/spire/templates/apps/beta.yml index d1574a64..69feb9cb 100644 --- a/spire/templates/apps/beta.yml +++ b/spire/templates/apps/beta.yml @@ -1,5 +1,6 @@ # stacks/apps/beta.yml AWSTemplateFormatVersion: "2010-09-09" +Transform: AWS::Serverless-2016-10-31 Description: >- Creates a regional S3 bucket for beta.prx.org to be used as an origin for a @@ -13,14 +14,16 @@ Parameters: CodeS3Bucket: { Type: String } StaticSiteArchiveS3ObjectKey: { Type: AWS::SSM::Parameter::Value } EnvironmentType: { Type: String } + EnvironmentTypeAbbreviation: { Type: String } StaticSiteCloudFrontOai: { Type: AWS::SSM::Parameter::Value } - FeederHostname: { Type String } - ExchangeHostname: { Type String } - PlayHostname: { Type String } + FeederHostname: { Type: String } + ExchangeHostname: { Type: String } + PlayHostname: { Type: String } RedirectLambdaCodeS3ObjectKey: { Type: AWS::SSM::Parameter::Value } Conditions: EnableNestedChangeSetScrubbingResources: !Equals [!Ref NestedChangeSetScrubbingResourcesState, Enabled] + IsProduction: !Equals [!Ref EnvironmentType, Production] Resources: NestedChangeSetScrubber: { Type: AWS::SNS::Topic, Condition: EnableNestedChangeSetScrubbingResources } @@ -92,7 +95,7 @@ Resources: prx:ops:environment: !Ref EnvironmentType prx:dev:application: Beta Timeout: 8 - FtpServerAuthorizerFunctionElevatedErrorAlarm: + RedirectFunctionElevatedErrorAlarm: Type: AWS::CloudWatch::Alarm Condition: IsProduction Properties: