Commit 9430c57c authored by David Diederich's avatar David Diederich
Browse files

Merge branch 'aws-integration' into 'master'

Int test: allow specifying schema authority for kind. Include changes for POM project id fixes

See merge request !95
parents 0070e951 0d802e29
Pipeline #35753 passed with stages
in 20 minutes and 28 seconds
......@@ -12,9 +12,9 @@
<publish.releases.id>community-maven-via-job-token</publish.releases.id>
<repo.releases.url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</repo.releases.url>
<publish.snapshots.url>https://community.opengroup.org/api/v4/projects/378/packages/maven
<publish.snapshots.url>https://community.opengroup.org/api/v4/projects/118/packages/maven
</publish.snapshots.url>
<publish.releases.url>https://community.opengroup.org/api/v4/projects/378/packages/maven
<publish.releases.url>https://community.opengroup.org/api/v4/projects/118/packages/maven
</publish.releases.url>
</properties>
</profile>
......@@ -35,9 +35,9 @@
<publish.releases.id>community-maven-via-private-token</publish.releases.id>
<repo.releases.url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</repo.releases.url>
<publish.snapshots.url>https://community.opengroup.org/api/v4/projects/378/packages/maven
<publish.snapshots.url>https://community.opengroup.org/api/v4/projects/118/packages/maven
</publish.snapshots.url>
<publish.releases.url>https://community.opengroup.org/api/v4/projects/378/packages/maven
<publish.releases.url>https://community.opengroup.org/api/v4/projects/118/packages/maven
</publish.releases.url>
</properties>
</profile>
......
......@@ -211,7 +211,7 @@ public abstract class Dataset extends TestBase {
Record datasetRegistry = new Record();
datasetRegistry.setId(id);
datasetRegistry.setKind(String.format("%s:wks:dataset--File.Generic:1.0.0", TenantUtils.getTenantName()));
datasetRegistry.setKind(String.format("%s:wks:dataset--File.Generic:1.0.0", TestUtils.getSchemaAuthority()));
//set legal
Legal legal = new Legal();
......
......@@ -51,6 +51,9 @@ public abstract class TestUtils {
public static final String datasetBaseUrl = System.getenv("DATASET_BASE_URL");
public static final String entitlementsBaseUrl = System.getenv("ENTITLEMENTS_BASE_URL");
public static final String providerKey = System.getenv("PROVIDER_KEY");
private static final String schemaAuthority = System.getenv("SCHEMA_AUTHORITY");
private static final String DEFAULT_SCHEMA_AUTHORITY = "osdu";
public static final String getDomain() {
return domain;
......@@ -60,6 +63,14 @@ public abstract class TestUtils {
return providerKey;
}
public static final String getSchemaAuthority() {
if (schemaAuthority == null) {
return DEFAULT_SCHEMA_AUTHORITY;
}
return schemaAuthority;
}
public static String getApiPath(String api) throws Exception {
URL mergedURL = new URL(datasetBaseUrl + api);
System.out.println(mergedURL.toString());
......
......@@ -50,9 +50,9 @@
<publish.releases.id>community-maven-via-job-token</publish.releases.id>
<repo.releases.url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven
</repo.releases.url>
<publish.snapshots.url>https://community.opengroup.org/api/v4/projects/378/packages/maven
<publish.snapshots.url>https://community.opengroup.org/api/v4/projects/118/packages/maven
</publish.snapshots.url>
<publish.releases.url>https://community.opengroup.org/api/v4/projects/378/packages/maven
<publish.releases.url>https://community.opengroup.org/api/v4/projects/118/packages/maven
</publish.releases.url>
</properties>
</profile>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment