diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8ab6bb2500323882ad35a60ac75a5207b67298ba..102961cb5e838a88e9f1e0cd852d021c524b78ca 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,9 +4,17 @@ variables:
OSDU_GCP_HELM_DEPLOYMENT_DIR: "devops/gcp/deploy"
OSDU_GCP_HELM_CONFIG_DIR: "devops/gcp/configmap"
OSDU_GCP_HELM_NAMESPACE: "default"
- OSDU_GCP_HELM_CONFIG_SERVICE_VARS: " --set data.log_level=$OSDU_GCP_LOG_LEVEL --set data.google_audiences=$GOOGLE_AUDIENCE --set data.app_register=$OSDU_GCP_REGISTER_API"
- OSDU_GCP_HELM_CONFIG_SERVICE_VARS_DEV2: " --set data.log_level=$OSDU_GCP_LOG_LEVEL --set data.google_audiences=$GOOGLE_AUDIENCE --set data.app_register=$OSDU_GCP_REGISTER_API"
- OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp:$CI_COMMIT_SHORT_SHA --set data.serviceAccountName=$OSDU_GCP_SERVICE-k8s"
+ OSDU_GCP_HELM_CONFIG_SERVICE_VARS: >
+ --set data.log_level=$OSDU_GCP_LOG_LEVEL
+ --set data.google_audiences=$GOOGLE_AUDIENCE
+ --set data.app_register=$OSDU_GCP_REGISTER_API
+ OSDU_GCP_HELM_CONFIG_SERVICE_VARS_DEV2: >
+ --set data.log_level=$OSDU_GCP_LOG_LEVEL
+ --set data.google_audiences=$GOOGLE_AUDIENCE
+ --set data.app_register=$OSDU_GCP_REGISTER_API
+ OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS: >
+ --set data.image=$CI_REGISTRY_IMAGE/osdu-gcp-$OSDU_GCP_SERVICE:$CI_COMMIT_SHORT_SHA
+ --set data.serviceAccountName=$OSDU_GCP_SERVICE-k8s
OSDU_GCP_HELM_CONFIG_SERVICE: "notification-config"
OSDU_GCP_HELM_DEPLOYMENT_SERVICE: "notification-deploy"
OSDU_GCP_HELM_PACKAGE_CHARTS: "devops/gcp/deploy devops/gcp/configmap"
@@ -29,23 +37,18 @@ variables:
include:
- project: "osdu/platform/ci-cd-pipelines"
- ref: "master"
file: "standard-setup.yml"
- project: "osdu/platform/ci-cd-pipelines"
- ref: "master"
file: "build/maven.yml"
- project: "osdu/platform/ci-cd-pipelines"
- ref: "master"
file: "scanners/fossa-maven.yml"
- project: "osdu/platform/ci-cd-pipelines"
- ref: "master"
file: "scanners/gitlab-ultimate.yml"
- project: "osdu/platform/ci-cd-pipelines"
- ref: "master"
file: "cloud-providers/azure.yml"
- project: "osdu/platform/ci-cd-pipelines"
diff --git a/devops/gcp/deploy/templates/virtual-service.yaml b/devops/gcp/deploy/templates/virtual-service.yaml
index ba166b2c2e6511f89b1bd16d296944a32d656f24..176fa89b85c5c0f92d9fd1af6545c0b6025d9853 100644
--- a/devops/gcp/deploy/templates/virtual-service.yaml
+++ b/devops/gcp/deploy/templates/virtual-service.yaml
@@ -5,7 +5,11 @@ metadata:
namespace: "{{ .Release.Namespace }}"
spec:
hosts:
+ {{- if .Values.conf.domain }}
+ - {{ printf "osdu.%s" .Values.conf.domain | quote }}
+ {{- else }}
- "*"
+ {{- end }}
gateways:
- service-gateway
http:
diff --git a/devops/gcp/deploy/values.yaml b/devops/gcp/deploy/values.yaml
index 08f3d3731e71523f01819853188e409057aef6bd..93d88da235754c905068c713d46778c18f386ce6 100644
--- a/devops/gcp/deploy/values.yaml
+++ b/devops/gcp/deploy/values.yaml
@@ -13,3 +13,4 @@ conf:
rabbitmq_secret_name: "rabbitmq-secret"
openid_secret_name: "notification-keycloak-secret"
on_prem_enabled: false
+ domain: ""
diff --git a/docs/tutorial/DataNotification.md b/docs/tutorial/DataNotification.md
index 27183f0f99a769c45d7b89c94b440e793629772e..132d9f2c1fd6d9f4b442e3c9eec6196f07517f7b 100644
--- a/docs/tutorial/DataNotification.md
+++ b/docs/tutorial/DataNotification.md
@@ -53,38 +53,82 @@ A sample output is shown below. Please note the "name" of the topic. This is req
```
[
- {
- "name": "records-changed",
- "description": "This notification is sent whenever a record is created, updated or deleted.",
- "state": "ACTIVE",
- "example": [
- {
- "id": "common:abc:123",
- "kind": "common:petrel:regularheightfieldsurface:1.0.0",
- "op": "create"
- },
- {
- "id": "common:abc:123",
- "kind": "common:petrel:regularheightfieldsurface:1.0.1",
- "op": "update",
- "previousVersionKind": "common:petrel:regularheightfieldsurface:1.0.0"
- },
- {
- "id": "common:abc:123",
- "kind": "common:petrel:regularheightfieldsurface:1.0.0",
- "op": "delete",
- "deletionType": "soft"
- },
- {
- "id": "common:abc:1234",
- "kind": "common:petrel:regularheightfieldsurface:1.0.0",
- "op": "delete",
- "deletionType": "hard"
- }
- ...
- ]
- },
- ...
+ {
+ "name": "recordstopic",
+ "description": "This notification is sent whenever a new record or record version is created, updated or deleted in storage. 'previousVersionKind' is noted upon 'kind' update. Record deletion is noted as a soft 'deletionType'. Record purge is noted as a hard 'deletionType'.",
+ "state": "ACTIVE",
+ "example": [
+ {
+ "id": "osdu:abc:123",
+ "kind": "osdu:petrel:regularheightfieldsurface:1.0.0",
+ "op": "create"
+ },
+ {
+ "id": "osdu:abc:345",
+ "kind": "osdu:petrel:regularheightfieldsurface:1.0.1",
+ "op": "update",
+ "previousVersionKind": "osdu:petrel:regularheightfieldsurface:1.0.0"
+ },
+ {
+ "id": "osdu:abc:567",
+ "kind": "osdu:petrel:regularheightfieldsurface:1.0.0",
+ "op": "delete",
+ "deletionType": "soft"
+ },
+ {
+ "id": "osdu:abc:789",
+ "kind": "osdu:petrel:regularheightfieldsurface:1.0.0",
+ "op": "delete",
+ "deletionType": "hard"
+ }
+ ]
+ },
+ {
+ "name": "schemachangedtopic",
+ "description": "This notification is sent whenever a new schema is created or updated via schema-service.",
+ "state": "ACTIVE",
+ "example": [
+ {
+ "kind": "osdu:wks:wellbore:1.0.0",
+ "op": "update"
+ },
+ {
+ "kind": "osdu:wks:wellbore:2.0.0",
+ "op": "create"
+ }
+ ]
+ },
+ {
+ "name": "statuschangedtopic",
+ "description": "Every Service/Stage would publish their respective status changed information in this topic.",
+ "state": "ACTIVE",
+ "example": [
+ {
+ "kind": "status",
+ "properties": {
+ "correlationId": "12345",
+ "recordId": "osdu:file:3479d828-a47d-4e13-a1f8-9791a19e1a7e",
+ "recordIdVersion": "1610537924768407",
+ "stage": "STORAGE_SYNC",
+ "status": "FAILED",
+ "message": "acl is not valid",
+ "errorCode ": 400,
+ "timestamp ": 1622118996000
+ }
+ },
+ {
+ "kind": "dataSetDetails",
+ "properties": {
+ "correlationId": "12345",
+ "dataSetId": "12345",
+ "dataSetIdVersion": "1",
+ "dataSetType": "FILE",
+ "recordCount": 10,
+ "timestamp ": 1622118996000
+ }
+ }
+ ]
+ }
]
```
@@ -657,6 +701,5 @@ properties:
## Current Limitations <a name="limitation"></a>
- There is no filtering applied on messages (such as based on the kind etc.) at the moment in OSDU. All the messages will be pushed to consumers.
-- Updates to existing records are notified as `create` event with attribute `recordUpdated` set to true.
[Back to Table of Contents](#TOC)
diff --git a/provider/notification-azure/pom.xml b/provider/notification-azure/pom.xml
index 47d508aa2cc4f7d8cd7a3549a3daa7bf3d5c8fd8..38d6ced74dc248da1b9378dcc90c00db18e71397 100644
--- a/provider/notification-azure/pom.xml
+++ b/provider/notification-azure/pom.xml
@@ -39,7 +39,7 @@
<springframework.version>4.3.0.RELEASE</springframework.version>
<reactor.netty.version>0.11.0.RELEASE</reactor.netty.version>
<reactor.core.version>3.3.0.RELEASE</reactor.core.version>
- <osdu.corelibazure.version>0.14.0</osdu.corelibazure.version>
+ <osdu.corelibazure.version>0.15.0-rc6</osdu.corelibazure.version>
<osdu.oscorecommon.version>0.14.0</osdu.oscorecommon.version>
<junit.version>5.6.0</junit.version>
<jjwt.version>3.8.1</jjwt.version>
diff --git a/provider/notification-ibm/pom.xml b/provider/notification-ibm/pom.xml
index 75960c13676b712f12e5dfab8c3a10f06522cd74..3f8ba4710215a362e42a52cd5c69a2d01054a9ff 100644
--- a/provider/notification-ibm/pom.xml
+++ b/provider/notification-ibm/pom.xml
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-lib-ibm</artifactId>
- <version>0.14.0</version>
+ <version>0.15.0-rc2</version>
<exclusions>
<exclusion>
<groupId>org.apache.lucene</groupId>