diff --git a/devops/core-plus/bootstrap/data_core.sh b/devops/core-plus/bootstrap/data_core.sh
index 1f5a96a28e5f8c770aea526c89939b7380539034..3a88303c57891f288001e33813ed57e3838d77b1 100644
--- a/devops/core-plus/bootstrap/data_core.sh
+++ b/devops/core-plus/bootstrap/data_core.sh
@@ -131,10 +131,6 @@ core_partition_data() {
"sensitive": true,
"value": "ELASTIC_PASS${PARTITION_SUFFIX}"
},
- "index-augmenter-enabled": {
- "sensitive": false,
- "value": "${INDEXER_AUGMENTER_ENABLED}"
- },
"entitlements.datasource.url": {
"sensitive": true,
"value": "ENT_PG_URL${PARTITION_SUFFIX}"
@@ -171,6 +167,10 @@ core_partition_data() {
"sensitive": false,
"value": "secret-admin"
},
+ "index-augmenter-enabled": {
+ "sensitive": false,
+ "value": "${INDEXER_AUGMENTER_ENABLED}"
+ },
"featureFlag.eds.enabled": {
"sensitive": false,
"value": "${EDS_ENABLED}"
@@ -183,6 +183,26 @@ core_partition_data() {
"sensitive": false,
"value": "${POLICY_SERVICE_ENABLED}"
},
+ "featureFlag.autocomplete.enabled": {
+ "sensitive": false,
+ "value": "${AUTOCOMPLETE_ENABLED}"
+ },
+ "featureFlag.asIngestedCoordinates.enabled": {
+ "sensitive": false,
+ "value": "${AS_INGESTED_COORDINATES_ENABLED}"
+ },
+ "featureFlag.keywordLower.enabled": {
+ "sensitive": false,
+ "value": "${KEYWORD_LOWER_ENABLED}"
+ },
+ "featureFlag.bagOfWords.enabled": {
+ "sensitive": false,
+ "value": "${BAG_OF_WORDS_ENABLED}"
+ },
+ "featureFlag.xCollaboration.enabled": {
+ "sensitive": false,
+ "value": "${X_COLLABORATION_ENABLED}"
+ },
"featureFlag.autocomplete.enabled": {
"sensitive": false,
"value": "${AUTOCOMPLETE_ENABLED}"
diff --git a/devops/core-plus/deploy/templates/configmap-bootstrap.yaml b/devops/core-plus/deploy/templates/configmap-bootstrap.yaml
index 1fbdafcebe87039d90090d28ec8bd6ae84b79867..63f9ca8f119b601064a4f70ccc0f9233cb9a1fae 100644
--- a/devops/core-plus/deploy/templates/configmap-bootstrap.yaml
+++ b/devops/core-plus/deploy/templates/configmap-bootstrap.yaml
@@ -7,7 +7,6 @@ metadata:
namespace: "{{ .Release.Namespace }}"
data:
PARTITION_HOST: "partition"
- INDEXER_AUGMENTER_ENABLED: {{ .Values.data.indexerAugmenterEnabled | quote }}
PARTITION_SUFFIX: {{ .Values.data.partitionSuffix | quote }}
DATA_PARTITION_ID: {{ .Values.global.dataPartitionId | quote }}
ENVIRONMENT: "anthos"
@@ -22,3 +21,11 @@ data:
MINIO_EXTERNAL_ENDPOINT: {{ default (printf "http://s3.%s" .Values.global.domain) .Values.data.minioExternalEndpoint | quote }}
{{- end }}
MINIO_IGNORE_CERT_CHECK: {{ .Values.data.minioIgnoreCertCheck | quote }}
+ AS_INGESTED_COORDINATES_ENABLED: {{ .Values.data.asIngestedCoordinatesEnabled | quote }}
+ KEYWORD_LOWER_ENABLED: {{ .Values.data.keywordLowerEnabled | quote }}
+ BAG_OF_WORDS_ENABLED: {{ .Values.data.bagOfWordsEnabled | quote }}
+ X_COLLABORATION_ENABLED: {{ .Values.data.xCollaborationEnabled | quote }}
+ AUTOCOMPLETE_ENABLED: {{ .Values.data.autocompleteEnabled | quote }}
+ INDEXER_AUGMENTER_ENABLED: {{ .Values.data.indexerAugmenterEnabled | quote }}
+ EDS_ENABLED: {{ .Values.data.edsEnabled | quote }}
+ POLICY_SERVICE_ENABLED: {{ .Values.data.policyServiceEnabled | quote }}
diff --git a/devops/core-plus/deploy/values.yaml b/devops/core-plus/deploy/values.yaml
index d7af376ee95be38bdaf4d626300ded74083debd6..e17cd6a4690613a27fa915694e0d41053f73b05c 100644
--- a/devops/core-plus/deploy/values.yaml
+++ b/devops/core-plus/deploy/values.yaml
@@ -14,7 +14,6 @@ data:
minioExternalEndpoint: "" # use only if external minio is configured
minioIgnoreCertCheck: "false"
minioUIEndpoint: "http://minio:9001"
- indexerAugmenterEnabled: "false"
requestsCpu: "5m"
requestsMemory: "350Mi"
limitsCpu: "500m"
@@ -23,6 +22,15 @@ data:
imagePullPolicy: "IfNotPresent"
image: ""
bootstrapImage: ""
+ # featureFlags
+ indexerAugmenterEnabled: "false"
+ asIngestedCoordinatesEnabled: "false"
+ keywordLowerEnabled: "false"
+ bagOfWordsEnabled: "false"
+ xCollaborationEnabled: "false"
+ autocompleteEnabled: "false"
+ policyServiceEnabled: "false"
+ edsEnabled: "false"
conf:
appName: "partition"
diff --git a/devops/gc/deploy/templates/configmap-bootstrap.yaml b/devops/gc/deploy/templates/configmap-bootstrap.yaml
index 93e995adcc98e6adea0160ef86d0f129ad56f2b3..c00c9fe845b2385df37f2963e4473d9aafea1678 100644
--- a/devops/gc/deploy/templates/configmap-bootstrap.yaml
+++ b/devops/gc/deploy/templates/configmap-bootstrap.yaml
@@ -16,10 +16,6 @@ metadata:
namespace: "{{ .Release.Namespace }}"
data:
PARTITION_HOST: {{ .Values.data.partitionHost | quote }}
- INDEXER_AUGMENTER_ENABLED: {{ .Values.data.indexerAugmenterEnabled | quote }}
- EDS_ENABLED: {{ .Values.data.edsEnabled | quote }}
- POLICY_SERVICE_ENABLED: {{ .Values.data.policyServiceEnabled | quote }}
- AUTOCOMPLETE_ENABLED: {{ .Values.data.autocompleteEnabled | quote }}
PARTITION_SUFFIX: {{ .Values.data.partitionSuffix | quote }}
DATA_PARTITION_ID: {{ .Values.global.dataPartitionId | quote }}
{{- if .Values.data.dataProjectId }}
@@ -30,3 +26,11 @@ data:
SERVICE_ACCOUNT: {{ printf "%s@%s.iam.gserviceaccount.com" .Values.data.datafierSa .Values.data.projectId | quote }}
DATABASE_ID: "{{ $databaseId }}"
ELASTIC_HTTPS: {{ .Values.data.elasticHttps | quote}}
+ AS_INGESTED_COORDINATES_ENABLED: {{ .Values.data.asIngestedCoordinatesEnabled | quote }}
+ KEYWORD_LOWER_ENABLED: {{ .Values.data.keywordLowerEnabled | quote }}
+ BAG_OF_WORDS_ENABLED: {{ .Values.data.bagOfWordsEnabled | quote }}
+ X_COLLABORATION_ENABLED: {{ .Values.data.xCollaborationEnabled | quote }}
+ INDEXER_AUGMENTER_ENABLED: {{ .Values.data.indexerAugmenterEnabled | quote }}
+ EDS_ENABLED: {{ .Values.data.edsEnabled | quote }}
+ POLICY_SERVICE_ENABLED: {{ .Values.data.policyServiceEnabled | quote }}
+ AUTOCOMPLETE_ENABLED: {{ .Values.data.autocompleteEnabled | quote }}
diff --git a/devops/gc/deploy/values.yaml b/devops/gc/deploy/values.yaml
index 3ec6e8696d8c5a5d788c957bfe19edf1539825ed..55c91e21299e37e9605cce1ccdf5e71373769d9f 100644
--- a/devops/gc/deploy/values.yaml
+++ b/devops/gc/deploy/values.yaml
@@ -16,10 +16,6 @@ data:
partitionNamespace: "partition"
partitionSuffix: "_SYSTEM"
datafierSa: "datafier"
- indexerAugmenterEnabled: "true"
- policyServiceEnabled: "true"
- edsEnabled: "false"
- autocompleteEnabled: "true"
databaseId: ""
elasticHttps: ""
# deployments
@@ -31,6 +27,15 @@ data:
imagePullPolicy: "IfNotPresent"
image: "community.opengroup.org:5555/osdu/platform/system/partition/osdu-gcp-partition:latest"
bootstrapImage: "community.opengroup.org:5555/osdu/platform/system/partition/osdu-gcp-bootstrap-partition:latest"
+ # featureFlags
+ indexerAugmenterEnabled: "true"
+ policyServiceEnabled: "true"
+ edsEnabled: "false"
+ autocompleteEnabled: "true"
+ asIngestedCoordinatesEnabled: "true"
+ keywordLowerEnabled: "true"
+ bagOfWordsEnabled: "true"
+ xCollaborationEnabled: "false"
conf:
appName: "partition"
diff --git a/docs/api/partition_openapi.yaml b/docs/api/partition_openapi.yaml
index 03302532bfc8583a96aefe74c83df913b8fffec2..e6352df44fc28252f311f5a6058591f98f2c701a 100644
--- a/docs/api/partition_openapi.yaml
+++ b/docs/api/partition_openapi.yaml
@@ -1,418 +1,201 @@
openapi: 3.0.1
info:
title: Partition Service
- description: Partition service is responsible for creating and retrieving the partition specific properties (secret and non-secret) on behalf of other services.
+ description: Partition service is responsible for creating and retrieving the partition
+ specific properties (secret and non-secret) on behalf of other services.
contact:
name: OSDU Data Platform Team
email: dps@OSDU.org
license:
name: Apache 2.0
url: https://www.apache.org/licenses/LICENSE-2.0.html
- version: '1.0'
+ version: "1.0"
servers:
- - url: /api/partition/v1
+- url: /api/partition/v1
security:
- - Authorization: []
+- Authorization: []
tags:
- - name: partition-api
- description: Partition API
- - name: health-check-api
- description: Health Check API
- - name: info
- description: Version info endpoint
+- name: health-check-api
+ description: Health Check API
+- name: partition-api
+ description: Partition API
+- name: info
+ description: Version info endpoint
paths:
- /partitions/{partitionId}:
+ /partitions:
get:
tags:
- - partition-api
- summary: Get Partition Info
- description: Get all properties and their values for a given data partition id
- operationId: get
- parameters:
- - name: partitionId
- in: path
- description: Partition Id
- required: true
- schema:
- type: string
+ - partition-api
+ summary: List all Partitions
+ description: Returns all existing data partitions
+ operationId: list
responses:
- '200':
+ "200":
description: OK
content:
application/json:
schema:
- $ref: '#/components/schemas/Map'
- '400':
- description: Bad Request
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/AppError'
- '401':
- description: Unauthorized
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/AppError'
- '403':
- description: User not authorized to perform the action.
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/AppError'
- '404':
+ type: array
+ items:
+ type: string
+ "404":
description: Not Found
content:
application/json:
schema:
- $ref: '#/components/schemas/AppError'
- '500':
- description: Internal Server Error
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/AppError'
- '502':
- description: Bad Gateway
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/AppError'
- '503':
- description: Service Unavailable
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/AppError'
- security:
- - Authorization: []
- post:
- tags:
- - partition-api
- summary: Create a new Partition
- description: Creates a new data partition with all given properties and their values.
- operationId: create
- parameters:
- - name: partitionId
- in: path
- description: Partition Id
- required: true
- schema:
- type: string
- requestBody:
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/PartitionInfo'
- required: true
- responses:
- '201':
- description: Created
- content:
- application/json:
- schema:
- type: string
- '400':
- description: Bad Request
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/AppError'
- '401':
+ $ref: "#/components/schemas/AppError"
+ "401":
description: Unauthorized
content:
application/json:
schema:
- $ref: '#/components/schemas/AppError'
- '403':
- description: User not authorized to perform the action.
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/AppError'
- '404':
- description: Not Found
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/AppError'
- '500':
- description: Internal Server Error
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/AppError'
- '502':
- description: Bad Gateway
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/AppError'
- '503':
- description: Service Unavailable
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/AppError'
- security:
- - Authorization: []
- delete:
- tags:
- - partition-api
- summary: Delete an existing Partition
- description: Delete all the properties of a given data partition
- operationId: delete
- parameters:
- - name: partitionId
- in: path
- description: Partition Id
- required: true
- schema:
- type: string
- responses:
- '204':
- description: No Content
- content:
- application/json:
- schema:
- type: string
- '400':
+ $ref: "#/components/schemas/AppError"
+ "400":
description: Bad Request
content:
application/json:
schema:
- $ref: '#/components/schemas/AppError'
- '401':
- description: Unauthorized
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/AppError'
- '403':
+ $ref: "#/components/schemas/AppError"
+ "403":
description: User not authorized to perform the action.
content:
application/json:
schema:
- $ref: '#/components/schemas/AppError'
- '404':
- description: Not Found
+ $ref: "#/components/schemas/AppError"
+ "502":
+ description: Bad Gateway
content:
application/json:
schema:
- $ref: '#/components/schemas/AppError'
- '500':
+ $ref: "#/components/schemas/AppError"
+ "500":
description: Internal Server Error
content:
application/json:
schema:
- $ref: '#/components/schemas/AppError'
- '502':
- description: Bad Gateway
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/AppError'
- '503':
+ $ref: "#/components/schemas/AppError"
+ "503":
description: Service Unavailable
content:
application/json:
schema:
- $ref: '#/components/schemas/AppError'
+ $ref: "#/components/schemas/AppError"
security:
- - Authorization: []
- patch:
+ - Authorization: []
+ /partitions/{partitionId}:
+ get:
tags:
- - partition-api
- summary: Updates an existing Partition
- description: Add new properties or update existing properties of a given data partition
- operationId: patch
+ - partition-api
+ summary: Get Partition Info
+ description: Get all properties and their values for a given data partition
+ id
+ operationId: get
parameters:
- - name: partitionId
- in: path
- description: Partition Id
- required: true
- schema:
- type: string
- requestBody:
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/PartitionInfo'
+ - name: partitionId
+ in: path
+ description: Partition Id
required: true
+ schema:
+ type: string
responses:
- '204':
- description: No Content
- '400':
- description: Bad Request
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/AppError'
- '401':
- description: Unauthorized
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/AppError'
- '403':
- description: User not authorized to perform the action.
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/AppError'
- '404':
+ "404":
description: Not Found
content:
application/json:
schema:
- $ref: '#/components/schemas/AppError'
- '500':
- description: Internal Server Error
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/AppError'
- '502':
- description: Bad Gateway
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/AppError'
- '503':
- description: Service Unavailable
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/AppError'
- security:
- - Authorization: []
- /partitions:
- get:
- tags:
- - partition-api
- summary: List all Partitions
- description: Returns all existing data partitions
- operationId: list
- responses:
- '200':
- description: OK
+ $ref: "#/components/schemas/AppError"
+ "401":
+ description: Unauthorized
content:
application/json:
schema:
- type: array
- items:
- type: string
- '400':
+ $ref: "#/components/schemas/AppError"
+ "400":
description: Bad Request
content:
application/json:
schema:
- $ref: '#/components/schemas/AppError'
- '401':
- description: Unauthorized
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/AppError'
- '403':
+ $ref: "#/components/schemas/AppError"
+ "403":
description: User not authorized to perform the action.
content:
application/json:
schema:
- $ref: '#/components/schemas/AppError'
- '404':
- description: Not Found
+ $ref: "#/components/schemas/AppError"
+ "502":
+ description: Bad Gateway
content:
application/json:
schema:
- $ref: '#/components/schemas/AppError'
- '500':
+ $ref: "#/components/schemas/AppError"
+ "500":
description: Internal Server Error
content:
application/json:
schema:
- $ref: '#/components/schemas/AppError'
- '502':
- description: Bad Gateway
+ $ref: "#/components/schemas/AppError"
+ "503":
+ description: Service Unavailable
content:
application/json:
schema:
- $ref: '#/components/schemas/AppError'
- '503':
- description: Service Unavailable
+ $ref: "#/components/schemas/AppError"
+ "200":
+ description: OK
content:
application/json:
schema:
- $ref: '#/components/schemas/AppError'
+ $ref: "#/components/schemas/Map"
security:
- - Authorization: []
+ - Authorization: []
/liveness_check:
get:
tags:
- - health-check-api
+ - health-check-api
summary: Liveness Check endpoint
description: For deployment available public `/liveness_check` endpoint.
operationId: livenessCheck
responses:
- '200':
- description: OK
+ "502":
+ description: Bad Gateway
content:
'*/*':
schema:
- type: string
- '502':
- description: Bad Gateway
+ $ref: "#/components/schemas/AppError"
+ "503":
+ description: Service Unavailable
content:
'*/*':
schema:
- $ref: '#/components/schemas/AppError'
- '503':
- description: Service Unavailable
+ $ref: "#/components/schemas/AppError"
+ "200":
+ description: OK
content:
'*/*':
schema:
- $ref: '#/components/schemas/AppError'
+ type: string
/info:
get:
tags:
- - info
+ - info
summary: Version info
- description: For deployment available public `/info` endpoint, which provides build and git related information.
+ description: "For deployment available public `/info` endpoint, which provides\
+ \ build and git related information."
operationId: info
responses:
- '200':
+ "200":
description: Version info.
content:
application/json:
schema:
- $ref: '#/components/schemas/VersionInfo'
+ $ref: "#/components/schemas/VersionInfo"
components:
schemas:
Map:
type: object
properties:
< * >:
- $ref: '#/components/schemas/Property'
- PartitionInfo:
- required:
- - properties
- type: object
- properties:
- properties:
- type: object
- additionalProperties:
- $ref: '#/components/schemas/Property'
- description: Free form key value pair object for any data partition specific values
- description: Partition properties and their values
- example: 'OrderedMap { "properties": OrderedMap { "compliance-ruleset": OrderedMap { "sensitive": false, "value": "shared" }, "elastic-endpoint": OrderedMap { "sensitive": true, "value": "elastic-endpoint" }, "cosmos-connection": OrderedMap { "sensitive": true, "value": "cosmos-connection" } } }'
- Property:
- type: object
- properties:
- sensitive:
- type: boolean
- value:
- type: object
- description: Free form key value pair object for any data partition specific values
+ $ref: "#/components/schemas/Property"
AppError:
type: object
properties:
@@ -450,9 +233,9 @@ components:
connectedOuterServices:
type: array
items:
- $ref: '#/components/schemas/ConnectedOuterService'
+ $ref: "#/components/schemas/ConnectedOuterService"
securitySchemes:
Authorization:
type: http
scheme: bearer
- bearerFormat: Authorization
\ No newline at end of file
+ bearerFormat: Authorization
diff --git a/docs/docs/api.md b/docs/docs/api.md
index f2ccb12b21c9f48dec0021982e7a80d94dc11fc1..4abd9c2142a7f3278223e7227735593f5c098ce1 100644
--- a/docs/docs/api.md
+++ b/docs/docs/api.md
@@ -79,90 +79,6 @@ A sample output is shown below.
</details>
-#### Create a new partition
-This api can be used to create a new partition. A plausible use case would be partition provisioning infrastructure script.
-```
-POST api/partition/v1/partitions/{partitionId}
-```
-<details><summary>Curl Create Partition</summary>
-
-```
-curl --request POST \
- --url 'https://<base_url>/api/partition/v1/partitions/mypartition' \
- --header 'Authorization: Bearer <JWT>' \
- --header 'Content-Type: application/json' \
- --data-raw '{
- "properties": {
- "compliance-ruleset": {
- "value": "shared"
- },
- "elastic-endpoint": {
- "sensitive": true,
- "value": "elastic-endpoint"
- },
- "elastic-username": {
- "sensitive": true,
- "value": "elastic-username"
- },
- "elastic-password": {
- "sensitive": true,
- "value": "elastic-password"
- },
- "cosmos-connection": {
- "sensitive": true,
- "value": "cosmos-connection"
- },
- "cosmos-endpoint": {
- "sensitive": true,
- "value": "cosmos-endpoint"
- }
- }
- }'
-```
-</details>
-
-#### Update an existing partition
-This api is used to update the properties of an existing partition. With this api, we can modify existing properties or add new ones. Deletion of properties can not be achieved, we'll have to delete the partition and re-create it for the same effect.
-```
-PATCH api/partition/v1/partitions/{partitionId}
-```
-<details><summary>Curl Patch Partition</summary>
-
-```
-curl --request PATCH \
- --url 'https://<base_url>/api/partition/v1/partitions/mypartition' \
- --header 'Authorization: Bearer <JWT>' \
- --header 'Content-Type: application/json' \
- --data-raw '{
- "properties": {
- "compliance-ruleset": {
- "value": "shared-update-value"
- },
- "new-key": {
- "sensitive": true,
- "value": "new-value"
- }
- }
- }'
-```
-</details>
-
-#### Delete an existing partition
-This api is used to delete an existing partition. A plausible use case would be partition teardown infrastructure script.
-```
-DELETE api/partition/v1/partitions/{partitionId}
-```
-<details><summary>Curl Delete partition</summary>
-
-```
-curl --request DELETE \
- --url 'https://<base_url>/api/partition/v1/partitions/mypartition' \
- --header 'Authorization: Bearer <JWT>' \
- --header 'Content-Type: application/json'
-```
-</details>
-
-
#### List partitions
Consuming services can use this API to list all partitions Id.
```
@@ -225,4 +141,4 @@ This endpoint takes information from files, generated by `spring-boot-maven-plug
properties:
- `version.info.buildPropertiesPath`
-- `version.info.gitPropertiesPath`
\ No newline at end of file
+- `version.info.gitPropertiesPath`
diff --git a/docs/docs/index.md b/docs/docs/index.md
index e77872e0fc48356ff6c6cf86c46d950fe4d72504..7f495d93a934e1912c2175bae5644f10809eae1d 100644
--- a/docs/docs/index.md
+++ b/docs/docs/index.md
@@ -2,6 +2,6 @@
## Introduction
-Partition service is responsible for creating and retrieving the partition specific properties (secret and non-secret) on behalf of other services.
+Partition service is responsible for retrieving the partition specific properties (secret and non-secret) on behalf of other services.
-It is a Maven multi-module project with each cloud implementation placed in its submodule.
\ No newline at end of file
+It is a Maven multi-module project with each cloud implementation placed in its submodule.
diff --git a/docs/tutorial/gcp/Partition.md b/docs/tutorial/gcp/Partition.md
index 3aa26159acf0fcdae1a96ef04f4c7a4732296f4d..6481e9d21e68380043fc39f508d03ea1606cd701 100644
--- a/docs/tutorial/gcp/Partition.md
+++ b/docs/tutorial/gcp/Partition.md
@@ -92,102 +92,6 @@ A sample output is shown below.
[Back to Table of Contents](#TOC)
-### Create a new partition<a name="create-partition"></a>
-This api can be used to create a new partition. A plausible use case would be partition provisioning infrastructure script.
-The default namespace value of Cloud Datastore is `partition`.
-```
-POST api/partition/v1/partitions/{partitionId}
-```
-<details><summary>curl</summary>
-
-```
-curl --request POST \
- --url 'https://<base_url>/api/partition/v1/partitions/mypartition' \
- --header 'Authorization: Bearer <JWT>' \
- --header 'Content-Type: application/json' \
- --data-raw '{
- "properties": {
- "projectId": {
- "sensitive": false,
- "value": "mypartition"
- },
- "serviceAccount": {
- "sensitive": false,
- "value": ".iam.gserviceaccount.com"
- },
- "complianceRuleSet": {
- "sensitive": false,
- "value": "shared"
- },
- "dataPartitionId": {
- "sensitive": false,
- "value": "mypartition"
- },
- "name": {
- "sensitive": false,
- "value": "mypartition"
- },
- "policy-service-enabled": {
- "sensitive": false,
- "value": "false"
- },
- "bucket": {
- "sensitive": false,
- "value": "bucketName"
- },
- "crmAccountID": {
- "sensitive": false,
- "value": ["mypartition","mypartition"]
- }
- }
- }'
-```
-</details>
-
-[Back to Table of Contents](#TOC)
-
-### Update an existing partition<a name="update-partition"></a>
-This api is used to update the properties of an existing partition. With this api, we can modify existing properties or add new ones. Deletion of properties can not be achieved, we'll have to delete the partition and re-create it for the same effect.
-```
-PATCH api/partition/v1/partitions/{partitionId}
-```
-<details><summary>curl</summary>
-
-```
-curl --request PATCH \
- --url 'https://<base_url>/api/partition/v1/partitions/mypartition' \
- --header 'Authorization: Bearer <JWT>' \
- --header 'Content-Type: application/json' \
- --data-raw '{
- "properties": {
- "bucket": {
- "value": "bucket-update-value"
- },
- "new-key": {
- "sensitive": true,
- "value": "new-value"
- }
- }
- }'
-```
-</details>
-
-### Delete an existing partition<a name="delete-partition"></a>
-This api is used to delete an existing partition. A plausible use case would be partition teardown infrastructure script.
-```
-DELETE api/partition/v1/partitions/{partitionId}
-```
-<details><summary>curl</summary>
-
-```
-curl --request DELETE \
- --url 'https://<base_url>/api/partition/v1/partitions/mypartition' \
- --header 'Authorization: Bearer <JWT>' \
- --header 'Content-Type: application/json'
-```
-</details>
-
-
### List partitions <a name="list-partition"></a>
Consuming services can use this API to list all partitions Id.
```
@@ -217,4 +121,4 @@ A sample output is shown below.
</details>
-[Back to Table of Contents](#TOC)
\ No newline at end of file
+[Back to Table of Contents](#TOC)
diff --git a/partition-core/src/main/java/org/opengroup/osdu/partition/api/PartitionApi.java b/partition-core/src/main/java/org/opengroup/osdu/partition/api/PartitionApi.java
index e980824884651633d9387a72886a1cc6fa9858b9..220df2cfa546fbcdda7451baefa10f9bb9450b57 100644
--- a/partition-core/src/main/java/org/opengroup/osdu/partition/api/PartitionApi.java
+++ b/partition-core/src/main/java/org/opengroup/osdu/partition/api/PartitionApi.java
@@ -14,6 +14,7 @@
package org.opengroup.osdu.partition.api;
+import io.swagger.v3.oas.annotations.Hidden;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.media.ArraySchema;
@@ -40,6 +41,8 @@ import java.util.Map;
@RequestMapping(path = "/partitions", produces = "application/json")
@Tag(name = "partition-api", description = "Partition API")
public interface PartitionApi {
+
+ @Hidden
@Operation(summary = "${partitionApi.create.summary}", description = "${partitionApi.create.description}",
security = {@SecurityRequirement(name = "Authorization")}, tags = { "partition-api" })
@ApiResponses(value = {
@@ -57,6 +60,7 @@ public interface PartitionApi {
ResponseEntity create(@Parameter(description = "Partition Id") @PathVariable("partitionId") String partitionId,
@RequestBody @Valid PartitionInfo partitionInfo);
+ @Hidden
@Operation(summary = "${partitionApi.patch.summary}", description = "${partitionApi.patch.description}",
security = {@SecurityRequirement(name = "Authorization")}, tags = { "partition-api" })
@ApiResponses(value = {
@@ -103,6 +107,8 @@ public interface PartitionApi {
@ApiResponse(responseCode = "502", description = "Bad Gateway", content = {@Content(schema = @Schema(implementation = AppError.class ))}),
@ApiResponse(responseCode = "503", description = "Service Unavailable", content = {@Content(schema = @Schema(implementation = AppError.class ))})
})
+
+ @Hidden
@DeleteMapping("/{partitionId}")
@PreAuthorize("@authorizationFilter.hasPermissions()")
ResponseEntity delete(@Parameter(description = "Partition Id") @PathVariable("partitionId") String partitionId);
diff --git a/provider/partition-aws/build-aws/build-info.py b/provider/partition-aws/build-aws/build-info.py
index 1ea9b54bde9216cd158e4ea43eef41f06b8da1be..33c0f0a73c22cfe2beebc6c3630b9bcb136c5b0c 100644
--- a/provider/partition-aws/build-aws/build-info.py
+++ b/provider/partition-aws/build-aws/build-info.py
@@ -1,16 +1,4 @@
-# Copyright © 2020 Amazon Web Services
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
import boto3
import json
import os
@@ -18,12 +6,11 @@ import argparse
# Create the build-info.json
parser = argparse.ArgumentParser(description="")
-
-# env - CODEBUILD_SOURCE_VERSION
parser.add_argument("--branch", type=str, help="")
-
-# env - CODEBUILD_RESOLVED_SOURCE_VERSION
-parser.add_argument("--commit", type=str, help="")
+parser.add_argument("--commitId", type=str, help="")
+parser.add_argument("--commitMessage", type=str, help="")
+parser.add_argument("--commitAuthor", type=str, help="")
+parser.add_argument("--commitDate", type=str, help="")
# env - CODEBUILD_BUILD_ID
parser.add_argument("--buildid", type=str, help="")
@@ -31,7 +18,6 @@ parser.add_argument("--buildid", type=str, help="")
# env - CODEBUILD_BUILD_NUMBER
parser.add_argument("--buildnumber", type=str, help="")
-# Get from directory name
parser.add_argument("--reponame", type=str, help="")
# env OUTPUT_DIR
@@ -45,7 +31,10 @@ parser.add_argument("--artifact", type=str, action="append", help="")
args = parser.parse_args()
branch = args.branch
-commitId = args.commit
+commitId = args.commitId
+commitMessage = args.commitMessage
+commitAuthor = args.commitAuthor
+commitDate = args.commitDate
buildId = args.buildid
buildNumber = args.buildnumber
repoName = args.reponame
@@ -56,32 +45,20 @@ buildInfoFilePath = os.path.join(".", outputDir, "build-info.json")
print(buildInfoFilePath)
-commitArgs = {
- "repositoryName": repoName,
- "commitId": commitId
-}
-
-commitDetail = {
- "commit": ""
-}
-
-# get the commit detail
-try:
- codecommit = boto3.client("codecommit")
- commitDetail = codecommit.get_commit(**commitArgs)
-except Exception as e:
- print("Getting commit information from codecommit failed")
-
buildInfo = {
"branch": branch,
"build-id": buildId,
"build-number": buildNumber,
"repo": repoName,
"artifacts": artifacts,
- "commit": commitDetail["commit"]
+ "commit-id": commitId,
+ "commit-message": commitMessage,
+ "commit-author": commitAuthor,
+ "commit-date":commitDate
}
-print(json.dumps(buildInfo, sort_keys=True, indent=4))
+
+print(json.dumps(buildInfo, sort_keys=True, indent=4))
# write the build.json file to dist
f = open(buildInfoFilePath, "w")
f.write(json.dumps(buildInfo, sort_keys=True, indent=4))
diff --git a/provider/partition-aws/build-aws/buildspec.yaml b/provider/partition-aws/build-aws/buildspec.yaml
index ff1e478508e4d73ee523b8c228d2ca84d0b604ad..344ed297f7510e677923d78ff2467ca360c6cda2 100644
--- a/provider/partition-aws/build-aws/buildspec.yaml
+++ b/provider/partition-aws/build-aws/buildspec.yaml
@@ -32,8 +32,6 @@ phases:
runtime-versions:
java: corretto17
commands:
- # fix error noted here: https://github.com/yarnpkg/yarn/issues/7866
- - if [ $(echo $CODEBUILD_SOURCE_VERSION | grep -c ^refs/heads.*) -eq 1 ]; then echo "Branch name found"; else echo "This build only supports branch builds" && exit 1; fi
- java -version
- mvn -version
- mkdir -p /root/.m2
@@ -50,10 +48,9 @@ phases:
- docker login -u ${DOCKER_USERNAME} -p ${DOCKER_PASSWORD}
build:
commands:
- - export REPO_NAME=${PWD##*/}
- export OUTPUT_DIR="dist"
- - export BRANCH_NAME=`echo ${CODEBUILD_SOURCE_VERSION} | awk '{gsub("refs/heads/","");gsub("\\.","-");gsub("[[:space:]]","-")}1' | sed 's/\//-/g' | awk '{print tolower($0)}'`
- - export ECR_TAG=`echo build.${BRANCH_NAME}.${CODEBUILD_BUILD_NUMBER}.${CODEBUILD_RESOLVED_SOURCE_VERSION} | cut -c 1-120`
+ - export BRANCH_NAME=`echo ${BRANCH_NAME} | awk '{gsub("refs/heads/","");gsub("\\.","-");gsub("[[:space:]]","-")}1' | sed 's/\//-/g' | awk '{print tolower($0)}'`
+ - export ECR_TAG=`echo build.${BRANCH_NAME}.${CODEBUILD_BUILD_NUMBER}.${COMMIT_ID} | cut -c 1-120`
- export ECR_IMAGE=${ECR_REGISTRY}:${ECR_TAG}
- export ECR_IMAGE_BRANCH_LATEST=${ECR_REGISTRY}:${BRANCH_NAME}
- export INTEGRATION_TEST_OUTPUT=${OUTPUT_DIR}/testing/integration
@@ -81,7 +78,8 @@ phases:
- echo "Generate build-info.json"
- |
- python provider/partition-aws/build-aws/build-info.py --branch ${CODEBUILD_SOURCE_VERSION} --commit ${CODEBUILD_RESOLVED_SOURCE_VERSION} \
+ python provider/partition-aws/build-aws/build-info.py --branch ${BRANCH_NAME} --commitId ${COMMIT_ID} \
+ --commitMessage "\"${COMMIT_MESSAGE}\"" --commitAuthor "\"${COMMIT_AUTHOR}\"" --commitDate "\"${COMMIT_DATE}\"" \
--buildid ${CODEBUILD_BUILD_ID} --buildnumber ${CODEBUILD_BUILD_NUMBER} --reponame ${REPO_NAME} --outdir ${OUTPUT_DIR} \
--artifact ${ECR_IMAGE}
reports:
@@ -94,7 +92,7 @@ artifacts:
files:
- "**/*"
base-directory: "dist"
- name: ${REPO_NAME}_${BRANCH_NAME}_$(date +%F)_${CODEBUILD_BUILD_NUMBER}.zip
+ name: ${BRANCH_NAME}/${PACKAGE_NAME}.zip
cache:
paths:
- "/root/.m2/**/*"
diff --git a/provider/partition-gc/bootstrap/data_gc.sh b/provider/partition-gc/bootstrap/data_gc.sh
index 50fe27f7e826230a6be86f054c1f049246797b25..4597291e6444d9dbdfade76856bfd694ab9d02ef 100644
--- a/provider/partition-gc/bootstrap/data_gc.sh
+++ b/provider/partition-gc/bootstrap/data_gc.sh
@@ -89,6 +89,22 @@ gc_partition_data() {
"sensitive": false,
"value": "${AUTOCOMPLETE_ENABLED}"
},
+ "featureFlag.asIngestedCoordinates.enabled": {
+ "sensitive": false,
+ "value": "${AS_INGESTED_COORDINATES_ENABLED}"
+ },
+ "featureFlag.keywordLower.enabled": {
+ "sensitive": false,
+ "value": "${KEYWORD_LOWER_ENABLED}"
+ },
+ "featureFlag.bagOfWords.enabled": {
+ "sensitive": false,
+ "value": "${BAG_OF_WORDS_ENABLED}"
+ },
+ "featureFlag.xCollaboration.enabled": {
+ "sensitive": false,
+ "value": "${X_COLLABORATION_ENABLED}"
+ },
"sd.ksd.k8s.namespace": {
"sensitive": false,
"value": "secret-admin"
diff --git a/provider/partition-gc/bootstrap/system_gc.sh b/provider/partition-gc/bootstrap/system_gc.sh
index b8ced8836ca004d4e33ab9dc8cef8fa05afe8242..cff386a63062b23840688b1389eaa0b395976308 100644
--- a/provider/partition-gc/bootstrap/system_gc.sh
+++ b/provider/partition-gc/bootstrap/system_gc.sh
@@ -68,6 +68,22 @@ gc_system_partition_data() {
"system.featureFlag.autocomplete.enabled": {
"sensitive": false,
"value": "${AUTOCOMPLETE_ENABLED}"
+ },
+ "system.featureFlag.asIngestedCoordinates.enabled": {
+ "sensitive": false,
+ "value": "${AS_INGESTED_COORDINATES_ENABLED}"
+ },
+ "system.featureFlag.keywordLower.enabled": {
+ "sensitive": false,
+ "value": "${KEYWORD_LOWER_ENABLED}"
+ },
+ "system.featureFlag.bagOfWords.enabled": {
+ "sensitive": false,
+ "value": "${BAG_OF_WORDS_ENABLED}"
+ },
+ "system.featureFlag.xCollaboration.enabled": {
+ "sensitive": false,
+ "value": "${X_COLLABORATION_ENABLED}"
}
}
}
diff --git a/provider/partition-gc/src/main/java/org/opengroup/osdu/partition/provider/gcp/api/SystemPartitionApi.java b/provider/partition-gc/src/main/java/org/opengroup/osdu/partition/provider/gcp/api/SystemPartitionApi.java
index e93a05e01a4d52856130a4616a9f9e44e9a1b491..f80b1b7ed8c2d3ca02325ee931681cdbad6e018b 100644
--- a/provider/partition-gc/src/main/java/org/opengroup/osdu/partition/provider/gcp/api/SystemPartitionApi.java
+++ b/provider/partition-gc/src/main/java/org/opengroup/osdu/partition/provider/gcp/api/SystemPartitionApi.java
@@ -19,6 +19,7 @@ package org.opengroup.osdu.partition.provider.gcp.api;
import static org.opengroup.osdu.partition.provider.gcp.config.SystemApiConfiguration.PARTITION_SYSTEM_TENANT_API;
+import io.swagger.v3.oas.annotations.Hidden;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
@@ -44,6 +45,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseStatus;
import org.springframework.web.context.annotation.RequestScope;
+@Hidden
@RequestScope
@RequestMapping(path = "/partition/system", produces = "application/json")
@Tag(name = "partition-system-api", description = "Partition System API")
diff --git a/provider/partition-ibm/pom.xml b/provider/partition-ibm/pom.xml
index 456e35dadbc576f91db8c30bb9cc73fa331ee6e8..8e613ea5c32c33638cef93091d61c6f3d6a2aaf3 100644
--- a/provider/partition-ibm/pom.xml
+++ b/provider/partition-ibm/pom.xml
@@ -25,6 +25,13 @@
<dependencyManagement>
<dependencies>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-bom</artifactId>
+ <version>4.1.118.Final</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
diff --git a/testing/pom.xml b/testing/pom.xml
index 1f4b0c6c67f8a21c683feb58c3c67fe6295af54f..35b9875db0bc0d263328bfef96632ced151bb50f 100644
--- a/testing/pom.xml
+++ b/testing/pom.xml
@@ -72,6 +72,7 @@
<repo.releases.url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</repo.releases.url>
<publish.snapshots.url>https://community.opengroup.org/api/v4/projects/221/packages/maven</publish.snapshots.url>
<publish.releases.url>https://community.opengroup.org/api/v4/projects/221/packages/maven</publish.releases.url>
+ <maven-surefire-plugin.version>3.0.0-M4</maven-surefire-plugin.version>
</properties>
</profile>
</profiles>