Merge branch 'master' into master-dev-merge

5adc4136 · Morris Estepa · d1e22813 · ccf3808b · 5adc4136 · 5adc4136
Commit 5adc4136 authored 2 years ago by Morris Estepa
--- a/.fossa.yml
+++ b/.fossa.yml
@@ -32,7 +32,3 @@ analyze:
    type: mvn
    target: provider/partition-gcp/pom.xml
    path: .
-  - name: partition-reference
-    type: mvn
-    target: provider/partition-reference/pom.xml
-    path: .
--- a/NOTICE
+++ b/NOTICE
@@ -368,10 +368,12 @@ The following software have components provided under the terms of this license:
 - Cloud Key Management Service (KMS) API (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-cloudkms)
 - Cloud Key Management Service (KMS) API v1-rev20220407-1.32.1 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-cloudkms)
 - Cloud Key Management Service (KMS) API v1-rev20220617-1.32.1 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-cloudkms)
+- Cloud Key Management Service (KMS) API v1-rev20220701-1.32.1 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-cloudkms)
 - Cloud Storage JSON API (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage)
 - Cloud Storage JSON API v1-rev20220604-1.32.1 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage)
 - Cloud Storage JSON API v1-rev20220608-1.32.1 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage)
 - Cloud Storage JSON API v1-rev20220705-1.32.1 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage)
+- Cloud Storage JSON API v1-rev20220705-2.0.0 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage)
 - CloudWatch Metrics for AWS Java SDK (from https://aws.amazon.com/sdkforjava)
 - Cobertura (from http://cobertura.sourceforge.net)
 - Cobertura Limited Runtime (from http://cobertura.sourceforge.net)
@@ -1195,8 +1197,6 @@ The following software have components provided under the terms of this license:
 ========================================================================
 unknown
 ========================================================================
-The following software have components provided under the terms of this license:
-
 - Bouncy Castle Provider (from http://www.bouncycastle.org/java.html, https://www.bouncycastle.org/java.html)
 - Byte Buddy (without dependencies) (from https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy)
 - Checker Qual (from https://checkerframework.org)

--- a/devops/gcp/deploy/templates/authorization-policy.yml
+++ b/devops/gcp/deploy/templates/authorization-policy.yml
@@ -68,11 +68,15 @@ spec:
    when:
    - key: request.auth.claims[iss]
      values:
-      - "https://keycloak.{{ .Values.conf.domain }}/auth/realms/{{ .Values.auth.realm }}"
-      - "http://keycloak.{{ .Values.conf.domain }}/auth/realms/{{ .Values.auth.realm }}"
-      - "http://keycloak.{{ .Release.Namespace }}.svc.cluster.local/auth/realms/{{ .Values.auth.realm }}"
+      - "https://keycloak.{{ .Values.conf.domain }}/realms/{{ .Values.auth.realm }}"
+      - "http://keycloak.{{ .Values.conf.domain }}/realms/{{ .Values.auth.realm }}"
+      - "http://keycloak.{{ .Release.Namespace }}.svc.cluster.local/realms/{{ .Values.auth.realm }}"
    - key: request.auth.claims[email]
      values:
      - "integration-tester@service.local"
+      - "storage@service.local"
+      - "datafier@service.local"
+      - "register@service.local"
+      - "notification@service.local"
  {{- end }}
 {{- end }}
--- a/devops/gcp/deploy/templates/request-authentication.yml
+++ b/devops/gcp/deploy/templates/request-authentication.yml
@@ -9,13 +9,13 @@ spec:
    matchLabels:
      app: "{{ .Values.conf.appName }}"
  jwtRules:
-  - issuer: "https://keycloak.{{ .Values.conf.domain }}/auth/realms/{{ .Values.auth.realm }}"
-    jwksUri: "http://keycloak.{{ .Release.Namespace }}.svc.cluster.local/auth/realms/{{ .Values.auth.realm }}/protocol/openid-connect/certs"
+  - issuer: "https://keycloak.{{ .Values.conf.domain }}/realms/{{ .Values.auth.realm }}"
+    jwksUri: "http://keycloak.{{ .Release.Namespace }}.svc.cluster.local/realms/{{ .Values.auth.realm }}/protocol/openid-connect/certs"
    forwardOriginalToken: true
-  - issuer: "http://keycloak.{{ .Values.conf.domain }}/auth/realms/{{ .Values.auth.realm }}"
-    jwksUri: "http://keycloak.{{ .Release.Namespace }}.svc.cluster.local/auth/realms/{{ .Values.auth.realm }}/protocol/openid-connect/certs"
+  - issuer: "http://keycloak.{{ .Values.conf.domain }}/realms/{{ .Values.auth.realm }}"
+    jwksUri: "http://keycloak.{{ .Release.Namespace }}.svc.cluster.local/realms/{{ .Values.auth.realm }}/protocol/openid-connect/certs"
    forwardOriginalToken: true
-  - issuer: "http://keycloak.{{ .Release.Namespace }}.svc.cluster.local/auth/realms/{{ .Values.auth.realm }}"
-    jwksUri: "http://keycloak.{{ .Release.Namespace }}.svc.cluster.local/auth/realms/{{ .Values.auth.realm }}/protocol/openid-connect/certs"
+  - issuer: "http://keycloak.{{ .Release.Namespace }}.svc.cluster.local/realms/{{ .Values.auth.realm }}"
+    jwksUri: "http://keycloak.{{ .Release.Namespace }}.svc.cluster.local/realms/{{ .Values.auth.realm }}/protocol/openid-connect/certs"
    forwardOriginalToken: true
 {{- end }}
--- a/partition-core/pom.xml
+++ b/partition-core/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.opengroup.osdu</groupId>
 		<artifactId>partition</artifactId>
-		<version>0.16.0-SNAPSHOT</version>
+		<version>0.17.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>


--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.opengroup.osdu</groupId>
  <artifactId>partition</artifactId>
-  <version>0.16.0-SNAPSHOT</version>
+  <version>0.17.0-SNAPSHOT</version>
  <description>Partition Service</description>

  <properties>

--- a/provider/partition-aws/pom.xml
+++ b/provider/partition-aws/pom.xml
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>partition</artifactId>
        <groupId>org.opengroup.osdu</groupId>
-        <version>0.16.0-SNAPSHOT</version>
+        <version>0.17.0-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>


--- a/provider/partition-azure/pom.xml
+++ b/provider/partition-azure/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>partition</artifactId>
    <groupId>org.opengroup.osdu</groupId>
-    <version>0.16.0-SNAPSHOT</version>
+    <version>0.17.0-SNAPSHOT</version>
    <relativePath>../../pom.xml</relativePath>
  </parent>


--- a/provider/partition-gcp/pom.xml
+++ b/provider/partition-gcp/pom.xml
@@ -5,7 +5,7 @@
  <parent>
    <artifactId>partition</artifactId>
    <groupId>org.opengroup.osdu</groupId>
-    <version>0.16.0-SNAPSHOT</version>
+    <version>0.17.0-SNAPSHOT</version>
    <relativePath>../../pom.xml</relativePath>
  </parent>


--- a/provider/partition-ibm/pom.xml
+++ b/provider/partition-ibm/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <artifactId>partition</artifactId>
        <groupId>org.opengroup.osdu</groupId>
-        <version>0.16.0-SNAPSHOT</version>
+        <version>0.17.0-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>


--- a/testing/partition-test-anthos/pom.xml
+++ b/testing/partition-test-anthos/pom.xml
@@ -16,21 +16,19 @@
  ~ limitations under the License.
  -->

-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>

    <parent>
        <groupId>org.opengroup.osdu</groupId>
        <artifactId>os-partition-testing</artifactId>
-        <version>0.16.0-SNAPSHOT</version>
+        <version>0.17.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <groupId>org.opengroup.osdu.partition</groupId>
    <artifactId>partition-test-anthos</artifactId>
-    <version>0.16.0-SNAPSHOT</version>
+    <version>0.17.0-SNAPSHOT</version>
    <packaging>jar</packaging>

    <properties>
@@ -41,7 +39,7 @@
        <dependency>
            <groupId>org.opengroup.osdu.partition</groupId>
            <artifactId>partition-test-core</artifactId>
-            <version>0.16.0-SNAPSHOT</version>
+            <version>0.17.0-SNAPSHOT</version>
        </dependency>
        <dependency>
            <groupId>com.nimbusds</groupId>

--- a/testing/partition-test-aws/pom.xml
+++ b/testing/partition-test-aws/pom.xml
@@ -19,14 +19,14 @@
    <parent>
        <groupId>org.opengroup.osdu</groupId>
        <artifactId>os-partition-testing</artifactId>
-        <version>0.16.0-SNAPSHOT</version>
+        <version>0.17.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <groupId>org.opengroup.osdu.partition</groupId>
    <artifactId>partition-test-aws</artifactId>
-    <version>0.16.0-SNAPSHOT</version>
+    <version>0.17.0-SNAPSHOT</version>
    <packaging>jar</packaging>

    <properties>
@@ -65,7 +65,7 @@
        <dependency>
            <groupId>org.opengroup.osdu.partition</groupId>
            <artifactId>partition-test-core</artifactId>
-            <version>0.16.0-SNAPSHOT</version>
+            <version>0.17.0-SNAPSHOT</version>
        </dependency>

        <dependency>

--- a/testing/partition-test-azure/pom.xml
+++ b/testing/partition-test-azure/pom.xml
@@ -20,13 +20,13 @@
    <parent>
        <groupId>org.opengroup.osdu</groupId>
        <artifactId>os-partition-testing</artifactId>
-        <version>0.16.0-SNAPSHOT</version>
+        <version>0.17.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <groupId>org.opengroup.osdu.partition</groupId>
    <artifactId>partition-test-azure</artifactId>
-    <version>0.16.0-SNAPSHOT</version>
+    <version>0.17.0-SNAPSHOT</version>
    <packaging>jar</packaging>

    <properties>
@@ -65,7 +65,7 @@
        <dependency>
            <groupId>org.opengroup.osdu.partition</groupId>
            <artifactId>partition-test-core</artifactId>
-            <version>0.16.0-SNAPSHOT</version>
+            <version>0.17.0-SNAPSHOT</version>
        </dependency>

        <dependency>

--- a/testing/partition-test-core/pom.xml
+++ b/testing/partition-test-core/pom.xml
@@ -20,13 +20,13 @@
 	<parent>
 		<groupId>org.opengroup.osdu</groupId>
 		<artifactId>os-partition-testing</artifactId>
-		<version>0.16.0-SNAPSHOT</version>
+		<version>0.17.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>

 	<groupId>org.opengroup.osdu.partition</groupId>
 	<artifactId>partition-test-core</artifactId>
-	<version>0.16.0-SNAPSHOT</version>
+	<version>0.17.0-SNAPSHOT</version>
 	<packaging>jar</packaging>

 	<properties>

--- a/testing/partition-test-gcp/pom.xml
+++ b/testing/partition-test-gcp/pom.xml
@@ -6,13 +6,13 @@
  <parent>
    <groupId>org.opengroup.osdu</groupId>
    <artifactId>os-partition-testing</artifactId>
-    <version>0.16.0-SNAPSHOT</version>
+    <version>0.17.0-SNAPSHOT</version>
    <relativePath>../pom.xml</relativePath>
  </parent>

  <groupId>org.opengroup.osdu.partition</groupId>
  <artifactId>partition-test-gcp</artifactId>
-  <version>0.16.0-SNAPSHOT</version>
+  <version>0.17.0-SNAPSHOT</version>
  <packaging>jar</packaging>

  <properties>
@@ -57,7 +57,7 @@
    <dependency>
      <groupId>org.opengroup.osdu.partition</groupId>
      <artifactId>partition-test-core</artifactId>
-      <version>0.16.0-SNAPSHOT</version>
+      <version>0.17.0-SNAPSHOT</version>
    </dependency>

    <dependency>

--- a/testing/partition-test-ibm/pom.xml
+++ b/testing/partition-test-ibm/pom.xml
@@ -6,13 +6,13 @@
    <parent>
        <groupId>org.opengroup.osdu</groupId>
        <artifactId>os-partition-testing</artifactId>
-        <version>0.16.0-SNAPSHOT</version>
+        <version>0.17.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <groupId>org.opengroup.osdu.partition</groupId>
    <artifactId>partition-test-ibm</artifactId>
-    <version>0.16.0-SNAPSHOT</version>
+    <version>0.17.0-SNAPSHOT</version>
    <packaging>jar</packaging>

    <properties>
@@ -58,7 +58,7 @@
        <dependency>
            <groupId>org.opengroup.osdu.partition</groupId>
            <artifactId>partition-test-core</artifactId>
-            <version>0.16.0-SNAPSHOT</version>
+            <version>0.17.0-SNAPSHOT</version>
        </dependency>

        <dependency>

--- a/testing/pom.xml
+++ b/testing/pom.xml
@@ -18,7 +18,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.opengroup.osdu</groupId>
 	<artifactId>os-partition-testing</artifactId>
-	<version>0.16.0-SNAPSHOT</version>
+	<version>0.17.0-SNAPSHOT</version>
 	<description>Root partition test project</description>
 	<packaging>pom</packaging>