Create dedicated cert

Author: mohsanjaffery

Makefile

@@ -24,6 +24,9 @@ setup-predeploy:
 	source venv/bin/activate
 	pip install cfn-flip==1.2.2
 
+clean:
+	rm -rf *.zip source/witch/nodejs/node_modules/
+
 test-cfn:
 	cfn_nag templates/*.yaml --blacklist-path ci/cfn_nag_blacklist.yaml
 
@@ -41,5 +44,7 @@ package-static:
 	cd source/witch && zip -r ../../witch.zip nodejs
 
 package-function:
+	make clean
 	make package-static
 	cd source/secured-headers/ && zip -r ../../s-headers.zip index.js
+

templates/acm-certificate.yaml

@@ -11,6 +11,8 @@ Parameters:
     Type: String
   CopyFunction:
     Type: String
+  SubDomain:
+    Type: String
 
 Resources:
   CopyCustomResource:
@@ -21,7 +23,7 @@ Resources:
   Certificate:
     Type: Custom::Certificate
     Properties:
-      DomainName: !Sub '*.${DomainName}'
+      DomainName: !Sub '${SubDomain}.${DomainName}'
       Region: !Ref Region
       ValidationMethod: DNS
       ServiceToken: !Ref 'CFNCustomProvider'
@@ -36,7 +38,7 @@ Resources:
     Type: Custom::CertificateDNSRecord
     Properties:
       CertificateArn: !Ref Certificate
-      DomainName: !Sub '*.${DomainName}'
+      DomainName: !Sub '${SubDomain}.${DomainName}'
       ServiceToken: !Ref 'CFNCustomProvider'
 
   DomainValidationRecord:

templates/main.yaml

@@ -39,6 +39,7 @@ Resources:
     Properties:
       TemplateURL: ./acm-certificate.yaml
       Parameters:
+        SubDomain: !Ref SubDomain
         DomainName: !Ref DomainName
         CFNCustomProvider: !GetAtt CustomResourceStack.Outputs.CFNCustomProvider
         CopyFunction: !GetAtt CustomResourceStack.Outputs.CopyFunction
@@ -64,6 +65,8 @@ Resources:
           Value: ACFS3
 
 Outputs:
+  SolutionVersion:
+    Value: !FindInMap [Solution, Constants, Version]
   CFNCustomProvider:
     Description: ACM helper function    
     Value: !GetAtt CustomResourceStack.Outputs.CFNCustomProvider
@@ -94,5 +97,3 @@ Outputs:
   CloudFrontDomainName:
     Description: Website address
     Value: !GetAtt CloudFrontStack.Outputs.CloudFrontDomainName
-  SolutionVersion:
-    Value: !FindInMap [Solution, Constants, Version]