Skip to content

Commit

Permalink
feat: update to latest parent
Browse files Browse the repository at this point in the history
  • Loading branch information
andrejpetras committed Feb 1, 2024
1 parent 7643a19 commit 5e6b31e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 16 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>io.github.onecx</groupId>
<artifactId>onecx-quarkus3-parent</artifactId>
<version>0.25.0</version>
<version>0.30.0</version>
</parent>

<artifactId>onecx-theme-svc</artifactId>
Expand Down
16 changes: 3 additions & 13 deletions src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@ tkit.dataimport.configurations.theme.metadata.operation=CLEAN_INSERT
tkit.dataimport.configurations.theme.enabled=false
tkit.dataimport.configurations.theme.stop-at-error=true

tkit.log.json.enabled=false
tkit.log.json.pretty-print=false
tkit.log.json.print-details=false

# enable or disable multi-tenancy support
tkit.rs.context.tenant-id.enabled=true

Expand All @@ -44,16 +40,10 @@ tkit.rs.context.tenant-id.enabled=true
%test.tkit.rs.context.tenant-id.mock.enabled=true
%test.tkit.rs.context.tenant-id.mock.default-tenant=default
%test.tkit.rs.context.tenant-id.mock.claim-org-id=orgId
%test.tkit.rs.context.tenant-id.mock.token-header-param=apm-principal-token
%test.tkit.rs.context.tenant-id.mock.data.org1=tenant-100
%test.tkit.rs.context.tenant-id.mock.data.org2=tenant-200

# TEST-IT
quarkus.test.integration-test-profile=test-it
%test-it.tkit.log.json.enabled=false
%test-it.tkit.rs.context.tenant-id.mock.enabled=true
%test-it.tkit.rs.context.tenant-id.mock.default-tenant=default
%test-it.tkit.rs.context.tenant-id.mock.claim-org-id=orgId
%test-it.tkit.rs.context.tenant-id.mock.token-header-param=apm-principal-token
%test-it.tkit.rs.context.tenant-id.mock.data.org1=tenant-100
%test-it.tkit.rs.context.tenant-id.mock.data.org2=tenant-200
quarkus.test.integration-test-profile=test

# PIPE CONFIG
3 changes: 1 addition & 2 deletions src/test/java/io/github/onecx/theme/test/AbstractTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@
@SuppressWarnings("java:S2187")
public class AbstractTest {

protected static final String APM_HEADER_PARAM = ConfigProvider.getConfig()
.getValue("%test.tkit.rs.context.tenant-id.mock.token-header-param", String.class);
protected static final String APM_HEADER_PARAM = "apm-principal-token";
protected static final String CLAIMS_ORG_ID = ConfigProvider.getConfig()
.getValue("%test.tkit.rs.context.tenant-id.mock.claim-org-id", String.class);;

Expand Down

0 comments on commit 5e6b31e

Please sign in to comment.