fix: service endpoints

cds-snc · Jan 20, 2024 · a86d79b · a86d79b
1 parent 93f4c55
commit a86d79b
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 9 deletions.
diff --git a/.github/workflows/pull_requests_lambda.yml b/.github/workflows/pull_requests_lambda.yml
@@ -11,7 +11,6 @@ jobs:
   go-tests:
     if: github.ref != 'refs/heads/main'
     runs-on: ubuntu-latest
-    container: ubuntu
 
     services:
       dynamodb-local:
@@ -43,3 +42,6 @@ jobs:
 
       - name: Test
         run: make test
+        env:
+          DYNAMODB_ENDPOINT: http://localhost:9000
+          KMS_ENDPOINT: http://localhost:8080
diff --git a/encryption/aws_kms_test.go b/encryption/aws_kms_test.go
@@ -1,9 +1,20 @@
 package encryption
 
 import (
+	"os"
 	"testing"
 )
 
+func getKmsHost() string {
+	host := "http://kms-local:8080"
+
+	if h := os.Getenv("KMS_HOST"); h != "" {
+		host = h
+	}
+
+	return host
+}
+
 func TestAwsKmsEncryptionInitMissingKeyId(t *testing.T) {
 	t.Parallel()
 
@@ -38,7 +49,7 @@ func TestAwsKmsEncryptionInitValid(t *testing.T) {
 	e := AwsKmsEncryption{}
 
 	err := e.Init(map[string]string{
-		"endpoint":   "http://localhost:4566",
+		"endpoint":   getKmsHost(),
 		"kms_key_id": "test",
 		"region":     "ca-central-1",
 	})
@@ -54,7 +65,7 @@ func TestAwsKmsEncryptionEncrypt(t *testing.T) {
 	e := AwsKmsEncryption{}
 
 	_ = e.Init(map[string]string{
-		"endpoint":   "http://kms-local:8080",
+		"endpoint":   getKmsHost(),
 		"kms_key_id": "bc436485-5092-42b8-92a3-0aa8b93536dc", // Set in .devcontainer/docker/kms/init.yml
 		"region":     "ca-central-1",
 	})
@@ -82,7 +93,7 @@ func TestAwsKmsEncryptionDecrypt(t *testing.T) {
 	e := AwsKmsEncryption{}
 
 	_ = e.Init(map[string]string{
-		"endpoint":   "http://kms-local:8080",
+		"endpoint":   getKmsHost(),
 		"kms_key_id": "bc436485-5092-42b8-92a3-0aa8b93536dc", // Set in .devcontainer/docker/kms/init.yml
 		"region":     "ca-central-1",
 	})

diff --git a/storage/dynamodb_test.go b/storage/dynamodb_test.go
@@ -1,19 +1,30 @@
 package storage
 
 import (
+	"os"
 	"testing"
 	"time"
 
 	"github.com/google/uuid"
 )
 
+func getDynamoDBHost() string {
+	host := "http://dynamodb-local:8000"
+
+	if h := os.Getenv("DYNAMODB_HOST"); h != "" {
+		host = h
+	}
+
+	return host
+}
+
 func TestDynamoDBBackendDelete(t *testing.T) {
 	t.Parallel()
 
 	backend := DynamoDBBackend{}
 
 	_ = backend.Init(map[string]string{
-		"endpoint":   "http://dynamodb-local:8000",
+		"endpoint":   getDynamoDBHost(),
 		"region":     "ca-central-1",
 		"table_name": "test",
 	})
@@ -76,7 +87,7 @@ func TestDynamoDBBackendInitWithEndpoint(t *testing.T) {
 	err := backend.Init(map[string]string{
 		"region":     "ca-central-1",
 		"table_name": "test",
-		"endpoint":   "http://localhost:8000",
+		"endpoint":   getDynamoDBHost(),
 	})
 
 	if err != nil {
@@ -90,7 +101,7 @@ func TestDynamoDBBackendStore(t *testing.T) {
 	backend := DynamoDBBackend{}
 
 	_ = backend.Init(map[string]string{
-		"endpoint":   "http://dynamodb-local:8000",
+		"endpoint":   getDynamoDBHost(),
 		"region":     "ca-central-1",
 		"table_name": "secrets",
 	})
@@ -112,7 +123,7 @@ func TestDynamoDBBackendRetrieveWithTTLInFuture(t *testing.T) {
 	backend := DynamoDBBackend{}
 
 	_ = backend.Init(map[string]string{
-		"endpoint":   "http://dynamodb-local:8000",
+		"endpoint":   getDynamoDBHost(),
 		"region":     "ca-central-1",
 		"table_name": "secrets",
 	})
@@ -144,7 +155,7 @@ func TestDynamoDBBackendRetrieveWithTTLInPast(t *testing.T) {
 	backend := DynamoDBBackend{}
 
 	_ = backend.Init(map[string]string{
-		"endpoint":   "http://dynamodb-local:8000",
+		"endpoint":   getDynamoDBHost(),
 		"region":     "ca-central-1",
 		"table_name": "secrets",
 	})