Remove custom ports

hashicorp · Aug 5, 2020 · f4957ac · f4957ac
1 parent db13801
commit f4957ac
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -64,7 +64,7 @@ jobs:
       run: npm run test:integration:basic
       env:
         VAULT_HOST: localhost
-        VAULT_PORT: ${{ job.services.vault.ports[8200] }}
+        VAULT_PORT: 8200
         CI: true
 
   integrationEnterprise:
@@ -98,7 +98,7 @@ jobs:
       run: npm run test:integration:enterprise
       env:
         VAULT_HOST: localhost
-        VAULT_PORT: ${{ job.services.vaultEnterprise.ports[8200] }}
+        VAULT_PORT: 8200
         CI: true
 
   e2e:
@@ -132,13 +132,13 @@ jobs:
       run: node ./integrationTests/e2e/setup.js
       env:
         VAULT_HOST: localhost
-        VAULT_PORT: 8201
+        VAULT_PORT: 8200
 
     - name: Test Vault Action (default KV V2)
       uses: ./
       id: kv-secrets
       with:
-        url: http://localhost:8201
+        url: http://localhost:8200
         token: testtoken
         secrets: |
           test secret ;
@@ -148,7 +148,7 @@ jobs:
     - name: Test Vault Action (default KV V1)
       uses: ./
       with:
-        url: http://localhost:8201
+        url: http://localhost:8200
         token: testtoken
         path: my-secret
         kv-version: 1
@@ -160,7 +160,7 @@ jobs:
     - name: Test Vault Action (cubbyhole)
       uses: ./
       with:
-        url: http://localhost:8201
+        url: http://localhost:8200
         token: testtoken
         secrets: |
           /cubbyhole/test foo ;
@@ -202,7 +202,7 @@ jobs:
       run: node ./integrationTests/e2e-tls/setup.js
       env:
         VAULT_HOST: localhost
-        VAULT_PORT: 8202
+        VAULT_PORT: 8200
         VAULTCA: ${{ secrets.VAULTCA }}
         VAULT_CLIENT_CERT: ${{ secrets.VAULT_CLIENT_CERT }}
         VAULT_CLIENT_KEY: ${{ secrets.VAULT_CLIENT_KEY }}
@@ -211,7 +211,7 @@ jobs:
       uses: ./
       id: kv-secrets
       with:
-        url: https://localhost:8202
+        url: https://localhost:8200
         token: ${{ env.VAULT_TOKEN }}
         caCertificate: ${{ secrets.VAULTCA }}
         clientCertificate: ${{ secrets.VAULT_CLIENT_CERT }}
@@ -224,7 +224,7 @@ jobs:
     - name: Test Vault Action (default KV V1)
       uses: ./
       with:
-        url: https://localhost:8202
+        url: https://localhost:8200
         token: ${{ env.VAULT_TOKEN }}
         path: my-secret
         kv-version: 1
@@ -239,7 +239,7 @@ jobs:
     - name: Test Vault Action (cubbyhole)
       uses: ./
       with:
-        url: https://localhost:8202
+        url: https://localhost:8200
         token: ${{ env.VAULT_TOKEN }}
         secrets: |
           /cubbyhole/test foo ;

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -13,15 +13,15 @@ services:
     environment:
       VAULT_DEV_ROOT_TOKEN_ID: testtoken
     ports:
-      - 8201:8200
+      - 8200:8200
     privileged: true
   vault-tls:
     image: vault:latest
     hostname: vault-tls
     environment:
       VAULT_CAPATH: /etc/vault/ca.crt
     ports:
-    - 8202:8200
+    - 8200:8200
     privileged: true
     volumes:
     - ${PWD}/integrationTests/e2e-tls/configs:/etc/vault