rename privateKeyPath to gitRepoPrivateKeyPath

export common env vars
pluralsh · Nov 25, 2024 · a233552 · a233552
1 parent dbc20e0
commit a233552
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 23 deletions.
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -13,10 +13,13 @@ permissions:
 env:
   GOPATH: /home/runner/go/
   GOBIN: /home/runner/go/bin
-  E2E_TESTOUT_PATH: /home/runner/testout
-  E2E_PRIVATE_KEY_PATH: /home/runner/private.key
   PLURAL_LOGIN_AFFIRM_CURRENT_USER: true
   PLURAL_UP_AFFIRM_DEPLOY: true
+  TESTOUT_PATH: /home/runner/testout
+  VENOM_VAR_directory: /home/runner/testout/azure
+  VENOM_VAR_gitRepo: [email protected]:pluralsh/plural-cli-e2e.git
+  VENOM_VAR_gitRepoPrivateKey: ${{ secrets.E2E_REPO_PRIVATE_KEY }}
+  VENOM_VAR_gitRepoPrivateKeyPath: /home/runner/private.key
 jobs:
   plural-up-gcp:
     name: plural up / GCP
@@ -30,8 +33,8 @@ jobs:
         run: echo "TIMESTAMP=$(date +'%s')" >> $GITHUB_ENV
       - name: Retrieve the test repository private key and decode it to a file
         run: |
-          (base64 -d <<< ${{ secrets.E2E_REPO_PRIVATE_KEY }}) >> ${{ env.E2E_PRIVATE_KEY_PATH }}
-          chmod 0600 ${{ env.E2E_PRIVATE_KEY_PATH }}
+          (base64 -d <<< ${{ secrets.E2E_REPO_PRIVATE_KEY }}) >> ${{ env.VENOM_VAR_gitRepoPrivateKeyPath }}
+          chmod 0600 ${{ env.VENOM_VAR_gitRepoPrivateKeyPath }}
       - name: Setup Go
         uses: actions/[email protected]
         with:
@@ -54,13 +57,14 @@ jobs:
       - name: Run tests
         env:
           VENOM_VAR_provider: gcp
-          # TODO
-        run: venom run -vv --html-report --format=json --output-dir ${{ env.E2E_TESTOUT_PATH }} --stop-on-failure test/plural
+          VENOM_VAR_region: us-central1
+          VENOM_VAR_project: e2e-${{ env.TIMESTAMP }}
+        run: venom run -vv --html-report --format=json --output-dir ${{ env.TESTOUT_PATH }} --stop-on-failure test/plural
       - name: Upload test log
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          path: ${{ env.E2E_TESTOUT_PATH }}/venom.log
+          path: ${{ env.TESTOUT_PATH }}/venom.log
   plural-up-azure:
     name: plural up / Azure
     runs-on: ubuntu-latest
@@ -73,8 +77,8 @@ jobs:
         run: echo "TIMESTAMP=$(date +'%s')" >> $GITHUB_ENV
       - name: Retrieve the test repository private key and decode it to a file
         run: |
-          (base64 -d <<< ${{ secrets.E2E_REPO_PRIVATE_KEY }}) >> ${{ env.E2E_PRIVATE_KEY_PATH }}
-          chmod 0600 ${{ env.E2E_PRIVATE_KEY_PATH }}
+          (base64 -d <<< ${{ secrets.E2E_REPO_PRIVATE_KEY }}) >> ${{ env.VENOM_VAR_gitRepoPrivateKeyPath }}
+          chmod 0600 ${{ env.VENOM_VAR_gitRepoPrivateKeyPath }}
       - name: Setup Go
         uses: actions/[email protected]
         with:
@@ -108,18 +112,14 @@ jobs:
           VENOM_VAR_azureSubscriptionId: ${{ secrets.E2E_AZURE_SUBSCRIPTION_ID }}
           VENOM_VAR_azureStorageAccount: e2e${{ env.TIMESTAMP }}
           VENOM_VAR_project: e2e-${{ env.TIMESTAMP }}
-          VENOM_VAR_directory: ${{ env.E2E_TESTOUT_PATH }}/azure
-          VENOM_VAR_gitRepo: [email protected]:pluralsh/plural-cli-e2e.git
-          VENOM_VAR_gitRepoPrivateKey: ${{ secrets.E2E_REPO_PRIVATE_KEY }}
-          VENOM_VAR_privateKeyPath: ${{ env.E2E_PRIVATE_KEY_PATH }}
           VENOM_VAR_branch: e2e-azure-${{ env.TIMESTAMP }}
           VENOM_VAR_username: ${{ secrets.E2E_AZURE_SA_USERNAME }}
           VENOM_VAR_email: ${{ secrets.E2E_AZURE_SA_EMAIL }}
           VENOM_VAR_token: ${{ secrets.E2E_AZURE_SA_TOKEN }}
           VENOM_VAR_pluralHome: ${{ env.HOME }}/.plural
-        run: venom run -vv --html-report --format=json --output-dir ${{ env.E2E_TESTOUT_PATH }} --stop-on-failure test/plural
+        run: venom run -vv --html-report --format=json --output-dir ${{ env.TESTOUT_PATH }} --stop-on-failure test/plural
       - name: Upload test log
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          path: ${{ env.E2E_TESTOUT_PATH }}/venom.log
+          path: ${{ env.TESTOUT_PATH }}/venom.log
diff --git a/Makefile b/Makefile
@@ -199,7 +199,7 @@ e2e: --ensure-venom
 	VENOM_VAR_email=${PLRL_CLI_E2E_SA_EMAIL} \
 	VENOM_VAR_gitRepo=${PLRL_CLI_E2E_GIT_REPO} \
 	VENOM_VAR_gitRepoPrivateKey=${PLRL_CLI_E2E_PRIVATE_KEY} \
-	VENOM_VAR_privateKeyPath=${PLRL_CLI_E2E_PRIVATE_KEY_PATH} \
+	VENOM_VAR_gitRepoPrivateKeyPath=${PLRL_CLI_E2E_PRIVATE_KEY_PATH} \
 	VENOM_VAR_username=${PLRL_CLI_E2E_SA_USERNAME} \
 	VENOM_VAR_token=${PLRL_CLI_E2E_SA_TOKEN} \
 	VENOM_VAR_pluralHome=${HOME}/.plural \

diff --git a/test/plural/lib/check-required.yml b/test/plural/lib/check-required.yml
@@ -4,11 +4,11 @@ input:
   directory: ''
   email: ''
   gitRepo: ''
-  privateKeyPath: ''
+  gitRepoPrivateKeyPath: ''
+  gitRepoPrivateKey: ''
   username: ''
   token: ''
   pluralHome: ''
-  gitRepoPrivateKey: ''
   project: ''
   provider: ''
   region: ''
@@ -35,7 +35,7 @@ steps:
       - result.systemout ShouldMatchRegex '^Git Repo .+$'
 
   - name: Private Key Path
-    script: "echo Private Key Path {{ .input.privateKeyPath }}"
+    script: "echo Private Key Path {{ .input.gitRepoPrivateKeyPath }}"
     assertions:
       - result.systemout ShouldMatchRegex '^Private Key Path .+$'
 

diff --git a/test/plural/lib/git-setup.yml b/test/plural/lib/git-setup.yml
@@ -4,15 +4,15 @@ input:
   directory: ''
   email: ''
   gitRepo: ''
-  privateKeyPath: ''
+  gitRepoPrivateKeyPath: ''
   username: ''
 steps:
   - script: |
-      git -c core.sshCommand="ssh -i {{ .input.privateKeyPath }}" clone {{ .input.gitRepo }} "{{ .input.directory }}" ;\
+      git -c core.sshCommand="ssh -i {{ .input.gitRepoPrivateKeyPath }}" clone {{ .input.gitRepo }} "{{ .input.directory }}" ;\
       cd {{ .input.directory }} ;\
       git config --local user.email {{ .input.email }} ;\
       git config --local user.name {{ .input.username }} ;\
       git checkout -b {{ .input.branch }} ;\
-      GIT_SSH_COMMAND='ssh -i {{ .input.privateKeyPath }} -o IdentitiesOnly=yes -F /dev/null' git push -u origin {{ .input.branch }}
+      GIT_SSH_COMMAND='ssh -i {{ .input.gitRepoPrivateKeyPath }} -o IdentitiesOnly=yes -F /dev/null' git push -u origin {{ .input.branch }}
     info:
       - 'Git Repository: {{ .input.gitRepo }}'
diff --git a/test/plural/up.yml b/test/plural/up.yml
@@ -12,7 +12,7 @@ vars:
   # Git repository address used to run 'plural up' and store generated files
   gitRepo: ''
   # SSH key path used to access git repository
-  privateKeyPath: ''
+  gitRepoPrivateKeyPath: ''
   # Plural user name
   username: ''
   # Plural user acess token