Merge branch 'gcp-property-lookup' into 'master'

sensitive property look-up from env variables(GONRG-4404)

See merge request !191

devops/gcp/configmap/templates/notification-configmap.yaml

@@ -12,5 +12,4 @@ data:
   APP_REGISTER: "{{ .Values.data.app_register }}"
   PARTITION_API: "{{ .Values.data.partition_api }}"
   GOOGLE_AUDIENCES: "{{ .Values.data.google_audiences }}"
-  SERVICE_TOKEN_PROVIDER: "{{ .Values.data.token_provider }}"
-  PARTITION_AUTH_ENABLED: "{{ .Values.data.partition_auth_enabled }}"
+  SPRING_PROFILES_ACTIVE: "{{ .Values.data.spring_profiles_active }}"

devops/gcp/configmap/values.yaml

@@ -5,8 +5,7 @@ data:
   app_register: "http://register/api/register/v1"
   partition_api: "http://partition/api/partition/v1/"
   google_audiences: ""
-  token_provider: "GCP"
-  partition_auth_enabled: "true"
+  spring_profiles_active: "gcp"
 conf:
   configmap: "notification-config"
   app_name: "notification"

provider/notification-gcp/docs/anthos/README.md

@@ -18,16 +18,20 @@
 | name | value | description | sensitive? | source |
 | ---  | ---   | ---         | ---        | ---    |
 | `APP_ENTITLEMENTS` | ex `https://entitlements.com/entitlements/v1` | Entitlements API endpoint | no | output of infrastructure deployment |
-| `APP_REGISTER` | ex `https://register.com/api/register/v1` | Storage API endpoint | no | output of infrastructure deployment |
+| `APP_REGISTER` | ex `https://register.com/api/register/v1` | Register API endpoint | no | output of infrastructure deployment |
 | `APP_PROJECT` | ex `opendes` | Google Cloud Project Id | no | output of infrastructure deployment |
 | `PARTITION_API` | ex `http://localhost:8081/api/partition/v1` | Partition service endpoint | no | - |
-| `SERVICE_TOKEN_PROVIDER` | ex `GCP` or `OPENID` | Service token provider | no | - |
 
 **System Environment required to run service**
 
 | name | value | description | sensitive? | source |
 | ---  | ---   | ---         | ---        | ---    |
 | `SPRING_PROFILES_ACTIVE` | `anthos` | spring active profile | no |
+| `OPENID_PROVIDER_CLIENT_ID` | `*****` |  Client id that represents this service and serves to request tokens, example `workload-identity-legal` |yes| - |
+| `OPENID_PROVIDER_CLIENT_SECRET` | `*****` | This client secret that serves to request tokens| yes | - |
+| `OPENID_PROVIDER_URL` | `https://keycloack.com/auth/realms/master` | URL of OpenID Connect provider, it will be used as `<OpenID URL> + /.well-known/openid-configuration` to auto configure endpoint for token request  | no | - |
+| `<AMQP_PASSWORD_ENV_VARIABLE_NAME>` | ex `AMQP_PASS_OSDU` | Amqp password env name, name of that variable not defined at the service level, the name will be received through partition service. Each tenant can have it's own ENV name value, and it must be present in ENV of Notification service | yes | - |
+| `<AMQP_ADMIN_PASSWORD_ENV_VARIABLE_NAME>` | ex `AMQP_ADMIN_PASS_OSDU` | Amqp admin password env name, name of that variable not defined at the service level, the name will be received through partition service. Each tenant can have it's own ENV name value, and it must be present in ENV of Notification service | yes | - |
 
 ### For Mappers to activate drivers
 
@@ -100,7 +104,7 @@ curl -L -X PATCH 'https://dev.osdu.club/api/partition/v1/partitions/opendes' -H
     },
     "oqm.rabbitmq.amqp.password": {
       "sensitive": true,
-      "value": "guest"
+      "value": "<AMQP_PASSWORD_ENV_VARIABLE_NAME>" <- (Not actual value, just name of env variable)
     },
 
      "oqm.rabbitmq.admin.schema": {
@@ -125,7 +129,7 @@ curl -L -X PATCH 'https://dev.osdu.club/api/partition/v1/partitions/opendes' -H
     },
     "oqm.rabbitmq.admin.password": {
       "sensitive": true,
-      "value": "guest"
+      "value": "<AMQP_ADMIN_PASSWORD_ENV_VARIABLE_NAME>" <- (Not actual value, just name of env variable)
     }
   }
 }'

provider/notification-gcp/pom.xml

@@ -44,7 +44,7 @@
         <dependency>
             <groupId>org.opengroup.osdu</groupId>
             <artifactId>core-lib-gcp</artifactId>
-            <version>0.14.0-rc1</version>
+            <version>0.14.0-rc2</version>
         </dependency>
 
         <dependency>