From 3f81c3f1c94986a1b6f74057b8edf9a122a5cac1 Mon Sep 17 00:00:00 2001
From: Alok Joshi <ajoshi19@slb.com>
Date: Mon, 18 Jan 2021 15:10:51 -0600
Subject: [PATCH 1/4] policy service feature flag

---
 pom.xml                                                        | 2 +-
 .../org/opengroup/osdu/azure/partition/PartitionInfoAzure.java | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 25b82ade..a1d78b2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
   <groupId>org.opengroup.osdu</groupId>
   <artifactId>core-lib-azure</artifactId>
   <packaging>jar</packaging>
-  <version>0.0.60</version>
+  <version>0.0.61</version>
   <name>core-lib-azure</name>
 
   <properties>
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 41656268..f3124533 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();
-- 
GitLab


From 7b371b46413f4cea4230ec5e22beeff92d883b4a Mon Sep 17 00:00:00 2001
From: Alok Joshi <AJoshi19@slb.com>
Date: Thu, 21 Jan 2021 12:27:45 -0600
Subject: [PATCH 2/4] pull master, fix fossa scan

---
 .gitlab-ci.yml | 2 +-
 pom.xml        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4f02b1c0..d80dd024 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 9c38fb39..530de760 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
   <groupId>org.opengroup.osdu</groupId>
   <artifactId>core-lib-azure</artifactId>
   <packaging>jar</packaging>
-  <version>0.0.61</version>
+  <version>0.0.62</version>
   <name>core-lib-azure</name>
 
   <properties>
-- 
GitLab


From 69a5e03cac175025c79555f459e59b844f5d9359 Mon Sep 17 00:00:00 2001
From: Alok Joshi <AJoshi19@slb.com>
Date: Thu, 21 Jan 2021 12:45:31 -0600
Subject: [PATCH 3/4] add get func for policy config

---
 .../opengroup/osdu/azure/partition/PartitionInfoAzure.java   | 5 +++++
 1 file changed, 5 insertions(+)

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 f3124533..26b27d34 100644
--- a/src/main/java/org/opengroup/osdu/azure/partition/PartitionInfoAzure.java
+++ b/src/main/java/org/opengroup/osdu/azure/partition/PartitionInfoAzure.java
@@ -89,6 +89,11 @@ 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
      */
-- 
GitLab


From cea0a9ad3dcfd87dd7bfe65eddcdb49fca800915 Mon Sep 17 00:00:00 2001
From: Alok Joshi <AJoshi19@slb.com>
Date: Thu, 21 Jan 2021 14:54:14 -0600
Subject: [PATCH 4/4] fix missing line break

---
 .../opengroup/osdu/azure/partition/PartitionInfoAzure.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 26b27d34..41ee2256 100644
--- a/src/main/java/org/opengroup/osdu/azure/partition/PartitionInfoAzure.java
+++ b/src/main/java/org/opengroup/osdu/azure/partition/PartitionInfoAzure.java
@@ -92,7 +92,9 @@ public class PartitionInfoAzure {
     /**
      * @return policy service config
      */
-    public String getPolicySvcConfig() { return String.valueOf(this.getPolicyServiceConfig().getValue()); }
+    public String getPolicySvcConfig() {
+        return String.valueOf(this.getPolicyServiceConfig().getValue());
+    }
 
     /**
      * @return partition name
-- 
GitLab