From f23549edaa59201ffe83cd8666519202a2423acd Mon Sep 17 00:00:00 2001 From: Jamie Li Date: Mon, 4 Nov 2024 13:32:47 -0800 Subject: [PATCH 1/6] Bump version to 2.11.2 --- build.gradle.kts | 2 +- docs/README.md | 2 +- service-runner/src/main/resources/version-info.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 25265b8cb..957af037b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -222,7 +222,7 @@ subprojects { allprojects { group = "org.stellar.anchor-sdk" - version = "2.11.1" + version = "2.11.2" tasks.jar { manifest { diff --git a/docs/README.md b/docs/README.md index fb1fb2829..ab6028858 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,6 +1,6 @@ [![License](https://badgen.net/badge/license/Apache%202/blue?icon=github&label=License)](https://github.com/stellar/java-stellar-anchor-sdk/blob/develop/LICENSE) [![GitHub Version](https://badgen.net/github/release/stellar/java-stellar-anchor-sdk?icon=github&label=Latest%20release)](https://github.com/stellar/java-stellar-anchor-sdk/releases) -[![Docker](https://badgen.net/badge/Latest%20Release/v2.11.1/blue?icon=docker)](https://hub.docker.com/r/stellar/anchor-platform/tags?page=1&name=2.11.1) +[![Docker](https://badgen.net/badge/Latest%20Release/v2.11.2/blue?icon=docker)](https://hub.docker.com/r/stellar/anchor-platform/tags?page=1&name=2.11.2) ![Develop Branch](https://github.com/stellar/java-stellar-anchor-sdk/actions/workflows/on_push_to_develop.yml/badge.svg?branch=develop)
diff --git a/service-runner/src/main/resources/version-info.properties b/service-runner/src/main/resources/version-info.properties index 0a1e4ef92..dba48edd5 100644 --- a/service-runner/src/main/resources/version-info.properties +++ b/service-runner/src/main/resources/version-info.properties @@ -1 +1 @@ -version=2.11.1 \ No newline at end of file +version=2.11.2 \ No newline at end of file From 24f29192155fba82cf88b9d48b4ac2b5430c01e0 Mon Sep 17 00:00:00 2001 From: Jamie Li Date: Wed, 4 Dec 2024 14:40:44 -0800 Subject: [PATCH 2/6] [ANCHOR-592] Add schema to database configuration --- .github/workflows/sub_essential_tests.yml | 2 +- build.gradle.kts | 2 +- docs/README.md | 2 +- .../platform/configurator/DataConfigAdapter.java | 8 ++++++-- .../config/anchor-config-default-values.yaml | 11 ++++++++++- .../resources/config/anchor-config-schema-v1.yaml | 1 + .../src/main/resources/profiles/default/config.env | 1 + .../src/main/resources/version-info.properties | 2 +- 8 files changed, 22 insertions(+), 7 deletions(-) diff --git a/.github/workflows/sub_essential_tests.yml b/.github/workflows/sub_essential_tests.yml index 6c5f97ff4..a96d627f1 100644 --- a/.github/workflows/sub_essential_tests.yml +++ b/.github/workflows/sub_essential_tests.yml @@ -104,7 +104,7 @@ jobs: - name: Run Stellar validation tool run: | - docker run --network host -v /home/runner/java-stellar-anchor-sdk/platform/src/test/resources://config stellar/anchor-tests:latest --home-domain http://host.docker.internal:8080 --seps 1 6 10 12 24 31 38 --sep-config //config/stellar-anchor-tests-sep-config.json --verbose + docker run --network host -v /home/runner/java-stellar-anchor-sdk/platform/src/test/resources://config stellar/anchor-tests:v0.6.19 --home-domain http://host.docker.internal:8080 --seps 1 6 10 12 24 31 38 --sep-config //config/stellar-anchor-tests-sep-config.json --verbose - name: Upload Essential Tests report if: always() diff --git a/build.gradle.kts b/build.gradle.kts index 957af037b..7c9b477ce 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -222,7 +222,7 @@ subprojects { allprojects { group = "org.stellar.anchor-sdk" - version = "2.11.2" + version = "2.12.0" tasks.jar { manifest { diff --git a/docs/README.md b/docs/README.md index ab6028858..13c1ca2b4 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,6 +1,6 @@ [![License](https://badgen.net/badge/license/Apache%202/blue?icon=github&label=License)](https://github.com/stellar/java-stellar-anchor-sdk/blob/develop/LICENSE) [![GitHub Version](https://badgen.net/github/release/stellar/java-stellar-anchor-sdk?icon=github&label=Latest%20release)](https://github.com/stellar/java-stellar-anchor-sdk/releases) -[![Docker](https://badgen.net/badge/Latest%20Release/v2.11.2/blue?icon=docker)](https://hub.docker.com/r/stellar/anchor-platform/tags?page=1&name=2.11.2) +[![Docker](https://badgen.net/badge/Latest%20Release/v2.12.0/blue?icon=docker)](https://hub.docker.com/r/stellar/anchor-platform/tags?page=1&name=2.12.0) ![Develop Branch](https://github.com/stellar/java-stellar-anchor-sdk/actions/workflows/on_push_to_develop.yml/badge.svg?branch=develop)
diff --git a/platform/src/main/java/org/stellar/anchor/platform/configurator/DataConfigAdapter.java b/platform/src/main/java/org/stellar/anchor/platform/configurator/DataConfigAdapter.java index 600128f4d..0aa72d0a0 100644 --- a/platform/src/main/java/org/stellar/anchor/platform/configurator/DataConfigAdapter.java +++ b/platform/src/main/java/org/stellar/anchor/platform/configurator/DataConfigAdapter.java @@ -180,9 +180,13 @@ private void configureFlyway(ConfigMap config) { } private String constructPostgressUrl(ConfigMap config) { + String schema = config.getString("data.schema"); + if (isEmpty(schema)) { + schema = "public"; + } return String.format( - "jdbc:postgresql://%s/%s", - config.getString("data.server"), config.getString("data.database")); + "jdbc:postgresql://%s/%s?currentSchema=%s", + config.getString("data.server"), config.getString("data.database"), schema); } private String constructSQLiteUrl(ConfigMap config) { diff --git a/platform/src/main/resources/config/anchor-config-default-values.yaml b/platform/src/main/resources/config/anchor-config-default-values.yaml index c6e345370..789b14c27 100644 --- a/platform/src/main/resources/config/anchor-config-default-values.yaml +++ b/platform/src/main/resources/config/anchor-config-default-values.yaml @@ -781,9 +781,18 @@ data: # The hostname and port of the database server. server: - # Name of the database. + # The name of the database. + # For `sqlite`, this is the path to the database file. + # For `postgres` and `aurora`, this is the name of the database. database: + # The schema of the database. + # For `postgres` and `aurora`, default is `public` + # For `sqlite`, this is ignored. + # Noteļ¼š If the schema is specified other than the default value, the tables will be created in the new schema. + # The previously created tables may need to be moved from the default to the new schema. + schema: + # Initial number of connections # For `sqlite`, set this to 1 to avoid database file lock exception initial_connection_pool_size: 1 diff --git a/platform/src/main/resources/config/anchor-config-schema-v1.yaml b/platform/src/main/resources/config/anchor-config-schema-v1.yaml index 3353220be..3368b65e2 100644 --- a/platform/src/main/resources/config/anchor-config-schema-v1.yaml +++ b/platform/src/main/resources/config/anchor-config-schema-v1.yaml @@ -18,6 +18,7 @@ data.flyway_location: data.initial_connection_pool_size: data.max_active_connections: data.server: +data.schema: data.type: event_processor.callback_api_request.enabled: event_processor.client_status_callback.enabled: diff --git a/service-runner/src/main/resources/profiles/default/config.env b/service-runner/src/main/resources/profiles/default/config.env index ee8a3b0c3..87311808e 100644 --- a/service-runner/src/main/resources/profiles/default/config.env +++ b/service-runner/src/main/resources/profiles/default/config.env @@ -27,6 +27,7 @@ custody_server.base_url=http://custody-server:8086 data.type=postgres data.server=db:5432 data.database=postgres +data.schema=anchor-platform data.flyway_enabled=true # assets assets.type=file diff --git a/service-runner/src/main/resources/version-info.properties b/service-runner/src/main/resources/version-info.properties index dba48edd5..1b797ac49 100644 --- a/service-runner/src/main/resources/version-info.properties +++ b/service-runner/src/main/resources/version-info.properties @@ -1 +1 @@ -version=2.11.2 \ No newline at end of file +version=2.12.0 \ No newline at end of file From 9cd4d75ebe68409d1a593585caa1ae2bfc91fad5 Mon Sep 17 00:00:00 2001 From: jiahuihu Date: Tue, 10 Dec 2024 22:14:32 -0500 Subject: [PATCH 3/6] bump version 3.0.0 --- build.gradle.kts | 2 +- docs/README.md | 2 +- service-runner/src/main/resources/version-info.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 95dcb8288..ba1c76601 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -216,7 +216,7 @@ subprojects { allprojects { group = "org.stellar.anchor-sdk" - version = "2.11.1" + version = "3.0.0" tasks.jar { manifest { diff --git a/docs/README.md b/docs/README.md index dfedc8b85..907d3d76d 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,6 +1,6 @@ [![License](https://badgen.net/badge/license/Apache%202/blue?icon=github&label=License)](https://github.com/stellar/java-stellar-anchor-sdk/blob/develop/LICENSE) [![GitHub Version](https://badgen.net/github/release/stellar/java-stellar-anchor-sdk?icon=github&label=Latest%20release)](https://github.com/stellar/java-stellar-anchor-sdk/releases) -[![Docker](https://badgen.net/badge/Latest%20Release/v2.11.1/blue?icon=docker)](https://hub.docker.com/r/stellar/anchor-platform/tags?page=1&name=2.11.1) +[![Docker](https://badgen.net/badge/Latest%20Release/v3.0.0/blue?icon=docker)](https://hub.docker.com/r/stellar/anchor-platform/tags?page=1&name=3.0.0) ![Develop Branch](https://github.com/stellar/java-stellar-anchor-sdk/actions/workflows/on_push_to_develop.yml/badge.svg?branch=develop)
diff --git a/service-runner/src/main/resources/version-info.properties b/service-runner/src/main/resources/version-info.properties index 0a1e4ef92..317fe995b 100644 --- a/service-runner/src/main/resources/version-info.properties +++ b/service-runner/src/main/resources/version-info.properties @@ -1 +1 @@ -version=2.11.1 \ No newline at end of file +version=3.0.0 \ No newline at end of file From ed290baba233cb600d374b927077d008a3787e83 Mon Sep 17 00:00:00 2001 From: philipliu Date: Wed, 11 Dec 2024 15:00:33 -0500 Subject: [PATCH 4/6] Ignore transfer_received_at field in API tests --- .../platform/extendedtest/custody/PlatformApiCustodyTests.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/extended-tests/src/test/kotlin/org/stellar/anchor/platform/extendedtest/custody/PlatformApiCustodyTests.kt b/extended-tests/src/test/kotlin/org/stellar/anchor/platform/extendedtest/custody/PlatformApiCustodyTests.kt index 645db22bb..d650fb8b3 100644 --- a/extended-tests/src/test/kotlin/org/stellar/anchor/platform/extendedtest/custody/PlatformApiCustodyTests.kt +++ b/extended-tests/src/test/kotlin/org/stellar/anchor/platform/extendedtest/custody/PlatformApiCustodyTests.kt @@ -161,6 +161,7 @@ class PlatformApiCustodyTests : AbstractIntegrationTests(TestConfig("custody")) actualResult, CustomComparator( JSONCompareMode.LENIENT, + Customization("[*].result.transfer_received_at") { _, _ -> true }, Customization("[*].result.started_at") { _, _ -> true }, Customization("[*].result.updated_at") { _, _ -> true }, Customization("[*].result.completed_at") { _, _ -> true }, From 17114dc30dae6721db6454d1454364d16d63a65e Mon Sep 17 00:00:00 2001 From: philipliu Date: Wed, 11 Dec 2024 15:19:00 -0500 Subject: [PATCH 5/6] Fix Github actions paths --- .github/workflows/sub_essential_tests.yml | 34 +++++++-------- .github/workflows/sub_extended_tests.yml | 52 +++++++++++------------ .github/workflows/sub_gradle_build.yml | 10 ++--- .github/workflows/sub_jacoco_report.yml | 14 +++--- 4 files changed, 55 insertions(+), 55 deletions(-) diff --git a/.github/workflows/sub_essential_tests.yml b/.github/workflows/sub_essential_tests.yml index dbf162899..58b15a914 100644 --- a/.github/workflows/sub_essential_tests.yml +++ b/.github/workflows/sub_essential_tests.yml @@ -11,7 +11,7 @@ jobs: steps: ############################################# # Setup JDK 17 - # Download, and Extract java-stellar-anchor-sdk.tar + # Download, and Extract anchor-platform.tar # Setup hostnames (/etc/hosts) ############################################# - name: Set up JDK 17 @@ -20,17 +20,17 @@ jobs: java-version: '17' distribution: 'adopt' - - name: Download java-stellar-anchor-sdk.tar + - name: Download anchor-platform.tar uses: actions/download-artifact@v3 with: - name: java-stellar-anchor-sdk-tar + name: anchor-platform-tar path: /home/runner/ - - name: Extract java-stellar-anchor-sdk.tar + - name: Extract anchor-platform.tar run: | cd /home/runner - tar -xf /home/runner/java-stellar-anchor-sdk.tar - cd /home/runner/java-stellar-anchor-sdk + tar -xf /home/runner/anchor-platform.tar + cd /home/runner/anchor-platform - name: Set up hostnames (/etc/hosts) run: | @@ -53,7 +53,7 @@ jobs: - name: Run Kafka, Postgres, and Sep24 UI with docker compose env: TEST_PROFILE_NAME: default - run: docker compose -f /home/runner/java-stellar-anchor-sdk/service-runner/src/main/resources/docker-compose-test.yaml up -d --build + run: docker compose -f /home/runner/anchor-platform/service-runner/src/main/resources/docker-compose-test.yaml up -d --build - name: Run sep server, platform server, observer, and reference servers for integration tests env: @@ -65,13 +65,13 @@ jobs: RUN_KOTLIN_REFERENCE_SERVER: true RUN_EVENT_PROCESSING_SERVER: true RUN_WALLET_SERVER: true - KT_REFERENCE_SERVER_CONFIG: /home/runner/java-stellar-anchor-sdk/service-runner/src/main/resources/config/reference-config.yaml - SEP1_TOML_VALUE: /home/runner/java-stellar-anchor-sdk/service-runner/src/main/resources/config/stellar.host.docker.internal.toml + KT_REFERENCE_SERVER_CONFIG: /home/runner/anchor-platform/service-runner/src/main/resources/config/reference-config.yaml + SEP1_TOML_VALUE: /home/runner/anchor-platform/service-runner/src/main/resources/config/stellar.host.docker.internal.toml SEP10_WEB_AUTH_DOMAIN: host.docker.internal:8080 SEP10_HOME_DOMAINS: host.docker.internal:8080,*.stellar.org - TOML_PATH: /home/runner/java-stellar-anchor-sdk/wallet-reference-server/src/main/resources/toml + TOML_PATH: /home/runner/anchor-platform/wallet-reference-server/src/main/resources/toml run: | - cp /home/runner/java-stellar-anchor-sdk/service-runner/build/libs/anchor-platform-runner-*.jar /home/runner/anchor-platform-runner.jar + cp /home/runner/anchor-platform/service-runner/build/libs/anchor-platform-runner-*.jar /home/runner/anchor-platform-runner.jar java -jar /home/runner/anchor-platform-runner.jar -t & echo "PID=$!" >> $GITHUB_ENV @@ -99,12 +99,12 @@ jobs: RUN_DOCKER: false ANCHOR_DOMAIN: http://host.docker.internal:8080 run: | - cd /home/runner/java-stellar-anchor-sdk + cd /home/runner/anchor-platform ./gradlew runEssentialTests - name: Run Stellar validation tool run: | - docker run --network host -v /home/runner/java-stellar-anchor-sdk/platform/src/test/resources://config stellar/anchor-tests:v0.6.20 --home-domain http://host.docker.internal:8080 --seps 1 6 10 12 24 31 38 --sep-config //config/stellar-anchor-tests-sep-config.json --verbose + docker run --network host -v /home/runner/anchor-platform/platform/src/test/resources://config stellar/anchor-tests:v0.6.20 --home-domain http://host.docker.internal:8080 --seps 1 6 10 12 24 31 38 --sep-config //config/stellar-anchor-tests-sep-config.json --verbose - name: Upload Essential Tests report if: always() @@ -112,8 +112,8 @@ jobs: with: name: essential-tests-report path: | - /home/runner/java-stellar-anchor-sdk/api-schema/build/reports/ - /home/runner/java-stellar-anchor-sdk/core/build/reports/ - /home/runner/java-stellar-anchor-sdk/platform/build/reports/ - /home/runner/java-stellar-anchor-sdk/essential-tests/build/reports/ + /home/runner/anchor-platform/api-schema/build/reports/ + /home/runner/anchor-platform/core/build/reports/ + /home/runner/anchor-platform/platform/build/reports/ + /home/runner/anchor-platform/essential-tests/build/reports/ diff --git a/.github/workflows/sub_extended_tests.yml b/.github/workflows/sub_extended_tests.yml index 90aac095f..ac8751f3b 100644 --- a/.github/workflows/sub_extended_tests.yml +++ b/.github/workflows/sub_extended_tests.yml @@ -11,7 +11,7 @@ jobs: steps: ############################################# # Setup JDK 17 - # Download, and Extract java-stellar-anchor-sdk.tar + # Download, and Extract anchor-platform.tar # Setup hostnames (/etc/hosts) ############################################# - name: Set up JDK 17 @@ -20,17 +20,17 @@ jobs: java-version: '17' distribution: 'adopt' - - name: Download java-stellar-anchor-sdk.tar + - name: Download anchor-platform.tar uses: actions/download-artifact@v3 with: - name: java-stellar-anchor-sdk-tar + name: anchor-platform-tar path: /home/runner/ - - name: Extract java-stellar-anchor-sdk.tar + - name: Extract anchor-platform.tar run: | cd /home/runner - tar -xf /home/runner/java-stellar-anchor-sdk.tar - cd /home/runner/java-stellar-anchor-sdk + tar -xf /home/runner/anchor-platform.tar + cd /home/runner/anchor-platform - name: Set up hostnames (/etc/hosts) run: | @@ -47,15 +47,15 @@ jobs: ############################################# - name: Run Kafka, Postgres, and Sep24 UI with docker compose - run: docker compose -f /home/runner/java-stellar-anchor-sdk/service-runner/src/main/resources/docker-compose-test.yaml up -d --build + run: docker compose -f /home/runner/anchor-platform/service-runner/src/main/resources/docker-compose-test.yaml up -d --build # `custody` Tests - name: Start `custody` configuration env: TEST_PROFILE_NAME: custody - KT_REFERENCE_SERVER_CONFIG: /home/runner/java-stellar-anchor-sdk/service-runner/src/main/resources/config/reference-config.yaml + KT_REFERENCE_SERVER_CONFIG: /home/runner/anchor-platform/service-runner/src/main/resources/config/reference-config.yaml run: | - cd /home/runner/java-stellar-anchor-sdk + cd /home/runner/anchor-platform ./gradlew startServersWithTestProfile & echo "PID=$!" >> $GITHUB_ENV @@ -69,7 +69,7 @@ jobs: env: TEST_PROFILE_NAME: custody run: | - cd /home/runner/java-stellar-anchor-sdk + cd /home/runner/anchor-platform ./gradlew :service-runner:clean :extended-tests:clean :extended-tests:test --tests org.stellar.anchor.platform.suite.CustodyTestSuite kill -9 $PID @@ -77,9 +77,9 @@ jobs: - name: Start `rpc` configuration env: TEST_PROFILE_NAME: rpc - KT_REFERENCE_SERVER_CONFIG: /home/runner/java-stellar-anchor-sdk/service-runner/src/main/resources/config/reference-config.yaml + KT_REFERENCE_SERVER_CONFIG: /home/runner/anchor-platform/service-runner/src/main/resources/config/reference-config.yaml run: | - cd /home/runner/java-stellar-anchor-sdk + cd /home/runner/anchor-platform ./gradlew startServersWithTestProfile & echo "PID=$!" >> $GITHUB_ENV @@ -93,7 +93,7 @@ jobs: env: TEST_PROFILE_NAME: rpc run: | - cd /home/runner/java-stellar-anchor-sdk + cd /home/runner/anchor-platform ./gradlew :extended-tests:test --tests org.stellar.anchor.platform.suite.RpcTestSuite kill -9 $PID @@ -101,9 +101,9 @@ jobs: - name: Start `auth-apikey-custody` configuration env: TEST_PROFILE_NAME: auth-apikey-custody - KT_REFERENCE_SERVER_CONFIG: /home/runner/java-stellar-anchor-sdk/service-runner/src/main/resources/config/reference-config.yaml + KT_REFERENCE_SERVER_CONFIG: /home/runner/anchor-platform/service-runner/src/main/resources/config/reference-config.yaml run: | - cd /home/runner/java-stellar-anchor-sdk + cd /home/runner/anchor-platform ./gradlew startServersWithTestProfile & echo "PID=$!" >> $GITHUB_ENV @@ -117,7 +117,7 @@ jobs: env: TEST_PROFILE_NAME: auth-apikey-custody run: | - cd /home/runner/java-stellar-anchor-sdk + cd /home/runner/anchor-platform ./gradlew :extended-tests:test --tests org.stellar.anchor.platform.suite.AuthApikeyCustodyTestSuite kill -9 $PID @@ -125,9 +125,9 @@ jobs: - name: Start `auth-jwt-custody` configuration env: TEST_PROFILE_NAME: auth-jwt-custody - KT_REFERENCE_SERVER_CONFIG: /home/runner/java-stellar-anchor-sdk/service-runner/src/main/resources/config/reference-config.yaml + KT_REFERENCE_SERVER_CONFIG: /home/runner/anchor-platform/service-runner/src/main/resources/config/reference-config.yaml run: | - cd /home/runner/java-stellar-anchor-sdk + cd /home/runner/anchor-platform ./gradlew startServersWithTestProfile & echo "PID=$!" >> $GITHUB_ENV @@ -141,7 +141,7 @@ jobs: env: TEST_PROFILE_NAME: auth-jwt-custody run: | - cd /home/runner/java-stellar-anchor-sdk + cd /home/runner/anchor-platform ./gradlew :extended-tests:test --tests org.stellar.anchor.platform.suite.AuthJwtCustodyTestSuite kill -9 $PID @@ -149,9 +149,9 @@ jobs: - name: Start `auth-apikey-platform` configuration env: TEST_PROFILE_NAME: auth-apikey-platform - KT_REFERENCE_SERVER_CONFIG: /home/runner/java-stellar-anchor-sdk/service-runner/src/main/resources/config/reference-config.yaml + KT_REFERENCE_SERVER_CONFIG: /home/runner/anchor-platform/service-runner/src/main/resources/config/reference-config.yaml run: | - cd /home/runner/java-stellar-anchor-sdk + cd /home/runner/anchor-platform ./gradlew startServersWithTestProfile & echo "PID=$!" >> $GITHUB_ENV @@ -166,7 +166,7 @@ jobs: env: TEST_PROFILE_NAME: auth-apikey-platform run: | - cd /home/runner/java-stellar-anchor-sdk + cd /home/runner/anchor-platform ./gradlew :extended-tests:test --tests org.stellar.anchor.platform.suite.AuthApikeyPlatformTestSuite kill -9 $PID @@ -174,9 +174,9 @@ jobs: - name: Start `auth-jwt-platform` configuration env: TEST_PROFILE_NAME: auth-jwt-platform - KT_REFERENCE_SERVER_CONFIG: /home/runner/java-stellar-anchor-sdk/service-runner/src/main/resources/config/reference-config.yaml + KT_REFERENCE_SERVER_CONFIG: /home/runner/anchor-platform/service-runner/src/main/resources/config/reference-config.yaml run: | - cd /home/runner/java-stellar-anchor-sdk + cd /home/runner/anchor-platform ./gradlew startServersWithTestProfile & echo "PID=$!" >> $GITHUB_ENV @@ -191,7 +191,7 @@ jobs: env: TEST_PROFILE_NAME: auth-jwt-platform run: | - cd /home/runner/java-stellar-anchor-sdk + cd /home/runner/anchor-platform ./gradlew :extended-tests:test --tests org.stellar.anchor.platform.suite.AuthJwtPlatformTestSuite kill -9 $PID @@ -201,5 +201,5 @@ jobs: with: name: extended-tests-report path: | - /home/runner/java-stellar-anchor-sdk/extended-tests/build/reports/ + /home/runner/anchor-platform/extended-tests/build/reports/ diff --git a/.github/workflows/sub_gradle_build.yml b/.github/workflows/sub_gradle_build.yml index a0c35dc60..b73c57886 100644 --- a/.github/workflows/sub_gradle_build.yml +++ b/.github/workflows/sub_gradle_build.yml @@ -31,13 +31,13 @@ jobs: - name: Archive Project Folder run: | - cd /home/runner/work/java-stellar-anchor-sdk - tar -cf /home/runner/java-stellar-anchor-sdk.tar ./java-stellar-anchor-sdk + cd /home/runner/work/anchor-platform + tar -cf /home/runner/anchor-platform.tar ./anchor-platform - - name: Upload java-stellar-anchor-sdk.tar to GitHub Artifacts + - name: Upload anchor-platform.tar to GitHub Artifacts if: always() uses: actions/upload-artifact@v3 with: - name: java-stellar-anchor-sdk-tar + name: anchor-platform-tar path: | - /home/runner/java-stellar-anchor-sdk.tar + /home/runner/anchor-platform.tar diff --git a/.github/workflows/sub_jacoco_report.yml b/.github/workflows/sub_jacoco_report.yml index fd7c0f317..f458e67f6 100644 --- a/.github/workflows/sub_jacoco_report.yml +++ b/.github/workflows/sub_jacoco_report.yml @@ -17,7 +17,7 @@ jobs: steps: ############################################# # Setup JDK 17 - # Download, and Extract java-stellar-anchor-sdk.tar + # Download, and Extract anchor-platform.tar # Setup hostnames (/etc/hosts) ############################################# - name: Set up JDK 17 @@ -26,17 +26,17 @@ jobs: java-version: '17' distribution: 'adopt' - - name: Download java-stellar-anchor-sdk.tar + - name: Download anchor-platform.tar uses: actions/download-artifact@v3 with: - name: java-stellar-anchor-sdk-tar + name: anchor-platform-tar path: /home/runner/ - - name: Extract java-stellar-anchor-sdk.tar + - name: Extract anchor-platform.tar run: | cd /home/runner - tar -xf /home/runner/java-stellar-anchor-sdk.tar - cd /home/runner/java-stellar-anchor-sdk + tar -xf /home/runner/anchor-platform.tar + cd /home/runner/anchor-platform - name: Set up hostnames (/etc/hosts) run: | @@ -54,7 +54,7 @@ jobs: - name: Gradle Build with unit tests only if : ${{ inputs.forceRebuild }} run: | - cd /home/runner/java-stellar-anchor-sdk + cd /home/runner/anchor-platform ./gradlew clean build jacocoTestReport -x essential-tests:test -x extended-tests:test - name: Add coverage to the Pull Request From 1e0eca92388ef2f47e16efcf035b18b1126a8f8a Mon Sep 17 00:00:00 2001 From: Jamie Li Date: Fri, 13 Dec 2024 07:26:29 +0800 Subject: [PATCH 6/6] [ANCHOR-431] Set callback-api-request.enabled default to false (#1593) ### Description - Set callback-api-request.enabled default to false - The "What's Changed" from v2 to v3 will document this. --- .../src/main/resources/config/anchor-config-default-values.yaml | 2 +- service-runner/src/main/resources/profiles/default/config.env | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/platform/src/main/resources/config/anchor-config-default-values.yaml b/platform/src/main/resources/config/anchor-config-default-values.yaml index af1cda49a..c5fe150c3 100644 --- a/platform/src/main/resources/config/anchor-config-default-values.yaml +++ b/platform/src/main/resources/config/anchor-config-default-values.yaml @@ -166,7 +166,7 @@ event_processor: # The configuration of the event delivery to the anchor business server callback_api_request: # Whether to enable the event delivery to the anchor business server - enabled: true + enabled: false ###################### ## Platform Server Configuration diff --git a/service-runner/src/main/resources/profiles/default/config.env b/service-runner/src/main/resources/profiles/default/config.env index 299058b88..663c58369 100644 --- a/service-runner/src/main/resources/profiles/default/config.env +++ b/service-runner/src/main/resources/profiles/default/config.env @@ -18,6 +18,7 @@ languages=en,es-AR events.enabled=true events.queue.type=kafka events.queue.kafka.bootstrap_server=kafka:29092 +event_processor.callback_api_request.enabled=true # callback API endpoint callback_api.base_url=http://reference-server:8091/ # platform API endpoint