diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0f793ef..342733f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,3 +12,13 @@ jobs: jdk-matrix: '[ "8", "11" ]' secrets: extra-env: '{ "VERTEX_URL": "${{ secrets.VERTEX_URL }}", "VERTEX_CLIENT_ID": "${{ secrets.VERTEX_CLIENT_ID }}", "VERTEX_CLIENT_SECRET": "${{ secrets.VERTEX_CLIENT_SECRET }}", "VERTEX_COMPANY_NAME": "${{ secrets.VERTEX_COMPANY_NAME }}", "VERTEX_COMPANY_DIVISION": "${{ secrets.VERTEX_COMPANY_DIVISION }}"}' + + integration_test: + uses: killbill/gh-actions-shared/.github/workflows/integration_test.yml@main + with: + plugin_name: 'vertex' + integration_tests_goal: 'test:plugins:vertex' + ddl_file: 'src/main/resources/ddl.sql' + integration_tests_ref: 'refs/heads/master' + secrets: + extra-env: '{ "VERTEX_URL": "${{ secrets.VERTEX_URL }}", "VERTEX_CLIENT_ID": "${{ secrets.VERTEX_CLIENT_ID }}", "VERTEX_CLIENT_SECRET": "${{ secrets.VERTEX_CLIENT_SECRET }}", "VERTEX_COMPANY_NAME": "${{ secrets.VERTEX_COMPANY_NAME }}", "VERTEX_COMPANY_DIVISION": "${{ secrets.VERTEX_COMPANY_DIVISION }}"}' diff --git a/docker/docker-compose.ci.mysql.yml b/docker/docker-compose.ci.mysql.yml new file mode 100644 index 0000000..52571e8 --- /dev/null +++ b/docker/docker-compose.ci.mysql.yml @@ -0,0 +1,23 @@ +version: '3.8' + +services: + killbill: + network_mode: host + image: killbill/killbill:0.22.20 + environment: + - KILLBILL_CATALOG_URI=SpyCarAdvanced.xml + - KILLBILL_DAO_URL=jdbc:mysql://127.0.0.1:3306/killbill + - KILLBILL_DAO_USER=root + - KILLBILL_DAO_PASSWORD=root + - KILLBILL_SERVER_TEST_MODE=true + - KILLBILL_INVOICE_SANITY_SAFETY_BOUND_ENABLED=false + - KILLBILL_INVOICE_MAX_DAILY_NUMBER_OF_ITEMS_SAFETY_BOUND=-1 + depends_on: + - db + volumes: + - /var/tmp/bundles/plugins/java/vertex-plugin:/var/lib/killbill/bundles/plugins/java/vertex-plugin + db: + network_mode: host + image: killbill/mariadb:0.22 + environment: + - MYSQL_ROOT_PASSWORD=root diff --git a/docker/docker-compose.ci.postgresql.yml b/docker/docker-compose.ci.postgresql.yml new file mode 100644 index 0000000..9e68f13 --- /dev/null +++ b/docker/docker-compose.ci.postgresql.yml @@ -0,0 +1,23 @@ +version: '3.8' + +services: + killbill: + network_mode: host + image: killbill/killbill:0.22.20 + environment: + - KILLBILL_CATALOG_URI=SpyCarAdvanced.xml + - KILLBILL_DAO_URL=jdbc:postgresql://127.0.0.1:5432/killbill + - KILLBILL_DAO_USER=postgres + - KILLBILL_DAO_PASSWORD=postgres + - KILLBILL_SERVER_TEST_MODE=true + - KILLBILL_INVOICE_SANITY_SAFETY_BOUND_ENABLED=false + - KILLBILL_INVOICE_MAX_DAILY_NUMBER_OF_ITEMS_SAFETY_BOUND=-1 + depends_on: + - db + volumes: + - /var/tmp/bundles/plugins/java/vertex-plugin:/var/lib/killbill/bundles/plugins/java/vertex-plugin + db: + network_mode: host + image: killbill/postgresql:0.22 + environment: + - POSTGRES_PASSWORD=postgres diff --git a/src/main/java/org/killbill/billing/plugin/vertex/health/VertexHealthcheck.java b/src/main/java/org/killbill/billing/plugin/vertex/health/VertexHealthcheck.java index 6554962..1d03518 100644 --- a/src/main/java/org/killbill/billing/plugin/vertex/health/VertexHealthcheck.java +++ b/src/main/java/org/killbill/billing/plugin/vertex/health/VertexHealthcheck.java @@ -68,7 +68,7 @@ public HealthStatus getHealthStatus(@Nullable final Tenant tenant, @Nullable fin logger.error("health-check via TaxAreaLookup API failed - " + e.getMessage()); return HealthStatus.unHealthy("health check failed"); } - return HealthStatus.healthy(); + return HealthStatus.healthy("Vertex OK"); } } }