Fix names.

_cim.yml

@@ -1,6 +1,6 @@
 version: 0.1
 stack:
- name: services-cicd # Note: Update this with your stack name
+ name: app-bootstrap # Note: Update this with your stack name
  template:
  file: bootstrap.stack.yml
  # Stacks are uploaded here prior to deployment. The bucket is created if it doesn't exist.
@@ -16,6 +16,7 @@ stack:
  GitHubToken: '${kms.decrypt(AQICAHgiu9XuQb4FZRXrLn/77g1P99ZhS7/g3xOsvbvNpb+/qQH+sxP+if0SN0/QR0I3M9ehAAAAhzCBhAYJKoZIhvcNAQcGoHcwdQIBADBwBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDNTJCu1YrFM64MUL4AIBEIBD8zDL0Oc+8rQwr/7fJq+NyPB7vKJ/lNqqcmBBN9QS8XDFAqB9Vh9fkCUSilXs3HG3NL6EdLYaR9Z5blo7p2/HTmJrnw==)}'
 
  KeyPairName: 'bluefineng'
+ AppName: 'app'
 
  # Build Notification
 # NotificationEmail: '[email protected]'

bootstrap.stack.yml

@@ -15,6 +15,9 @@ Parameters:
  KeyPairName:
  Type: String
  Description: EC2 KeyPair
+ AppName:
+ Type: String
+ Description: Application name
 
 Resources:
 
@@ -176,14 +179,14 @@ Resources:
  Value:
  Fn::Join:
  - ''
- - - Ref: AWS::StackName
+ - - Ref: AppName
  - '-vpc-prod'
  - Name: KeyPairName
  Value: !Ref KeyPairName
  Name:
  Fn::Join:
  - ''
- - - Ref: AWS::StackName
+ - - Ref: AppName
  - '-code-build-prod'
  ServiceRole: !GetAtt CodeBuildRole.Arn
  Source:
@@ -204,14 +207,14 @@ Resources:
  Value:
  Fn::Join:
  - ''
- - - Ref: AWS::StackName
+ - - Ref: AppName
  - '-vpc-sandbox'
  - Name: KeyPairName
  Value: !Ref KeyPairName
  Name:
  Fn::Join:
  - ''
- - - Ref: AWS::StackName
+ - - Ref: AppName
  - '-code-build-sandbox'
  ServiceRole: !GetAtt CodeBuildRole.Arn
  Source:
@@ -287,13 +290,13 @@ Resources:
  StackName:
  Fn::Join:
  - ''
- - - Ref: AWS::StackName
+ - - Ref: AppName
  - '-ecs-prod'
  ParameterOverrides: !Sub |
  {
  "Environment": "prod",
  "KeyPairName": "${KeyPairName}",
- "VPCStack" : "${AWS::StackName}-vpc-prod"
+ "VPCStack" : "${AppName}-vpc-prod"
  }
  RunOrder: 1
  - Name: Service1
@@ -318,14 +321,16 @@ Resources:
  StackName:
  Fn::Join:
  - ''
- - - Ref: AWS::StackName
- - '-service1-prod'
+ - - Ref: AppName
+ - '-service1-bootstrap-prod'
  ParameterOverrides: !Sub |
  {
  "Environment": "prod",
- "VPCStack" : "${AWS::StackName}-vpc-prod",
- "ECSStack" : "${AWS::StackName}-ecs-prod",
- "GitHubToken" : "${GitHubToken}"
+ "VPCStack" : "${AppName}-vpc-prod",
+ "ECSStack" : "${AppName}-ecs-prod",
+ "GitHubToken" : "${GitHubToken}",
+ "AppName" : "${AppName}",
+ "ServiceName" : "service1"
  }
  RunOrder: 1
 
@@ -397,13 +402,13 @@ Resources:
  StackName:
  Fn::Join:
  - ''
- - - Ref: AWS::StackName
+ - - Ref: AppName
  - '-ecs-sandbox'
  ParameterOverrides: !Sub |
  {
  "Environment": "sandbox",
  "KeyPairName": "${KeyPairName}",
- "VPCStack" : "${AWS::StackName}-vpc-sandbox"
+ "VPCStack" : "${AppName}-vpc-sandbox"
  }
  RunOrder: 1
  - Name: Service1
@@ -428,13 +433,14 @@ Resources:
  StackName:
  Fn::Join:
  - ''
- - - Ref: AWS::StackName
- - '-service1-sandbox'
+ - - Ref: AppName
+ - '-service1-bootstrap-sandbox'
  ParameterOverrides: !Sub |
  {
  "Environment": "sandbox",
- "VPCStack" : "${AWS::StackName}-vpc-sandbox",
- "ECSStack" : "${AWS::StackName}-ecs-sandbox",
- "GitHubToken" : "${GitHubToken}"
+ "VPCStack" : "${AppName}-vpc-sandbox",
+ "ECSStack" : "${AppName}-ecs-sandbox",
+ "GitHubToken" : "${GitHubToken}",
+ "AppName" : "${AppName}"
  }
  RunOrder: 1

stacks/service1.stack.yml

@@ -27,6 +27,14 @@ Parameters:
  Type: String
  Description: ECS Stack Name
 
+ AppName:
+ Type: String
+ Description: Application name
+
+ ServiceName:
+ Type: String
+ Description: Service name
+
 Mappings:
  Branch:
  prod:
@@ -188,14 +196,18 @@ Resources:
  StackName:
  Fn::Join:
  - ''
- - - Ref: AWS::StackName
- - '-bootstrap'
+ - - Ref: AppName
+ - '-'
+ - Ref: ServiceName
+ - '-'
+ - Ref: Environment
  ParameterOverrides: !Sub |
  {
  "Environment": "${Environment}",
  "VPCStack" : "${VPCStack}",
  "ECSStack" : "${ECSStack}",
  "GitHubToken" : "${GitHubToken}",
- "ServiceName" : "service1"
+ "AppName": "${AppName}",
+ "ServiceName" : "${ServiceName}"
  }
  RunOrder: 1