Skip to content

Commit

Permalink
update to v3.7.3
Browse files Browse the repository at this point in the history
  • Loading branch information
mfriesen committed Jan 18, 2025
1 parent 19275e9 commit 67cb073
Show file tree
Hide file tree
Showing 2 changed files with 78 additions and 78 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ public void testS3Buckets() {
*/
@Test
public void testSsmParameters() {
assertEquals("v3.7.2",
assertEquals("v3.7.3",
ssmService.getParameterValue("/formkiq/" + appenvironment + "/console/version"));
assertTrue(ssmService.getParameterValue("/formkiq/" + appenvironment + "/s3/Console")
.contains(appenvironment + "-console-"));
Expand Down
154 changes: 77 additions & 77 deletions console/src/main/resources/cloudformation/template.yaml
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
AWSTemplateFormatVersion: '2010-09-09'
Transform: AWS::Serverless-2016-10-31
Description: FormKiQ Core - Console

Parameters:

AdminEmail:
Type: String
Description: Administrator Email
AllowedPattern: ".+"

AppEnvironment:
Type: String
Description: The Document Stack Environment
AllowedPattern: ".+"

ConsoleVersion:
Type: String
Description: Version of FormKiQ console to deploy
Default: v3.7.2
Default: v3.7.3

FormKiQType:
Description: The type of FormKiQ installation
Default: "core"
Expand All @@ -34,30 +34,30 @@ Parameters:
Description: Is Installation AWS Region gov cloud
Type: String
AllowedValues: ["true", "false"]

Conditions:

HasCertificateStackName:
Fn::Not:
- Fn::Equals:
- Fn::Equals:
- Ref: CertificateStackName
- ''

IsNotGovCloud:
Fn::Equals:
Fn::Equals:
- Ref: IsGovCloud
- 'false'

Resources:

Console:
Type: AWS::S3::Bucket
Properties:
BucketName:
BucketName:
Fn::Sub: "formkiq-${FormKiQType}-${AppEnvironment}-console-${AWS::AccountId}"
AccessControl: Private
BucketEncryption:
ServerSideEncryptionConfiguration:
BucketEncryption:
ServerSideEncryptionConfiguration:
- ServerSideEncryptionByDefault:
SSEAlgorithm: AES256
PublicAccessBlockConfiguration:
Expand All @@ -69,63 +69,63 @@ Resources:
- Key: Application
Value: FormKiQ
- Key: AppEnvironment
Value:
Value:
Fn::Sub: "${AppEnvironment}"
- Key: StackName
Value:
Value:
Fn::Sub: "${AWS::StackName}"

ConsoleVersionParameter:
Type: AWS::SSM::Parameter
Properties:
Description: "Console Version"
Name:
Name:
Fn::Sub: "/formkiq/${AppEnvironment}/console/version"
Type: String
Value:
Value:
Ref: ConsoleVersion
Tags:
Application:
Application:
Fn::Sub: "FormKiQ ${FormKiQType}"
AppEnvironment:
AppEnvironment:
Fn::Sub: "${AppEnvironment}"
StackName:
StackName:
Fn::Sub: "${AWS::StackName}"

ConsoleParameter:
Type: AWS::SSM::Parameter
Properties:
Description: "Console S3 Bucket"
Name:
Name:
Fn::Sub: "/formkiq/${AppEnvironment}/s3/Console"
Type: String
Value:
Value:
Ref: Console
Tags:
Application:
Application:
Fn::Sub: "FormKiQ ${FormKiQType}"
AppEnvironment:
AppEnvironment:
Fn::Sub: "${AppEnvironment}"
StackName:
StackName:
Fn::Sub: "${AWS::StackName}"

ConsoleArnParameter:
Type: AWS::SSM::Parameter
Properties:
Description: "Console S3 Bucket Arn"
Name:
Name:
Fn::Sub: "/formkiq/${AppEnvironment}/s3/ConsoleArn"
Type: String
Value:
Fn::GetAtt:
- Console
- Arn
- Arn
Tags:
Application:
Application:
Fn::Sub: "FormKiQ ${FormKiQType}"
AppEnvironment:
AppEnvironment:
Fn::Sub: "${AppEnvironment}"
StackName:
StackName:
Fn::Sub: "${AWS::StackName}"

ConsoleDomainNameParameter:
Expand All @@ -134,40 +134,40 @@ Resources:
- Console
Properties:
Description: "Console S3 Bucket Domain Name"
Name:
Name:
Fn::Sub: "/formkiq/${AppEnvironment}/s3/ConsoleDomainName"
Type: String
Value:
Value:
Fn::GetAtt:
- Console
- DomainName
Tags:
Application:
Application:
Fn::Sub: "FormKiQ ${FormKiQType}"
AppEnvironment:
AppEnvironment:
Fn::Sub: "${AppEnvironment}"
StackName:
StackName:
Fn::Sub: "${AWS::StackName}"

ConsoleRegionalDomainNameParameter:
Type: AWS::SSM::Parameter
Properties:
Description: "Console S3 Bucket Regional Domain Name"
Name:
Name:
Fn::Sub: "/formkiq/${AppEnvironment}/s3/ConsoleRegionalDomainName"
Type: String
Value:
Value:
Fn::GetAtt:
- Console
- RegionalDomainName
Tags:
Application:
Application:
Fn::Sub: "FormKiQ ${FormKiQType}"
AppEnvironment:
AppEnvironment:
Fn::Sub: "${AppEnvironment}"
StackName:
StackName:
Fn::Sub: "${AWS::StackName}"

CloudFrontDistribution:
Type: AWS::CloudFront::Distribution
Condition: IsNotGovCloud
Expand All @@ -176,15 +176,15 @@ Resources:
Comment:
Fn::Sub: "FormKiQ Console ${ConsoleVersion}"
Origins:
- DomainName:
- DomainName:
Fn::GetAtt:
- Console
- RegionalDomainName
Id: s3origin
OriginPath:
OriginPath:
Fn::Sub: "/${ConsoleVersion}"
S3OriginConfig:
OriginAccessIdentity:
OriginAccessIdentity:
Fn::Sub: 'origin-access-identity/cloudfront/${CloudFrontOriginAccessIdentity}'
DefaultCacheBehavior:
Compress: true
Expand Down Expand Up @@ -232,53 +232,53 @@ Resources:
ResponseCode: '200'
Tags:
- Key: Application
Value:
Value:
Fn::Sub: "FormKiQ ${FormKiQType}"
- Key: AppEnvironment
Value:
Value:
Fn::Sub: "${AppEnvironment}"
- Key: StackName
Value:
Value:
Fn::Sub: "${AWS::StackName}"

ConsoleUrlParameter:
Type: AWS::SSM::Parameter
Condition: IsNotGovCloud
Properties:
Description: "The URL for the FormKiQ Console"
Name:
Name:
Fn::Sub: "/formkiq/${AppEnvironment}/console/Url"
Type: String
Value:
Fn::If:
- HasCertificateStackName
- Fn::Join:
- Fn::Join:
- ""
-
-
- 'https://'
- Fn::ImportValue:
Fn::Sub: '${CertificateStackName}-ConsoleDomain'
- Fn::Join:
- Fn::Join:
- ""
-
-
- 'https://'
- Fn::GetAtt:
- CloudFrontDistribution
- DomainName
Tags:
Application:
Application:
Fn::Sub: "FormKiQ ${FormKiQType}"
AppEnvironment:
AppEnvironment:
Fn::Sub: "${AppEnvironment}"
StackName:
StackName:
Fn::Sub: "${AWS::StackName}"

CloudFrontOriginAccessIdentity:
Condition: IsNotGovCloud
Type: AWS::CloudFront::CloudFrontOriginAccessIdentity
Properties:
CloudFrontOriginAccessIdentityConfig:
Comment:
Comment:
Fn::Sub: "FormKiQ Console CloudFront Identity"

ConsoleBucketPolicy:
Expand All @@ -287,75 +287,75 @@ Resources:
DependsOn:
- CloudFrontOriginAccessIdentity
- Console
Properties:
Bucket:
Properties:
Bucket:
Ref: Console
PolicyDocument:
Version: '2012-10-17'
Statement:
-
Action:
Statement:
-
Action:
- "s3:GetObject"
Effect: "Allow"
Resource:
Fn::Join:
Fn::Join:
- ""
-
-
- Fn::GetAtt:
- Console
- Arn
- "/*"
Principal:
CanonicalUser:
CanonicalUser:
Fn::GetAtt:
- CloudFrontOriginAccessIdentity
- S3CanonicalUserId

Outputs:

ConsoleUrl:
Description: Console URL
Value:
Fn::If:
- HasCertificateStackName
- Fn::Join:
- Fn::Join:
- ""
-
-
- 'https://'
- Fn::ImportValue:
Fn::Sub: '${CertificateStackName}-ConsoleDomain'
- Fn::If:
- IsNotGovCloud
- Fn::Join:
- Fn::Join:
- ""
-
-
- 'https://'
- Fn::GetAtt:
- CloudFrontDistribution
- DomainName
- "none"

ConsoleBucket:
Value:
Ref: Console

ConsoleVersion:
Value:
Ref: ConsoleVersion

HostedZoneId:
Value:
Fn::If:
- HasCertificateStackName
- Fn::ImportValue:
Fn::Sub: '${CertificateStackName}-HostedZoneId'
- ""

CloudFrontDistributionDomainName:
Value:
Fn::If:
- IsNotGovCloud
- Fn::GetAtt:
- CloudFrontDistribution
- DomainName
- ""
- ""

0 comments on commit 67cb073

Please sign in to comment.