Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions .github/workflows/integration_tests.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Integration Tests Default
name: Integration Tests

on:
workflow_dispatch:
Expand All @@ -20,12 +20,13 @@ permissions:

jobs:
run-integration-tests:
name: Run Integration Tests with Default
name: Run Integration Tests
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
dbEngine: ["mysql", "postgres"]
versions: [ "default", "latest" ]
dbEngine: ["aurora-mysql", "aurora-postgres", "multi-az-mysql", "multi-az-postgres" ]

steps:
- name: Clone repository
Expand Down Expand Up @@ -54,14 +55,14 @@ jobs:

- name: Run Integration Tests
run: |
./gradlew --no-parallel --no-daemon test-aurora-${{ matrix.dbEngine }} --info
./gradlew --no-parallel --no-daemon test-${{ matrix.dbEngine }} --info
env:
RDS_DB_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
AWS_ACCESS_KEY_ID: ${{ steps.creds.outputs.aws-access-key-id }}
AWS_SECRET_ACCESS_KEY: ${{ steps.creds.outputs.aws-secret-access-key }}
AWS_SESSION_TOKEN: ${{ steps.creds.outputs.aws-session-token }}
AURORA_MYSQL_DB_ENGINE_VERSION: "default"
AURORA_PG_DB_ENGINE_VERSION: "default"
AURORA_MYSQL_DB_ENGINE_VERSION: ${{ matrix.dbEngine }}
AURORA_PG_DB_ENGINE_VERSION: ${{ matrix.versions }}

- name: "Get Github Action IP"
if: always()
Expand All @@ -82,6 +83,6 @@ jobs:
if: always()
uses: actions/upload-artifact@v4
with:
name: integration-report-default-${{ matrix.dbEngine }}
name: integration-report-default-${{ matrix.dbEngine }}-${{ matrix.versions}}
path: ./tests/integration/container/reports
retention-days: 5
90 changes: 0 additions & 90 deletions .github/workflows/integration_tests_latest.yml

This file was deleted.

87 changes: 0 additions & 87 deletions .github/workflows/multi_az_integration_tests.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/release_draft.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- name: "Package Wrapper"
run: |
mkdir -p ./build
npm run prepublish
npm run prepublishOnly
- name: "Set Version Env Variable"
run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
- name: "Get Release Details"
Expand Down
2 changes: 1 addition & 1 deletion common/lib/authentication/aws_secrets_manager_plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ export class AwsSecretsManagerPlugin extends AbstractConnectionPlugin implements
AwsSecretsManagerPlugin.secretsCache.set(JSON.stringify(this.secretKey), this.secret);
} catch (error: any) {
if (error instanceof SecretsManagerServiceException) {
logAndThrowError(Messages.get("AwsSecretsManagerConnectionPlugin.failedToFetchDbCredentials"));
logAndThrowError(Messages.get("AwsSecretsManagerConnectionPlugin.failedToFetchDbCredentials", error.message));
} else if (error instanceof Error && error.message.includes("AWS SDK error")) {
logAndThrowError(Messages.get("AwsSecretsManagerConnectionPlugin.endpointOverrideInvalidConnection", error.message));
} else {
Expand Down
Loading
Loading