New repos and links

aws-samples · Dec 11, 2020 · 285b184 · 285b184
1 parent 150b524
commit 285b184
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -71,7 +71,7 @@ After the CloudFormation templates have been deployed, the [stack outputs](http:
 
 You can launch this CloudFormation stack in the US East 1 (North Virginia) Region in your account:
 
-[![cloudformation-launch-button](images/cloudformation-launch-stack.png)](https://console.aws.amazon.com/cloudformation/home?region=us-east-1#/stacks/new?stackName=reactive&templateURL=https://s3.amazonaws.com/reactive-refarch-cloudformation-us-east-1/master.yaml)    
+[![cloudformation-launch-button](images/cloudformation-launch-stack.png)](https://console.aws.amazon.com/cloudformation/home?region=us-east-1#/stacks/new?stackName=reactive&templateURL=https://reactive-refarch-cf-us-east-1.s3.amazonaws.com/master.yaml)    
 
 ### Test the application
 

diff --git a/infrastructure/lambda.yaml b/infrastructure/lambda.yaml
@@ -1,6 +1,6 @@
 Description: >
     This template deploys two different Amazon Kinesis Streams we need for the architecture.
-    We create them it a seperate nested template, so it can be referenced by all of the other nested templates.
+    We create them it a separate nested template, so it can be referenced by all of the other nested templates.
 
 Parameters:
 
@@ -111,8 +111,8 @@ Resources:
       Handler: "kinesis-consumer"
       Role: !GetAtt LambdaExecutionRoleDynamoDB.Arn
       Code: 
-        S3Bucket: "reactive-refarch-cloudformation-us-east-1"
-        S3Key: "lambda/kinesis-consumer-2.2.zip"
+        S3Bucket: "reactive-refarch-cf-us-east-1"
+        S3Key: "lambda/kinesis-consumer-3.2.zip"
       Runtime: "go1.x"
       MemorySize: 128
       Timeout: "30"
@@ -127,8 +127,8 @@ Resources:
       Handler: "redis-updater"
       Role: !GetAtt LambdaExecutionRoleRedis.Arn
       Code: 
-        S3Bucket: "reactive-refarch-cloudformation-us-east-1"
-        S3Key: "lambda/redis-updater-2.2.zip"
+        S3Bucket: "reactive-refarch-cf-us-east-1"
+        S3Key: "lambda/redis-updater-3.2.zip"
       Runtime: "go1.x"
       MemorySize: 128
       Timeout: "30"

diff --git a/master.yaml b/master.yaml
@@ -9,7 +9,7 @@ Description: >
   Amazon EC2 Container Registry (Amazon ECR). In addition, a DynamoDB table, Kinesis Data Streams,
   an ElastiCache cluster and AWS Lambda-functions are created.
 
-  Last Modified: 10. April 2019
+  Last Modified: 11. December 2020
   Author: Sascha Möllering <[email protected]>
 
 Parameters: 
@@ -26,7 +26,7 @@ Resources:
   VPC:
     Type: AWS::CloudFormation::Stack
     Properties:
-      TemplateURL: https://s3.amazonaws.com/reactive-refarch-cloudformation-us-east-1/infrastructure/vpc.yaml
+      TemplateURL: https://s3.amazonaws.com/reactive-refarch-cf-us-east-1/infrastructure/vpc.yaml
       Parameters:
         EnvironmentName:    !Ref AWS::StackName
         VpcCIDR:            10.180.0.0/16
@@ -38,15 +38,15 @@ Resources:
   SecurityGroups:
     Type: AWS::CloudFormation::Stack
     Properties:
-      TemplateURL: https://s3.amazonaws.com/reactive-refarch-cloudformation-us-east-1/infrastructure/security-groups.yaml
+      TemplateURL: https://s3.amazonaws.com/reactive-refarch-cf-us-east-1/infrastructure/security-groups.yaml
       Parameters:
         EnvironmentName: !Ref AWS::StackName
         VPC: !GetAtt VPC.Outputs.VPC
 
   ALB:
     Type: AWS::CloudFormation::Stack
     Properties:
-      TemplateURL: https://s3.amazonaws.com/reactive-refarch-cloudformation-us-east-1/infrastructure/load-balancers.yaml
+      TemplateURL: https://s3.amazonaws.com/reactive-refarch-cf-us-east-1/infrastructure/load-balancers.yaml
       Parameters:
         EnvironmentName: !Ref AWS::StackName
         VPC: !GetAtt VPC.Outputs.VPC
@@ -56,7 +56,7 @@ Resources:
   ECS:
     Type: AWS::CloudFormation::Stack
     Properties:
-      TemplateURL: https://s3.amazonaws.com/reactive-refarch-cloudformation-us-east-1/infrastructure/ecs-cluster.yaml
+      TemplateURL: https://s3.amazonaws.com/reactive-refarch-cf-us-east-1/infrastructure/ecs-cluster.yaml
       Parameters:
         EnvironmentName: !Ref AWS::StackName
         VPC: !GetAtt VPC.Outputs.VPC
@@ -66,7 +66,7 @@ Resources:
   ElastiCache:
     Type: AWS::CloudFormation::Stack
     Properties:
-      TemplateURL: https://s3.amazonaws.com/reactive-refarch-cloudformation-us-east-1/infrastructure/elasticache.yaml
+      TemplateURL: https://s3.amazonaws.com/reactive-refarch-cf-us-east-1/infrastructure/elasticache.yaml
       Parameters:
         EnvironmentName: !Ref AWS::StackName
         InstanceType: cache.m4.large
@@ -77,22 +77,22 @@ Resources:
   DynamoDB:
     Type: AWS::CloudFormation::Stack
     Properties:
-      TemplateURL: https://s3.amazonaws.com/reactive-refarch-cloudformation-us-east-1/infrastructure/dynamodb.yaml
+      TemplateURL: https://s3.amazonaws.com/reactive-refarch-cf-us-east-1/infrastructure/dynamodb.yaml
       Parameters:
         VPC: !GetAtt VPC.Outputs.VPC
         EnvironmentName: !Ref AWS::StackName
 
   Kinesis:
     Type: AWS::CloudFormation::Stack
     Properties:
-      TemplateURL: https://s3.amazonaws.com/reactive-refarch-cloudformation-us-east-1/infrastructure/kinesis.yaml
+      TemplateURL: https://s3.amazonaws.com/reactive-refarch-cf-us-east-1/infrastructure/kinesis.yaml
       Parameters:
         EnvironmentName: !Ref AWS::StackName
 
   Lambda:
     Type: AWS::CloudFormation::Stack
     Properties:
-      TemplateURL: https://s3.amazonaws.com/reactive-refarch-cloudformation-us-east-1/infrastructure/lambda.yaml
+      TemplateURL: https://s3.amazonaws.com/reactive-refarch-cf-us-east-1/infrastructure/lambda.yaml
       Parameters:
         EnvironmentName: !Ref AWS::StackName
         VPC: !GetAtt VPC.Outputs.VPC
@@ -107,7 +107,7 @@ Resources:
   ReactiveService:
     Type: AWS::CloudFormation::Stack
     Properties:
-      TemplateURL: https://s3.amazonaws.com/reactive-refarch-cloudformation-us-east-1/services/tracking-service/service.yaml
+      TemplateURL: https://s3.amazonaws.com/reactive-refarch-cf-us-east-1/services/tracking-service/service.yaml
       Parameters:
         VPC: !GetAtt VPC.Outputs.VPC
         Subnets: !GetAtt VPC.Outputs.PrivateSubnets

diff --git a/services/tracking-service/service.yaml b/services/tracking-service/service.yaml
@@ -116,7 +116,7 @@ Resources:
             ContainerDefinitions:
                 - Name: !Ref ServiceName
                   Essential: true
-                  Image: !If [IsOpenJDKTarget, 'smoell/reactive-vertx:2.0.1', 'smoell/reactive-vertx:2.0.1-native']
+                  Image: !If [IsOpenJDKTarget, 'public.ecr.aws/f8l6y1f6/reactive-vertx:2.0.1', 'public.ecr.aws/f8l6y1f6/reactive-vertx:2.0.1-native']
                   Memory: 2048
                   Cpu: 1024
                   HealthCheck:
@@ -154,7 +154,6 @@ Resources:
         MaxCapacity: 4
         MinCapacity: 2
         ResourceId: !Join ['/', [service, !Ref Cluster, !Ref ServiceName]]
-        RoleARN: !GetAtt [AutoscalingRole, Arn]
         ScalableDimension: ecs:service:DesiredCount
         ServiceNamespace: ecs
         RoleARN: !GetAtt AutoscalingRole.Arn