From 6a3b81a8887cfc406d5c76d37ed8b10f5385264d Mon Sep 17 00:00:00 2001
From: Joseph Manley <j@cloudsumu.com>
Date: Sat, 23 May 2020 23:53:54 -0400
Subject: [PATCH] Move cfn location

Fix deploy

Space seperated subnets
---
 .github/workflows/build_stage.yml                | 2 +-
 cloudformation/{ => jenkins}/dns.yaml            | 0
 cloudformation/{ => jenkins}/load_balancing.yaml | 0
 cloudformation/{ => jenkins}/task.yaml           | 0
 cloudformation/{ => jenkins}/top.yaml            | 2 +-
 5 files changed, 2 insertions(+), 2 deletions(-)
 rename cloudformation/{ => jenkins}/dns.yaml (100%)
 rename cloudformation/{ => jenkins}/load_balancing.yaml (100%)
 rename cloudformation/{ => jenkins}/task.yaml (100%)
 rename cloudformation/{ => jenkins}/top.yaml (97%)

diff --git a/.github/workflows/build_stage.yml b/.github/workflows/build_stage.yml
index 6e42e80..45dd43c 100644
--- a/.github/workflows/build_stage.yml
+++ b/.github/workflows/build_stage.yml
@@ -33,6 +33,6 @@ jobs:
       uses: aws-actions/aws-cloudformation-github-deploy@v1
       with:
         name: ecs-jenkins
-        template: cloudformation/top.yaml
+        template: cloudformation/jenkins/top.yaml
         capabilities: "CAPABILITY_NAMED_IAM,CAPABILITY_IAM"
         parameter-overrides: VpcId=${{ secrets.VPC_ID }},PublicSubnets=${{ secrets.SUBNET_IDS }},EcsCluster=${{ secrets.CLUSTER }},PortalCertificate=${{ secrets.CERTIFICATE }},Domain=${{ secrets.DOMAIN }}
\ No newline at end of file
diff --git a/cloudformation/dns.yaml b/cloudformation/jenkins/dns.yaml
similarity index 100%
rename from cloudformation/dns.yaml
rename to cloudformation/jenkins/dns.yaml
diff --git a/cloudformation/load_balancing.yaml b/cloudformation/jenkins/load_balancing.yaml
similarity index 100%
rename from cloudformation/load_balancing.yaml
rename to cloudformation/jenkins/load_balancing.yaml
diff --git a/cloudformation/task.yaml b/cloudformation/jenkins/task.yaml
similarity index 100%
rename from cloudformation/task.yaml
rename to cloudformation/jenkins/task.yaml
diff --git a/cloudformation/top.yaml b/cloudformation/jenkins/top.yaml
similarity index 97%
rename from cloudformation/top.yaml
rename to cloudformation/jenkins/top.yaml
index a7b0df0..c17ffe9 100644
--- a/cloudformation/top.yaml
+++ b/cloudformation/jenkins/top.yaml
@@ -85,7 +85,7 @@ Resources:
         environment: !Ref environment
         release: !Ref release
         VpcId: !Ref VpcId
-        PublicSubnets: !Ref PublicSubnets
+        PublicSubnets: !Join [",", !Split [" ", !Ref PublicSubnets]]
         PortalCertificate: !Ref PortalCertificate
 
   #-------------------