From 8191038ee0cb7d178193e618c4e1ebc3c8130160 Mon Sep 17 00:00:00 2001
From: dunemask <elijah@dunemask.net>
Date: Thu, 15 Feb 2024 04:48:52 +0000
Subject: [PATCH 01/49] [FEATURE] Adjust URLS

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e4fd7c2..0e57a58 100644
--- a/README.md
+++ b/README.md
@@ -6,8 +6,9 @@ The actions are used by Elysium to run CI/CD tasks and this repo will be archive
 
 The actions available are: 
 - [S3 Backup](https://gitea.dunemask.dev/elysium/elysium-actions/src/branch/s3-backup/action.yml)
-- [Oasis Deploy](https://gitea.dunemask.dev/elysium/elysium-actions/src/branch/oasis-deploy/action.yml)
+- [Oasis Auto Setup](https://gitea.dunemask.dev/elysium/elysium-actions/src/branch/oasis-setup-auto/action.yml)
 - [Infisical Env](https://gitea.dunemask.dev/elysium/elysium-actions/src/branch/infisical-env/action.yml)
+- [Oasis Advanced Setup](https://gitea.dunemask.dev/elysium/elysium-actions/src/branch/oasis-setup-advanced/action.yml)
 - [Elysium CI/CD](https://gitea.dunemask.dev/elysium/elysium-actions/src/branch/elysium-ci-cd/action.yml)
 
 ## Workflow Template

From 8dd851ec4a6584b52f3793ca682d1cd6ae9d9131 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Wed, 14 Feb 2024 22:04:41 -0700
Subject: [PATCH 02/49] [TMP] Init prototype

---
 action.yml | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 action.yml

diff --git a/action.yml b/action.yml
new file mode 100644
index 0000000..81d900c
--- /dev/null
+++ b/action.yml
@@ -0,0 +1,42 @@
+name: 'Oasis Auto Config Action'
+description: 'Configure env for deploying apps using Oasis Automagically'
+inputs:
+  deploy-env:
+      description: 'Deploy Environment (ci or edge)'
+      required: true
+  garden-version:
+      description: 'Version of Garden to deploy'
+      required: false
+      default: 0.13.24
+  oasis-branch:
+      description: 'Branch of Oasis to use'
+      required: false
+      default: master
+  oasis-workspace: 
+      descipriont: 'Workspace to setup Oasis'
+      required: false
+      default: ${{ gitea.workspace}}/oasis
+runs:
+  using: "composite"
+  steps:
+    - name: Configure Workflow
+      shell: bash
+      echo OASIS_ENV_STRATEGY=${{ inputs.deploy-env }} >> $GITHUB_ENV
+      
+    # Set additional Envars
+    - name: Setup Oasis Envars
+      uses: https://gitea.dunemask.dev/elysium/elysium-actions@infisical-env
+      with:
+        infisical-token: ${{ secrets.INFISICAL_ELYSIUM_CI_READ_TOKEN }}
+        environment: ci
+        secret-path: /workflows/oasis-ci-deploy
+
+      run: echo "Getting envars"
+    - name: Setup Environment
+      shell: bash
+      run: |
+        echo CI_NAMESPACE=ci-$SHORT_COMMIT_SHA >> $GITHUB_ENV
+        echo DEVOPS_GITEA_ELYSIUM_ORG_READ_TOKEN=${{ inputs.gitea-token }} >> $GITHUB_ENV
+        echo "Checking out Oasis"        
+
+

From 98d35dd706049629304b74d6ba32ba6affc7d970 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Thu, 15 Feb 2024 10:31:21 -0700
Subject: [PATCH 03/49] [FEATURE] Auto Oasis Test

---
 action.yml | 42 +++++++++++++++++++++++++++++++-----------
 1 file changed, 31 insertions(+), 11 deletions(-)

diff --git a/action.yml b/action.yml
index 81d900c..0d79c9c 100644
--- a/action.yml
+++ b/action.yml
@@ -22,21 +22,41 @@ runs:
     - name: Configure Workflow
       shell: bash
       echo OASIS_ENV_STRATEGY=${{ inputs.deploy-env }} >> $GITHUB_ENV
-      
+      if [ ${{ inputs.deploy-env }} == "edge" ]; then
+        echo OASIS_INFISICAL_TOKEN=${{ secrets.INFISICAL_ELYSIUM_PROD_READ_TOKEN }} >> $GITHUB_ENV
+        echo OASIS_INFISICAL_WORKFLOW=/workflows/oasis-edge-deploy >> $GITHUB_ENV
+      elif [ ${{ inputs.deploy-env }} == "ci" ]; then
+        echo OASIS_INFISICAL_TOKEN=${{ secrets.INFISICAL_ELYSIUM_PROD_READ_TOKEN }} >> $GITHUB_ENV
+        echo OASIS_INFISICAL_WORKFLOW=/workflows/oasis-edge-deploy >> $GITHUB_ENV
+      else
+        echo "Error! deploy-env required, and must be 'ci' or 'edge'!"
+        exit 1
+      fi
+  
     # Set additional Envars
     - name: Setup Oasis Envars
       uses: https://gitea.dunemask.dev/elysium/elysium-actions@infisical-env
       with:
-        infisical-token: ${{ secrets.INFISICAL_ELYSIUM_CI_READ_TOKEN }}
-        environment: ci
-        secret-path: /workflows/oasis-ci-deploy
+        infisical-token: ${{ env.OASIS_INFISICAL_TOKEN }}
+        environment: ${{ env.OASIS_ENV_STRATEGY}}
+        secret-path: ${{ env.OASIS_INFISICAL_WORKFLOW }}
 
-      run: echo "Getting envars"
-    - name: Setup Environment
-      shell: bash
-      run: |
-        echo CI_NAMESPACE=ci-$SHORT_COMMIT_SHA >> $GITHUB_ENV
-        echo DEVOPS_GITEA_ELYSIUM_ORG_READ_TOKEN=${{ inputs.gitea-token }} >> $GITHUB_ENV
-        echo "Checking out Oasis"        
+    - name: Configure Kubeconfig
+          shell: bash
+          echo OASIS_ENV_STRATEGY=${{ inputs.deploy-env }} >> $GITHUB_ENV
+          if [ ${{ inputs.deploy-env }} == "edge" ]; then
+            echo OASIS_WORKFLOW_KUBECONFIG=${{env.KUBERNETES_CONFIG_USW_DEV}} >> $GITHUB_ENV
+          elif [ ${{ inputs.deploy-env }} == "ci" ]; then
+            echo OASIS_WORKFLOW_KUBECONFIG=${{env.KUBERNETES_CONFIG_USW_EDGE}} >> $GITHUB_ENV
+          else
+            echo "Error! deploy-env required, and must be 'ci' or 'edge'!"
+            exit 1
+          fi
+    - name: Oasis Setup
+      uses: https://gitea.dunemask.dev/elysium/elysium-actions@oasis-setup-advanced
+      with:
+        oasis-branch: ep/Feb13-2024/ActionRework
+        kubeconfig: ${{ env.OASIS_WORKFLOW_KUBECONFIG }}
+       
 
 

From a18f49543ea7a4ed62c0a914a186a3d6f7d960d8 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Thu, 15 Feb 2024 10:36:39 -0700
Subject: [PATCH 04/49] [FEATURE] Auto Oasis Test

---
 action.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/action.yml b/action.yml
index 0d79c9c..1d98d9c 100644
--- a/action.yml
+++ b/action.yml
@@ -7,7 +7,6 @@ inputs:
   garden-version:
       description: 'Version of Garden to deploy'
       required: false
-      default: 0.13.24
   oasis-branch:
       description: 'Branch of Oasis to use'
       required: false
@@ -15,7 +14,6 @@ inputs:
   oasis-workspace: 
       descipriont: 'Workspace to setup Oasis'
       required: false
-      default: ${{ gitea.workspace}}/oasis
 runs:
   using: "composite"
   steps:
@@ -55,7 +53,9 @@ runs:
     - name: Oasis Setup
       uses: https://gitea.dunemask.dev/elysium/elysium-actions@oasis-setup-advanced
       with:
-        oasis-branch: ep/Feb13-2024/ActionRework
+        garden-version: ${{ inputs.garden-version }}
+        oasis-branch: ${{ inputs.oasis-branch }}
+        oasis-workspace: ${{ inputs.oasis-workspace }}
         kubeconfig: ${{ env.OASIS_WORKFLOW_KUBECONFIG }}
        
 

From e4cd7950816438d988c6f2500272120acaf2fc88 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Thu, 15 Feb 2024 16:14:02 -0700
Subject: [PATCH 05/49] [FEATURE] Auto Oasis Test

---
 action.yml | 75 +++++++++++++++++++++++++-----------------------------
 1 file changed, 35 insertions(+), 40 deletions(-)

diff --git a/action.yml b/action.yml
index 1d98d9c..3501bbe 100644
--- a/action.yml
+++ b/action.yml
@@ -1,55 +1,53 @@
-name: 'Oasis Auto Config Action'
-description: 'Configure env for deploying apps using Oasis Automagically'
+name: Oasis Auto Config Action
+description: Configure env for deploying apps using Oasis Automagically
 inputs:
   deploy-env:
-      description: 'Deploy Environment (ci or edge)'
-      required: true
+    description: Deploy Environment (ci or edge)
+    required: true
   garden-version:
-      description: 'Version of Garden to deploy'
-      required: false
+    description: Version of Garden to deploy
+    required: false
   oasis-branch:
-      description: 'Branch of Oasis to use'
-      required: false
-      default: master
-  oasis-workspace: 
-      descipriont: 'Workspace to setup Oasis'
-      required: false
+    description: Branch of Oasis to use
+    required: false
+    default: master
+  oasis-workspace:
+    descipriont: Workspace to setup Oasis
+    required: false
 runs:
-  using: "composite"
+  using: composite
   steps:
     - name: Configure Workflow
       shell: bash
-      echo OASIS_ENV_STRATEGY=${{ inputs.deploy-env }} >> $GITHUB_ENV
-      if [ ${{ inputs.deploy-env }} == "edge" ]; then
-        echo OASIS_INFISICAL_TOKEN=${{ secrets.INFISICAL_ELYSIUM_PROD_READ_TOKEN }} >> $GITHUB_ENV
-        echo OASIS_INFISICAL_WORKFLOW=/workflows/oasis-edge-deploy >> $GITHUB_ENV
-      elif [ ${{ inputs.deploy-env }} == "ci" ]; then
-        echo OASIS_INFISICAL_TOKEN=${{ secrets.INFISICAL_ELYSIUM_PROD_READ_TOKEN }} >> $GITHUB_ENV
-        echo OASIS_INFISICAL_WORKFLOW=/workflows/oasis-edge-deploy >> $GITHUB_ENV
-      else
-        echo "Error! deploy-env required, and must be 'ci' or 'edge'!"
-        exit 1
-      fi
-  
-    # Set additional Envars
+      run: >-
+        echo OASIS_ENV_STRATEGY=${{ inputs.deploy-env }} >> $GITHUB_ENV
+        if [ ${{ inputs.deploy-env }} == "edge" ]; then
+          echo OASIS_INFISICAL_TOKEN=${{ secrets.INFISICAL_ELYSIUM_PROD_READ_TOKEN }} >> $GITHUB_ENV
+          echo OASIS_INFISICAL_WORKFLOW=/workflows/oasis-edge-deploy >> $GITHUB_ENV
+        elif [ ${{ inputs.deploy-env }} == "ci" ]; then
+          echo OASIS_INFISICAL_TOKEN=${{ secrets.INFISICAL_ELYSIUM_PROD_READ_TOKEN }} >> $GITHUB_ENV
+          echo OASIS_INFISICAL_WORKFLOW=/workflows/oasis-edge-deploy >> $GITHUB_ENV
+        else
+          echo "Error! deploy-env required, and must be 'ci' or 'edge'!"
+          exit 1
+        fi
     - name: Setup Oasis Envars
       uses: https://gitea.dunemask.dev/elysium/elysium-actions@infisical-env
       with:
         infisical-token: ${{ env.OASIS_INFISICAL_TOKEN }}
         environment: ${{ env.OASIS_ENV_STRATEGY}}
         secret-path: ${{ env.OASIS_INFISICAL_WORKFLOW }}
-
     - name: Configure Kubeconfig
-          shell: bash
-          echo OASIS_ENV_STRATEGY=${{ inputs.deploy-env }} >> $GITHUB_ENV
-          if [ ${{ inputs.deploy-env }} == "edge" ]; then
-            echo OASIS_WORKFLOW_KUBECONFIG=${{env.KUBERNETES_CONFIG_USW_DEV}} >> $GITHUB_ENV
-          elif [ ${{ inputs.deploy-env }} == "ci" ]; then
-            echo OASIS_WORKFLOW_KUBECONFIG=${{env.KUBERNETES_CONFIG_USW_EDGE}} >> $GITHUB_ENV
-          else
-            echo "Error! deploy-env required, and must be 'ci' or 'edge'!"
-            exit 1
-          fi
+      shell: bash
+      run: >-
+        if [ ${{ inputs.deploy-env }} == "edge" ]; then
+          echo OASIS_WORKFLOW_KUBECONFIG=${{env.KUBERNETES_CONFIG_USW_DEV}} >> $GITHUB_ENV
+        elif [ ${{ inputs.deploy-env }} == "ci" ]; then
+          echo OASIS_WORKFLOW_KUBECONFIG=${{env.KUBERNETES_CONFIG_USW_EDGE}} >> $GITHUB_ENV
+        else
+          echo "Error! deploy-env required, and must be 'ci' or 'edge'!"
+          exit 1
+        fi
     - name: Oasis Setup
       uses: https://gitea.dunemask.dev/elysium/elysium-actions@oasis-setup-advanced
       with:
@@ -57,6 +55,3 @@ runs:
         oasis-branch: ${{ inputs.oasis-branch }}
         oasis-workspace: ${{ inputs.oasis-workspace }}
         kubeconfig: ${{ env.OASIS_WORKFLOW_KUBECONFIG }}
-       
-
-

From 9c70c0017b95ec096806d83c01b6c4ffc21d9b1d Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Thu, 15 Feb 2024 16:14:46 -0700
Subject: [PATCH 06/49] [FEATURE] Auto Oasis Test

---
 action.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/action.yml b/action.yml
index 3501bbe..94c948a 100644
--- a/action.yml
+++ b/action.yml
@@ -19,7 +19,7 @@ runs:
   steps:
     - name: Configure Workflow
       shell: bash
-      run: >-
+      run: |
         echo OASIS_ENV_STRATEGY=${{ inputs.deploy-env }} >> $GITHUB_ENV
         if [ ${{ inputs.deploy-env }} == "edge" ]; then
           echo OASIS_INFISICAL_TOKEN=${{ secrets.INFISICAL_ELYSIUM_PROD_READ_TOKEN }} >> $GITHUB_ENV
@@ -39,7 +39,7 @@ runs:
         secret-path: ${{ env.OASIS_INFISICAL_WORKFLOW }}
     - name: Configure Kubeconfig
       shell: bash
-      run: >-
+      run: |
         if [ ${{ inputs.deploy-env }} == "edge" ]; then
           echo OASIS_WORKFLOW_KUBECONFIG=${{env.KUBERNETES_CONFIG_USW_DEV}} >> $GITHUB_ENV
         elif [ ${{ inputs.deploy-env }} == "ci" ]; then

From fd33db2388161ff2d274faa89197024ed4f46965 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Thu, 15 Feb 2024 16:17:30 -0700
Subject: [PATCH 07/49] [FEATURE] Auto Oasis Test

---
 action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/action.yml b/action.yml
index 94c948a..653aba9 100644
--- a/action.yml
+++ b/action.yml
@@ -35,7 +35,7 @@ runs:
       uses: https://gitea.dunemask.dev/elysium/elysium-actions@infisical-env
       with:
         infisical-token: ${{ env.OASIS_INFISICAL_TOKEN }}
-        environment: ${{ env.OASIS_ENV_STRATEGY}}
+        environment: ${{ inputs.deploy-env }}
         secret-path: ${{ env.OASIS_INFISICAL_WORKFLOW }}
     - name: Configure Kubeconfig
       shell: bash

From 8e20966f8a70f7278ba9671c3abe5038a8657e65 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Thu, 15 Feb 2024 16:21:25 -0700
Subject: [PATCH 08/49] [FEATURE] Auto Oasis Test

---
 action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/action.yml b/action.yml
index 653aba9..5e4e4d8 100644
--- a/action.yml
+++ b/action.yml
@@ -25,7 +25,7 @@ runs:
           echo OASIS_INFISICAL_TOKEN=${{ secrets.INFISICAL_ELYSIUM_PROD_READ_TOKEN }} >> $GITHUB_ENV
           echo OASIS_INFISICAL_WORKFLOW=/workflows/oasis-edge-deploy >> $GITHUB_ENV
         elif [ ${{ inputs.deploy-env }} == "ci" ]; then
-          echo OASIS_INFISICAL_TOKEN=${{ secrets.INFISICAL_ELYSIUM_PROD_READ_TOKEN }} >> $GITHUB_ENV
+          echo OASIS_INFISICAL_TOKEN=${{ secrets.INFISICAL_ELYSIUM_CI_READ_TOKEN }} >> $GITHUB_ENV
           echo OASIS_INFISICAL_WORKFLOW=/workflows/oasis-edge-deploy >> $GITHUB_ENV
         else
           echo "Error! deploy-env required, and must be 'ci' or 'edge'!"

From b903fe63c9736d96d8f717ae1a01e488d734af43 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Thu, 15 Feb 2024 16:23:05 -0700
Subject: [PATCH 09/49] [FEATURE] Auto Oasis Test

---
 action.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/action.yml b/action.yml
index 5e4e4d8..d4bfac3 100644
--- a/action.yml
+++ b/action.yml
@@ -31,6 +31,12 @@ runs:
           echo "Error! deploy-env required, and must be 'ci' or 'edge'!"
           exit 1
         fi
+    - name: Configure Kubeconfig
+      shell: bash
+      run: |
+        echo "Token: ${{ env.OASIS_INFISICAL_TOKEN }}"
+        echo "Deploy env: ${{ inputs.deploy-env }}"
+        echo "Workflow: ${{ env.OASIS_INFISICAL_WORKFLOW }}"
     - name: Setup Oasis Envars
       uses: https://gitea.dunemask.dev/elysium/elysium-actions@infisical-env
       with:

From 44fede9092c2d30de4b32c0ef124a62e802f3696 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Thu, 15 Feb 2024 16:25:09 -0700
Subject: [PATCH 10/49] [FEATURE] Auto Oasis Test

---
 action.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/action.yml b/action.yml
index d4bfac3..2e84e92 100644
--- a/action.yml
+++ b/action.yml
@@ -35,6 +35,7 @@ runs:
       shell: bash
       run: |
         echo "Token: ${{ env.OASIS_INFISICAL_TOKEN }}"
+        echo "Token: ${{ secrets.INFISICAL_ELYSIUM_CI_READ_TOKEN }}"
         echo "Deploy env: ${{ inputs.deploy-env }}"
         echo "Workflow: ${{ env.OASIS_INFISICAL_WORKFLOW }}"
     - name: Setup Oasis Envars
@@ -47,9 +48,9 @@ runs:
       shell: bash
       run: |
         if [ ${{ inputs.deploy-env }} == "edge" ]; then
-          echo OASIS_WORKFLOW_KUBECONFIG=${{env.KUBERNETES_CONFIG_USW_DEV}} >> $GITHUB_ENV
-        elif [ ${{ inputs.deploy-env }} == "ci" ]; then
           echo OASIS_WORKFLOW_KUBECONFIG=${{env.KUBERNETES_CONFIG_USW_EDGE}} >> $GITHUB_ENV
+        elif [ ${{ inputs.deploy-env }} == "ci" ]; then
+          echo OASIS_WORKFLOW_KUBECONFIG=${{env.KUBERNETES_CONFIG_USW_DEV}} >> $GITHUB_ENV
         else
           echo "Error! deploy-env required, and must be 'ci' or 'edge'!"
           exit 1

From 1c50c8cea67e37891d1b4bf4ade13993781314d7 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Thu, 15 Feb 2024 16:28:32 -0700
Subject: [PATCH 11/49] [FEATURE] Auto Oasis Test

---
 action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/action.yml b/action.yml
index 2e84e92..84c958e 100644
--- a/action.yml
+++ b/action.yml
@@ -26,7 +26,7 @@ runs:
           echo OASIS_INFISICAL_WORKFLOW=/workflows/oasis-edge-deploy >> $GITHUB_ENV
         elif [ ${{ inputs.deploy-env }} == "ci" ]; then
           echo OASIS_INFISICAL_TOKEN=${{ secrets.INFISICAL_ELYSIUM_CI_READ_TOKEN }} >> $GITHUB_ENV
-          echo OASIS_INFISICAL_WORKFLOW=/workflows/oasis-edge-deploy >> $GITHUB_ENV
+          echo OASIS_INFISICAL_WORKFLOW=/workflows/oasis-ci-deploy >> $GITHUB_ENV
         else
           echo "Error! deploy-env required, and must be 'ci' or 'edge'!"
           exit 1

From b45d64de656e1c162888c43cfab2f7d80b06b4c2 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Thu, 15 Feb 2024 16:29:06 -0700
Subject: [PATCH 12/49] [FEATURE] Auto Oasis Test

---
 action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/action.yml b/action.yml
index 84c958e..dd1767a 100644
--- a/action.yml
+++ b/action.yml
@@ -35,7 +35,7 @@ runs:
       shell: bash
       run: |
         echo "Token: ${{ env.OASIS_INFISICAL_TOKEN }}"
-        echo "Token: ${{ secrets.INFISICAL_ELYSIUM_CI_READ_TOKEN }}"
+        echo "Token: '${{ secrets.INFISICAL_ELYSIUM_CI_READ_TOKEN }}'"
         echo "Deploy env: ${{ inputs.deploy-env }}"
         echo "Workflow: ${{ env.OASIS_INFISICAL_WORKFLOW }}"
     - name: Setup Oasis Envars

From b188ab8a7aee61490e12eb0108da7f303b158dcf Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Thu, 15 Feb 2024 16:34:57 -0700
Subject: [PATCH 13/49] [FEATURE] Auto Oasis Test

---
 action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/action.yml b/action.yml
index dd1767a..4820385 100644
--- a/action.yml
+++ b/action.yml
@@ -25,7 +25,7 @@ runs:
           echo OASIS_INFISICAL_TOKEN=${{ secrets.INFISICAL_ELYSIUM_PROD_READ_TOKEN }} >> $GITHUB_ENV
           echo OASIS_INFISICAL_WORKFLOW=/workflows/oasis-edge-deploy >> $GITHUB_ENV
         elif [ ${{ inputs.deploy-env }} == "ci" ]; then
-          echo OASIS_INFISICAL_TOKEN=${{ secrets.INFISICAL_ELYSIUM_CI_READ_TOKEN }} >> $GITHUB_ENV
+          echo OASIS_INFISICAL_TOKEN="${{ secrets.INFISICAL_ELYSIUM_CI_READ_TOKEN }}" >> $GITHUB_ENV
           echo OASIS_INFISICAL_WORKFLOW=/workflows/oasis-ci-deploy >> $GITHUB_ENV
         else
           echo "Error! deploy-env required, and must be 'ci' or 'edge'!"

From 81d12ebb1c52623610dc6650883db280e6203f7b Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Thu, 15 Feb 2024 16:37:52 -0700
Subject: [PATCH 14/49] [FEATURE] Auto Oasis Test

---
 action.yml | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/action.yml b/action.yml
index 4820385..7dfcda1 100644
--- a/action.yml
+++ b/action.yml
@@ -1,6 +1,9 @@
 name: Oasis Auto Config Action
 description: Configure env for deploying apps using Oasis Automagically
 inputs:
+  infiscal-token:
+    description: Infisical token for CI or Prod 
+    required: true
   deploy-env:
     description: Deploy Environment (ci or edge)
     required: true
@@ -21,23 +24,15 @@ runs:
       shell: bash
       run: |
         echo OASIS_ENV_STRATEGY=${{ inputs.deploy-env }} >> $GITHUB_ENV
+        echo OASIS_INFISICAL_TOKEN="${{ inputs.infiscal-token }}" >> $GITHUB_ENV
         if [ ${{ inputs.deploy-env }} == "edge" ]; then
-          echo OASIS_INFISICAL_TOKEN=${{ secrets.INFISICAL_ELYSIUM_PROD_READ_TOKEN }} >> $GITHUB_ENV
           echo OASIS_INFISICAL_WORKFLOW=/workflows/oasis-edge-deploy >> $GITHUB_ENV
         elif [ ${{ inputs.deploy-env }} == "ci" ]; then
-          echo OASIS_INFISICAL_TOKEN="${{ secrets.INFISICAL_ELYSIUM_CI_READ_TOKEN }}" >> $GITHUB_ENV
           echo OASIS_INFISICAL_WORKFLOW=/workflows/oasis-ci-deploy >> $GITHUB_ENV
         else
           echo "Error! deploy-env required, and must be 'ci' or 'edge'!"
           exit 1
         fi
-    - name: Configure Kubeconfig
-      shell: bash
-      run: |
-        echo "Token: ${{ env.OASIS_INFISICAL_TOKEN }}"
-        echo "Token: '${{ secrets.INFISICAL_ELYSIUM_CI_READ_TOKEN }}'"
-        echo "Deploy env: ${{ inputs.deploy-env }}"
-        echo "Workflow: ${{ env.OASIS_INFISICAL_WORKFLOW }}"
     - name: Setup Oasis Envars
       uses: https://gitea.dunemask.dev/elysium/elysium-actions@infisical-env
       with:

From e32369da3869cc68d04ca6074b9250f3dc274041 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Thu, 15 Feb 2024 16:43:08 -0700
Subject: [PATCH 15/49] [FEATURE] Auto Oasis Test

---
 action.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/action.yml b/action.yml
index 7dfcda1..5adcd42 100644
--- a/action.yml
+++ b/action.yml
@@ -23,8 +23,9 @@ runs:
     - name: Configure Workflow
       shell: bash
       run: |
+        echo "${{ inputs.infiscal-token }}"
         echo OASIS_ENV_STRATEGY=${{ inputs.deploy-env }} >> $GITHUB_ENV
-        echo OASIS_INFISICAL_TOKEN="${{ inputs.infiscal-token }}" >> $GITHUB_ENV
+        echo OASIS_INFISICAL_TOKEN=${{ inputs.infiscal-token }} >> $GITHUB_ENV
         if [ ${{ inputs.deploy-env }} == "edge" ]; then
           echo OASIS_INFISICAL_WORKFLOW=/workflows/oasis-edge-deploy >> $GITHUB_ENV
         elif [ ${{ inputs.deploy-env }} == "ci" ]; then

From 19c521ef6d2a88002d318072593146666f89bdb8 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Thu, 15 Feb 2024 16:44:06 -0700
Subject: [PATCH 16/49] [FEATURE] Auto Oasis Test

---
 action.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/action.yml b/action.yml
index 5adcd42..a5bbf28 100644
--- a/action.yml
+++ b/action.yml
@@ -24,6 +24,7 @@ runs:
       shell: bash
       run: |
         echo "${{ inputs.infiscal-token }}"
+        echo "^^^"
         echo OASIS_ENV_STRATEGY=${{ inputs.deploy-env }} >> $GITHUB_ENV
         echo OASIS_INFISICAL_TOKEN=${{ inputs.infiscal-token }} >> $GITHUB_ENV
         if [ ${{ inputs.deploy-env }} == "edge" ]; then

From b9b4f62104af63cc442b9305f0c5f968276189b7 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Thu, 15 Feb 2024 16:44:51 -0700
Subject: [PATCH 17/49] [FEATURE] Auto Oasis Test

---
 action.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/action.yml b/action.yml
index a5bbf28..f949c08 100644
--- a/action.yml
+++ b/action.yml
@@ -23,10 +23,10 @@ runs:
     - name: Configure Workflow
       shell: bash
       run: |
-        echo "${{ inputs.infiscal-token }}"
+        echo "${{ inputs.infisical-token }}"
         echo "^^^"
         echo OASIS_ENV_STRATEGY=${{ inputs.deploy-env }} >> $GITHUB_ENV
-        echo OASIS_INFISICAL_TOKEN=${{ inputs.infiscal-token }} >> $GITHUB_ENV
+        echo OASIS_INFISICAL_TOKEN=${{ inputs.infisical-token }} >> $GITHUB_ENV
         if [ ${{ inputs.deploy-env }} == "edge" ]; then
           echo OASIS_INFISICAL_WORKFLOW=/workflows/oasis-edge-deploy >> $GITHUB_ENV
         elif [ ${{ inputs.deploy-env }} == "ci" ]; then

From 9d03004a2513bb6f33178b1c42782d79657b480b Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Thu, 15 Feb 2024 16:45:22 -0700
Subject: [PATCH 18/49] [FEATURE] Auto Oasis Test

---
 action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/action.yml b/action.yml
index f949c08..c113835 100644
--- a/action.yml
+++ b/action.yml
@@ -1,7 +1,7 @@
 name: Oasis Auto Config Action
 description: Configure env for deploying apps using Oasis Automagically
 inputs:
-  infiscal-token:
+  infisical-token:
     description: Infisical token for CI or Prod 
     required: true
   deploy-env:

From 4e14462ec00b93a8da76f56e3007ae7eef4c57e4 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Thu, 15 Feb 2024 16:47:08 -0700
Subject: [PATCH 19/49] [FEATURE] Auto Oasis Test

---
 action.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/action.yml b/action.yml
index c113835..0d0fe4a 100644
--- a/action.yml
+++ b/action.yml
@@ -18,13 +18,11 @@ inputs:
     descipriont: Workspace to setup Oasis
     required: false
 runs:
-  using: composite
+  # using: composite
   steps:
     - name: Configure Workflow
       shell: bash
       run: |
-        echo "${{ inputs.infisical-token }}"
-        echo "^^^"
         echo OASIS_ENV_STRATEGY=${{ inputs.deploy-env }} >> $GITHUB_ENV
         echo OASIS_INFISICAL_TOKEN=${{ inputs.infisical-token }} >> $GITHUB_ENV
         if [ ${{ inputs.deploy-env }} == "edge" ]; then

From f30fb74a11d9adb9bcf863fe4a1c594e6007a397 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Thu, 15 Feb 2024 16:48:27 -0700
Subject: [PATCH 20/49] [FEATURE] Auto Oasis Test

---
 action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/action.yml b/action.yml
index 0d0fe4a..5ccf165 100644
--- a/action.yml
+++ b/action.yml
@@ -18,7 +18,7 @@ inputs:
     descipriont: Workspace to setup Oasis
     required: false
 runs:
-  # using: composite
+  using: composite
   steps:
     - name: Configure Workflow
       shell: bash

From 733cd652600efb7f3eacca0d92384ec9cf6d3de8 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Thu, 15 Feb 2024 16:52:09 -0700
Subject: [PATCH 21/49] [FEATURE] Auto Oasis Test

---
 action.yml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/action.yml b/action.yml
index 5ccf165..c36e337 100644
--- a/action.yml
+++ b/action.yml
@@ -7,6 +7,9 @@ inputs:
   deploy-env:
     description: Deploy Environment (ci or edge)
     required: true
+  kubeconfig:
+    description: Kubeconfig for Oasis
+    required: false
   garden-version:
     description: Version of Garden to deploy
     required: false
@@ -42,10 +45,12 @@ runs:
     - name: Configure Kubeconfig
       shell: bash
       run: |
-        if [ ${{ inputs.deploy-env }} == "edge" ]; then
+        if [ ${{ inputs.deploy-env }} == "edge" && -z ${{ inputs.kubeconfig }} ]; then
           echo OASIS_WORKFLOW_KUBECONFIG=${{env.KUBERNETES_CONFIG_USW_EDGE}} >> $GITHUB_ENV
-        elif [ ${{ inputs.deploy-env }} == "ci" ]; then
+        elif [ ${{ inputs.deploy-env }} == "ci" && -z ${{ inputs.kubeconfig }} ]; then
           echo OASIS_WORKFLOW_KUBECONFIG=${{env.KUBERNETES_CONFIG_USW_DEV}} >> $GITHUB_ENV
+        elif [ -n ${{ inputs.kubeconfig }} ]; then
+          echo OASIS_WORKFLOW_KUBECONFIG=${{ inputs.kubeconfig }} >> $GITHUB_ENV
         else
           echo "Error! deploy-env required, and must be 'ci' or 'edge'!"
           exit 1

From 664e6eaf66695fa0bdda8515b2e8f9f233d9f0af Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Thu, 15 Feb 2024 16:53:30 -0700
Subject: [PATCH 22/49] [FEATURE] Auto Oasis Test

---
 action.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/action.yml b/action.yml
index c36e337..140c39d 100644
--- a/action.yml
+++ b/action.yml
@@ -46,10 +46,13 @@ runs:
       shell: bash
       run: |
         if [ ${{ inputs.deploy-env }} == "edge" && -z ${{ inputs.kubeconfig }} ]; then
+          echo "Using Edge Kubernetes Config"
           echo OASIS_WORKFLOW_KUBECONFIG=${{env.KUBERNETES_CONFIG_USW_EDGE}} >> $GITHUB_ENV
         elif [ ${{ inputs.deploy-env }} == "ci" && -z ${{ inputs.kubeconfig }} ]; then
+          echo "Using Dev Kubernetes Config"
           echo OASIS_WORKFLOW_KUBECONFIG=${{env.KUBERNETES_CONFIG_USW_DEV}} >> $GITHUB_ENV
         elif [ -n ${{ inputs.kubeconfig }} ]; then
+        echo "Using Provided Kubernetes Config"
           echo OASIS_WORKFLOW_KUBECONFIG=${{ inputs.kubeconfig }} >> $GITHUB_ENV
         else
           echo "Error! deploy-env required, and must be 'ci' or 'edge'!"

From 6782a58d4e1ceb8e221cf998dc9f1d3ec7397f34 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Thu, 15 Feb 2024 16:53:49 -0700
Subject: [PATCH 23/49] [FEATURE] Auto Oasis Test

---
 action.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/action.yml b/action.yml
index 140c39d..52243b6 100644
--- a/action.yml
+++ b/action.yml
@@ -58,6 +58,7 @@ runs:
           echo "Error! deploy-env required, and must be 'ci' or 'edge'!"
           exit 1
         fi
+        env | grep KUB
     - name: Oasis Setup
       uses: https://gitea.dunemask.dev/elysium/elysium-actions@oasis-setup-advanced
       with:

From 99a61892bdf99fc9dadece6d6d6cecb83a41c401 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Thu, 15 Feb 2024 16:55:46 -0700
Subject: [PATCH 24/49] [FEATURE] Auto Oasis Test

---
 action.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/action.yml b/action.yml
index 52243b6..73b84af 100644
--- a/action.yml
+++ b/action.yml
@@ -45,15 +45,15 @@ runs:
     - name: Configure Kubeconfig
       shell: bash
       run: |
-        if [ ${{ inputs.deploy-env }} == "edge" && -z ${{ inputs.kubeconfig }} ]; then
+        if [ -n ${{ inputs.kubeconfig }} ]; then
+          echo "Using Provided Kubernetes Config"
+          echo OASIS_WORKFLOW_KUBECONFIG=${{ inputs.kubeconfig }} >> $GITHUB_ENV
+        elif [ ${{ inputs.deploy-env }} == "edge" ]; then
           echo "Using Edge Kubernetes Config"
           echo OASIS_WORKFLOW_KUBECONFIG=${{env.KUBERNETES_CONFIG_USW_EDGE}} >> $GITHUB_ENV
-        elif [ ${{ inputs.deploy-env }} == "ci" && -z ${{ inputs.kubeconfig }} ]; then
+        elif [ ${{ inputs.deploy-env }} == "ci" ]; then
           echo "Using Dev Kubernetes Config"
           echo OASIS_WORKFLOW_KUBECONFIG=${{env.KUBERNETES_CONFIG_USW_DEV}} >> $GITHUB_ENV
-        elif [ -n ${{ inputs.kubeconfig }} ]; then
-        echo "Using Provided Kubernetes Config"
-          echo OASIS_WORKFLOW_KUBECONFIG=${{ inputs.kubeconfig }} >> $GITHUB_ENV
         else
           echo "Error! deploy-env required, and must be 'ci' or 'edge'!"
           exit 1

From 1766b9273e065a0625642fcc21b3877fd18a7331 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Thu, 15 Feb 2024 16:58:03 -0700
Subject: [PATCH 25/49] [FEATURE] Auto Oasis Test

---
 action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/action.yml b/action.yml
index 73b84af..449b475 100644
--- a/action.yml
+++ b/action.yml
@@ -45,7 +45,7 @@ runs:
     - name: Configure Kubeconfig
       shell: bash
       run: |
-        if [ -n ${{ inputs.kubeconfig }} ]; then
+        if [ -n ${{ inputs.kubeconfig }} && ${{ inputs.kubeconfig }} != ""  ]; then
           echo "Using Provided Kubernetes Config"
           echo OASIS_WORKFLOW_KUBECONFIG=${{ inputs.kubeconfig }} >> $GITHUB_ENV
         elif [ ${{ inputs.deploy-env }} == "edge" ]; then

From d06cddc696edacf5a9294ca13bdc6a1c58dadd06 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Thu, 15 Feb 2024 17:37:05 -0700
Subject: [PATCH 26/49] [FEATURE] Auto Oasis Test

---
 action.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/action.yml b/action.yml
index 449b475..1099629 100644
--- a/action.yml
+++ b/action.yml
@@ -58,7 +58,6 @@ runs:
           echo "Error! deploy-env required, and must be 'ci' or 'edge'!"
           exit 1
         fi
-        env | grep KUB
     - name: Oasis Setup
       uses: https://gitea.dunemask.dev/elysium/elysium-actions@oasis-setup-advanced
       with:

From 334a647253ee7c34e38f3d95b01149d996c1bdd1 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Thu, 15 Feb 2024 17:50:51 -0700
Subject: [PATCH 27/49] [FEATURE] Auto Oasis Test

---
 action.yml | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/action.yml b/action.yml
index 1099629..0157df8 100644
--- a/action.yml
+++ b/action.yml
@@ -10,6 +10,12 @@ inputs:
   kubeconfig:
     description: Kubeconfig for Oasis
     required: false
+  extra-secret-paths:
+    description: Additional Secrets to fetch
+    required: false
+  extra-secret-envs:
+    description: Additional Envs for secrets to fetch
+    required: false
   garden-version:
     description: Version of Garden to deploy
     required: false
@@ -26,22 +32,24 @@ runs:
     - name: Configure Workflow
       shell: bash
       run: |
-        echo OASIS_ENV_STRATEGY=${{ inputs.deploy-env }} >> $GITHUB_ENV
-        echo OASIS_INFISICAL_TOKEN=${{ inputs.infisical-token }} >> $GITHUB_ENV
         if [ ${{ inputs.deploy-env }} == "edge" ]; then
-          echo OASIS_INFISICAL_WORKFLOW=/workflows/oasis-edge-deploy >> $GITHUB_ENV
+          WORKFLOW_SECRET=/workflows/oasis-edge-deploy
         elif [ ${{ inputs.deploy-env }} == "ci" ]; then
-          echo OASIS_INFISICAL_WORKFLOW=/workflows/oasis-ci-deploy >> $GITHUB_ENV
+          WORKFLOW_SECRET=/workflows/oasis-ci-deploy
         else
           echo "Error! deploy-env required, and must be 'ci' or 'edge'!"
           exit 1
         fi
+        # Save Envars
+        echo OASIS_INFISICAL_TOKEN=${{ inputs.infisical-token }} >> $GITHUB_ENV
+        echo OASIS_PATH_FETCH=$WORKFLOW_SECRET,${{ inputs.extra-secret-paths }} # /workflows/oasis-<deploy-type>-deploy, ...extra-secret-paths
+        echo OASIS_ENV_FETCH=${{ inputs.deploy-env }},${{ inputs.extra-secret-envs }} #<deploy-type>, ...extra-secret-envs
     - name: Setup Oasis Envars
       uses: https://gitea.dunemask.dev/elysium/elysium-actions@infisical-env
       with:
         infisical-token: ${{ env.OASIS_INFISICAL_TOKEN }}
-        environment: ${{ inputs.deploy-env }}
-        secret-path: ${{ env.OASIS_INFISICAL_WORKFLOW }}
+        envs: ${{ env.OASIS_ENV_FETCH }}
+        secret-paths: ${{ env.OASIS_PATH_FETCH }}
     - name: Configure Kubeconfig
       shell: bash
       run: |

From 48a90a06437b7165b58dd6546a729b849a4449c8 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Thu, 15 Feb 2024 18:05:57 -0700
Subject: [PATCH 28/49] [FEATURE] Auto Oasis Test

---
 action.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/action.yml b/action.yml
index 0157df8..5b2ad2f 100644
--- a/action.yml
+++ b/action.yml
@@ -32,6 +32,7 @@ runs:
     - name: Configure Workflow
       shell: bash
       run: |
+        echo "HUNYUH"
         if [ ${{ inputs.deploy-env }} == "edge" ]; then
           WORKFLOW_SECRET=/workflows/oasis-edge-deploy
         elif [ ${{ inputs.deploy-env }} == "ci" ]; then
@@ -40,6 +41,7 @@ runs:
           echo "Error! deploy-env required, and must be 'ci' or 'edge'!"
           exit 1
         fi
+        echo "HUNO"
         # Save Envars
         echo OASIS_INFISICAL_TOKEN=${{ inputs.infisical-token }} >> $GITHUB_ENV
         echo OASIS_PATH_FETCH=$WORKFLOW_SECRET,${{ inputs.extra-secret-paths }} # /workflows/oasis-<deploy-type>-deploy, ...extra-secret-paths

From 66aaa3be7cda720314e66e18c59ef479546528b8 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Thu, 15 Feb 2024 18:07:23 -0700
Subject: [PATCH 29/49] [FEATURE] Auto Oasis Test

---
 action.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/action.yml b/action.yml
index 5b2ad2f..dbfc2d2 100644
--- a/action.yml
+++ b/action.yml
@@ -32,7 +32,6 @@ runs:
     - name: Configure Workflow
       shell: bash
       run: |
-        echo "HUNYUH"
         if [ ${{ inputs.deploy-env }} == "edge" ]; then
           WORKFLOW_SECRET=/workflows/oasis-edge-deploy
         elif [ ${{ inputs.deploy-env }} == "ci" ]; then
@@ -41,7 +40,6 @@ runs:
           echo "Error! deploy-env required, and must be 'ci' or 'edge'!"
           exit 1
         fi
-        echo "HUNO"
         # Save Envars
         echo OASIS_INFISICAL_TOKEN=${{ inputs.infisical-token }} >> $GITHUB_ENV
         echo OASIS_PATH_FETCH=$WORKFLOW_SECRET,${{ inputs.extra-secret-paths }} # /workflows/oasis-<deploy-type>-deploy, ...extra-secret-paths
@@ -50,11 +48,15 @@ runs:
       uses: https://gitea.dunemask.dev/elysium/elysium-actions@infisical-env
       with:
         infisical-token: ${{ env.OASIS_INFISICAL_TOKEN }}
-        envs: ${{ env.OASIS_ENV_FETCH }}
+        secret-envs: ${{ env.OASIS_ENV_FETCH }}
         secret-paths: ${{ env.OASIS_PATH_FETCH }}
     - name: Configure Kubeconfig
       shell: bash
       run: |
+        echo "WHAIT JUST WHPAPENN"
+        echo "Token: ${{ env.OASIS_INFISICAL_TOKEN }}"
+        echo "Envs: ${{ env.OASIS_ENV_FETCH }}"
+        echo "Paths: ${{ env.OASIS_PATH_FETCH }}"
         if [ -n ${{ inputs.kubeconfig }} && ${{ inputs.kubeconfig }} != ""  ]; then
           echo "Using Provided Kubernetes Config"
           echo OASIS_WORKFLOW_KUBECONFIG=${{ inputs.kubeconfig }} >> $GITHUB_ENV

From 2f53dd592aca2000d1066cfdbe84acb091348cf8 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Thu, 15 Feb 2024 18:07:58 -0700
Subject: [PATCH 30/49] [FEATURE] Auto Oasis Test

---
 action.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/action.yml b/action.yml
index dbfc2d2..8eed8e1 100644
--- a/action.yml
+++ b/action.yml
@@ -42,8 +42,8 @@ runs:
         fi
         # Save Envars
         echo OASIS_INFISICAL_TOKEN=${{ inputs.infisical-token }} >> $GITHUB_ENV
-        echo OASIS_PATH_FETCH=$WORKFLOW_SECRET,${{ inputs.extra-secret-paths }} # /workflows/oasis-<deploy-type>-deploy, ...extra-secret-paths
-        echo OASIS_ENV_FETCH=${{ inputs.deploy-env }},${{ inputs.extra-secret-envs }} #<deploy-type>, ...extra-secret-envs
+        echo OASIS_PATH_FETCH=$WORKFLOW_SECRET,${{ inputs.extra-secret-paths }} >> $GITHUB_ENV # /workflows/oasis-<deploy-type>-deploy, ...extra-secret-paths
+        echo OASIS_ENV_FETCH=${{ inputs.deploy-env }},${{ inputs.extra-secret-envs }} >> $GITHUB_ENV #<deploy-type>, ...extra-secret-envs
     - name: Setup Oasis Envars
       uses: https://gitea.dunemask.dev/elysium/elysium-actions@infisical-env
       with:

From 823067b007c61f335255e289497a00b0e9963bea Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Thu, 15 Feb 2024 18:10:05 -0700
Subject: [PATCH 31/49] [FEATURE] Auto Oasis Test

---
 action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/action.yml b/action.yml
index 8eed8e1..8d05628 100644
--- a/action.yml
+++ b/action.yml
@@ -57,7 +57,7 @@ runs:
         echo "Token: ${{ env.OASIS_INFISICAL_TOKEN }}"
         echo "Envs: ${{ env.OASIS_ENV_FETCH }}"
         echo "Paths: ${{ env.OASIS_PATH_FETCH }}"
-        if [ -n ${{ inputs.kubeconfig }} && ${{ inputs.kubeconfig }} != ""  ]; then
+        if [ [ -n ${{ inputs.kubeconfig }} ] && [ ${{ inputs.kubeconfig }} != "" ]  ]; then
           echo "Using Provided Kubernetes Config"
           echo OASIS_WORKFLOW_KUBECONFIG=${{ inputs.kubeconfig }} >> $GITHUB_ENV
         elif [ ${{ inputs.deploy-env }} == "edge" ]; then

From 55799efc2366c9675f052f61db73fbd9f7b77ee6 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Thu, 15 Feb 2024 18:10:21 -0700
Subject: [PATCH 32/49] [FEATURE] Auto Oasis Test

---
 action.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/action.yml b/action.yml
index 8d05628..8332ad1 100644
--- a/action.yml
+++ b/action.yml
@@ -53,10 +53,6 @@ runs:
     - name: Configure Kubeconfig
       shell: bash
       run: |
-        echo "WHAIT JUST WHPAPENN"
-        echo "Token: ${{ env.OASIS_INFISICAL_TOKEN }}"
-        echo "Envs: ${{ env.OASIS_ENV_FETCH }}"
-        echo "Paths: ${{ env.OASIS_PATH_FETCH }}"
         if [ [ -n ${{ inputs.kubeconfig }} ] && [ ${{ inputs.kubeconfig }} != "" ]  ]; then
           echo "Using Provided Kubernetes Config"
           echo OASIS_WORKFLOW_KUBECONFIG=${{ inputs.kubeconfig }} >> $GITHUB_ENV

From ca8cf1f80183862cb286bde3949b4a52ed4494fc Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Thu, 15 Feb 2024 18:13:12 -0700
Subject: [PATCH 33/49] [FEATURE] Auto Oasis Test

---
 action.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/action.yml b/action.yml
index 8332ad1..fdea4f0 100644
--- a/action.yml
+++ b/action.yml
@@ -53,13 +53,13 @@ runs:
     - name: Configure Kubeconfig
       shell: bash
       run: |
-        if [ [ -n ${{ inputs.kubeconfig }} ] && [ ${{ inputs.kubeconfig }} != "" ]  ]; then
+        if [ -n "${{ inputs.kubeconfig }}" ] && [ "${{ inputs.kubeconfig }}" != "" ]; then
           echo "Using Provided Kubernetes Config"
           echo OASIS_WORKFLOW_KUBECONFIG=${{ inputs.kubeconfig }} >> $GITHUB_ENV
-        elif [ ${{ inputs.deploy-env }} == "edge" ]; then
+        elif [ "${{ inputs.deploy-env }}" == "edge" ]; then
           echo "Using Edge Kubernetes Config"
           echo OASIS_WORKFLOW_KUBECONFIG=${{env.KUBERNETES_CONFIG_USW_EDGE}} >> $GITHUB_ENV
-        elif [ ${{ inputs.deploy-env }} == "ci" ]; then
+        elif [ "${{ inputs.deploy-env }}" == "ci" ]; then
           echo "Using Dev Kubernetes Config"
           echo OASIS_WORKFLOW_KUBECONFIG=${{env.KUBERNETES_CONFIG_USW_DEV}} >> $GITHUB_ENV
         else

From 78015fb5a9848295a73dc854956c0e1f68cbb9d4 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Thu, 15 Feb 2024 19:01:20 -0700
Subject: [PATCH 34/49] [FEATURE] Adjust Edge naming

---
 action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/action.yml b/action.yml
index fdea4f0..61c34a0 100644
--- a/action.yml
+++ b/action.yml
@@ -2,7 +2,7 @@ name: Oasis Auto Config Action
 description: Configure env for deploying apps using Oasis Automagically
 inputs:
   infisical-token:
-    description: Infisical token for CI or Prod 
+    description: Infisical token for CI or Edge
     required: true
   deploy-env:
     description: Deploy Environment (ci or edge)

From 64a63ff1c15f9ec52bb7b14ceb2783c27a72ffae Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sun, 18 Feb 2024 16:05:29 -0700
Subject: [PATCH 35/49] [FEATURE] Add Discord paths

---
 action.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/action.yml b/action.yml
index 61c34a0..877cbbb 100644
--- a/action.yml
+++ b/action.yml
@@ -33,9 +33,9 @@ runs:
       shell: bash
       run: |
         if [ ${{ inputs.deploy-env }} == "edge" ]; then
-          WORKFLOW_SECRET=/workflows/oasis-edge-deploy
+          WORKFLOW_SECRET=/workflows/oasis-edge-deploy,/workflows/discord
         elif [ ${{ inputs.deploy-env }} == "ci" ]; then
-          WORKFLOW_SECRET=/workflows/oasis-ci-deploy
+          WORKFLOW_SECRET=/workflows/oasis-ci-deploy,/workflows/discord
         else
           echo "Error! deploy-env required, and must be 'ci' or 'edge'!"
           exit 1

From 3675654981baf3123e7567681f189a77d4c97703 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sun, 18 Feb 2024 16:14:22 -0700
Subject: [PATCH 36/49] [FEATURE] Fix ENV PATH mismatch

---
 action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/action.yml b/action.yml
index 877cbbb..a24e203 100644
--- a/action.yml
+++ b/action.yml
@@ -43,7 +43,7 @@ runs:
         # Save Envars
         echo OASIS_INFISICAL_TOKEN=${{ inputs.infisical-token }} >> $GITHUB_ENV
         echo OASIS_PATH_FETCH=$WORKFLOW_SECRET,${{ inputs.extra-secret-paths }} >> $GITHUB_ENV # /workflows/oasis-<deploy-type>-deploy, ...extra-secret-paths
-        echo OASIS_ENV_FETCH=${{ inputs.deploy-env }},${{ inputs.extra-secret-envs }} >> $GITHUB_ENV #<deploy-type>, ...extra-secret-envs
+        echo OASIS_ENV_FETCH=${{ inputs.deploy-env }},${{inputs.deploy-env}},${{ inputs.extra-secret-envs }} >> $GITHUB_ENV #<deploy-type>, ...extra-secret-envs
     - name: Setup Oasis Envars
       uses: https://gitea.dunemask.dev/elysium/elysium-actions@infisical-env
       with:

From 8aaeec865407e2742d9335530b92eca79690baef Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sat, 24 Aug 2024 17:10:44 -0600
Subject: [PATCH 37/49] [CHORE] Tweak Sub-Action URLs

---
 action.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/action.yml b/action.yml
index a24e203..cc2bc01 100644
--- a/action.yml
+++ b/action.yml
@@ -45,7 +45,7 @@ runs:
         echo OASIS_PATH_FETCH=$WORKFLOW_SECRET,${{ inputs.extra-secret-paths }} >> $GITHUB_ENV # /workflows/oasis-<deploy-type>-deploy, ...extra-secret-paths
         echo OASIS_ENV_FETCH=${{ inputs.deploy-env }},${{inputs.deploy-env}},${{ inputs.extra-secret-envs }} >> $GITHUB_ENV #<deploy-type>, ...extra-secret-envs
     - name: Setup Oasis Envars
-      uses: https://gitea.dunemask.dev/elysium/elysium-actions@infisical-env
+      uses: https://forgejo.dunemask.dev/elysium/elysium-actions@infisical-env
       with:
         infisical-token: ${{ env.OASIS_INFISICAL_TOKEN }}
         secret-envs: ${{ env.OASIS_ENV_FETCH }}
@@ -67,7 +67,7 @@ runs:
           exit 1
         fi
     - name: Oasis Setup
-      uses: https://gitea.dunemask.dev/elysium/elysium-actions@oasis-setup-advanced
+      uses: https://forgejo.dunemask.dev/elysium/elysium-actions@oasis-setup-advanced
       with:
         garden-version: ${{ inputs.garden-version }}
         oasis-branch: ${{ inputs.oasis-branch }}

From a344d9225bf7cc3ceae2dc4eb15c582de07d7d2e Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sat, 24 Aug 2024 20:06:35 -0600
Subject: [PATCH 38/49] [CHORE] Tweak Action Inputs

---
 action.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/action.yml b/action.yml
index cc2bc01..ba4549d 100644
--- a/action.yml
+++ b/action.yml
@@ -4,6 +4,9 @@ inputs:
   infisical-token:
     description: Infisical token for CI or Edge
     required: true
+  infisical-project:
+    description: Infisical Project For Secrets
+    required: true
   deploy-env:
     description: Deploy Environment (ci or edge)
     required: true

From 86855b697699a18b8533631158a500725ead97b4 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sat, 24 Aug 2024 20:11:54 -0600
Subject: [PATCH 39/49] [CHORE] Tweak Action Inputs

---
 action.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/action.yml b/action.yml
index ba4549d..c0ec4df 100644
--- a/action.yml
+++ b/action.yml
@@ -51,6 +51,7 @@ runs:
       uses: https://forgejo.dunemask.dev/elysium/elysium-actions@infisical-env
       with:
         infisical-token: ${{ env.OASIS_INFISICAL_TOKEN }}
+        project-id: ${{ inputs.infisical-project }}
         secret-envs: ${{ env.OASIS_ENV_FETCH }}
         secret-paths: ${{ env.OASIS_PATH_FETCH }}
     - name: Configure Kubeconfig

From a1b0a9b69c7bddb123dd808b9f3177161f740e21 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sat, 24 Aug 2024 20:44:41 -0600
Subject: [PATCH 40/49] [CHORE] Tweak Secret Usage

---
 action.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/action.yml b/action.yml
index c0ec4df..05c5ce5 100644
--- a/action.yml
+++ b/action.yml
@@ -57,6 +57,10 @@ runs:
     - name: Configure Kubeconfig
       shell: bash
       run: |
+        echo "vvvvvvvv"
+        echo ${{ env.DEVOPS_FORGEJO_ELYSIUM_ORG_READ_TOKEN }}
+        echo $DEVOPS_FORGEJO_ELYSIUM_ORG_READ_TOKEN
+        echo "^^^^"
         if [ -n "${{ inputs.kubeconfig }}" ] && [ "${{ inputs.kubeconfig }}" != "" ]; then
           echo "Using Provided Kubernetes Config"
           echo OASIS_WORKFLOW_KUBECONFIG=${{ inputs.kubeconfig }} >> $GITHUB_ENV

From a26c1f4f703041899ddcf85ee4bb632753dc0f7d Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sat, 24 Aug 2024 21:11:44 -0600
Subject: [PATCH 41/49] [CHORE] Remove Excess Logging

---
 action.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/action.yml b/action.yml
index 05c5ce5..c0ec4df 100644
--- a/action.yml
+++ b/action.yml
@@ -57,10 +57,6 @@ runs:
     - name: Configure Kubeconfig
       shell: bash
       run: |
-        echo "vvvvvvvv"
-        echo ${{ env.DEVOPS_FORGEJO_ELYSIUM_ORG_READ_TOKEN }}
-        echo $DEVOPS_FORGEJO_ELYSIUM_ORG_READ_TOKEN
-        echo "^^^^"
         if [ -n "${{ inputs.kubeconfig }}" ] && [ "${{ inputs.kubeconfig }}" != "" ]; then
           echo "Using Provided Kubernetes Config"
           echo OASIS_WORKFLOW_KUBECONFIG=${{ inputs.kubeconfig }} >> $GITHUB_ENV

From 25a8f2c12add69b7b1916eafc0fe303774d5f00d Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sun, 25 Aug 2024 15:54:41 -0600
Subject: [PATCH 42/49] [CHORE] Adjust Actions

---
 action.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/action.yml b/action.yml
index c0ec4df..9fd12ba 100644
--- a/action.yml
+++ b/action.yml
@@ -29,6 +29,7 @@ inputs:
   oasis-workspace:
     descipriont: Workspace to setup Oasis
     required: false
+    default: ${{ forgejo.workspace }}/oasis
 runs:
   using: composite
   steps:

From 42855412dcd3ce8bcb427eaa51a9094b951935e4 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sun, 25 Aug 2024 15:55:56 -0600
Subject: [PATCH 43/49] [CHORE] Adjust Actions

---
 action.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/action.yml b/action.yml
index 9fd12ba..3cd311a 100644
--- a/action.yml
+++ b/action.yml
@@ -71,6 +71,8 @@ runs:
           echo "Error! deploy-env required, and must be 'ci' or 'edge'!"
           exit 1
         fi
+    - name: B4
+      run: echo "I'm Before"
     - name: Oasis Setup
       uses: https://forgejo.dunemask.dev/elysium/elysium-actions@oasis-setup-advanced
       with:
@@ -78,3 +80,5 @@ runs:
         oasis-branch: ${{ inputs.oasis-branch }}
         oasis-workspace: ${{ inputs.oasis-workspace }}
         kubeconfig: ${{ env.OASIS_WORKFLOW_KUBECONFIG }}
+    - name: After
+      run: echo "I'm after"

From 93b02e9bdbdaa5acb70707901b0f75ee80721860 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sun, 25 Aug 2024 16:00:00 -0600
Subject: [PATCH 44/49] [CHORE] Adjust Actions

---
 action.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/action.yml b/action.yml
index 3cd311a..143d316 100644
--- a/action.yml
+++ b/action.yml
@@ -29,7 +29,6 @@ inputs:
   oasis-workspace:
     descipriont: Workspace to setup Oasis
     required: false
-    default: ${{ forgejo.workspace }}/oasis
 runs:
   using: composite
   steps:
@@ -71,8 +70,8 @@ runs:
           echo "Error! deploy-env required, and must be 'ci' or 'edge'!"
           exit 1
         fi
-    - name: B4
-      run: echo "I'm Before"
+    - name: After
+      run: echo "I'm after"
     - name: Oasis Setup
       uses: https://forgejo.dunemask.dev/elysium/elysium-actions@oasis-setup-advanced
       with:

From a7f7e0d31ac04684b7ffb887761285ee02a83433 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sun, 25 Aug 2024 16:02:41 -0600
Subject: [PATCH 45/49] [CHORE] Adjust Actions

---
 action.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/action.yml b/action.yml
index 143d316..60f4c3f 100644
--- a/action.yml
+++ b/action.yml
@@ -29,6 +29,7 @@ inputs:
   oasis-workspace:
     descipriont: Workspace to setup Oasis
     required: false
+    default: oasis
 runs:
   using: composite
   steps:

From 8b4ee422e5136bae91ea81ae4332d0d8c7483031 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sun, 25 Aug 2024 16:14:04 -0600
Subject: [PATCH 46/49] [CHORE] Adjust Actions

---
 action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/action.yml b/action.yml
index 60f4c3f..9a5398c 100644
--- a/action.yml
+++ b/action.yml
@@ -81,4 +81,4 @@ runs:
         oasis-workspace: ${{ inputs.oasis-workspace }}
         kubeconfig: ${{ env.OASIS_WORKFLOW_KUBECONFIG }}
     - name: After
-      run: echo "I'm after"
+      run: echo "I'm after After"

From ddcc8b198f90898c7fb0fc13bbfc074395d90ab6 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sun, 25 Aug 2024 16:14:43 -0600
Subject: [PATCH 47/49] [CHORE] Adjust Actions

---
 action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/action.yml b/action.yml
index 9a5398c..a8b4611 100644
--- a/action.yml
+++ b/action.yml
@@ -80,5 +80,5 @@ runs:
         oasis-branch: ${{ inputs.oasis-branch }}
         oasis-workspace: ${{ inputs.oasis-workspace }}
         kubeconfig: ${{ env.OASIS_WORKFLOW_KUBECONFIG }}
-    - name: After
+    - name: Noper
       run: echo "I'm after After"

From 876d871d40dcc79197b8b82d8a0c2834d4aa9f4a Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sun, 25 Aug 2024 16:19:00 -0600
Subject: [PATCH 48/49] [CHORE] Adjust Actions

---
 action.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/action.yml b/action.yml
index a8b4611..9fd12ba 100644
--- a/action.yml
+++ b/action.yml
@@ -29,7 +29,7 @@ inputs:
   oasis-workspace:
     descipriont: Workspace to setup Oasis
     required: false
-    default: oasis
+    default: ${{ forgejo.workspace }}/oasis
 runs:
   using: composite
   steps:
@@ -71,8 +71,6 @@ runs:
           echo "Error! deploy-env required, and must be 'ci' or 'edge'!"
           exit 1
         fi
-    - name: After
-      run: echo "I'm after"
     - name: Oasis Setup
       uses: https://forgejo.dunemask.dev/elysium/elysium-actions@oasis-setup-advanced
       with:
@@ -80,5 +78,3 @@ runs:
         oasis-branch: ${{ inputs.oasis-branch }}
         oasis-workspace: ${{ inputs.oasis-workspace }}
         kubeconfig: ${{ env.OASIS_WORKFLOW_KUBECONFIG }}
-    - name: Noper
-      run: echo "I'm after After"

From eec8f55eb3e8607c14273b19229ba7db083a987b Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sun, 25 Aug 2024 16:38:18 -0600
Subject: [PATCH 49/49] [CHORE] Adjust Actions

---
 action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/action.yml b/action.yml
index 9fd12ba..da6cea8 100644
--- a/action.yml
+++ b/action.yml
@@ -29,7 +29,7 @@ inputs:
   oasis-workspace:
     descipriont: Workspace to setup Oasis
     required: false
-    default: ${{ forgejo.workspace }}/oasis
+    default: ${{ gitea.workspace }}/oasis
 runs:
   using: composite
   steps: