From 16828953406614cfff154993cbbaecfd32cb0e3a Mon Sep 17 00:00:00 2001
From: Cole Killian <g.cole.killian@gmail.com>
Date: Tue, 15 Jun 2021 14:22:26 -0700
Subject: [PATCH 1/3] feat: replace wisp-prod with secrets.GKE_CLUSTER

---
 .github/workflows/dev.yaml  | 2 +-
 .github/workflows/prod.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/dev.yaml b/.github/workflows/dev.yaml
index 1736c8b..b46c1e8 100644
--- a/.github/workflows/dev.yaml
+++ b/.github/workflows/dev.yaml
@@ -12,7 +12,7 @@ env:
   DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
   DOCKER_ORGANIZATION: ${{ secrets.DOCKER_ORGANIZATION }} 
   PROJECT_ID: ${{ secrets.GKE_PROJECT }}
-  GKE_CLUSTER: wisp-prod
+  GKE_CLUSTER: ${{ secrets.GKE_CLUSTER }}
   GKE_ZONE: northamerica-northeast1-c
   IMAGE: wisp-problems
 
diff --git a/.github/workflows/prod.yaml b/.github/workflows/prod.yaml
index 94fb4a7..808e30a 100644
--- a/.github/workflows/prod.yaml
+++ b/.github/workflows/prod.yaml
@@ -12,7 +12,7 @@ env:
   DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
   DOCKER_ORGANIZATION: ${{ secrets.DOCKER_ORGANIZATION }} 
   PROJECT_ID: ${{ secrets.GKE_PROJECT }}
-  GKE_CLUSTER: wisp-prod
+  GKE_CLUSTER: ${{ secrets.GKE_CLUSTER }}
   GKE_ZONE: northamerica-northeast1-c
   IMAGE: wisp-problems
 

From 11efc10e5cef0ed34accb490aad94b254f8164ca Mon Sep 17 00:00:00 2001
From: Cole Killian <g.cole.killian@gmail.com>
Date: Tue, 15 Jun 2021 18:03:56 -0700
Subject: [PATCH 2/3] feat: convert GKE_ZONE to a github secret

---
 .github/workflows/dev.yaml  | 4 ++--
 .github/workflows/prod.yaml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/dev.yaml b/.github/workflows/dev.yaml
index b46c1e8..f7bcdc8 100644
--- a/.github/workflows/dev.yaml
+++ b/.github/workflows/dev.yaml
@@ -13,7 +13,7 @@ env:
   DOCKER_ORGANIZATION: ${{ secrets.DOCKER_ORGANIZATION }} 
   PROJECT_ID: ${{ secrets.GKE_PROJECT }}
   GKE_CLUSTER: ${{ secrets.GKE_CLUSTER }}
-  GKE_ZONE: northamerica-northeast1-c
+  GKE_ZONE: ${{ secrets.GKE_ZONE }}
   IMAGE: wisp-problems
 
 jobs:
@@ -26,7 +26,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v2
 
-      # Setup gcloud CLI
+    # Setup gcloud CLI
     - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
       with:
         service_account_key: ${{ secrets.GKE_SA_KEY }}
diff --git a/.github/workflows/prod.yaml b/.github/workflows/prod.yaml
index 808e30a..63bc892 100644
--- a/.github/workflows/prod.yaml
+++ b/.github/workflows/prod.yaml
@@ -13,7 +13,7 @@ env:
   DOCKER_ORGANIZATION: ${{ secrets.DOCKER_ORGANIZATION }} 
   PROJECT_ID: ${{ secrets.GKE_PROJECT }}
   GKE_CLUSTER: ${{ secrets.GKE_CLUSTER }}
-  GKE_ZONE: northamerica-northeast1-c
+  GKE_ZONE: ${{ secrets.GKE_ZONE }}
   IMAGE: wisp-problems
 
 jobs:

From e15a015f4baa4babe723aaddd1d0933cc96d6355 Mon Sep 17 00:00:00 2001
From: Cole Killian <g.cole.killian@gmail.com>
Date: Tue, 15 Jun 2021 18:04:08 -0700
Subject: [PATCH 3/3] feat: update prettierrc with tabWidth 2 for yaml

---
 .prettierrc.js | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/.prettierrc.js b/.prettierrc.js
index 9831d86..94825f9 100644
--- a/.prettierrc.js
+++ b/.prettierrc.js
@@ -1,6 +1,14 @@
 module.exports = {
-	semi: true,
-	trailingComma: "none",
-	singleQuote: false,
-	tabWidth: 4
-};
\ No newline at end of file
+    semi: true,
+    trailingComma: "none",
+    singleQuote: false,
+    tabWidth: 4,
+    overrides: [
+        {
+            files: ["*.yaml"],
+            options: {
+                tabWidth: 2
+            }
+        }
+    ]
+};