Refactor webapp sample to use new modules section

Author: ericzbeard

modules/cognito.yaml

@@ -49,4 +49,3 @@ Resources:
         - openid
       SupportedIdentityProviders:
         - COGNITO
-

modules/compliant-bucket.yaml

@@ -28,6 +28,48 @@ Rain:
     LogBucketArn: "${Rain::S3Arn}${Rain::LogBucketName}"
     ReplicaBucketName: "${AppName}-replicas-${AWS::Region}-${AWS::AccountId}"
 
+Modules:
+
+  BucketAccess:
+    Source: bucket-policy.yaml
+    Properties:
+      PolicyBucketName: !Sub ${AppName}-${AWS::Region}-${AWS::AccountId}
+
+  ReplicaBucketAccess:
+    Source: bucket-policy.yaml
+    Properties:
+      PolicyBucketName: !Sub ${AppName}-replicas-${AWS::Region}-${AWS::AccountId}
+
+  LogBucketAccess:
+    Source: bucket-policy.yaml
+    Properties:
+      PolicyBucketName: !Sub ${Rain::LogBucketName}
+    Overrides:
+      Policy:
+        Properties:
+          PolicyDocument:
+            Statement:
+              - Action: s3:*
+                Condition:
+                  Bool:
+                    aws:SecureTransport: false
+                Effect: Deny
+                Principal:
+                  AWS: '*'
+                Resource:
+                  - !Sub ${Rain::LogBucketArn}
+                  - !Sub ${Rain::LogBucketArn}/*
+              - Action: s3:PutObject
+                Condition:
+                  ArnLike:
+                    aws:SourceArn: !Sub ${Rain::LogBucketArn}/*
+                  StringEquals:
+                    aws:SourceAccount: !Ref AWS::AccountId
+                Effect: Allow
+                Principal:
+                  Service: logging.s3.amazonaws.com
+                Resource:
+                  - !Sub ${Rain::LogBucketArn}/*
 
 Resources:
 
@@ -67,36 +109,6 @@ Resources:
       VersioningConfiguration:
         Status: Enabled
 
-  LogBucketAccess:
-    Type: !Rain::Module "bucket-policy.yaml"
-    Properties:
-      PolicyBucketName: !Sub ${Rain::LogBucketName}
-    Overrides:
-      Policy:
-        Properties:
-          PolicyDocument:
-            Statement:
-              - Action: s3:*
-                Condition:
-                  Bool:
-                    aws:SecureTransport: false
-                Effect: Deny
-                Principal:
-                  AWS: '*'
-                Resource:
-                  - !Sub ${Rain::LogBucketArn}
-                  - !Sub ${Rain::LogBucketArn}/*
-              - Action: s3:PutObject
-                Condition:
-                  ArnLike:
-                    aws:SourceArn: !Sub ${Rain::LogBucketArn}/*
-                  StringEquals:
-                    aws:SourceAccount: !Ref AWS::AccountId
-                Effect: Allow
-                Principal:
-                  Service: logging.s3.amazonaws.com
-                Resource:
-                  - !Sub ${Rain::LogBucketArn}/*
 
   Bucket:
     Type: AWS::S3::Bucket
@@ -131,10 +143,6 @@ Resources:
       VersioningConfiguration:
         Status: Enabled
 
-  BucketAccess:
-    Type: !Rain::Module "bucket-policy.yaml"
-    Properties:
-      PolicyBucketName: !Sub ${AppName}-${AWS::Region}-${AWS::AccountId}
 
   ReplicaBucket:
     Type: AWS::S3::Bucket
@@ -167,10 +175,6 @@ Resources:
       VersioningConfiguration:
         Status: Enabled
 
-  ReplicaBucketAccess:
-    Type: !Rain::Module "bucket-policy.yaml"
-    Properties:
-      PolicyBucketName: !Sub ${AppName}-replicas-${AWS::Region}-${AWS::AccountId}
 
   ReplicationPolicy:
     Type: AWS::IAM::RolePolicy

modules/rest-api.yaml

@@ -34,4 +34,3 @@ Resources:
         - !Ref UserPoolArn
       RestApiId: !Ref Api
       Type: COGNITO_USER_POOLS
-

modules/static-site.yaml

@@ -89,8 +89,9 @@ Resources:
               ExcludedRules:
                 - Name: NoUserAgent_HEADER
 
+Modules:
   Content:
-    Type: !Rain::Module "compliant-bucket.yaml"
+    Source: compliant-bucket.yaml
     Properties:
       AppName: !Sub ${AppName}-content
       EmptyOnDelete: true
@@ -120,7 +121,7 @@ Resources:
             Version: "2012-10-17"
 
   CloudFrontLogs:
-    Type: !Rain::Module "compliant-bucket.yaml"
+    Source: compliant-bucket.yaml
     Properties:
       AppName: !Sub ${AppName}-cflogs
       EmptyOnDelete: true
@@ -130,4 +131,3 @@ Resources:
           OwnershipControls:
             Rules:
               - ObjectOwnership: BucketOwnerPreferred
-

test/webapp/webapp.yaml

@@ -16,10 +16,9 @@ Parameters:
     Description: This name is used as a prefix for resource names
     Default: rain-webapp
 
-Resources:
-
+Modules:
   Site:
-    Type: !Rain::Module "../../modules/static-site.yaml"
+    Source: ../../modules/static-site.yaml
     Properties:
       AppName: !Ref AppName
     Overrides:
@@ -41,7 +40,7 @@ Resources:
                 - Rain::OutputValue AppClientId
 
   Cognito:
-    Type: !Rain::Module "../../modules/cognito.yaml"
+    Source: ../../modules/cognito.yaml
     Properties:
       AppName: !Ref AppName
       CallbackURL: !Sub "https://${SiteDistribution.DomainName}/index.html"
@@ -50,7 +49,7 @@ Resources:
         DependsOn: SiteDistribution
 
   Rest:
-    Type: !Rain::Module "../../modules/rest-api.yaml"
+    Source: ../../modules/rest-api.yaml
     Properties:
       AppName: !Ref AppName
       UserPoolArn: !GetAtt CognitoUserPool.Arn
@@ -65,15 +64,15 @@ Resources:
           - JwtResourceOptions
 
   TestResource:
-    Type: !Rain::Module "../../modules/api-resource.yaml"
+    Source: ../../modules/api-resource.yaml
     Metadata:
       Comment: This module handles all methods on the /test path on the API. The lambda function code is located in api/resources/test.  
     Properties:
       Name: !Sub ${AppName}-test
       RestApi: !Ref RestApi
       RestApiDeployment: !Ref RestApiDeployment
-      BuildScript: ../test/webapp/buildapi.sh
-      CodePath: ../test/webapp/api/dist/test/lambda-handler.zip
+      BuildScript: buildapi.sh
+      CodePath: api/dist/test/lambda-handler.zip
       ResourcePath: test
       StageName: staging
       AuthorizerId: !Ref RestApiAuthorizer
@@ -85,21 +84,21 @@ Resources:
               TABLE_NAME: !Ref TestDataTable
 
   TestData:
-    Type: !Rain::Module "../../modules/simple-table.yaml" 
+    Source: ../../modules/simple-table.yaml
     Properties:
       TableName: !Sub ${AppName}-test
       LambdaRole: !Ref TestResourceHandlerRole
 
   JwtResource:
-    Type: !Rain::Module "../../modules/api-resource.yaml"
+    Source: ../../modules/api-resource.yaml
     Metadata:
       Comment: This module handles all methods on the /jwt path on the API. The lambda function code is located in api/resources/jwt
     Properties:
       Name: !Sub ${AppName}-jwt
       RestApi: !Ref RestApi
       RestApiDeployment: !Ref RestApiDeployment
-      BuildScript: ../test/webapp/buildapi.sh
-      CodePath: ../test/webapp/api/dist/jwt/lambda-handler.zip
+      BuildScript: buildapi.sh
+      CodePath: api/dist/jwt/lambda-handler.zip
       ResourcePath: jwt
       StageName: staging
       AuthorizerId: AWS::NoValue
@@ -136,4 +135,3 @@ Outputs:
 
   CognitoDomainPrefix:
     Value: !Ref AppName
-