From 93fb4b42ca3a54ba882ed33cb9982cde1f4071ce Mon Sep 17 00:00:00 2001
From: Joseph Manley <j@cloudsumu.com>
Date: Sat, 25 Apr 2020 23:01:30 -0400
Subject: [PATCH] Reorganize directories

---
 .github/workflows/deploy_environment.yml    |  6 ++---
 .github/workflows/push_production.yml       | 25 ---------------------
 cloudformation/cluster/ec2.yaml             |  0
 cloudformation/cluster/efs.yaml             |  0
 cloudformation/cluster/top.yaml => top.yaml |  0
 5 files changed, 3 insertions(+), 28 deletions(-)
 delete mode 100644 .github/workflows/push_production.yml
 delete mode 100644 cloudformation/cluster/ec2.yaml
 delete mode 100644 cloudformation/cluster/efs.yaml
 rename cloudformation/cluster/top.yaml => top.yaml (100%)

diff --git a/.github/workflows/deploy_environment.yml b/.github/workflows/deploy_environment.yml
index 98babd3..be71f96 100644
--- a/.github/workflows/deploy_environment.yml
+++ b/.github/workflows/deploy_environment.yml
@@ -17,9 +17,9 @@ jobs:
       with:
         args: --follow-symlinks --delete
       env:
-        SOURCE_DIR: cloudformation
+        SOURCE_DIR: "./"
         AWS_REGION: "us-east-1"
-        DEST_DIR: actions/cloudformation
+        DEST_DIR: actions/cloudformation/cluster
         AWS_S3_BUCKET: ${{ secrets.DEPLOY_BUCKET }}
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -33,6 +33,6 @@ jobs:
       uses: aws-actions/aws-cloudformation-github-deploy@v1
       with:
         name: ecs-cluster
-        template: cloudformation/cluster/top.yaml
+        template: top.yaml
         capabilities: "CAPABILITY_NAMED_IAM,CAPABILITY_IAM"
         parameter-overrides: VpcId=${{ secrets.VPC_ID }},SubnetIds=${{ secrets.SUBNET_IDS }},Project=General,Environment=Main
\ No newline at end of file
diff --git a/.github/workflows/push_production.yml b/.github/workflows/push_production.yml
deleted file mode 100644
index 826b5b4..0000000
--- a/.github/workflows/push_production.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-name: Push Production Release
-
-on:
-  push:
-    branches:
-      - develop
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout Repo
-      uses: actions/checkout@v1
-    - name: Ship to S3
-      uses: jakejarvis/s3-sync-action@master
-      with:
-        args: --follow-symlinks --delete
-      env:
-        SOURCE_DIR: cloudformation
-        AWS_REGION: "us-east-1"
-        DEST_DIR: nakama/production/cloudformation
-        AWS_S3_BUCKET: sumu-stacks
-        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
\ No newline at end of file
diff --git a/cloudformation/cluster/ec2.yaml b/cloudformation/cluster/ec2.yaml
deleted file mode 100644
index e69de29..0000000
diff --git a/cloudformation/cluster/efs.yaml b/cloudformation/cluster/efs.yaml
deleted file mode 100644
index e69de29..0000000
diff --git a/cloudformation/cluster/top.yaml b/top.yaml
similarity index 100%
rename from cloudformation/cluster/top.yaml
rename to top.yaml