Skip to content

Commit 4d77929

Browse files
extract subdomain name from config
1 parent 6411956 commit 4d77929

File tree

3 files changed

+22
-19
lines changed

3 files changed

+22
-19
lines changed

cicd/2-cicd/cicd.template.yml

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,7 @@ Resources:
305305
ActionMode: CREATE_UPDATE
306306
TemplatePath: appBuildResults::packaged-app-template.yml
307307
TemplateConfiguration: appBuildResults::cicd/3-app/javabuilder/test.config.json
308+
ParameterName: { "SubDomainName": !If [TargetsMainBranch, "javabuilder-test", !Sub "javabuilder-${GitHubBranch}-test"] }
308309
Capabilities: CAPABILITY_AUTO_EXPAND
309310
RoleArn: !Sub arn:aws:iam::${AWS::AccountId}:role/admin/CloudFormationService
310311

@@ -327,23 +328,27 @@ Resources:
327328
OutputArtifacts:
328329
- Name: integrationTestResultsPOC
329330

330-
- Name: Deploy_To_Production
331-
Actions:
332-
- Name: app-deploy
333-
ActionTypeId:
334-
Category: Deploy
335-
Owner: AWS
336-
Version: 1
337-
Provider: CloudFormation
338-
InputArtifacts:
339-
- Name: appBuildResults
340-
Configuration:
341-
StackName: !If [TargetsMainBranch, "javabuilder", !Sub "javabuilder-${GitHubBranch}"]
342-
ActionMode: CREATE_UPDATE
343-
TemplatePath: appBuildResults::packaged-app-template.yml
344-
TemplateConfiguration: appBuildResults::cicd/3-app/javabuilder/production.config.json
345-
Capabilities: CAPABILITY_AUTO_EXPAND
346-
RoleArn: !Sub arn:aws:iam::${AWS::AccountId}:role/admin/CloudFormationService
331+
- !If
332+
- TargetsMainBranch
333+
- Name: Deploy_To_Production
334+
Actions:
335+
- Name: app-deploy
336+
ActionTypeId:
337+
Category: Deploy
338+
Owner: AWS
339+
Version: 1
340+
Provider: CloudFormation
341+
InputArtifacts:
342+
- Name: appBuildResults
343+
Configuration:
344+
StackName: !If [TargetsMainBranch, "javabuilder", !Sub "javabuilder-${GitHubBranch}"]
345+
ActionMode: CREATE_UPDATE
346+
TemplatePath: appBuildResults::packaged-app-template.yml
347+
TemplateConfiguration: appBuildResults::cicd/3-app/javabuilder/production.config.json
348+
ParameterName: { "SubDomainName": !If [TargetsMainBranch, "javabuilder", !Sub "javabuilder-${GitHubBranch}"] }
349+
Capabilities: CAPABILITY_AUTO_EXPAND
350+
RoleArn: !Sub arn:aws:iam::${AWS::AccountId}:role/admin/CloudFormationService
351+
- !Ref AWS::NoValue
347352

348353
# Send pipeline events to an SNS topic.
349354
# Note: Integration with Slack via AWS ChatBot is configured manually via AWS Console.

cicd/3-app/javabuilder/config/production.config.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"Parameters": {
3-
"SubDomainName": "javabuilder",
43
"BaseDomainName": "code.org",
54
"BaseDomainNameHostedZonedID": "Z2LCOI49SCXUGU",
65
"ProvisionedConcurrentExecutions": "5",

cicd/3-app/javabuilder/config/test.config.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"Parameters": {
3-
"SubDomainName": "javabuilder-test",
43
"BaseDomainName": "code.org",
54
"BaseDomainNameHostedZonedID": "Z2LCOI49SCXUGU",
65
"ProvisionedConcurrentExecutions": "1",

0 commit comments

Comments
 (0)