diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4f02b1c0e3f4719472a1afe3ea5652eb94ce95b0..d80dd0240b74d6386bfe08a8a09019d4f803fb4a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,7 +13,7 @@ include: - project: 'osdu/platform/ci-cd-pipelines' ref: 'master' - file: 'scanners/fossa.yml' + file: 'scanners/fossa-maven.yml' - project: 'osdu/platform/ci-cd-pipelines' ref: 'master' diff --git a/pom.xml b/pom.xml index 9c38fb39e3c723b07d20708fe7b34d2a686fb5e4..530de7609e82f1f9e0f0c566a58829749fd9529c 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ org.opengroup.osdu core-lib-azure jar - 0.0.61 + 0.0.62 core-lib-azure diff --git a/src/main/java/org/opengroup/osdu/azure/partition/PartitionInfoAzure.java b/src/main/java/org/opengroup/osdu/azure/partition/PartitionInfoAzure.java index 41656268cada6addef5612ce6c005d01e591b16d..41ee22569a7ff6ab836597898e5e0691689765bb 100644 --- a/src/main/java/org/opengroup/osdu/azure/partition/PartitionInfoAzure.java +++ b/src/main/java/org/opengroup/osdu/azure/partition/PartitionInfoAzure.java @@ -73,6 +73,9 @@ public class PartitionInfoAzure { @SerializedName("encryption-key-identifier") private Property cryptographyEncryptionKeyIdentifierConfig; + @SerializedName("policy-service-enabled") + private Property policyServiceConfig = Property.builder().sensitive(false).build(); + private Property azureSubscriptionIdConfig = Property.builder().value("subscription-id").sensitive(true).build(); private Property servicePrincipalAppIdConfig = Property.builder().value("app-dev-sp-username").sensitive(true).build(); @@ -86,6 +89,13 @@ public class PartitionInfoAzure { return String.valueOf(this.getIdConfig().getValue()); } + /** + * @return policy service config + */ + public String getPolicySvcConfig() { + return String.valueOf(this.getPolicyServiceConfig().getValue()); + } + /** * @return partition name */