From 625c15af9c72566ad17bf1266ef391498dce2738 Mon Sep 17 00:00:00 2001 From: Rob Harrison Date: Fri, 28 Jun 2019 09:31:08 +0100 Subject: [PATCH 1/2] Removed access keys --- postgres-backup-s3/integration-tests.test.yml | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/postgres-backup-s3/integration-tests.test.yml b/postgres-backup-s3/integration-tests.test.yml index ca4c1d8..594148f 100644 --- a/postgres-backup-s3/integration-tests.test.yml +++ b/postgres-backup-s3/integration-tests.test.yml @@ -13,14 +13,14 @@ services: depends_on: - postgres environment: - PGPASSWORD: 12345 - S3_REGION: "eu-west-2" - S3_ACCESS_KEY_ID: "AKIASAH3OBJUZI7R3KIM" - S3_SECRET_ACCESS_KEY: "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" - S3_BUCKET: flowmoco-s3-backup-test - S3_PREFIX: "postgres-test" - POSTGRES_HOST: postgres - POSTGRES_DATABASE: user - POSTGRES_USER: user - POSTGRES_PASSWORD: 12345 - POSTGRES_EXTRA_OPTS: '--schema=public --blobs' + - PGPASSWORD=12345 + - S3_REGION="eu-west-2" + - S3_ACCESS_KEY_ID + - S3_SECRET_ACCESS_KEY + - S3_BUCKET=flowmoco-s3-backup-test + - S3_PREFIX="postgres-test" + - POSTGRES_HOST=postgres + - POSTGRES_DATABASE=user + - POSTGRES_USER=user + - POSTGRES_PASSWORD=12345 + - POSTGRES_EXTRA_OPTS='--schema=public --blobs' From e4c290c9bd391940df75378ea862f50dff9d5345 Mon Sep 17 00:00:00 2001 From: Rob Harrison Date: Fri, 28 Jun 2019 11:14:52 +0100 Subject: [PATCH 2/2] Fixed integration tests --- postgres-backup-s3/integration-tests.test.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/postgres-backup-s3/integration-tests.test.yml b/postgres-backup-s3/integration-tests.test.yml index 594148f..1ebba38 100644 --- a/postgres-backup-s3/integration-tests.test.yml +++ b/postgres-backup-s3/integration-tests.test.yml @@ -9,18 +9,18 @@ services: sut: build: context: . - command: 'sh integration-tests.sh' + command: 'sh' depends_on: - postgres environment: - PGPASSWORD=12345 - - S3_REGION="eu-west-2" + - S3_REGION=eu-west-2 - S3_ACCESS_KEY_ID - S3_SECRET_ACCESS_KEY - S3_BUCKET=flowmoco-s3-backup-test - - S3_PREFIX="postgres-test" + - S3_PREFIX=postgres-test - POSTGRES_HOST=postgres - POSTGRES_DATABASE=user - POSTGRES_USER=user - POSTGRES_PASSWORD=12345 - - POSTGRES_EXTRA_OPTS='--schema=public --blobs' + - POSTGRES_EXTRA_OPTS=--schema=public -b