fix test proxy tests (#301)

* pass in ssh keys, fix db object
hashicorp · Sep 22, 2023 · a66a3e7 · a66a3e7
1 parent 3c77529
commit a66a3e7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/handler-test.yml b/.github/workflows/handler-test.yml
@@ -64,6 +64,7 @@ jobs:
       pull_request_repo_name: ${{ github.event.client_payload.github.payload.repository.full_name }}
       pull_request_ref: ${{ github.event.client_payload.pull_request.head.sha }}
       pull_request_comment_id: ${{ github.event.client_payload.github.payload.comment.id }}
+      ssh_private_key_secret_name: PRIVATE_ACTIVE_ACTIVE_SSH_KEY_BASE64
       work_dir: ./tests/private-active-active
       TFC_token_secret_name: PRIVATE_ACTIVE_ACTIVE_TFC_TOKEN
 
@@ -81,6 +82,7 @@ jobs:
       pull_request_repo_name: ${{ github.event.client_payload.github.payload.repository.full_name }}
       pull_request_ref: ${{ github.event.client_payload.pull_request.head.sha }}
       pull_request_comment_id: ${{ github.event.client_payload.github.payload.comment.id }}
+      ssh_private_key_secret_name: PRIVATE_TCP_ACTIVE_ACTIVE_SSH_KEY_BASE64
       work_dir: ./tests/private-tcp-active-active
       TFC_token_secret_name: PRIVATE_TCP_ACTIVE_ACTIVE_TFC_TOKEN
 
@@ -165,6 +167,7 @@ jobs:
       pull_request_repo_name: ${{ github.event.client_payload.github.payload.repository.full_name }}
       pull_request_ref: ${{ github.event.client_payload.pull_request.head.sha }}
       pull_request_comment_id: ${{ github.event.client_payload.github.payload.comment.id }}
+      ssh_private_key_secret_name: PRIVATE_ACTIVE_ACTIVE_SSH_KEY_BASE64
       work_dir: ./tests/private-active-active
       TFC_token_secret_name: PRIVATE_ACTIVE_ACTIVE_REPLICATED_TFC_TOKEN
       TFC_workspace_substitution_pattern: s/aws-private-active-active/aws-private-active-active-replicated/
@@ -183,6 +186,7 @@ jobs:
       pull_request_repo_name: ${{ github.event.client_payload.github.payload.repository.full_name }}
       pull_request_ref: ${{ github.event.client_payload.pull_request.head.sha }}
       pull_request_comment_id: ${{ github.event.client_payload.github.payload.comment.id }}
+      ssh_private_key_secret_name: PRIVATE_TCP_ACTIVE_ACTIVE_SSH_KEY_BASE64
       work_dir: ./tests/private-tcp-active-active
       TFC_token_secret_name: PRIVATE_TCP_ACTIVE_ACTIVE_REPLICATED_TFC_TOKEN
       TFC_workspace_substitution_pattern: s/aws-private-tcp-active-active/aws-private-tcp-active-active-replicated/

diff --git a/locals.tf b/locals.tf
@@ -22,10 +22,11 @@ locals {
   database = try(
     module.database[0],
     {
-      name     = null
-      password = null
-      endpoint = null
-      username = null
+      name       = null
+      password   = null
+      host       = null
+      user       = null
+      parameters = null
     }
   )