From 693e2fa9ce5d9775581a02d2d5f01503766ef945 Mon Sep 17 00:00:00 2001 From: Oleksii Tsyganov Date: Thu, 17 Jun 2021 08:39:06 +0300 Subject: [PATCH 01/26] Added helm charts --- .gitlab-ci.yml | 1 + devops/gcp/configmap/Chart.yaml | 20 ++++++++++ .../templates/partition-variables.yml | 13 +++++++ devops/gcp/configmap/values.yaml | 10 +++++ devops/gcp/deploy/Chart.yaml | 20 ++++++++++ .../gcp/deploy/templates/partition-deploy.yml | 38 +++++++++++++++++++ .../deploy/templates/partition-service.yml | 15 ++++++++ .../templates/partition-virtual-service.yml | 19 ++++++++++ devops/gcp/deploy/values.yaml | 15 ++++++++ 9 files changed, 151 insertions(+) create mode 100644 devops/gcp/configmap/Chart.yaml create mode 100644 devops/gcp/configmap/templates/partition-variables.yml create mode 100644 devops/gcp/configmap/values.yaml create mode 100644 devops/gcp/deploy/Chart.yaml create mode 100644 devops/gcp/deploy/templates/partition-deploy.yml create mode 100644 devops/gcp/deploy/templates/partition-service.yml create mode 100644 devops/gcp/deploy/templates/partition-virtual-service.yml create mode 100644 devops/gcp/deploy/values.yaml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f626195e..6ed7dde9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,6 +18,7 @@ variables: OSDU_GCP_ENV_VARS: AUTHORIZE_API=$OSDU_GCP_AUTHORIZE_API,GOOGLE_CLOUD_PROJECT=$OSDU_GCP_PROJECT,GOOGLE_AUDIENCES=$GOOGLE_AUDIENCE,PARTITION_ADMIN_ACCOUNT=$OSDU_GCP_SERVICE_ACCOUNT MAVEN_PROJECTS: "-pl partition-core,provider/partition-gcp" OSDU_GCP_TEST_SUBDIR: testing/$OSDU_GCP_SERVICE-test-$OSDU_GCP_VENDOR + OSDU_GCP_HELM_PACKAGE_CHARTS: "devops/gcp/deploy devops/gcp/configmap" include: - project: "osdu/platform/ci-cd-pipelines" diff --git a/devops/gcp/configmap/Chart.yaml b/devops/gcp/configmap/Chart.yaml new file mode 100644 index 00000000..d423a9dc --- /dev/null +++ b/devops/gcp/configmap/Chart.yaml @@ -0,0 +1,20 @@ +apiVersion: v2 +name: partition-configmap +description: A Helm chart for Kubernetes +# A chart can be either an 'application' or a 'library' chart. +# +# Application charts are a collection of templates that can be packaged into versioned archives +# to be deployed. +# +# Library charts provide useful utilities or functions for the chart developer. They're included as +# a dependency of application charts to inject those utilities and functions into the rendering +# pipeline. Library charts do not define any templates and therefore cannot be deployed. +type: application +# This is the chart version. This version number should be incremented each time you make changes +# to the chart and its templates, including the app version. +# Versions are expected to follow Semantic Versioning (https://semver.org/) +version: 0.1.0 +# This is the version number of the application being deployed. This version number should be +# incremented each time you make changes to the application. Versions are not expected to +# follow Semantic Versioning. They should reflect the version the application is using. +appVersion: 1.16.0 diff --git a/devops/gcp/configmap/templates/partition-variables.yml b/devops/gcp/configmap/templates/partition-variables.yml new file mode 100644 index 00000000..d0073e7b --- /dev/null +++ b/devops/gcp/configmap/templates/partition-variables.yml @@ -0,0 +1,13 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + labels: + app: "{{ .Values.conf.app_name }}" + name: "{{ .Values.conf.configmap }}" + namespace: "{{ .Release.Namespace }}" +data: + GOOGLE_CLOUD_PROJECT: "{{ .Values.data.google_cloud_project }}" + PARTITION_ADMIN_ACCOUNT: "{{ .Values.data.partition_admin_account }}" + GOOGLE_AUDIENCES: "{{ .Values.data.google_audiences }}" + KEY_RING: "{{ .Values.data.key_ring }}" + LOG_LEVEL: "{{ .Values.data.log_level }}" diff --git a/devops/gcp/configmap/values.yaml b/devops/gcp/configmap/values.yaml new file mode 100644 index 00000000..6ae6d4b6 --- /dev/null +++ b/devops/gcp/configmap/values.yaml @@ -0,0 +1,10 @@ +data: + google_cloud_project: "" + partition_admin_account: "" + google_audiences: "" + key_ring: "" + log_level: "" + +conf: + configmap: "partition-config" + app_name: "partition" diff --git a/devops/gcp/deploy/Chart.yaml b/devops/gcp/deploy/Chart.yaml new file mode 100644 index 00000000..18597150 --- /dev/null +++ b/devops/gcp/deploy/Chart.yaml @@ -0,0 +1,20 @@ +apiVersion: v2 +name: partition-deploy +description: A Helm chart for Kubernetes +# A chart can be either an 'application' or a 'library' chart. +# +# Application charts are a collection of templates that can be packaged into versioned archives +# to be deployed. +# +# Library charts provide useful utilities or functions for the chart developer. They're included as +# a dependency of application charts to inject those utilities and functions into the rendering +# pipeline. Library charts do not define any templates and therefore cannot be deployed. +type: application +# This is the chart version. This version number should be incremented each time you make changes +# to the chart and its templates, including the app version. +# Versions are expected to follow Semantic Versioning (https://semver.org/) +version: 0.1.0 +# This is the version number of the application being deployed. This version number should be +# incremented each time you make changes to the application. Versions are not expected to +# follow Semantic Versioning. They should reflect the version the application is using. +appVersion: 1.16.0 diff --git a/devops/gcp/deploy/templates/partition-deploy.yml b/devops/gcp/deploy/templates/partition-deploy.yml new file mode 100644 index 00000000..7640b812 --- /dev/null +++ b/devops/gcp/deploy/templates/partition-deploy.yml @@ -0,0 +1,38 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: "{{ .Values.conf.app_name }}" + namespace: {{ .Release.Namespace }} +spec: + replicas: 1 + selector: + matchLabels: + app: "{{ .Values.conf.app_name }}" + template: + metadata: + labels: + app: "{{ .Values.conf.app_name }}" + spec: + containers: + - image: "{{ .Values.data.image }}" + imagePullPolicy: Always + name: "{{ .Values.conf.app_name }}" + env: + - name: "ACCEPT_HTTP" + value: "true" + envFrom: + - configMapRef: + name: "{{ .Values.conf.configmap }}" + securityContext: + allowPrivilegeEscalation: false + runAsUser: 0 + ports: + - containerPort: 8080 + resources: + requests: + cpu: "{{ .Values.data.requests_cpu }}" + memory: "{{ .Values.data.requests_memory }}" + limits: + cpu: "{{ .Values.data.limits_cpu }}" + memory: "{{ .Values.data.limits_memory }}" + serviceAccountName: "{{ .Values.data.serviceAccountName }}" diff --git a/devops/gcp/deploy/templates/partition-service.yml b/devops/gcp/deploy/templates/partition-service.yml new file mode 100644 index 00000000..d507d683 --- /dev/null +++ b/devops/gcp/deploy/templates/partition-service.yml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Service +metadata: + name: "{{ .Values.conf.app_name }}" + namespace: {{ .Release.Namespace }} + annotations: + cloud.google.com/neg: '{"ingress": true}' +spec: + ports: + - port: 80 + targetPort: 8080 + protocol: TCP + name: http + selector: + app: "{{ .Values.conf.app_name }}" diff --git a/devops/gcp/deploy/templates/partition-virtual-service.yml b/devops/gcp/deploy/templates/partition-virtual-service.yml new file mode 100644 index 00000000..4ac78d87 --- /dev/null +++ b/devops/gcp/deploy/templates/partition-virtual-service.yml @@ -0,0 +1,19 @@ +apiVersion: networking.istio.io/v1alpha3 +kind: VirtualService +metadata: + name: "{{ .Values.conf.app_name }}" + namespace: {{ .Release.Namespace }} +spec: + hosts: + - "*" + gateways: + - service-gateway + http: + - match: + - uri: + prefix: /api/partition + route: + - destination: + port: + number: 80 + host: {{ .Values.conf.app_name }}.{{ .Release.Namespace }}.svc.cluster.local diff --git a/devops/gcp/deploy/values.yaml b/devops/gcp/deploy/values.yaml new file mode 100644 index 00000000..eb04941e --- /dev/null +++ b/devops/gcp/deploy/values.yaml @@ -0,0 +1,15 @@ +# Default values for partition-deploy. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +data: + requests_cpu: "0.25" + requests_memory: "128M" + limits_cpu: "1" + limits_memory: "1G" + serviceAccountName: "" + image: "" + +conf: + configmap: "partition-config" + app_name: "partition" -- GitLab From 30ca026a5e484a7149950299b51b91b8a0c79fda Mon Sep 17 00:00:00 2001 From: Oleksii Tsyganov Date: Thu, 17 Jun 2021 10:19:00 +0300 Subject: [PATCH 02/26] Added pages publishing --- .gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f626195e..c25cafbf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -44,6 +44,9 @@ include: - project: "osdu/platform/ci-cd-pipelines" file: "cloud-providers/osdu-gcp-cloudrun.yml" + - project: 'osdu/platform/ci-cd-pipelines' + file: 'publishing/pages.yml' + osdu-gcp-test: variables: CLIENT_TENANT: osdu -- GitLab From a18f127c357e988a84d0a1e4cc03d767a7b0d6cb Mon Sep 17 00:00:00 2001 From: "Oleksandr Kosse (EPAM)" Date: Thu, 17 Jun 2021 07:22:33 +0000 Subject: [PATCH 03/26] Revert "Merge branch 'Add-pages-publishing' into 'master'" This reverts merge request !62 --- .gitlab-ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c54998db..6ed7dde9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,9 +45,6 @@ include: - project: "osdu/platform/ci-cd-pipelines" file: "cloud-providers/osdu-gcp-cloudrun.yml" - - project: 'osdu/platform/ci-cd-pipelines' - file: 'publishing/pages.yml' - osdu-gcp-test: variables: CLIENT_TENANT: osdu -- GitLab From 89064860b2b0eeb511519347192fccfc9e4072fc Mon Sep 17 00:00:00 2001 From: Oleksii Tsyganov Date: Thu, 17 Jun 2021 10:25:46 +0300 Subject: [PATCH 04/26] Added publishing pages --- .gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6ed7dde9..26e709ca 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,6 +45,9 @@ include: - project: "osdu/platform/ci-cd-pipelines" file: "cloud-providers/osdu-gcp-cloudrun.yml" + - project: "osdu/platform/ci-cd-pipelines" + file: "publishing/pages.yml" + osdu-gcp-test: variables: CLIENT_TENANT: osdu -- GitLab From 8ffa076c3be5dec5f9683fe8727009fbb9e4077f Mon Sep 17 00:00:00 2001 From: "Oleksii Tsyganov (EPAM)" Date: Thu, 17 Jun 2021 08:29:34 +0000 Subject: [PATCH 05/26] Added fossa report --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 26e709ca..29f910f7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,7 +31,7 @@ include: file: "scanners/gitlab-ultimate.yml" - project: "osdu/platform/ci-cd-pipelines" - file: "scanners/fossa-maven.yml" + file: "scanners/fossa.yml" - project: "osdu/platform/ci-cd-pipelines" file: "cloud-providers/aws.yml" -- GitLab From 9324392a4a53d2bd0ccbdde149b1aa5d621a3a5d Mon Sep 17 00:00:00 2001 From: Oleksii Tsyganov Date: Thu, 17 Jun 2021 11:52:07 +0300 Subject: [PATCH 06/26] Changed fossa --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 29f910f7..26e709ca 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,7 +31,7 @@ include: file: "scanners/gitlab-ultimate.yml" - project: "osdu/platform/ci-cd-pipelines" - file: "scanners/fossa.yml" + file: "scanners/fossa-maven.yml" - project: "osdu/platform/ci-cd-pipelines" file: "cloud-providers/aws.yml" -- GitLab From 8fdf6f5f7cfbedc644408b338062a721bc4d1c91 Mon Sep 17 00:00:00 2001 From: Mikhail Piatliou Date: Fri, 18 Jun 2021 14:49:11 +0300 Subject: [PATCH 07/26] GONRG-2627: minor improvements for helms --- devops/gcp/configmap/Chart.yaml | 2 +- devops/gcp/deploy/Chart.yaml | 2 +- devops/gcp/deploy/templates/partition-deploy.yml | 2 +- devops/gcp/deploy/templates/partition-service.yml | 2 +- devops/gcp/deploy/templates/partition-virtual-service.yml | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/devops/gcp/configmap/Chart.yaml b/devops/gcp/configmap/Chart.yaml index d423a9dc..75d7fdd9 100644 --- a/devops/gcp/configmap/Chart.yaml +++ b/devops/gcp/configmap/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -name: partition-configmap +name: gcp-partition-configmap description: A Helm chart for Kubernetes # A chart can be either an 'application' or a 'library' chart. # diff --git a/devops/gcp/deploy/Chart.yaml b/devops/gcp/deploy/Chart.yaml index 18597150..8db1c028 100644 --- a/devops/gcp/deploy/Chart.yaml +++ b/devops/gcp/deploy/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -name: partition-deploy +name: gcp-partition-deploy description: A Helm chart for Kubernetes # A chart can be either an 'application' or a 'library' chart. # diff --git a/devops/gcp/deploy/templates/partition-deploy.yml b/devops/gcp/deploy/templates/partition-deploy.yml index 7640b812..34791b84 100644 --- a/devops/gcp/deploy/templates/partition-deploy.yml +++ b/devops/gcp/deploy/templates/partition-deploy.yml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: "{{ .Values.conf.app_name }}" - namespace: {{ .Release.Namespace }} + namespace: "{{ .Release.Namespace }}" spec: replicas: 1 selector: diff --git a/devops/gcp/deploy/templates/partition-service.yml b/devops/gcp/deploy/templates/partition-service.yml index d507d683..d03488ae 100644 --- a/devops/gcp/deploy/templates/partition-service.yml +++ b/devops/gcp/deploy/templates/partition-service.yml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: name: "{{ .Values.conf.app_name }}" - namespace: {{ .Release.Namespace }} + namespace: "{{ .Release.Namespace }}" annotations: cloud.google.com/neg: '{"ingress": true}' spec: diff --git a/devops/gcp/deploy/templates/partition-virtual-service.yml b/devops/gcp/deploy/templates/partition-virtual-service.yml index 4ac78d87..13c21ddf 100644 --- a/devops/gcp/deploy/templates/partition-virtual-service.yml +++ b/devops/gcp/deploy/templates/partition-virtual-service.yml @@ -2,7 +2,7 @@ apiVersion: networking.istio.io/v1alpha3 kind: VirtualService metadata: name: "{{ .Values.conf.app_name }}" - namespace: {{ .Release.Namespace }} + namespace: "{{ .Release.Namespace }}" spec: hosts: - "*" @@ -11,9 +11,9 @@ spec: http: - match: - uri: - prefix: /api/partition + prefix: "/api/partition" route: - destination: port: number: 80 - host: {{ .Values.conf.app_name }}.{{ .Release.Namespace }}.svc.cluster.local + host: "{{ .Values.conf.app_name }}.{{ .Release.Namespace }}.svc.cluster.local" -- GitLab From 6285dcafb73a3f754d7199d2d44ebcef87f39f9e Mon Sep 17 00:00:00 2001 From: "Riabokon Stanislav(EPAM)" Date: Mon, 21 Jun 2021 12:14:36 +0000 Subject: [PATCH 08/26] Gcp health wrong status (GONRG-2598) --- .../partition-gcp/src/main/resources/application.properties | 2 ++ 1 file changed, 2 insertions(+) diff --git a/provider/partition-gcp/src/main/resources/application.properties b/provider/partition-gcp/src/main/resources/application.properties index 3bb3b734..ac69c0db 100644 --- a/provider/partition-gcp/src/main/resources/application.properties +++ b/provider/partition-gcp/src/main/resources/application.properties @@ -23,3 +23,5 @@ partition-admin-account=admin@domen.iam.gserviceaccount.com #logging configuration logging.level.org.springframework.web=${LOG_LEVEL:DEBUG} +management.endpoint.health.show-details=always +management.health.diskspace.enabled=false \ No newline at end of file -- GitLab From 5eeb7a79e60acccc32c033e1d2780281abc97bbe Mon Sep 17 00:00:00 2001 From: Dmitriy Novikov Date: Wed, 23 Jun 2021 11:24:02 +0000 Subject: [PATCH 09/26] GCP Clean up default config (GONRG-2599) --- docs/tutorial/gcp/Partition.md | 5 +++-- .../partition-gcp/src/main/resources/application.properties | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/tutorial/gcp/Partition.md b/docs/tutorial/gcp/Partition.md index f19acfae..3aa26159 100644 --- a/docs/tutorial/gcp/Partition.md +++ b/docs/tutorial/gcp/Partition.md @@ -83,7 +83,7 @@ A sample output is shown below. }, "crmAccountID": { "sensitive": false, - "value": "["osdu","osdu"]" + "value": ["osdu","osdu"] } } ``` @@ -94,6 +94,7 @@ A sample output is shown below. ### Create a new partition 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} ``` @@ -136,7 +137,7 @@ curl --request POST \ }, "crmAccountID": { "sensitive": false, - "value": "["mypartition","mypartition"]" + "value": ["mypartition","mypartition"] } } }' diff --git a/provider/partition-gcp/src/main/resources/application.properties b/provider/partition-gcp/src/main/resources/application.properties index ac69c0db..aea6a99c 100644 --- a/provider/partition-gcp/src/main/resources/application.properties +++ b/provider/partition-gcp/src/main/resources/application.properties @@ -5,7 +5,7 @@ server.servlet.contextPath=/api/partition/v1 server.port=8080 springfox.documentation.swagger.v2.path=/api-docs authorize-api=https://os-entitlements-gcp-jvmvia5dea-uc.a.run.app/entitlements/v1 -spring.cloud.gcp.datastore.namespace=partitiontest +spring.cloud.gcp.datastore.namespace=partition #ACCEPT_HTTP=true cache-expiration=1 -- GitLab From 95f433f714d8941e3cc1e8f97ed3413ecb2f7ca4 Mon Sep 17 00:00:00 2001 From: Maksimelyan Tamashevich Date: Thu, 24 Jun 2021 16:36:23 +0300 Subject: [PATCH 10/26] GONRG-2638 Partition should have access to KMS --- devops/gcp/configmap/templates/partition-variables.yml | 1 + devops/gcp/configmap/values.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/devops/gcp/configmap/templates/partition-variables.yml b/devops/gcp/configmap/templates/partition-variables.yml index d0073e7b..1eb6ac15 100644 --- a/devops/gcp/configmap/templates/partition-variables.yml +++ b/devops/gcp/configmap/templates/partition-variables.yml @@ -10,4 +10,5 @@ data: PARTITION_ADMIN_ACCOUNT: "{{ .Values.data.partition_admin_account }}" GOOGLE_AUDIENCES: "{{ .Values.data.google_audiences }}" KEY_RING: "{{ .Values.data.key_ring }}" + KMS_KEY: "{{ .Values.data.kms_key }}" LOG_LEVEL: "{{ .Values.data.log_level }}" diff --git a/devops/gcp/configmap/values.yaml b/devops/gcp/configmap/values.yaml index 6ae6d4b6..fa714ddf 100644 --- a/devops/gcp/configmap/values.yaml +++ b/devops/gcp/configmap/values.yaml @@ -3,6 +3,7 @@ data: partition_admin_account: "" google_audiences: "" key_ring: "" + kms_key: "" log_level: "" conf: -- GitLab From 8154d89066551ebfdc6b02c01b6e696c8cdd73ca Mon Sep 17 00:00:00 2001 From: "Riabokon Stanislav(EPAM)" Date: Fri, 25 Jun 2021 07:47:42 +0000 Subject: [PATCH 11/26] Update README.md --- provider/partition-gcp/README.md | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/provider/partition-gcp/README.md b/provider/partition-gcp/README.md index a60430b2..8c50e5fa 100644 --- a/provider/partition-gcp/README.md +++ b/provider/partition-gcp/README.md @@ -24,6 +24,9 @@ In order to run the service locally or remotely, you will need to have the follo | `GOOGLE_AUDIENCES` | ex `*****.apps.googleusercontent.com` | Client ID for getting access to cloud resources | yes | https://console.cloud.google.com/apis/credentials | | `PARTITION_ADMIN_ACCOUNT` | ex `admin@domen.iam.gserviceaccount.com` | Partition Admin account email | no | - | | `GOOGLE_APPLICATION_CREDENTIALS` | ex `/path/to/directory/service-key.json` | Service account credentials, you only need this if running locally | yes | https://console.cloud.google.com/iam-admin/serviceaccounts | +| `KEY_RING` | ex `csqp` | A key ring holds keys in a specific Google Cloud location and permit us to manage access control on groups of keys | yes | https://cloud.google.com/kms/docs/resource-hierarchy#key_rings | +| `KMS_KEY` | ex `partitionService` | A key exists on one key ring linked to a specific location. | yes | https://cloud.google.com/kms/docs/resource-hierarchy#key_rings | + ### Run Locally Check that maven is installed: @@ -140,23 +143,23 @@ Partition Service is compatible with App Engine Flexible Environment and Cloud R #### Cloud KMS Setup -Enable cloud KMS on master project +Enable cloud KMS on master project. Create king ring and key in the ***master project*** ```bash gcloud services enable cloudkms.googleapis.com export KEYRING_NAME="csqp" - export CRYPTOKEY_NAME="searchService" + export CRYPTOKEY_NAME="partionService" gcloud kms keyrings create $KEYRING_NAME --location global gcloud kms keys create $CRYPTOKEY_NAME --location global \ --keyring $KEYRING_NAME \ --purpose encryption ``` -Add **Cloud KMS CryptoKey Encrypter/Decrypter** role to the **App Engine default service account** of the master project through IAM - Role tab +Add **Cloud KMS CryptoKey Encrypter/Decrypter** role to the used **service account** by Partition Service of the ***master project*** through IAM - Role tab. -Add "Cloud KMS Encrypt/Decrypt" role to the "App Engine default service account" of ***master project*** +Add "Cloud KMS Encrypt/Decrypt" role to the used **service account** by Partition Service of the ***master project*** through IAM - Role tab. ## Licence Copyright © Google LLC @@ -172,4 +175,4 @@ 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. \ No newline at end of file +limitations under the License. -- GitLab From a7188c4df181121593d9c10c1f293752e7c3024e Mon Sep 17 00:00:00 2001 From: Spencer Sutton Date: Thu, 27 May 2021 16:02:40 +0000 Subject: [PATCH 12/26] Locking down maven central commit a62093b5 Author: Spencer Sutton Date: Thu May 27 2021 10:15:43 GMT-0500 (Central Daylight Time) "Excluding springs default security, locking down mvn central" --- provider/partition-aws/maven/settings.xml | 38 +++++++++---------- .../src/main/resources/application.properties | 4 +- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/provider/partition-aws/maven/settings.xml b/provider/partition-aws/maven/settings.xml index 3dbde15f..1bfc43ac 100644 --- a/provider/partition-aws/maven/settings.xml +++ b/provider/partition-aws/maven/settings.xml @@ -1,18 +1,19 @@ - - - - - - - - - + + + aws-osdu-dev-maven + aws-osdu-dev-maven + https://osdu-dev-${AWS_ACCOUNT_ID}.d.codeartifact.us-east-1.amazonaws.com/maven/osdu-maven/ + central,!gitlab-os-core-common-maven,!gitlab-os-core-lib-aws-maven + + credentialsConfiguration diff --git a/provider/partition-aws/src/main/resources/application.properties b/provider/partition-aws/src/main/resources/application.properties index be8040fa..6175e300 100644 --- a/provider/partition-aws/src/main/resources/application.properties +++ b/provider/partition-aws/src/main/resources/application.properties @@ -46,4 +46,6 @@ server.ssl.key-store-type=PKCS12 server.ssl.key-store=${SSL_KEY_STORE_PATH:/certs/osduonaws.p12} server.ssl.key-alias=${SSL_KEY_ALIAS:osduonaws} server.ssl.key-password=${SSL_KEY_PASSWORD:} -server.ssl.key-store-password=${SSL_KEY_STORE_PASSWORD:} \ No newline at end of file +server.ssl.key-store-password=${SSL_KEY_STORE_PASSWORD:} + +spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.security.SecurityAutoConfiguration \ No newline at end of file -- GitLab From 0fce8d468b0f8335bd133b50d606926ee7e012d6 Mon Sep 17 00:00:00 2001 From: Yunhua Koglin Date: Tue, 15 Jun 2021 18:52:44 +0000 Subject: [PATCH 13/26] enable redis auth token --- .../osdu/partition/provider/aws/cache/GroupCache.java | 4 ++-- .../partition-aws/src/main/resources/application.properties | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/provider/partition-aws/src/main/java/org/opengroup/osdu/partition/provider/aws/cache/GroupCache.java b/provider/partition-aws/src/main/java/org/opengroup/osdu/partition/provider/aws/cache/GroupCache.java index 49736345..2bb06360 100644 --- a/provider/partition-aws/src/main/java/org/opengroup/osdu/partition/provider/aws/cache/GroupCache.java +++ b/provider/partition-aws/src/main/java/org/opengroup/osdu/partition/provider/aws/cache/GroupCache.java @@ -23,8 +23,8 @@ import org.springframework.stereotype.Component; @Component public class GroupCache extends RedisCache { - public GroupCache(@Value("${aws.elasticache.cluster.endpoint}") final String REDIS_GROUP_HOST, @Value("${aws.elasticache.cluster.port}") final String REDIS_GROUP_PORT) { - super(REDIS_GROUP_HOST, Integer.parseInt(REDIS_GROUP_PORT), 30, String.class, Groups.class); + public GroupCache(@Value("${aws.elasticache.cluster.endpoint}") final String REDIS_GROUP_HOST, @Value("${aws.elasticache.cluster.port}") final String REDIS_GROUP_PORT, @Value("${aws.elasticache.cluster.key}") final String REDIS_GROUP_KEY) { + super(REDIS_GROUP_HOST, Integer.parseInt(REDIS_GROUP_PORT), REDIS_GROUP_KEY, 30, String.class, Groups.class); } public static String getGroupCacheKey(DpsHeaders headers) { diff --git a/provider/partition-aws/src/main/resources/application.properties b/provider/partition-aws/src/main/resources/application.properties index 6175e300..913f572d 100644 --- a/provider/partition-aws/src/main/resources/application.properties +++ b/provider/partition-aws/src/main/resources/application.properties @@ -40,6 +40,7 @@ aws.environment=${ENVIRONMENT} ## AWS ElastiCache configuration aws.elasticache.cluster.endpoint=${CACHE_CLUSTER_ENDPOINT} aws.elasticache.cluster.port=${CACHE_CLUSTER_PORT} +aws.elasticache.cluster.key=${CACHE_CLUSTER_KEY} server.ssl.enabled=${SSL_ENABLED:true} server.ssl.key-store-type=PKCS12 -- GitLab From 8d8b661ed542f29d3cb9d748b9d56ee441f42aa3 Mon Sep 17 00:00:00 2001 From: Matt Wise Date: Tue, 22 Jun 2021 13:57:13 -0400 Subject: [PATCH 14/26] update to core-lib-aws 0.9.2 --- provider/partition-aws/pom.xml | 8 ++++++-- testing/partition-test-aws/pom.xml | 8 ++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/provider/partition-aws/pom.xml b/provider/partition-aws/pom.xml index 848a2e69..0aea6595 100644 --- a/provider/partition-aws/pom.xml +++ b/provider/partition-aws/pom.xml @@ -21,7 +21,7 @@ partition org.opengroup.osdu - 0.10.0-SNAPSHOT + 0.9.0-SNAPSHOT ../../pom.xml @@ -57,7 +57,7 @@ org.opengroup.osdu.core.aws os-core-lib-aws - 0.9.0 + 0.9.2-SNAPSHOT org.opengroup.osdu @@ -93,6 +93,10 @@ org.springframework.boot spring-boot-starter-security + + org.springframework.boot + spring-boot-starter-actuator + org.springframework.security spring-security-oauth2-client diff --git a/testing/partition-test-aws/pom.xml b/testing/partition-test-aws/pom.xml index 8b4ecf3d..bd829d14 100644 --- a/testing/partition-test-aws/pom.xml +++ b/testing/partition-test-aws/pom.xml @@ -19,14 +19,14 @@ org.opengroup.osdu os-partition-testing - 0.10.0-SNAPSHOT + 0.9.0-SNAPSHOT ../pom.xml 4.0.0 org.opengroup.osdu.partition partition-test-aws - 0.10.0-SNAPSHOT + 0.9.0-SNAPSHOT jar @@ -65,13 +65,13 @@ org.opengroup.osdu.partition partition-test-core - 0.10.0-SNAPSHOT + 0.9.0-SNAPSHOT org.opengroup.osdu.core.aws os-core-lib-aws - 0.9.0 + 0.9.2-SNAPSHOT -- GitLab From 63d716a5863a9c41fcd660efbe7a0a81fdc4b0a7 Mon Sep 17 00:00:00 2001 From: Matt Wise Date: Tue, 22 Jun 2021 14:04:23 -0400 Subject: [PATCH 15/26] fix pom version --- provider/partition-aws/pom.xml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/provider/partition-aws/pom.xml b/provider/partition-aws/pom.xml index 0aea6595..48fcc328 100644 --- a/provider/partition-aws/pom.xml +++ b/provider/partition-aws/pom.xml @@ -21,7 +21,7 @@ partition org.opengroup.osdu - 0.9.0-SNAPSHOT + 0.10.0-SNAPSHOT ../../pom.xml @@ -93,10 +93,6 @@ org.springframework.boot spring-boot-starter-security - - org.springframework.boot - spring-boot-starter-actuator - org.springframework.security spring-security-oauth2-client -- GitLab From 24abd02fce74ece54af17f012e2de128064fc85b Mon Sep 17 00:00:00 2001 From: Matt Wise Date: Tue, 22 Jun 2021 14:13:07 -0400 Subject: [PATCH 16/26] fix test pom versions --- testing/partition-test-aws/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testing/partition-test-aws/pom.xml b/testing/partition-test-aws/pom.xml index bd829d14..9fa4e5d9 100644 --- a/testing/partition-test-aws/pom.xml +++ b/testing/partition-test-aws/pom.xml @@ -19,14 +19,14 @@ org.opengroup.osdu os-partition-testing - 0.9.0-SNAPSHOT + 0.10.0-SNAPSHOT ../pom.xml 4.0.0 org.opengroup.osdu.partition partition-test-aws - 0.9.0-SNAPSHOT + 0.10.0-SNAPSHOT jar @@ -65,7 +65,7 @@ org.opengroup.osdu.partition partition-test-core - 0.9.0-SNAPSHOT + 0.10.0-SNAPSHOT -- GitLab From d12cd71dd9b258a45f14955a8f745ae79b3933cd Mon Sep 17 00:00:00 2001 From: Oleksii Tsyganov Date: Mon, 12 Jul 2021 07:53:56 +0200 Subject: [PATCH 17/26] Changed authorize_api to v2 --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 26e709ca..7f134efc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,7 +15,7 @@ variables: OSDU_GCP_SERVICE: partition OSDU_GCP_VENDOR: gcp OSDU_GCP_APPLICATION_NAME: os-partition - OSDU_GCP_ENV_VARS: AUTHORIZE_API=$OSDU_GCP_AUTHORIZE_API,GOOGLE_CLOUD_PROJECT=$OSDU_GCP_PROJECT,GOOGLE_AUDIENCES=$GOOGLE_AUDIENCE,PARTITION_ADMIN_ACCOUNT=$OSDU_GCP_SERVICE_ACCOUNT + OSDU_GCP_ENV_VARS: AUTHORIZE_API=$OSDU_GCP_ENTITLEMENTS_V2_URL,GOOGLE_CLOUD_PROJECT=$OSDU_GCP_PROJECT,GOOGLE_AUDIENCES=$GOOGLE_AUDIENCE,PARTITION_ADMIN_ACCOUNT=$OSDU_GCP_SERVICE_ACCOUNT MAVEN_PROJECTS: "-pl partition-core,provider/partition-gcp" OSDU_GCP_TEST_SUBDIR: testing/$OSDU_GCP_SERVICE-test-$OSDU_GCP_VENDOR OSDU_GCP_HELM_PACKAGE_CHARTS: "devops/gcp/deploy devops/gcp/configmap" -- GitLab From d9db66dd09060e40d77ba46971bcaec952d05a8b Mon Sep 17 00:00:00 2001 From: Spencer Sutton Date: Tue, 13 Jul 2021 13:34:25 -0500 Subject: [PATCH 18/26] FIncrementing core lib aws --- provider/partition-aws/pom.xml | 2 +- testing/partition-test-aws/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/provider/partition-aws/pom.xml b/provider/partition-aws/pom.xml index 48fcc328..5c127766 100644 --- a/provider/partition-aws/pom.xml +++ b/provider/partition-aws/pom.xml @@ -57,7 +57,7 @@ org.opengroup.osdu.core.aws os-core-lib-aws - 0.9.2-SNAPSHOT + 0.10.0-SNAPSHOT org.opengroup.osdu diff --git a/testing/partition-test-aws/pom.xml b/testing/partition-test-aws/pom.xml index 9fa4e5d9..6791c386 100644 --- a/testing/partition-test-aws/pom.xml +++ b/testing/partition-test-aws/pom.xml @@ -71,7 +71,7 @@ org.opengroup.osdu.core.aws os-core-lib-aws - 0.9.2-SNAPSHOT + 0.10.0-SNAPSHOT -- GitLab From cd9ec798e05f25421ba2f97b7ba8d88cae2ae431 Mon Sep 17 00:00:00 2001 From: Spencer Sutton Date: Tue, 13 Jul 2021 13:59:30 -0500 Subject: [PATCH 19/26] Updating notice --- NOTICE | 60 +++++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 22 deletions(-) diff --git a/NOTICE b/NOTICE index b7a1139b..297ba56d 100644 --- a/NOTICE +++ b/NOTICE @@ -27,13 +27,9 @@ The following software have components provided under the terms of this license: - AMQP 1.0 JMS Spring Boot AutoConfiguration (from https://repo1.maven.org/maven2/org/amqphub/spring/amqp-10-jms-spring-boot-autoconfigure) - AMQP 1.0 JMS Spring Boot Starter (from https://repo1.maven.org/maven2/org/amqphub/spring/amqp-10-jms-spring-boot-starter) -- ASM Analysis (from ) -- ASM Commons (from ) - ASM Core (from ) - ASM Core (from ) - ASM Core (from ) -- ASM Tree (from ) -- ASM Util (from ) - ASM based accessors helper used by json-smart (from ) - ASM based accessors helper used by json-smart (from ) - AWS Event Stream (from https://github.com/awslabs/aws-eventstream-java) @@ -381,7 +377,6 @@ The following software have components provided under the terms of this license: - Google OAuth Client Library for Java (from ) - Gson (from https://github.com/google/gson) - Guava InternalFutureFailureAccess and InternalFutures (from ) -- Guava ListenableFuture only (from ) - Guava: Google Core Libraries for Java (from https://github.com/google/guava.git) - HTTP functionality for the Reactor Netty library (from https://github.com/reactor/reactor-netty) - Hibernate Validator Engine (from ) @@ -480,7 +475,6 @@ The following software have components provided under the terms of this license: - Mojo's Maven plugin for Cobertura (from http://mojo.codehaus.org/cobertura-maven-plugin/) - Netty Reactive Streams HTTP support (from ) - Netty Reactive Streams Implementation (from ) -- Netty Reactive Streams Implementation (from ) - Netty/Buffer (from http://netty.io/) - Netty/Codec (from ) - Netty/Codec/DNS (from ) @@ -511,8 +505,6 @@ The following software have components provided under the terms of this license: - PWDB :: Database (from https://repo1.maven.org/maven2/org/linguafranca/pwdb/database) - Plexus :: Default Container (from ) - Plexus Common Utilities (from http://plexus.codehaus.org/plexus-utils) -- Plexus Default Interactivity Handler (from ) -- Plexus I18N Component (from ) - Plexus Velocity Component (from ) - PowerMock (from http://www.powermock.org) - PowerMock (from http://www.powermock.org) @@ -606,7 +598,6 @@ The following software have components provided under the terms of this license: - org.jetbrains.kotlin:kotlin-stdlib-common (from https://kotlinlang.org/) - org.opentest4j:opentest4j (from https://github.com/ota4j-team/opentest4j) - org.xmlunit:xmlunit-core (from http://www.xmlunit.org/) -- oro (from ) - powermock-api-support (from ) - powermock-api-support (from ) - powermock-core (from http://www.powermock.org) @@ -656,9 +647,10 @@ The following software have components provided under the terms of this license: - Hamcrest (from http://hamcrest.org/JavaHamcrest/) - Hamcrest Core (from http://hamcrest.org/) - HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/) -- Plexus :: Default Container (from ) - Plexus Common Utilities (from http://plexus.codehaus.org/plexus-utils) +- Reflections (from http://github.com/ronmamo/reflections) - Stax2 API (from http://github.com/FasterXML/stax2-api) +- ThreeTen backport (from https://www.threeten.org/threetenbp) - jaxen (from http://jaxen.codehaus.org/) ======================================================================== @@ -684,7 +676,6 @@ The following software have components provided under the terms of this license: - Hamcrest (from http://hamcrest.org/JavaHamcrest/) - Hamcrest Core (from http://hamcrest.org/) - HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/) -- JDOM (from http://www.jdom.org) - JSch (from http://www.jcraft.com/jsch/) - JavaBeans Activation Framework (from ) - JavaBeans Activation Framework API jar (from ) @@ -699,7 +690,6 @@ The following software have components provided under the terms of this license: - Reflections (from http://github.com/ronmamo/reflections) - SnakeYAML (from http://www.snakeyaml.org) - Spring Core (from https://github.com/spring-projects/spring-framework) -- Stax2 API (from http://github.com/FasterXML/stax2-api) - ThreeTen backport (from https://www.threeten.org/threetenbp) - classworlds (from http://classworlds.codehaus.org/) - jakarta.xml.bind-api (from ) @@ -735,7 +725,6 @@ CDDL-1.0 The following software have components provided under the terms of this license: - Servlet Specification 2.5 API (from ) -- javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250) ======================================================================== CDDL-1.1 @@ -743,6 +732,8 @@ CDDL-1.1 The following software have components provided under the terms of this license: - JavaBeans Activation Framework (from ) +- Servlet Specification 2.5 API (from ) +- javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250) - tomcat-embed-core (from http://tomcat.apache.org/) ======================================================================== @@ -752,6 +743,14 @@ The following software have components provided under the terms of this license: - JUnit (from http://junit.org) +======================================================================== +DOC +======================================================================== +The following software have components provided under the terms of this license: + +- JDOM (from http://www.jdom.org) +- Woodstox (from https://github.com/FasterXML/woodstox) + ======================================================================== EPL-1.0 ======================================================================== @@ -833,6 +832,21 @@ The following software have components provided under the terms of this license: - Project Lombok (from https://projectlombok.org) - jakarta.annotation-api (from https://projects.eclipse.org/projects/ee4j.ca) +======================================================================== +ImageMagick +======================================================================== +The following software have components provided under the terms of this license: + +- Stax2 API (from http://github.com/FasterXML/stax2-api) +- Woodstox (from https://github.com/FasterXML/woodstox) + +======================================================================== +Info-ZIP +======================================================================== +The following software have components provided under the terms of this license: + +- Apache Ant Core (from http://ant.apache.org/) + ======================================================================== JSON ======================================================================== @@ -860,13 +874,13 @@ The following software have components provided under the terms of this license: - Microsoft Application Insights Java SDK Spring Boot starter (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Java SDK Web Module (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Log4j 2 Appender (from https://github.com/Microsoft/ApplicationInsights-Java) -- java-getopt (from ) ======================================================================== LGPL-2.1-or-later ======================================================================== The following software have components provided under the terms of this license: +- Javassist (from http://www.javassist.org/) - Javassist (from http://www.javassist.org/) - SnakeYAML (from http://www.snakeyaml.org) @@ -968,20 +982,15 @@ Public-Domain ======================================================================== The following software have components provided under the terms of this license: -- JTidy (from http://jtidy.sourceforge.net) -- Joda-Time (from http://www.joda.org/joda-time/) -- Joda-Time (from http://www.joda.org/joda-time/) -- Joda-Time (from http://www.joda.org/joda-time/) -- LatencyUtils (from http://latencyutils.github.io/LatencyUtils/) - Plexus Common Utilities (from http://plexus.codehaus.org/plexus-utils) - Spongy Castle (from http://rtyley.github.io/spongycastle/) ======================================================================== -SISSL-1.2 +SAX-PD ======================================================================== The following software have components provided under the terms of this license: -- Servlet Specification 2.5 API (from ) +- Apache Ant Core (from http://ant.apache.org/) ======================================================================== SPL-1.0 @@ -989,12 +998,14 @@ SPL-1.0 The following software have components provided under the terms of this license: - Checker Qual (from https://checkerframework.org) +- Servlet Specification 2.5 API (from ) ======================================================================== W3C ======================================================================== The following software have components provided under the terms of this license: +- Apache Ant Core (from http://ant.apache.org/) - JTidy (from http://jtidy.sourceforge.net) - Xerces2-j (from https://xerces.apache.org/xerces2-j/) - xml-apis (from ) @@ -1018,6 +1029,10 @@ The following software have components provided under the terms of this license: - Bouncy Castle Provider (from http://www.bouncycastle.org/java.html) - Guava: Google Core Libraries for Java (from https://github.com/google/guava.git) - HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/) +- JTidy (from http://jtidy.sourceforge.net) +- Joda-Time (from http://www.joda.org/joda-time/) +- Joda-Time (from http://www.joda.org/joda-time/) +- Joda-Time (from http://www.joda.org/joda-time/) - Keycloak Common (from ) - LatencyUtils (from http://latencyutils.github.io/LatencyUtils/) - Microsoft Application Insights Java SDK Core (from https://github.com/Microsoft/ApplicationInsights-Java) @@ -1042,11 +1057,12 @@ The following software have components provided under the terms of this license: - Bouncy Castle Provider (from http://www.bouncycastle.org/java.html) - Byte Buddy (without dependencies) (from ) - Checker Qual (from https://checkerframework.org) +- JSON in Java (from https://github.com/douglascrockford/JSON-java) +- JTidy (from http://jtidy.sourceforge.net) - JUnit (from http://junit.org) - JUnit Jupiter (Aggregator) (from https://junit.org/junit5/) - JavaBeans Activation Framework (from ) - JavaBeans Activation Framework API jar (from ) -- Servlet Specification 2.5 API (from ) - Spongy Castle (from http://rtyley.github.io/spongycastle/) - jakarta.xml.bind-api (from ) - org.junit.jupiter:junit-jupiter-api (from http://junit.org/junit5/) -- GitLab From 0e0e8f6c25d2b8b93ded528279e4922146e026b8 Mon Sep 17 00:00:00 2001 From: "Oleksii Tsyganov (EPAM)" Date: Tue, 20 Jul 2021 12:37:44 +0000 Subject: [PATCH 20/26] Added required helm variables --- .gitlab-ci.yml | 11 ++++++++++- devops/gcp/configmap/values.yaml | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7f134efc..717c0395 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,6 +19,15 @@ variables: MAVEN_PROJECTS: "-pl partition-core,provider/partition-gcp" OSDU_GCP_TEST_SUBDIR: testing/$OSDU_GCP_SERVICE-test-$OSDU_GCP_VENDOR OSDU_GCP_HELM_PACKAGE_CHARTS: "devops/gcp/deploy devops/gcp/configmap" + 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.authorize_api=$OSDU_GCP_AUTHORIZE_API --set data.google_cloud_project=$OSDU_GCP_PROJECT --set data.google_audiences=$GOOGLE_AUDIENCE --set data.partition_admin_account=osdu-gcp-sa@nice-etching-277309.iam.gserviceaccount.com --set data.log_level=INFO --set data.key_ring=$OSDU_GCP_PARTITION_KEY_RING --set data.kms_key=$OSDU_GCP_PARTITION_KMS_KEY" + OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp:$CI_COMMIT_SHORT_SHA --set data.serviceAccountName=workload-identity-partition" + OSDU_GCP_HELM_CONFIG_SERVICE: "partition-config" + OSDU_GCP_HELM_DEPLOYMENT_SERVICE: "partition-deploy" + + include: - project: "osdu/platform/ci-cd-pipelines" @@ -43,7 +52,7 @@ include: file: "cloud-providers/ibm.yml" - project: "osdu/platform/ci-cd-pipelines" - file: "cloud-providers/osdu-gcp-cloudrun.yml" + file: "cloud-providers/osdu-gcp-gke.yml" - project: "osdu/platform/ci-cd-pipelines" file: "publishing/pages.yml" diff --git a/devops/gcp/configmap/values.yaml b/devops/gcp/configmap/values.yaml index fa714ddf..d8e92367 100644 --- a/devops/gcp/configmap/values.yaml +++ b/devops/gcp/configmap/values.yaml @@ -5,6 +5,7 @@ data: key_ring: "" kms_key: "" log_level: "" + authorize_api: "" conf: configmap: "partition-config" -- GitLab From 72a8b803f95dd281d44acaf886661207cac490d7 Mon Sep 17 00:00:00 2001 From: David Diederich Date: Thu, 22 Jul 2021 03:42:42 -0400 Subject: [PATCH 21/26] Updating Libraries to Latest Release Version --- NOTICE | 326 ++++++++++++++--------------- pom.xml | 2 +- provider/partition-aws/pom.xml | 2 +- provider/partition-azure/pom.xml | 2 +- testing/partition-test-aws/pom.xml | 2 +- 5 files changed, 167 insertions(+), 167 deletions(-) diff --git a/NOTICE b/NOTICE index 297ba56d..0a6988ad 100644 --- a/NOTICE +++ b/NOTICE @@ -15,7 +15,7 @@ Apache-1.1 The following software have components provided under the terms of this license: - Apache Commons CLI (from http://commons.apache.org/proper/commons-cli/) -- Cobertura code coverage (from http://cobertura.sourceforge.net) +- Cobertura (from http://cobertura.sourceforge.net) - Plexus :: Default Container (from ) - Plexus Common Utilities (from http://plexus.codehaus.org/plexus-utils) - oro (from ) @@ -34,18 +34,18 @@ The following software have components provided under the terms of this license: - ASM based accessors helper used by json-smart (from ) - AWS Event Stream (from https://github.com/awslabs/aws-eventstream-java) - AWS Java SDK :: AWS Core (from https://aws.amazon.com/sdkforjava) -- AWS Java SDK :: Annotations (from ) +- AWS Java SDK :: Annotations (from https://repo1.maven.org/maven2/software/amazon/awssdk/annotations) - AWS Java SDK :: Auth (from https://aws.amazon.com/sdkforjava) - AWS Java SDK :: Core :: Protocols :: AWS Json Protocol (from https://aws.amazon.com/sdkforjava) - AWS Java SDK :: Core :: Protocols :: Protocol Core (from https://aws.amazon.com/sdkforjava) -- AWS Java SDK :: HTTP Client Interface (from ) -- AWS Java SDK :: HTTP Clients :: Apache (from ) -- AWS Java SDK :: HTTP Clients :: Netty Non-Blocking I/O (from ) +- AWS Java SDK :: HTTP Client Interface (from https://repo1.maven.org/maven2/software/amazon/awssdk/http-client-spi) +- AWS Java SDK :: HTTP Clients :: Apache (from https://repo1.maven.org/maven2/software/amazon/awssdk/apache-client) +- AWS Java SDK :: HTTP Clients :: Netty Non-Blocking I/O (from https://repo1.maven.org/maven2/software/amazon/awssdk/netty-nio-client) - AWS Java SDK :: Profiles (from https://aws.amazon.com/sdkforjava) -- AWS Java SDK :: Regions (from ) +- AWS Java SDK :: Regions (from https://repo1.maven.org/maven2/software/amazon/awssdk/regions) - AWS Java SDK :: SDK Core (from https://aws.amazon.com/sdkforjava) - AWS Java SDK :: Services :: AWS Simple Systems Management (SSM) (from https://aws.amazon.com/sdkforjava) -- AWS Java SDK :: Utilities (from ) +- AWS Java SDK :: Utilities (from https://repo1.maven.org/maven2/software/amazon/awssdk/utils) - AWS Java SDK for AWS Amplify (from https://aws.amazon.com/sdkforjava) - AWS Java SDK for AWS App Mesh (from https://aws.amazon.com/sdkforjava) - AWS Java SDK for AWS AppSync (from https://aws.amazon.com/sdkforjava) @@ -304,14 +304,14 @@ The following software have components provided under the terms of this license: - AWS Java SDK for the Amazon EC2 Container Service (from https://aws.amazon.com/sdkforjava) - AWS SDK for Java - Core (from https://aws.amazon.com/sdkforjava) - AWS SDK for Java - Models (from https://aws.amazon.com/sdkforjava) -- Adapter: RxJava (from ) +- Adapter: RxJava (from https://repo1.maven.org/maven2/com/squareup/retrofit2/adapter-rxjava) - Apache Ant + JUnit (from http://ant.apache.org/) - Apache Ant Core (from http://ant.apache.org/) - Apache Ant Launcher (from http://ant.apache.org/) - Apache Commons BeanUtils (from http://commons.apache.org/proper/commons-beanutils/) - Apache Commons CLI (from http://commons.apache.org/proper/commons-cli/) -- Apache Commons Codec (from http://commons.apache.org/proper/commons-codec/) -- Apache Commons Collections (from http://commons.apache.org/proper/commons-collections/) +- Apache Commons Codec (from https://commons.apache.org/proper/commons-codec/) +- Apache Commons Collections (from https://commons.apache.org/proper/commons-collections/) - Apache Commons Lang (from http://commons.apache.org/proper/commons-lang/) - Apache Commons Logging (from http://commons.apache.org/proper/commons-logging/) - Apache Commons Validator (from http://commons.apache.org/proper/commons-validator/) @@ -319,10 +319,10 @@ The following software have components provided under the terms of this license: - Apache HttpClient (from http://hc.apache.org/httpcomponents-client) - Apache HttpClient Cache (from http://hc.apache.org/httpcomponents-client) - Apache HttpCore (from http://hc.apache.org/httpcomponents-core-ga) -- Apache Log4j API (from ) -- Apache Log4j Core (from ) -- Apache Log4j JUL Adapter (from ) -- Apache Log4j SLF4J Binding (from ) +- Apache Log4j API (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-api) +- Apache Log4j Core (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-core) +- Apache Log4j JUL Adapter (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-jul) +- Apache Log4j SLF4J Binding (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-slf4j-impl) - Apache Log4j to SLF4J Adapter (from ) - Apache Maven Invoker (from ) - Apache Maven Reporting Implementation (from ) @@ -334,24 +334,24 @@ The following software have components provided under the terms of this license: - Apache Maven Wagon :: Providers :: SSH External Provider (from ) - Apache Maven Wagon :: Providers :: SSH Provider (from ) - Apache Velocity (from http://velocity.apache.org/engine/devel/) -- AssertJ fluent assertions (from ) -- AssertJ fluent assertions (from ) -- Asynchronous Http Client (from ) -- Asynchronous Http Client Netty Utils (from ) +- AssertJ fluent assertions (from https://repo1.maven.org/maven2/org/assertj/assertj-core) +- AssertJ fluent assertions (from https://repo1.maven.org/maven2/org/assertj/assertj-core) +- Asynchronous Http Client (from https://repo1.maven.org/maven2/org/asynchttpclient/async-http-client) +- Asynchronous Http Client Netty Utils (from https://repo1.maven.org/maven2/org/asynchttpclient/async-http-client-netty-utils) - Azure Spring Boot Starter for Azure AD Spring Security Integration (from https://github.com/Azure/azure-sdk-for-java) - Bean Validation API (from http://beanvalidation.org) - Brave Instrumentation: Http Adapters (from ) - Brave instrumentation for Reactor Netty HTTP (from https://github.com/reactor/reactor-netty) -- Byte Buddy (without dependencies) (from ) -- Byte Buddy Java agent (from ) +- Byte Buddy (without dependencies) (from https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy) +- Byte Buddy Java agent (from https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent) - ClassMate (from http://github.com/cowtowncoder/java-classmate) -- Cloud Storage JSON API v1-rev58-1.21.0 (from ) +- Cloud Storage JSON API v1-rev20181109-1.28.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 code coverage (from http://cobertura.sourceforge.net) +- Cobertura (from http://cobertura.sourceforge.net) +- Collections (from https://repo1.maven.org/maven2/commons-collections/commons-collections) - Commons Digester (from http://commons.apache.org/digester/) -- Commons IO (from http://commons.apache.org/io/) - Commons Lang (from http://commons.apache.org/lang/) -- Converter: Jackson (from ) +- Converter: Jackson (from https://repo1.maven.org/maven2/com/squareup/retrofit2/converter-jackson) - Core functionality for the Reactor Netty library (from https://github.com/reactor/reactor-netty) - Doxia :: APT Module (from ) - Doxia :: Core (from ) @@ -363,27 +363,29 @@ The following software have components provided under the terms of this license: - Doxia :: XHTML Module (from ) - Expression Language 3.0 (from https://projects.eclipse.org/projects/ee4j.el) - FindBugs-jsr305 (from http://findbugs.sourceforge.net/) -- Google APIs Client Library for Java (from ) -- Google App Engine extensions to the Google HTTP Client Library for Java. (from ) -- Google Cloud Core (from https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-core) -- Google Cloud Core HTTP (from https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-core-http) -- Google Cloud Core gRPC (from https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-core-grpc) +- Google APIs Client Library for Java (from https://repo1.maven.org/maven2/com/google/api-client/google-api-client) +- Google App Engine extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-appengine) +- Google Cloud Common Protos for Java (from https://github.com/googleapis/common-protos-java) +- Google Cloud Core (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-core) +- Google Cloud Core HTTP (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-core-http) +- Google Cloud Core gRPC (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-core-grpc) - Google Cloud Datastore (from https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-datastore) -- Google Cloud Key Management Service (KMS) API v1-rev22-1.23.0 (from ) +- Google Cloud Key Management Service (KMS) API v1-rev9-1.22.0 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-cloudkms) - Google Cloud Logging (from https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-logging) -- Google Cloud Pub/Sub (from https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-pubsub) -- Google Cloud Storage (from https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-storage) -- Google HTTP Client Library for Java (from https://github.com/google/google-http-java-client.git) -- Google OAuth Client Library for Java (from ) +- Google Cloud Pub/Sub (from https://github.com/googleapis/java-pubsub) +- Google Cloud Storage (from https://github.com/googleapis/java-storage) +- Google HTTP Client Library for Java (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client) +- Google OAuth Client Library for Java (from https://repo1.maven.org/maven2/com/google/oauth-client/google-oauth-client) - Gson (from https://github.com/google/gson) -- Guava InternalFutureFailureAccess and InternalFutures (from ) -- Guava: Google Core Libraries for Java (from https://github.com/google/guava.git) +- Guava InternalFutureFailureAccess and InternalFutures (from https://repo1.maven.org/maven2/com/google/guava/failureaccess) +- Guava: Google Core Libraries for Java (from https://repo1.maven.org/maven2/com/google/guava/guava) - HTTP functionality for the Reactor Netty library (from https://github.com/reactor/reactor-netty) - Hibernate Validator Engine (from ) - IBM COS Java SDK for Amazon S3 (from https://github.com/ibm/ibm-cos-sdk-java) - IBM COS Java SDK for COS KMS (from https://github.com/ibm/ibm-cos-sdk-java) - IBM COS SDK For Java (from https://github.com/ibm/ibm-cos-sdk-java) - IBM COS SDK for Java - Core (from https://github.com/ibm/ibm-cos-sdk-java) +- IO (from http://jakarta.apache.org/commons/${pom.artifactId.substring(8)}/) - Identity and Access Management (IAM) API v1-rev247-1.23.0 (from ) - IntelliJ IDEA Annotations (from http://www.jetbrains.org) - IntelliJ IDEA Annotations (from http://www.jetbrains.org) @@ -392,27 +394,27 @@ The following software have components provided under the terms of this license: - JCIP Annotations under Apache License (from http://stephenc.github.com/jcip-annotations) - JDOM (from http://www.jdom.org) - JMES Path Query library (from https://aws.amazon.com/sdkforjava) -- JSON Small and Fast Parser (from http://www.minidev.net/) -- JSON Small and Fast Parser (from http://www.minidev.net/) +- JSON Small and Fast Parser (from https://repo1.maven.org/maven2/net/minidev/json-smart) +- JSON Small and Fast Parser (from https://repo1.maven.org/maven2/net/minidev/json-smart) - JSON Web Token support for the JVM (from https://github.com/jwtk/jjwt.git) - JSON library from Android SDK (from http://developer.android.com/sdk) - JSONassert (from https://github.com/skyscreamer/JSONassert) - Jackson (from http://jackson.codehaus.org) -- Jackson 2 extensions to the Google HTTP Client Library for Java. (from https://github.com/google/google-http-java-client.git/google-http-client-jackson2) +- Jackson 2 extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-jackson2) - Jackson dataformat: CBOR (from http://github.com/FasterXML/jackson-dataformats-binary) -- Jackson datatype: JSR310 (from http://wiki.fasterxml.com/JacksonModuleJSR310) -- Jackson extensions to the Google HTTP Client Library for Java. (from ) +- Jackson datatype: JSR310 (from https://repo1.maven.org/maven2/com/fasterxml/jackson/datatype/jackson-datatype-jsr310) +- Jackson datatype: jdk8 (from https://repo1.maven.org/maven2/com/fasterxml/jackson/datatype/jackson-datatype-jdk8) +- Jackson extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-jackson) +- Jackson module: Afterburner (from https://github.com/FasterXML/jackson-modules-base) +- Jackson module: JAXB-annotations (from http://github.com/FasterXML/jackson-module-jaxb-annotations) - Jackson-annotations (from http://github.com/FasterXML/jackson) - Jackson-annotations (from http://github.com/FasterXML/jackson) -- Jackson-core (from https://github.com/FasterXML/jackson-core) -- Jackson-core (from https://github.com/FasterXML/jackson-core) +- Jackson-core (from http://wiki.fasterxml.com/JacksonHome) +- Jackson-core (from http://wiki.fasterxml.com/JacksonHome) - Jackson-dataformat-XML (from http://wiki.fasterxml.com/JacksonExtensionXmlDataBinding) -- Jackson-dataformat-YAML (from https://github.com/FasterXML/jackson) +- Jackson-dataformat-YAML (from https://github.com/FasterXML/jackson-dataformats-text) - Jackson-datatype-Joda (from http://wiki.fasterxml.com/JacksonModuleJoda) -- Jackson-datatype-jdk8 (from ) -- Jackson-module-Afterburner (from http://wiki.fasterxml.com/JacksonHome) -- Jackson-module-JAXB-annotations (from http://wiki.fasterxml.com/JacksonJAXBAnnotations) -- Jackson-module-parameter-names (from ) +- Jackson-module-parameter-names (from https://repo1.maven.org/maven2/com/fasterxml/jackson/module/jackson-module-parameter-names) - Jakarta Bean Validation API (from https://beanvalidation.org) - Java Libraries for Amazon Simple WorkFlow (from https://aws.amazon.com/sdkforjava) - Java Native Access (from https://github.com/java-native-access/jna) @@ -420,11 +422,11 @@ The following software have components provided under the terms of this license: - Java UUID Generator (from http://wiki.fasterxml.com/JugHome) - Javassist (from http://www.javassist.org/) - Javassist (from http://www.javassist.org/) -- Jetty Server (from ) -- Jetty Utilities (from ) -- Joda-Time (from http://www.joda.org/joda-time/) -- Joda-Time (from http://www.joda.org/joda-time/) -- Joda-Time (from http://www.joda.org/joda-time/) +- Jetty Server (from https://repo1.maven.org/maven2/org/mortbay/jetty/jetty) +- Jetty Utilities (from https://repo1.maven.org/maven2/org/mortbay/jetty/jetty-util) +- Joda-Time (from https://www.joda.org/joda-time/) +- Joda-Time (from https://www.joda.org/joda-time/) +- Joda-Time (from https://www.joda.org/joda-time/) - Json Path (from https://github.com/jayway/JsonPath) - KeePassJava2 :: All (from https://repo1.maven.org/maven2/org/linguafranca/pwdb/KeePassJava2) - KeePassJava2 :: DOM (from https://repo1.maven.org/maven2/org/linguafranca/pwdb/KeePassJava2-dom) @@ -441,26 +443,28 @@ The following software have components provided under the terms of this license: - Keycloak Spring Boot 2 Integration (from ) - Keycloak Spring Boot Adapter Core (from ) - Keycloak Spring Security Integration (from ) +- Kotlin Stdlib (from https://kotlinlang.org/) +- Kotlin Stdlib Common (from https://kotlinlang.org/) - Logback Contrib :: JSON :: Classic (from ) - Logback Contrib :: JSON :: Core (from ) - Logback Contrib :: Jackson (from ) -- MapStruct Core (from ) -- Maven Artifact (from ) +- MapStruct Core (from http://mapstruct.org/mapstruct/) +- Maven Artifact (from https://repo1.maven.org/maven2/org/apache/maven/maven-artifact) - Maven Artifact Manager (from ) -- Maven Core (from https://git-wip-us.apache.org/repos/asf/maven.git/maven-core) +- Maven Core (from https://repo1.maven.org/maven2/org/apache/maven/maven-core) - Maven Error Diagnostics (from ) -- Maven Model (from https://git-wip-us.apache.org/repos/asf/maven.git/maven-model) +- Maven Model (from https://repo1.maven.org/maven2/org/apache/maven/maven-model) - Maven Monitor (from ) -- Maven Plugin API (from https://git-wip-us.apache.org/repos/asf/maven.git/maven-plugin-api) +- Maven Plugin API (from https://repo1.maven.org/maven2/org/apache/maven/maven-plugin-api) - Maven Plugin Descriptor Model (from ) - Maven Plugin Parameter Documenter API (from ) - Maven Plugin Registry Model (from ) - Maven Profile Model (from ) - Maven Project (from ) - Maven Reporting API (from ) -- Maven Repository Metadata Model (from ) -- Maven Settings (from ) -- Metrics Core (from https://github.com/dropwizard/metrics) +- Maven Repository Metadata Model (from https://repo1.maven.org/maven2/org/apache/maven/maven-repository-metadata) +- Maven Settings (from https://repo1.maven.org/maven2/org/apache/maven/maven-settings) +- Metrics Core (from https://repo1.maven.org/maven2/io/dropwizard/metrics/metrics-core) - Microsoft Application Insights Java SDK Core (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Java SDK Spring Boot starter (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Java SDK Web Module (from https://github.com/Microsoft/ApplicationInsights-Java) @@ -470,35 +474,33 @@ The following software have components provided under the terms of this license: - Microsoft Azure SDK for Key Vault (from https://github.com/Azure/azure-sdk-for-java) - Microsoft Azure SDK for SQL API of Azure Cosmos DB Service (from https://github.com/Azure/azure-sdk-for-java) - Microsoft Azure Storage Client SDK (from https://github.com/Azure/azure-storage-java) -- Mockito (from http://mockito.org) -- Mockito (from http://mockito.org) - Mojo's Maven plugin for Cobertura (from http://mojo.codehaus.org/cobertura-maven-plugin/) -- Netty Reactive Streams HTTP support (from ) -- Netty Reactive Streams Implementation (from ) -- Netty/Buffer (from http://netty.io/) -- Netty/Codec (from ) -- Netty/Codec/DNS (from ) -- Netty/Codec/HTTP (from ) -- Netty/Codec/HTTP2 (from ) -- Netty/Codec/Socks (from ) -- Netty/Common (from ) -- Netty/Handler (from ) -- Netty/Handler/Proxy (from ) -- Netty/Resolver (from ) -- Netty/Resolver/DNS (from ) -- Netty/TomcatNative [BoringSSL - Static] (from ) -- Netty/Transport (from http://netty.io/) -- Netty/Transport/Native/Unix/Common (from ) +- Netty Reactive Streams HTTP support (from https://repo1.maven.org/maven2/com/typesafe/netty/netty-reactive-streams-http) +- Netty Reactive Streams Implementation (from https://repo1.maven.org/maven2/com/typesafe/netty/netty-reactive-streams) +- Netty/Buffer (from https://repo1.maven.org/maven2/io/netty/netty-buffer) +- Netty/Codec (from https://repo1.maven.org/maven2/io/netty/netty-codec) +- Netty/Codec/DNS (from https://repo1.maven.org/maven2/io/netty/netty-codec-dns) +- Netty/Codec/HTTP (from https://repo1.maven.org/maven2/io/netty/netty-codec-http) +- Netty/Codec/HTTP2 (from https://repo1.maven.org/maven2/io/netty/netty-codec-http2) +- Netty/Codec/Socks (from https://repo1.maven.org/maven2/io/netty/netty-codec-socks) +- Netty/Common (from https://repo1.maven.org/maven2/io/netty/netty-common) +- Netty/Handler (from https://repo1.maven.org/maven2/io/netty/netty-handler) +- Netty/Handler/Proxy (from https://repo1.maven.org/maven2/io/netty/netty-handler-proxy) +- Netty/Resolver (from https://repo1.maven.org/maven2/io/netty/netty-resolver) +- Netty/Resolver/DNS (from https://repo1.maven.org/maven2/io/netty/netty-resolver-dns) +- Netty/TomcatNative [BoringSSL - Static] (from https://repo1.maven.org/maven2/io/netty/netty-tcnative-boringssl-static) +- Netty/Transport (from https://repo1.maven.org/maven2/io/netty/netty-transport) +- Netty/Transport/Native/Unix/Common (from https://repo1.maven.org/maven2/io/netty/netty-transport-native-unix-common) - Nimbus Content Type (from https://bitbucket.org/connect2id/nimbus-content-type) - Nimbus JOSE+JWT (from https://bitbucket.org/connect2id/nimbus-jose-jwt) - Nimbus LangTag (from https://bitbucket.org/connect2id/nimbus-language-tags) -- Non-Blocking Reactive Foundation for the JVM (from https://github.com/reactor/reactor) +- Non-Blocking Reactive Foundation for the JVM (from https://github.com/reactor/reactor-core) - OAuth 2.0 SDK with OpenID Connect extensions (from https://bitbucket.org/connect2id/oauth-2.0-sdk-with-openid-connect-extensions) - Objenesis (from http://objenesis.org) -- OkHttp (from ) -- OkHttp Logging Interceptor (from ) -- OkHttp URLConnection (from ) -- Okio (from ) +- OkHttp (from https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp) +- OkHttp Logging Interceptor (from https://repo1.maven.org/maven2/com/squareup/okhttp3/logging-interceptor) +- OkHttp URLConnection (from https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp-urlconnection) +- Okio (from https://github.com/square/okio/) - OpenCensus (from https://github.com/census-instrumentation/opencensus-java) - OpenCensus (from https://github.com/census-instrumentation/opencensus-java) - OpenCensus (from https://github.com/census-instrumentation/opencensus-java) @@ -508,18 +510,16 @@ The following software have components provided under the terms of this license: - Plexus Velocity Component (from ) - PowerMock (from http://www.powermock.org) - PowerMock (from http://www.powermock.org) -- Protocol Buffer extensions to the Google HTTP Client Library for Java. (from ) +- Protocol Buffer extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-protobuf) +- Proton-J (from https://repo1.maven.org/maven2/org/apache/qpid/proton-j) - QpidJMS Client (from ) - Reactive Streams Netty driver (from https://github.com/reactor/reactor-netty) -- Retrofit (from ) +- Retrofit (from https://repo1.maven.org/maven2/com/squareup/retrofit2/retrofit) - Servlet Specification 2.5 API (from ) -- SnakeYAML (from http://www.snakeyaml.org) -- Spring AOP (from https://github.com/spring-projects/spring-framework) -- Spring Beans (from https://github.com/spring-projects/spring-framework) +- SnakeYAML (from http://code.google.com/p/snakeyaml/) - Spring Boot (from http://projects.spring.io/spring-boot/) - Spring Boot Actuator (from http://projects.spring.io/spring-boot/) - Spring Boot Actuator AutoConfigure (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-actuator-autoconfigure) -- Spring Boot Actuator Starter (from http://projects.spring.io/spring-boot/) - Spring Boot AutoConfigure (from http://projects.spring.io/spring-boot/) - Spring Boot Dependencies (from http://projects.spring.io/spring-boot/) - Spring Boot Json Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-json) @@ -528,12 +528,8 @@ The following software have components provided under the terms of this license: - Spring Boot Reactor Netty Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-reactor-netty) - Spring Boot Security Starter (from http://projects.spring.io/spring-boot/) - Spring Boot Starter (from http://projects.spring.io/spring-boot/) -- Spring Boot Test (from http://projects.spring.io/spring-boot/) - Spring Boot Test Auto-Configure (from http://projects.spring.io/spring-boot/) - Spring Boot Test Starter (from http://projects.spring.io/spring-boot/) -- Spring Boot Tomcat Starter (from http://projects.spring.io/spring-boot/) -- Spring Boot Validation Starter (from http://projects.spring.io/spring-boot/) -- Spring Boot Web Starter (from http://projects.spring.io/spring-boot/) - Spring Boot WebFlux Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-webflux) - Spring Cloud GCP Autoconfigure Module (from ) - Spring Cloud GCP Core Module (from ) @@ -541,20 +537,22 @@ The following software have components provided under the terms of this license: - Spring Cloud GCP Datastore Starter (from https://repo1.maven.org/maven2/org/springframework/cloud/spring-cloud-gcp-starter-data-datastore) - Spring Cloud GCP Support Starter (from ) - Spring Commons Logging Bridge (from https://github.com/spring-projects/spring-framework) -- Spring Context (from https://github.com/spring-projects/spring-framework) -- Spring Core (from https://github.com/spring-projects/spring-framework) -- Spring Data Core (from ) -- Spring Data Core (from ) +- Spring Data Core (from https://repo1.maven.org/maven2/org/springframework/data/spring-data-commons) +- Spring Data Core (from https://repo1.maven.org/maven2/org/springframework/data/spring-data-commons) - Spring Expression Language (SpEL) (from https://github.com/spring-projects/spring-framework) +- Spring Framework: AOP (from http://www.springframework.org) +- Spring Framework: Context (from http://www.springframework.org) +- Spring Framework: WebMVC (from http://www.springframework.org) - Spring JMS (from https://github.com/spring-projects/spring-framework) - Spring Messaging (from https://github.com/spring-projects/spring-framework) - Spring Plugin - Core (from ) -- Spring Plugin - Metadata Extension (from ) +- Spring Plugin - Metadata Extension (from https://repo1.maven.org/maven2/org/springframework/plugin/spring-plugin-metadata) - Spring TestContext Framework (from https://github.com/spring-projects/spring-framework) - Spring Transaction (from https://github.com/spring-projects/spring-framework) -- Spring Web (from https://github.com/spring-projects/spring-framework) -- Spring Web MVC (from https://github.com/spring-projects/spring-framework) - Spring WebFlux (from https://github.com/spring-projects/spring-framework) +- Spring beans (from https://repo1.maven.org/maven2/org/springframework/spring-beans) +- Spring core (from https://repo1.maven.org/maven2/org/springframework/spring-core) +- Spring web (from https://repo1.maven.org/maven2/org/springframework/spring-web) - Woodstox (from https://github.com/FasterXML/woodstox) - Xerces2-j (from https://xerces.apache.org/xerces2-j/) - Zipkin Reporter Brave (from https://repo1.maven.org/maven2/io/zipkin/reporter2/zipkin-reporter-brave) @@ -565,12 +563,8 @@ The following software have components provided under the terms of this license: - brave (from ) - com.google.api.grpc:grpc-google-cloud-pubsub-v1 (from https://github.com/googleapis/googleapis) - com.google.api.grpc:proto-google-cloud-logging-v2 (from https://github.com/googleapis/googleapis) -- com.google.api.grpc:proto-google-cloud-pubsub-v1 (from https://github.com/googleapis/googleapis) -- com.google.api.grpc:proto-google-common-protos (from https://github.com/googleapis/googleapis) -- com.google.api.grpc:proto-google-iam-v1 (from https://github.com/googleapis/googleapis) -- commons-collections (from ) - datastore-v1-proto-client (from ) -- error-prone annotations (from ) +- error-prone annotations (from https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations) - io.grpc:grpc-alts (from https://github.com/grpc/grpc-java) - io.grpc:grpc-api (from https://github.com/grpc/grpc-java) - io.grpc:grpc-auth (from https://github.com/grpc/grpc-java) @@ -583,19 +577,19 @@ The following software have components provided under the terms of this license: - io.grpc:grpc-stub (from https://github.com/grpc/grpc-java) - ion-java (from https://github.com/amznlabs/ion-java/) - ion-java (from https://github.com/amznlabs/ion-java/) -- jackson-databind (from http://github.com/FasterXML/jackson) -- jackson-databind (from http://github.com/FasterXML/jackson) +- jackson-databind (from http://wiki.fasterxml.com/JacksonHome) +- jackson-databind (from http://wiki.fasterxml.com/JacksonHome) - java-cloudant (from https://cloudant.com) - java-cloudant (from https://cloudant.com) - javatuples (from http://www.javatuples.org) - javax.inject (from http://code.google.com/p/atinject/) - jose4j (from https://bitbucket.org/b_c/jose4j/) -- kotlin-stdlib (from ) - lettuce (from http://github.com/mp911de/lettuce/wiki) - micrometer-core (from https://github.com/micrometer-metrics/micrometer) - micrometer-registry-azure-monitor (from https://github.com/micrometer-metrics/micrometer) +- mockito-core (from https://github.com/mockito/mockito) +- mockito-core (from https://github.com/mockito/mockito) - org.apiguardian:apiguardian-api (from https://github.com/apiguardian-team/apiguardian) -- org.jetbrains.kotlin:kotlin-stdlib-common (from https://kotlinlang.org/) - org.opentest4j:opentest4j (from https://github.com/ota4j-team/opentest4j) - org.xmlunit:xmlunit-core (from http://www.xmlunit.org/) - powermock-api-support (from ) @@ -609,17 +603,23 @@ The following software have components provided under the terms of this license: - powermock-reflect (from ) - powermock-reflect (from ) - proto-google-cloud-datastore-v1 (from https://github.com/googleapis/api-client-staging) -- proton-j (from ) +- proto-google-cloud-pubsub-v1 (from https://github.com/googleapis/java-pubsub/proto-google-cloud-pubsub-v1) +- proto-google-iam-v1 (from https://github.com/googleapis/api-client-staging) - rxjava (from https://github.com/ReactiveX/RxJava) - spring-boot-container-bundle (from ) +- spring-boot-starter-actuator (from https://spring.io/projects/spring-boot) +- spring-boot-starter-tomcat (from https://spring.io/projects/spring-boot) +- spring-boot-starter-validation (from https://spring.io/projects/spring-boot) +- spring-boot-starter-web (from https://spring.io/projects/spring-boot) +- spring-boot-test (from https://spring.io/projects/spring-boot) - spring-security-config (from http://spring.io/spring-security) -- spring-security-core (from http://spring.io/spring-security) +- spring-security-core (from https://spring.io/spring-security) - spring-security-oauth2-client (from http://spring.io/spring-security) - spring-security-oauth2-core (from http://spring.io/spring-security) - spring-security-oauth2-jose (from http://spring.io/spring-security) - spring-security-oauth2-resource-server (from http://spring.io/spring-security) - spring-security-test (from http://spring.io/spring-security) -- spring-security-web (from http://spring.io/spring-security) +- spring-security-web (from https://spring.io/spring-security) - springfox-core (from https://github.com/springfox/springfox) - springfox-schema (from https://github.com/springfox/springfox) - springfox-spi (from https://github.com/springfox/springfox) @@ -627,11 +627,11 @@ The following software have components provided under the terms of this license: - springfox-swagger-common (from https://github.com/springfox/springfox) - springfox-swagger-ui (from https://github.com/springfox/springfox) - springfox-swagger2 (from https://github.com/springfox/springfox) -- swagger-annotations (from ) +- swagger-annotations (from https://repo1.maven.org/maven2/io/swagger/swagger-annotations) - swagger-jaxrs (from ) - swagger-models (from ) - tomcat-embed-core (from http://tomcat.apache.org/) -- tomcat-embed-websocket (from http://tomcat.apache.org/) +- tomcat-embed-websocket (from https://tomcat.apache.org/) - xml-apis (from ) ======================================================================== @@ -639,11 +639,11 @@ BSD-2-Clause ======================================================================== The following software have components provided under the terms of this license: -- API Common (from https://github.com/googleapis) +- API Common (from https://github.com/googleapis/api-common-java) - Apache Commons CLI (from http://commons.apache.org/proper/commons-cli/) -- GAX (Google Api eXtensions) (from https://github.com/googleapis) -- GAX (Google Api eXtensions) (from https://github.com/googleapis) -- GAX (Google Api eXtensions) (from https://github.com/googleapis) +- GAX (Google Api eXtensions) for Java (from https://github.com/googleapis/gax-java) +- GAX (Google Api eXtensions) for Java (from https://github.com/googleapis/gax-java) +- GAX (Google Api eXtensions) for Java (from https://github.com/googleapis/gax-java) - Hamcrest (from http://hamcrest.org/JavaHamcrest/) - Hamcrest Core (from http://hamcrest.org/) - HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/) @@ -658,7 +658,7 @@ BSD-3-Clause ======================================================================== The following software have components provided under the terms of this license: -- API Common (from https://github.com/googleapis) +- API Common (from https://github.com/googleapis/api-common-java) - ASM Analysis (from ) - ASM Commons (from ) - ASM Core (from ) @@ -666,30 +666,30 @@ The following software have components provided under the terms of this license: - ASM Core (from ) - ASM Tree (from ) - ASM Util (from ) -- Apache Commons Codec (from http://commons.apache.org/proper/commons-codec/) -- GAX (Google Api eXtensions) (from https://github.com/googleapis) -- GAX (Google Api eXtensions) (from https://github.com/googleapis) -- GAX (Google Api eXtensions) (from https://github.com/googleapis) -- Google APIs Client Library for Java (from ) -- Google Auth Library for Java - Credentials (from ) -- Google Auth Library for Java - OAuth2 HTTP (from ) +- Apache Commons Codec (from https://commons.apache.org/proper/commons-codec/) +- GAX (Google Api eXtensions) for Java (from https://github.com/googleapis/gax-java) +- GAX (Google Api eXtensions) for Java (from https://github.com/googleapis/gax-java) +- GAX (Google Api eXtensions) for Java (from https://github.com/googleapis/gax-java) +- Google APIs Client Library for Java (from https://repo1.maven.org/maven2/com/google/api-client/google-api-client) +- Google Auth Library for Java - Credentials (from https://repo1.maven.org/maven2/com/google/auth/google-auth-library-credentials) +- Google Auth Library for Java - OAuth2 HTTP (from https://repo1.maven.org/maven2/com/google/auth/google-auth-library-oauth2-http) - Hamcrest (from http://hamcrest.org/JavaHamcrest/) - Hamcrest Core (from http://hamcrest.org/) - HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/) - JSch (from http://www.jcraft.com/jsch/) -- JavaBeans Activation Framework (from ) +- JavaBeans Activation Framework (from https://repo1.maven.org/maven2/com/sun/activation/jakarta.activation) - JavaBeans Activation Framework API jar (from ) - Microsoft Application Insights Java SDK Core (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Java SDK Spring Boot starter (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Java SDK Web Module (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Log4j 2 Appender (from https://github.com/Microsoft/ApplicationInsights-Java) -- Netty/Codec/HTTP (from ) +- Netty/Codec/HTTP (from https://repo1.maven.org/maven2/io/netty/netty-codec-http) - Plexus Common Utilities (from http://plexus.codehaus.org/plexus-utils) -- Protocol Buffer Java API (from https://developers.google.com/protocol-buffers/) -- Protocol Buffers [Util] (from ) +- Protocol Buffers [Core] (from https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java) +- Protocol Buffers [Util] (from https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java-util) - Reflections (from http://github.com/ronmamo/reflections) -- SnakeYAML (from http://www.snakeyaml.org) -- Spring Core (from https://github.com/spring-projects/spring-framework) +- SnakeYAML (from http://code.google.com/p/snakeyaml/) +- Spring core (from https://repo1.maven.org/maven2/org/springframework/spring-core) - ThreeTen backport (from https://www.threeten.org/threetenbp) - classworlds (from http://classworlds.codehaus.org/) - jakarta.xml.bind-api (from ) @@ -758,16 +758,16 @@ The following software have components provided under the terms of this license: - Expression Language 3.0 (from https://projects.eclipse.org/projects/ee4j.el) - JUnit Jupiter (Aggregator) (from https://junit.org/junit5/) -- Logback Classic Module (from ) +- Logback Classic Module (from https://repo1.maven.org/maven2/ch/qos/logback/logback-classic) - Logback Contrib :: JSON :: Classic (from ) - Logback Contrib :: JSON :: Core (from ) - Logback Contrib :: Jackson (from ) -- Logback Core Module (from ) +- Logback Core Module (from https://repo1.maven.org/maven2/ch/qos/logback/logback-core) - Microsoft Application Insights Java SDK Core (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Java SDK Spring Boot starter (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Java SDK Web Module (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Log4j 2 Appender (from https://github.com/Microsoft/ApplicationInsights-Java) -- SnakeYAML (from http://www.snakeyaml.org) +- SnakeYAML (from http://code.google.com/p/snakeyaml/) - jakarta.annotation-api (from https://projects.eclipse.org/projects/ee4j.ca) - org.junit.jupiter:junit-jupiter-api (from http://junit.org/junit5/) - org.junit.jupiter:junit-jupiter-engine (from http://junit.org/junit5/) @@ -794,8 +794,8 @@ GPL-2.0-only ======================================================================== The following software have components provided under the terms of this license: +- Cobertura (from http://cobertura.sourceforge.net) - Cobertura Limited Runtime (from http://cobertura.sourceforge.net) -- Cobertura code coverage (from http://cobertura.sourceforge.net) - Commons Lang (from http://commons.apache.org/lang/) - JavaBeans Activation Framework (from ) - Mojo's Maven plugin for Cobertura (from http://mojo.codehaus.org/cobertura-maven-plugin/) @@ -807,14 +807,14 @@ GPL-2.0-or-later ======================================================================== The following software have components provided under the terms of this license: -- SnakeYAML (from http://www.snakeyaml.org) +- SnakeYAML (from http://code.google.com/p/snakeyaml/) ======================================================================== GPL-2.0-with-classpath-exception ======================================================================== The following software have components provided under the terms of this license: -- Cobertura code coverage (from http://cobertura.sourceforge.net) +- Cobertura (from http://cobertura.sourceforge.net) - Expression Language 3.0 (from https://projects.eclipse.org/projects/ee4j.el) - JavaBeans Activation Framework (from ) - jakarta.annotation-api (from https://projects.eclipse.org/projects/ee4j.ca) @@ -859,17 +859,17 @@ LGPL-2.1-only ======================================================================== The following software have components provided under the terms of this license: -- Cobertura code coverage (from http://cobertura.sourceforge.net) +- Cobertura (from http://cobertura.sourceforge.net) - Commons Lang (from http://commons.apache.org/lang/) - Java Native Access (from https://github.com/java-native-access/jna) - Java Native Access Platform (from https://github.com/java-native-access/jna) - Javassist (from http://www.javassist.org/) - Javassist (from http://www.javassist.org/) -- Logback Classic Module (from ) +- Logback Classic Module (from https://repo1.maven.org/maven2/ch/qos/logback/logback-classic) - Logback Contrib :: JSON :: Classic (from ) - Logback Contrib :: JSON :: Core (from ) - Logback Contrib :: Jackson (from ) -- Logback Core Module (from ) +- Logback Core Module (from https://repo1.maven.org/maven2/ch/qos/logback/logback-core) - Microsoft Application Insights Java SDK Core (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Java SDK Spring Boot starter (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Java SDK Web Module (from https://github.com/Microsoft/ApplicationInsights-Java) @@ -882,15 +882,15 @@ The following software have components provided under the terms of this license: - Javassist (from http://www.javassist.org/) - Javassist (from http://www.javassist.org/) -- SnakeYAML (from http://www.snakeyaml.org) +- SnakeYAML (from http://code.google.com/p/snakeyaml/) ======================================================================== LGPL-3.0-only ======================================================================== The following software have components provided under the terms of this license: -- Apache Log4j API (from ) -- Apache Log4j Core (from ) +- Apache Log4j API (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-api) +- Apache Log4j Core (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-core) ======================================================================== MIT @@ -900,7 +900,7 @@ The following software have components provided under the terms of this license: - AWS Java SDK for AWS Lambda (from https://aws.amazon.com/sdkforjava) - AWS Java SDK for AWS License Manager (from https://aws.amazon.com/sdkforjava) - AWS SDK for Java - Models (from https://aws.amazon.com/sdkforjava) -- Animal Sniffer Annotations (from ) +- Animal Sniffer Annotations (from https://repo1.maven.org/maven2/org/codehaus/mojo/animal-sniffer-annotations) - Azure Java Client Authentication Library for AutoRest (from https://github.com/Azure/autorest-clientruntime-for-java) - Azure Java Client Runtime for ARM (from https://github.com/Azure/autorest-clientruntime-for-java) - Azure Java Client Runtime for AutoRest (from https://github.com/Azure/autorest-clientruntime-for-java) @@ -910,7 +910,6 @@ The following software have components provided under the terms of this license: - Extensions on Apache Proton-J library (from https://github.com/Azure/qpid-proton-j-extensions) - JUL to SLF4J bridge (from http://www.slf4j.org) - Java Client Runtime for AutoRest (from https://github.com/Azure/autorest-clientruntime-for-java) -- Java JWT (from http://www.jwt.io) - Microsoft Application Insights Java SDK Core (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Java SDK Spring Boot starter (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Java SDK Web Module (from https://github.com/Microsoft/ApplicationInsights-Java) @@ -929,10 +928,8 @@ The following software have components provided under the terms of this license: - Microsoft Azure client library for KeyVault Secrets (from https://github.com/Azure/azure-sdk-for-java) - Microsoft Azure common module for Storage (from https://github.com/Azure/azure-sdk-for-java) - Microsoft Azure internal Avro module for Storage (from https://github.com/Azure/azure-sdk-for-java) -- Mockito (from http://mockito.org) -- Mockito (from http://mockito.org) -- Netty/Codec/HTTP (from ) -- Netty/Common (from ) +- Netty/Codec/HTTP (from https://repo1.maven.org/maven2/io/netty/netty-codec-http) +- Netty/Common (from https://repo1.maven.org/maven2/io/netty/netty-common) - Plexus :: Default Container (from ) - Plexus Default Interactivity Handler (from ) - Project Lombok (from https://projectlombok.org) @@ -944,18 +941,21 @@ The following software have components provided under the terms of this license: - adal4j (from https://github.com/AzureAD/azure-activedirectory-library-for-java) - azure-documentdb (from https://azure.microsoft.com/en-us/services/cosmos-db/) - documentdb-bulkexecutor (from http://azure.microsoft.com/en-us/services/documentdb/) +- java jwt (from http://www.jwt.io) - micrometer-core (from https://github.com/micrometer-metrics/micrometer) +- mockito-core (from https://github.com/mockito/mockito) +- mockito-core (from https://github.com/mockito/mockito) - mockito-junit-jupiter (from https://github.com/mockito/mockito) - msal4j (from https://github.com/AzureAD/microsoft-authentication-library-for-java) - msal4j-persistence-extension (from https://github.com/AzureAD/microsoft-authentication-extensions-for-java) -- spring-security-core (from http://spring.io/spring-security) +- spring-security-core (from https://spring.io/spring-security) ======================================================================== MPL-1.1 ======================================================================== The following software have components provided under the terms of this license: -- Cobertura code coverage (from http://cobertura.sourceforge.net) +- Cobertura (from http://cobertura.sourceforge.net) - Javassist (from http://www.javassist.org/) - Javassist (from http://www.javassist.org/) @@ -966,14 +966,14 @@ The following software have components provided under the terms of this license: - Javassist (from http://www.javassist.org/) - Javassist (from http://www.javassist.org/) -- OkHttp (from ) +- OkHttp (from https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp) ======================================================================== PHP-3.01 ======================================================================== The following software have components provided under the terms of this license: -- JavaBeans Activation Framework (from ) +- JavaBeans Activation Framework (from https://repo1.maven.org/maven2/com/sun/activation/jakarta.activation) - JavaBeans Activation Framework API jar (from ) - jakarta.xml.bind-api (from ) @@ -1024,15 +1024,15 @@ The following software have components provided under the terms of this license: - AWS Java SDK :: SDK Core (from https://aws.amazon.com/sdkforjava) - AWS SDK for Java - Models (from https://aws.amazon.com/sdkforjava) -- Asynchronous Http Client (from ) +- Asynchronous Http Client (from https://repo1.maven.org/maven2/org/asynchttpclient/async-http-client) - Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs (from http://www.bouncycastle.org/java.html) - Bouncy Castle Provider (from http://www.bouncycastle.org/java.html) -- Guava: Google Core Libraries for Java (from https://github.com/google/guava.git) +- Guava: Google Core Libraries for Java (from https://repo1.maven.org/maven2/com/google/guava/guava) - HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/) - JTidy (from http://jtidy.sourceforge.net) -- Joda-Time (from http://www.joda.org/joda-time/) -- Joda-Time (from http://www.joda.org/joda-time/) -- Joda-Time (from http://www.joda.org/joda-time/) +- Joda-Time (from https://www.joda.org/joda-time/) +- Joda-Time (from https://www.joda.org/joda-time/) +- Joda-Time (from https://www.joda.org/joda-time/) - Keycloak Common (from ) - LatencyUtils (from http://latencyutils.github.io/LatencyUtils/) - Microsoft Application Insights Java SDK Core (from https://github.com/Microsoft/ApplicationInsights-Java) @@ -1042,7 +1042,7 @@ The following software have components provided under the terms of this license: - Project Lombok (from https://projectlombok.org) - Project Lombok (from https://projectlombok.org) - Project Lombok (from https://projectlombok.org) -- Spring Web (from https://github.com/spring-projects/spring-framework) +- Spring web (from https://repo1.maven.org/maven2/org/springframework/spring-web) - azure-documentdb (from https://azure.microsoft.com/en-us/services/cosmos-db/) - msal4j (from https://github.com/AzureAD/microsoft-authentication-library-for-java) - reactive-streams (from http://www.reactive-streams.org/) @@ -1055,13 +1055,13 @@ The following software have components provided under the terms of this license: - Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs (from http://www.bouncycastle.org/java.html) - Bouncy Castle Provider (from http://www.bouncycastle.org/java.html) -- Byte Buddy (without dependencies) (from ) +- Byte Buddy (without dependencies) (from https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy) - Checker Qual (from https://checkerframework.org) - JSON in Java (from https://github.com/douglascrockford/JSON-java) - JTidy (from http://jtidy.sourceforge.net) - JUnit (from http://junit.org) - JUnit Jupiter (Aggregator) (from https://junit.org/junit5/) -- JavaBeans Activation Framework (from ) +- JavaBeans Activation Framework (from https://repo1.maven.org/maven2/com/sun/activation/jakarta.activation) - JavaBeans Activation Framework API jar (from ) - Spongy Castle (from http://rtyley.github.io/spongycastle/) - jakarta.xml.bind-api (from ) diff --git a/pom.xml b/pom.xml index e88a94a5..52a53353 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ 1.8 1.8 UTF-8 - 0.9.0 + 0.10.0 2.4.5 diff --git a/provider/partition-aws/pom.xml b/provider/partition-aws/pom.xml index 5c127766..1118ab4f 100644 --- a/provider/partition-aws/pom.xml +++ b/provider/partition-aws/pom.xml @@ -57,7 +57,7 @@ org.opengroup.osdu.core.aws os-core-lib-aws - 0.10.0-SNAPSHOT + 0.10.0 org.opengroup.osdu diff --git a/provider/partition-azure/pom.xml b/provider/partition-azure/pom.xml index 37d09a50..caa7ac52 100644 --- a/provider/partition-azure/pom.xml +++ b/provider/partition-azure/pom.xml @@ -14,7 +14,7 @@ jar - 0.9.0 + 0.10.0 4.12 2.25.0 2.0.2 diff --git a/testing/partition-test-aws/pom.xml b/testing/partition-test-aws/pom.xml index 6791c386..4f43798a 100644 --- a/testing/partition-test-aws/pom.xml +++ b/testing/partition-test-aws/pom.xml @@ -71,7 +71,7 @@ org.opengroup.osdu.core.aws os-core-lib-aws - 0.10.0-SNAPSHOT + 0.10.0 -- GitLab From ba982d85784a9b9ab57277ae18bd3b901fe43383 Mon Sep 17 00:00:00 2001 From: "Oleksii Tsyganov (EPAM)" Date: Thu, 22 Jul 2021 04:33:34 -0400 Subject: [PATCH 22/26] Revert "Merge branch 'Migrate-partition-to-GKE' into 'master'" This reverts merge request !75 --- .gitlab-ci.yml | 11 +---------- devops/gcp/configmap/values.yaml | 1 - 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 717c0395..7f134efc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,15 +19,6 @@ variables: MAVEN_PROJECTS: "-pl partition-core,provider/partition-gcp" OSDU_GCP_TEST_SUBDIR: testing/$OSDU_GCP_SERVICE-test-$OSDU_GCP_VENDOR OSDU_GCP_HELM_PACKAGE_CHARTS: "devops/gcp/deploy devops/gcp/configmap" - 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.authorize_api=$OSDU_GCP_AUTHORIZE_API --set data.google_cloud_project=$OSDU_GCP_PROJECT --set data.google_audiences=$GOOGLE_AUDIENCE --set data.partition_admin_account=osdu-gcp-sa@nice-etching-277309.iam.gserviceaccount.com --set data.log_level=INFO --set data.key_ring=$OSDU_GCP_PARTITION_KEY_RING --set data.kms_key=$OSDU_GCP_PARTITION_KMS_KEY" - OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp:$CI_COMMIT_SHORT_SHA --set data.serviceAccountName=workload-identity-partition" - OSDU_GCP_HELM_CONFIG_SERVICE: "partition-config" - OSDU_GCP_HELM_DEPLOYMENT_SERVICE: "partition-deploy" - - include: - project: "osdu/platform/ci-cd-pipelines" @@ -52,7 +43,7 @@ include: file: "cloud-providers/ibm.yml" - project: "osdu/platform/ci-cd-pipelines" - file: "cloud-providers/osdu-gcp-gke.yml" + file: "cloud-providers/osdu-gcp-cloudrun.yml" - project: "osdu/platform/ci-cd-pipelines" file: "publishing/pages.yml" diff --git a/devops/gcp/configmap/values.yaml b/devops/gcp/configmap/values.yaml index d8e92367..fa714ddf 100644 --- a/devops/gcp/configmap/values.yaml +++ b/devops/gcp/configmap/values.yaml @@ -5,7 +5,6 @@ data: key_ring: "" kms_key: "" log_level: "" - authorize_api: "" conf: configmap: "partition-config" -- GitLab From cf5febc5c50a66d0ff1743a0b9962a57c00c1b78 Mon Sep 17 00:00:00 2001 From: David Diederich Date: Thu, 22 Jul 2021 06:19:54 -0400 Subject: [PATCH 23/26] Update version of default branch to 0.11.0-SNAPSHOT --- partition-core/pom.xml | 2 +- pom.xml | 2 +- provider/partition-aws/pom.xml | 2 +- provider/partition-azure/pom.xml | 2 +- provider/partition-gcp/pom.xml | 2 +- provider/partition-ibm/pom.xml | 2 +- testing/partition-test-aws/pom.xml | 6 +++--- testing/partition-test-azure/pom.xml | 6 +++--- testing/partition-test-core/pom.xml | 4 ++-- testing/partition-test-gcp/pom.xml | 6 +++--- testing/partition-test-ibm/pom.xml | 6 +++--- testing/pom.xml | 2 +- 12 files changed, 21 insertions(+), 21 deletions(-) diff --git a/partition-core/pom.xml b/partition-core/pom.xml index 24ba8c4a..4a4945f1 100644 --- a/partition-core/pom.xml +++ b/partition-core/pom.xml @@ -23,7 +23,7 @@ org.opengroup.osdu partition - 0.10.0-SNAPSHOT + 0.11.0-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 52a53353..5b8cb91d 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ 4.0.0 org.opengroup.osdu partition - 0.10.0-SNAPSHOT + 0.11.0-SNAPSHOT Partition Service diff --git a/provider/partition-aws/pom.xml b/provider/partition-aws/pom.xml index 1118ab4f..9e06fded 100644 --- a/provider/partition-aws/pom.xml +++ b/provider/partition-aws/pom.xml @@ -21,7 +21,7 @@ partition org.opengroup.osdu - 0.10.0-SNAPSHOT + 0.11.0-SNAPSHOT ../../pom.xml diff --git a/provider/partition-azure/pom.xml b/provider/partition-azure/pom.xml index caa7ac52..51f79fe5 100644 --- a/provider/partition-azure/pom.xml +++ b/provider/partition-azure/pom.xml @@ -4,7 +4,7 @@ partition org.opengroup.osdu - 0.10.0-SNAPSHOT + 0.11.0-SNAPSHOT ../../pom.xml diff --git a/provider/partition-gcp/pom.xml b/provider/partition-gcp/pom.xml index 68607241..a5836540 100644 --- a/provider/partition-gcp/pom.xml +++ b/provider/partition-gcp/pom.xml @@ -5,7 +5,7 @@ partition org.opengroup.osdu - 0.10.0-SNAPSHOT + 0.11.0-SNAPSHOT ../../pom.xml diff --git a/provider/partition-ibm/pom.xml b/provider/partition-ibm/pom.xml index 5c137ba7..ac87c614 100644 --- a/provider/partition-ibm/pom.xml +++ b/provider/partition-ibm/pom.xml @@ -9,7 +9,7 @@ partition org.opengroup.osdu - 0.10.0-SNAPSHOT + 0.11.0-SNAPSHOT ../../pom.xml diff --git a/testing/partition-test-aws/pom.xml b/testing/partition-test-aws/pom.xml index 4f43798a..c0c6b656 100644 --- a/testing/partition-test-aws/pom.xml +++ b/testing/partition-test-aws/pom.xml @@ -19,14 +19,14 @@ org.opengroup.osdu os-partition-testing - 0.10.0-SNAPSHOT + 0.11.0-SNAPSHOT ../pom.xml 4.0.0 org.opengroup.osdu.partition partition-test-aws - 0.10.0-SNAPSHOT + 0.11.0-SNAPSHOT jar @@ -65,7 +65,7 @@ org.opengroup.osdu.partition partition-test-core - 0.10.0-SNAPSHOT + 0.11.0-SNAPSHOT diff --git a/testing/partition-test-azure/pom.xml b/testing/partition-test-azure/pom.xml index 363fc3ea..e8924dbd 100644 --- a/testing/partition-test-azure/pom.xml +++ b/testing/partition-test-azure/pom.xml @@ -20,13 +20,13 @@ org.opengroup.osdu os-partition-testing - 0.10.0-SNAPSHOT + 0.11.0-SNAPSHOT ../pom.xml org.opengroup.osdu.partition partition-test-azure - 0.10.0-SNAPSHOT + 0.11.0-SNAPSHOT jar @@ -65,7 +65,7 @@ org.opengroup.osdu.partition partition-test-core - 0.10.0-SNAPSHOT + 0.11.0-SNAPSHOT diff --git a/testing/partition-test-core/pom.xml b/testing/partition-test-core/pom.xml index 120093c9..e0a4aa23 100644 --- a/testing/partition-test-core/pom.xml +++ b/testing/partition-test-core/pom.xml @@ -20,13 +20,13 @@ org.opengroup.osdu os-partition-testing - 0.10.0-SNAPSHOT + 0.11.0-SNAPSHOT ../pom.xml org.opengroup.osdu.partition partition-test-core - 0.10.0-SNAPSHOT + 0.11.0-SNAPSHOT jar diff --git a/testing/partition-test-gcp/pom.xml b/testing/partition-test-gcp/pom.xml index 399fcd7b..a0111c8f 100644 --- a/testing/partition-test-gcp/pom.xml +++ b/testing/partition-test-gcp/pom.xml @@ -6,13 +6,13 @@ org.opengroup.osdu os-partition-testing - 0.10.0-SNAPSHOT + 0.11.0-SNAPSHOT ../pom.xml org.opengroup.osdu.partition partition-test-gcp - 0.10.0-SNAPSHOT + 0.11.0-SNAPSHOT jar @@ -57,7 +57,7 @@ org.opengroup.osdu.partition partition-test-core - 0.10.0-SNAPSHOT + 0.11.0-SNAPSHOT diff --git a/testing/partition-test-ibm/pom.xml b/testing/partition-test-ibm/pom.xml index 796dd54b..70ea3a03 100644 --- a/testing/partition-test-ibm/pom.xml +++ b/testing/partition-test-ibm/pom.xml @@ -6,13 +6,13 @@ org.opengroup.osdu os-partition-testing - 0.10.0-SNAPSHOT + 0.11.0-SNAPSHOT ../pom.xml org.opengroup.osdu.partition partition-test-ibm - 0.10.0-SNAPSHOT + 0.11.0-SNAPSHOT jar @@ -58,7 +58,7 @@ org.opengroup.osdu.partition partition-test-core - 0.10.0-SNAPSHOT + 0.11.0-SNAPSHOT diff --git a/testing/pom.xml b/testing/pom.xml index 6f53bf90..6d504655 100644 --- a/testing/pom.xml +++ b/testing/pom.xml @@ -18,7 +18,7 @@ 4.0.0 org.opengroup.osdu os-partition-testing - 0.10.0-SNAPSHOT + 0.11.0-SNAPSHOT Root partition test project pom -- GitLab From c369b690261f7786e0dd5edefc364ffc0139f7dd Mon Sep 17 00:00:00 2001 From: Oleksii Tsyganov Date: Thu, 22 Jul 2021 12:20:54 +0200 Subject: [PATCH 24/26] Added rollme annotation --- devops/gcp/deploy/templates/partition-deploy.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/devops/gcp/deploy/templates/partition-deploy.yml b/devops/gcp/deploy/templates/partition-deploy.yml index 34791b84..b46afd8a 100644 --- a/devops/gcp/deploy/templates/partition-deploy.yml +++ b/devops/gcp/deploy/templates/partition-deploy.yml @@ -12,6 +12,8 @@ spec: metadata: labels: app: "{{ .Values.conf.app_name }}" + annotations: + rollme: {{ randAlphaNum 5 | quote }} spec: containers: - image: "{{ .Values.data.image }}" -- GitLab From 8b46758a69eb28fe08875ac253d650bedc3deb21 Mon Sep 17 00:00:00 2001 From: "Rustam Lotsmanenko (EPAM)" Date: Mon, 2 Aug 2021 11:17:55 +0000 Subject: [PATCH 25/26] Configurable partition admin accounts (GONRG-2687) --- .gitlab-ci.yml | 10 +- NOTICE | 224 +++++++++--------- .../templates/partition-variables.yml | 2 +- devops/gcp/configmap/values.yaml | 2 +- provider/partition-gcp/README.md | 2 +- .../config/IDTokenVerifierConfiguration.java | 44 ++++ .../gcp/config/PropertiesConfiguration.java | 17 +- .../gcp/security/AuthorizationService.java | 43 ++-- .../src/main/resources/application.properties | 2 +- .../security/AuthorizationServiceTest.java | 127 ++++++++++ 10 files changed, 336 insertions(+), 137 deletions(-) create mode 100644 provider/partition-gcp/src/main/java/org/opengroup/osdu/partition/provider/gcp/config/IDTokenVerifierConfiguration.java create mode 100644 provider/partition-gcp/src/test/java/org/opengroup/osdu/partition/provider/gcp/security/AuthorizationServiceTest.java diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7f134efc..aa7743a1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,6 +19,11 @@ variables: MAVEN_PROJECTS: "-pl partition-core,provider/partition-gcp" OSDU_GCP_TEST_SUBDIR: testing/$OSDU_GCP_SERVICE-test-$OSDU_GCP_VENDOR OSDU_GCP_HELM_PACKAGE_CHARTS: "devops/gcp/deploy devops/gcp/configmap" + OSDU_GCP_HELM_NAMESPACE: default + OSDU_GCP_HELM_CONFIG_SERVICE_VARS: "--set data.partition_admin_accounts=$OSDU_GCP_PARTITION_ADMIN_ACCOUNTS --set data.google_cloud_project=$OSDU_GCP_PROJECT --set data.google_audiences=$GOOGLE_AUDIENCE --set data.log_level=INFO --set data.key_ring=$OSDU_GCP_PARTITION_KEY_RING --set data.kms_key=$OSDU_GCP_PARTITION_KMS_KEY" + OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp:$CI_COMMIT_SHORT_SHA --set data.serviceAccountName=workload-identity-partition" + OSDU_GCP_HELM_CONFIG_SERVICE: partition-config + OSDU_GCP_HELM_DEPLOYMENT_SERVICE: partition-deploy include: - project: "osdu/platform/ci-cd-pipelines" @@ -43,7 +48,10 @@ include: file: "cloud-providers/ibm.yml" - project: "osdu/platform/ci-cd-pipelines" - file: "cloud-providers/osdu-gcp-cloudrun.yml" + file: "cloud-providers/osdu-gcp-gke.yml" + + - project: "osdu/platform/ci-cd-pipelines" + file: 'cloud-providers/osdu-gcp-global.yml' - project: "osdu/platform/ci-cd-pipelines" file: "publishing/pages.yml" diff --git a/NOTICE b/NOTICE index 0a6988ad..3493bbb4 100644 --- a/NOTICE +++ b/NOTICE @@ -16,8 +16,8 @@ The following software have components provided under the terms of this license: - Apache Commons CLI (from http://commons.apache.org/proper/commons-cli/) - Cobertura (from http://cobertura.sourceforge.net) -- Plexus :: Default Container (from ) -- Plexus Common Utilities (from http://plexus.codehaus.org/plexus-utils) +- Default Plexus Container (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-container-default) +- Plexus Common Utilities (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils) - oro (from ) ======================================================================== @@ -312,7 +312,8 @@ The following software have components provided under the terms of this license: - Apache Commons CLI (from http://commons.apache.org/proper/commons-cli/) - Apache Commons Codec (from https://commons.apache.org/proper/commons-codec/) - Apache Commons Collections (from https://commons.apache.org/proper/commons-collections/) -- Apache Commons Lang (from http://commons.apache.org/proper/commons-lang/) +- Apache Commons IO (from https://commons.apache.org/proper/commons-io/) +- Apache Commons Lang (from https://commons.apache.org/proper/commons-lang/) - Apache Commons Logging (from http://commons.apache.org/proper/commons-logging/) - Apache Commons Validator (from http://commons.apache.org/proper/commons-validator/) - Apache Geronimo JMS Spec 2.0 (from http://geronimo.apache.org/maven/${siteId}/${version}) @@ -323,16 +324,9 @@ The following software have components provided under the terms of this license: - Apache Log4j Core (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-core) - Apache Log4j JUL Adapter (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-jul) - Apache Log4j SLF4J Binding (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-slf4j-impl) -- Apache Log4j to SLF4J Adapter (from ) +- Apache Log4j to SLF4J Adapter (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-to-slf4j) - Apache Maven Invoker (from ) -- Apache Maven Reporting Implementation (from ) -- Apache Maven Wagon :: API (from ) -- Apache Maven Wagon :: Providers :: File Provider (from ) -- Apache Maven Wagon :: Providers :: HTTP Shared Library (from ) -- Apache Maven Wagon :: Providers :: Lightweight HTTP Provider (from ) -- Apache Maven Wagon :: Providers :: SSH Common Library (from ) -- Apache Maven Wagon :: Providers :: SSH External Provider (from ) -- Apache Maven Wagon :: Providers :: SSH Provider (from ) +- Apache Maven Reporting Implementation (from https://repo1.maven.org/maven2/org/apache/maven/reporting/maven-reporting-impl) - Apache Velocity (from http://velocity.apache.org/engine/devel/) - AssertJ fluent assertions (from https://repo1.maven.org/maven2/org/assertj/assertj-core) - AssertJ fluent assertions (from https://repo1.maven.org/maven2/org/assertj/assertj-core) @@ -340,12 +334,14 @@ The following software have components provided under the terms of this license: - Asynchronous Http Client Netty Utils (from https://repo1.maven.org/maven2/org/asynchttpclient/async-http-client-netty-utils) - Azure Spring Boot Starter for Azure AD Spring Security Integration (from https://github.com/Azure/azure-sdk-for-java) - Bean Validation API (from http://beanvalidation.org) -- Brave Instrumentation: Http Adapters (from ) +- Bean Validation API (from http://beanvalidation.org) +- Brave (from https://repo1.maven.org/maven2/io/zipkin/brave/brave) +- Brave Instrumentation: Http Adapters (from https://repo1.maven.org/maven2/io/zipkin/brave/brave-instrumentation-http) - Brave instrumentation for Reactor Netty HTTP (from https://github.com/reactor/reactor-netty) - Byte Buddy (without dependencies) (from https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy) -- Byte Buddy Java agent (from https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent) +- Byte Buddy agent (from https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent) - ClassMate (from http://github.com/cowtowncoder/java-classmate) -- Cloud Storage JSON API v1-rev20181109-1.28.0 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage) +- Cloud Storage JSON API v1-rev20210127-1.32.1 (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) - Collections (from https://repo1.maven.org/maven2/commons-collections/commons-collections) @@ -353,22 +349,23 @@ The following software have components provided under the terms of this license: - Commons Lang (from http://commons.apache.org/lang/) - Converter: Jackson (from https://repo1.maven.org/maven2/com/squareup/retrofit2/converter-jackson) - Core functionality for the Reactor Netty library (from https://github.com/reactor/reactor-netty) -- Doxia :: APT Module (from ) -- Doxia :: Core (from ) -- Doxia :: Decoration Model (from http://maven.apache.org/doxia/doxia-sitetools/doxia-decoration-model/) -- Doxia :: FML Module (from ) -- Doxia :: Sink API (from ) -- Doxia :: Site Renderer (from http://maven.apache.org/doxia/doxia-sitetools/doxia-site-renderer/) -- Doxia :: XDoc Module (from ) -- Doxia :: XHTML Module (from ) +- Default Plexus Container (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-container-default) +- Doxia :: APT Module (from http://maven.apache.org/doxia/doxia/doxia-modules/doxia-module-apt/) +- Doxia :: Core (from http://maven.apache.org/doxia/doxia/doxia-core/) +- Doxia :: FML Module (from http://maven.apache.org/doxia/doxia/doxia-modules/doxia-module-fml/) +- Doxia :: Sink API (from http://maven.apache.org/doxia/doxia/doxia-sink-api/) +- Doxia :: XDoc Module (from http://maven.apache.org/doxia/doxia/doxia-modules/doxia-module-xdoc/) +- Doxia :: XHTML Module (from http://maven.apache.org/doxia/doxia/doxia-modules/doxia-module-xhtml/) +- Doxia Sitetools :: Decoration Model (from http://maven.apache.org/doxia/doxia-sitetools/doxia-decoration-model/) +- Doxia Sitetools :: Site Renderer Component (from http://maven.apache.org/doxia/doxia-sitetools/doxia-site-renderer/) - Expression Language 3.0 (from https://projects.eclipse.org/projects/ee4j.el) - FindBugs-jsr305 (from http://findbugs.sourceforge.net/) - Google APIs Client Library for Java (from https://repo1.maven.org/maven2/com/google/api-client/google-api-client) - Google App Engine extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-appengine) - Google Cloud Common Protos for Java (from https://github.com/googleapis/common-protos-java) -- Google Cloud Core (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-core) -- Google Cloud Core HTTP (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-core-http) -- Google Cloud Core gRPC (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-core-grpc) +- Google Cloud Core (from https://github.com/googleapis/java-core) +- Google Cloud Core HTTP (from https://github.com/googleapis/java-core) +- Google Cloud Core gRPC (from https://github.com/googleapis/java-core) - Google Cloud Datastore (from https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-datastore) - Google Cloud Key Management Service (KMS) API v1-rev9-1.22.0 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-cloudkms) - Google Cloud Logging (from https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-logging) @@ -380,12 +377,11 @@ The following software have components provided under the terms of this license: - Guava InternalFutureFailureAccess and InternalFutures (from https://repo1.maven.org/maven2/com/google/guava/failureaccess) - Guava: Google Core Libraries for Java (from https://repo1.maven.org/maven2/com/google/guava/guava) - HTTP functionality for the Reactor Netty library (from https://github.com/reactor/reactor-netty) -- Hibernate Validator Engine (from ) +- Hibernate Validator Engine (from https://repo1.maven.org/maven2/org/hibernate/validator/hibernate-validator) - IBM COS Java SDK for Amazon S3 (from https://github.com/ibm/ibm-cos-sdk-java) - IBM COS Java SDK for COS KMS (from https://github.com/ibm/ibm-cos-sdk-java) - IBM COS SDK For Java (from https://github.com/ibm/ibm-cos-sdk-java) - IBM COS SDK for Java - Core (from https://github.com/ibm/ibm-cos-sdk-java) -- IO (from http://jakarta.apache.org/commons/${pom.artifactId.substring(8)}/) - Identity and Access Management (IAM) API v1-rev247-1.23.0 (from ) - IntelliJ IDEA Annotations (from http://www.jetbrains.org) - IntelliJ IDEA Annotations (from http://www.jetbrains.org) @@ -396,13 +392,14 @@ The following software have components provided under the terms of this license: - JMES Path Query library (from https://aws.amazon.com/sdkforjava) - JSON Small and Fast Parser (from https://repo1.maven.org/maven2/net/minidev/json-smart) - JSON Small and Fast Parser (from https://repo1.maven.org/maven2/net/minidev/json-smart) -- JSON Web Token support for the JVM (from https://github.com/jwtk/jjwt.git) +- JSON Web Token support for the JVM (from https://github.com/jwtk/jjwt) - JSON library from Android SDK (from http://developer.android.com/sdk) - JSONassert (from https://github.com/skyscreamer/JSONassert) - Jackson (from http://jackson.codehaus.org) - Jackson 2 extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-jackson2) - Jackson dataformat: CBOR (from http://github.com/FasterXML/jackson-dataformats-binary) - Jackson datatype: JSR310 (from https://repo1.maven.org/maven2/com/fasterxml/jackson/datatype/jackson-datatype-jsr310) +- Jackson datatype: Joda (from https://github.com/FasterXML/jackson-datatype-joda) - Jackson datatype: jdk8 (from https://repo1.maven.org/maven2/com/fasterxml/jackson/datatype/jackson-datatype-jdk8) - Jackson extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-jackson) - Jackson module: Afterburner (from https://github.com/FasterXML/jackson-modules-base) @@ -413,17 +410,15 @@ The following software have components provided under the terms of this license: - Jackson-core (from http://wiki.fasterxml.com/JacksonHome) - Jackson-dataformat-XML (from http://wiki.fasterxml.com/JacksonExtensionXmlDataBinding) - Jackson-dataformat-YAML (from https://github.com/FasterXML/jackson-dataformats-text) -- Jackson-datatype-Joda (from http://wiki.fasterxml.com/JacksonModuleJoda) - Jackson-module-parameter-names (from https://repo1.maven.org/maven2/com/fasterxml/jackson/module/jackson-module-parameter-names) -- Jakarta Bean Validation API (from https://beanvalidation.org) - Java Libraries for Amazon Simple WorkFlow (from https://aws.amazon.com/sdkforjava) -- Java Native Access (from https://github.com/java-native-access/jna) +- Java Native Access (from https://repo1.maven.org/maven2/net/java/dev/jna/jna) - Java Native Access Platform (from https://github.com/java-native-access/jna) - Java UUID Generator (from http://wiki.fasterxml.com/JugHome) - Javassist (from http://www.javassist.org/) - Javassist (from http://www.javassist.org/) -- Jetty Server (from https://repo1.maven.org/maven2/org/mortbay/jetty/jetty) -- Jetty Utilities (from https://repo1.maven.org/maven2/org/mortbay/jetty/jetty-util) +- Jetty Server (from http://jetty.mortbay.org) +- Jetty Utilities (from http://jetty.mortbay.org) - Joda-Time (from https://www.joda.org/joda-time/) - Joda-Time (from https://www.joda.org/joda-time/) - Joda-Time (from https://www.joda.org/joda-time/) @@ -448,22 +443,29 @@ The following software have components provided under the terms of this license: - Logback Contrib :: JSON :: Classic (from ) - Logback Contrib :: JSON :: Core (from ) - Logback Contrib :: Jackson (from ) -- MapStruct Core (from http://mapstruct.org/mapstruct/) +- MapStruct Core (from https://repo1.maven.org/maven2/org/mapstruct/mapstruct) - Maven Artifact (from https://repo1.maven.org/maven2/org/apache/maven/maven-artifact) -- Maven Artifact Manager (from ) +- Maven Artifact Manager (from https://repo1.maven.org/maven2/org/apache/maven/maven-artifact-manager) - Maven Core (from https://repo1.maven.org/maven2/org/apache/maven/maven-core) -- Maven Error Diagnostics (from ) +- Maven Error Diagnostics (from https://repo1.maven.org/maven2/org/apache/maven/maven-error-diagnostics) +- Maven Local Settings Model (from https://repo1.maven.org/maven2/org/apache/maven/maven-settings) - Maven Model (from https://repo1.maven.org/maven2/org/apache/maven/maven-model) -- Maven Monitor (from ) +- Maven Monitor (from https://repo1.maven.org/maven2/org/apache/maven/maven-monitor) - Maven Plugin API (from https://repo1.maven.org/maven2/org/apache/maven/maven-plugin-api) -- Maven Plugin Descriptor Model (from ) -- Maven Plugin Parameter Documenter API (from ) -- Maven Plugin Registry Model (from ) -- Maven Profile Model (from ) -- Maven Project (from ) -- Maven Reporting API (from ) +- Maven Plugin Descriptor Model (from https://repo1.maven.org/maven2/org/apache/maven/maven-plugin-descriptor) +- Maven Plugin Parameter Documenter API (from https://repo1.maven.org/maven2/org/apache/maven/maven-plugin-parameter-documenter) +- Maven Plugin Registry Model (from https://repo1.maven.org/maven2/org/apache/maven/maven-plugin-registry) +- Maven Profile Model (from https://repo1.maven.org/maven2/org/apache/maven/maven-profile) +- Maven Project Builder (from https://repo1.maven.org/maven2/org/apache/maven/maven-project) +- Maven Reporting API (from https://repo1.maven.org/maven2/org/apache/maven/reporting/maven-reporting-api) - Maven Repository Metadata Model (from https://repo1.maven.org/maven2/org/apache/maven/maven-repository-metadata) -- Maven Settings (from https://repo1.maven.org/maven2/org/apache/maven/maven-settings) +- Maven Wagon API (from https://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-provider-api) +- Maven Wagon File Provider (from https://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-file) +- Maven Wagon HTTP Shared Library (from https://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-http-shared) +- Maven Wagon Lightweight HTTP Provider (from https://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-http-lightweight) +- Maven Wagon SSH Common Library (from https://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-ssh-common) +- Maven Wagon SSH External Provider (from https://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-ssh-external) +- Maven Wagon SSH Provider (from https://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-ssh) - Metrics Core (from https://repo1.maven.org/maven2/io/dropwizard/metrics/metrics-core) - Microsoft Application Insights Java SDK Core (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Java SDK Spring Boot starter (from https://github.com/Microsoft/ApplicationInsights-Java) @@ -497,16 +499,12 @@ The following software have components provided under the terms of this license: - Non-Blocking Reactive Foundation for the JVM (from https://github.com/reactor/reactor-core) - OAuth 2.0 SDK with OpenID Connect extensions (from https://bitbucket.org/connect2id/oauth-2.0-sdk-with-openid-connect-extensions) - Objenesis (from http://objenesis.org) -- OkHttp (from https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp) -- OkHttp Logging Interceptor (from https://repo1.maven.org/maven2/com/squareup/okhttp3/logging-interceptor) -- OkHttp URLConnection (from https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp-urlconnection) - Okio (from https://github.com/square/okio/) - OpenCensus (from https://github.com/census-instrumentation/opencensus-java) - OpenCensus (from https://github.com/census-instrumentation/opencensus-java) - OpenCensus (from https://github.com/census-instrumentation/opencensus-java) - PWDB :: Database (from https://repo1.maven.org/maven2/org/linguafranca/pwdb/database) -- Plexus :: Default Container (from ) -- Plexus Common Utilities (from http://plexus.codehaus.org/plexus-utils) +- Plexus Common Utilities (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils) - Plexus Velocity Component (from ) - PowerMock (from http://www.powermock.org) - PowerMock (from http://www.powermock.org) @@ -514,35 +512,22 @@ The following software have components provided under the terms of this license: - Proton-J (from https://repo1.maven.org/maven2/org/apache/qpid/proton-j) - QpidJMS Client (from ) - Reactive Streams Netty driver (from https://github.com/reactor/reactor-netty) -- Retrofit (from https://repo1.maven.org/maven2/com/squareup/retrofit2/retrofit) -- Servlet Specification 2.5 API (from ) +- Retrofit (from https://github.com/square/retrofit) +- Servlet Specification 2.5 API (from http://jetty.mortbay.org) - SnakeYAML (from http://code.google.com/p/snakeyaml/) -- Spring Boot (from http://projects.spring.io/spring-boot/) -- Spring Boot Actuator (from http://projects.spring.io/spring-boot/) -- Spring Boot Actuator AutoConfigure (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-actuator-autoconfigure) -- Spring Boot AutoConfigure (from http://projects.spring.io/spring-boot/) -- Spring Boot Dependencies (from http://projects.spring.io/spring-boot/) +- Spring AOP (from https://repo1.maven.org/maven2/org/springframework/spring-aop) - Spring Boot Json Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-json) -- Spring Boot Log4J2 Starter (from http://projects.spring.io/spring-boot/) -- Spring Boot Logging Starter (from http://projects.spring.io/spring-boot/) -- Spring Boot Reactor Netty Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-reactor-netty) -- Spring Boot Security Starter (from http://projects.spring.io/spring-boot/) -- Spring Boot Starter (from http://projects.spring.io/spring-boot/) -- Spring Boot Test Auto-Configure (from http://projects.spring.io/spring-boot/) -- Spring Boot Test Starter (from http://projects.spring.io/spring-boot/) -- Spring Boot WebFlux Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-webflux) -- Spring Cloud GCP Autoconfigure Module (from ) -- Spring Cloud GCP Core Module (from ) +- Spring Boot Tomcat Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-tomcat) +- Spring Boot Web Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-web) +- Spring Cloud GCP Autoconfigure Module (from https://repo1.maven.org/maven2/org/springframework/cloud/spring-cloud-gcp-autoconfigure) +- Spring Cloud GCP Core Module (from https://repo1.maven.org/maven2/org/springframework/cloud/spring-cloud-gcp-core) - Spring Cloud GCP Datastore Module (from ) - Spring Cloud GCP Datastore Starter (from https://repo1.maven.org/maven2/org/springframework/cloud/spring-cloud-gcp-starter-data-datastore) -- Spring Cloud GCP Support Starter (from ) +- Spring Cloud GCP Support Starter (from https://repo1.maven.org/maven2/org/springframework/cloud/spring-cloud-gcp-starter) - Spring Commons Logging Bridge (from https://github.com/spring-projects/spring-framework) - Spring Data Core (from https://repo1.maven.org/maven2/org/springframework/data/spring-data-commons) - Spring Data Core (from https://repo1.maven.org/maven2/org/springframework/data/spring-data-commons) - Spring Expression Language (SpEL) (from https://github.com/spring-projects/spring-framework) -- Spring Framework: AOP (from http://www.springframework.org) -- Spring Framework: Context (from http://www.springframework.org) -- Spring Framework: WebMVC (from http://www.springframework.org) - Spring JMS (from https://github.com/spring-projects/spring-framework) - Spring Messaging (from https://github.com/spring-projects/spring-framework) - Spring Plugin - Core (from ) @@ -551,16 +536,16 @@ The following software have components provided under the terms of this license: - Spring Transaction (from https://github.com/spring-projects/spring-framework) - Spring WebFlux (from https://github.com/spring-projects/spring-framework) - Spring beans (from https://repo1.maven.org/maven2/org/springframework/spring-beans) +- Spring context (from https://repo1.maven.org/maven2/org/springframework/spring-context) - Spring core (from https://repo1.maven.org/maven2/org/springframework/spring-core) - Spring web (from https://repo1.maven.org/maven2/org/springframework/spring-web) +- Spring web MVC (from https://repo1.maven.org/maven2/org/springframework/spring-webmvc) - Woodstox (from https://github.com/FasterXML/woodstox) -- Xerces2-j (from https://xerces.apache.org/xerces2-j/) +- Zipkin Core Library (from https://repo1.maven.org/maven2/io/zipkin/zipkin2/zipkin) - Zipkin Reporter Brave (from https://repo1.maven.org/maven2/io/zipkin/reporter2/zipkin-reporter-brave) -- Zipkin Reporter: Core (from ) -- Zipkin v2 (from ) +- Zipkin Reporter: Core (from https://repo1.maven.org/maven2/io/zipkin/reporter2/zipkin-reporter) - aalto-xml (from ) - aws-ssm-java-caching-client (from https://github.com/awslabs/aws-ssm-java-caching-client) -- brave (from ) - com.google.api.grpc:grpc-google-cloud-pubsub-v1 (from https://github.com/googleapis/googleapis) - com.google.api.grpc:proto-google-cloud-logging-v2 (from https://github.com/googleapis/googleapis) - datastore-v1-proto-client (from ) @@ -589,37 +574,51 @@ The following software have components provided under the terms of this license: - micrometer-registry-azure-monitor (from https://github.com/micrometer-metrics/micrometer) - mockito-core (from https://github.com/mockito/mockito) - mockito-core (from https://github.com/mockito/mockito) +- okhttp (from https://square.github.io/okhttp/) +- okhttp-logging-interceptor (from https://square.github.io/okhttp/) +- okhttp-urlconnection (from https://github.com/square/okhttp) - org.apiguardian:apiguardian-api (from https://github.com/apiguardian-team/apiguardian) - org.opentest4j:opentest4j (from https://github.com/ota4j-team/opentest4j) - org.xmlunit:xmlunit-core (from http://www.xmlunit.org/) -- powermock-api-support (from ) -- powermock-api-support (from ) +- powermock-api-support (from https://repo1.maven.org/maven2/org/powermock/powermock-api-support) +- powermock-api-support (from https://repo1.maven.org/maven2/org/powermock/powermock-api-support) - powermock-core (from http://www.powermock.org) - powermock-core (from http://www.powermock.org) - powermock-module-junit4 (from http://www.powermock.org) - powermock-module-junit4 (from http://www.powermock.org) -- powermock-module-junit4-common (from ) -- powermock-module-junit4-common (from ) -- powermock-reflect (from ) -- powermock-reflect (from ) +- powermock-module-junit4-common (from https://repo1.maven.org/maven2/org/powermock/powermock-module-junit4-common) +- powermock-module-junit4-common (from https://repo1.maven.org/maven2/org/powermock/powermock-module-junit4-common) +- powermock-reflect (from https://repo1.maven.org/maven2/org/powermock/powermock-reflect) +- powermock-reflect (from https://repo1.maven.org/maven2/org/powermock/powermock-reflect) - proto-google-cloud-datastore-v1 (from https://github.com/googleapis/api-client-staging) - proto-google-cloud-pubsub-v1 (from https://github.com/googleapis/java-pubsub/proto-google-cloud-pubsub-v1) -- proto-google-iam-v1 (from https://github.com/googleapis/api-client-staging) +- proto-google-iam-v1 (from https://github.com/googleapis/java-iam/proto-google-iam-v1) - rxjava (from https://github.com/ReactiveX/RxJava) +- spring-boot (from https://spring.io/projects/spring-boot) +- spring-boot-actuator (from https://spring.io/projects/spring-boot) +- spring-boot-actuator-autoconfigure (from https://spring.io/projects/spring-boot) +- spring-boot-autoconfigure (from https://spring.io/projects/spring-boot) - spring-boot-container-bundle (from ) +- spring-boot-dependencies (from https://spring.io/projects/spring-boot) +- spring-boot-starter (from https://spring.io/projects/spring-boot) - spring-boot-starter-actuator (from https://spring.io/projects/spring-boot) -- spring-boot-starter-tomcat (from https://spring.io/projects/spring-boot) +- spring-boot-starter-log4j2 (from https://spring.io/projects/spring-boot) +- spring-boot-starter-logging (from https://spring.io/projects/spring-boot) +- spring-boot-starter-reactor-netty (from https://spring.io/projects/spring-boot) +- spring-boot-starter-security (from https://spring.io/projects/spring-boot) +- spring-boot-starter-test (from https://spring.io/projects/spring-boot) - spring-boot-starter-validation (from https://spring.io/projects/spring-boot) -- spring-boot-starter-web (from https://spring.io/projects/spring-boot) +- spring-boot-starter-webflux (from https://spring.io/projects/spring-boot) - spring-boot-test (from https://spring.io/projects/spring-boot) +- spring-boot-test-autoconfigure (from https://spring.io/projects/spring-boot) - spring-security-config (from http://spring.io/spring-security) -- spring-security-core (from https://spring.io/spring-security) +- spring-security-core (from http://spring.io/spring-security) - spring-security-oauth2-client (from http://spring.io/spring-security) - spring-security-oauth2-core (from http://spring.io/spring-security) - spring-security-oauth2-jose (from http://spring.io/spring-security) - spring-security-oauth2-resource-server (from http://spring.io/spring-security) - spring-security-test (from http://spring.io/spring-security) -- spring-security-web (from https://spring.io/spring-security) +- spring-security-web (from http://spring.io/spring-security) - springfox-core (from https://github.com/springfox/springfox) - springfox-schema (from https://github.com/springfox/springfox) - springfox-spi (from https://github.com/springfox/springfox) @@ -629,9 +628,10 @@ The following software have components provided under the terms of this license: - springfox-swagger2 (from https://github.com/springfox/springfox) - swagger-annotations (from https://repo1.maven.org/maven2/io/swagger/swagger-annotations) - swagger-jaxrs (from ) -- swagger-models (from ) +- swagger-models (from https://repo1.maven.org/maven2/io/swagger/swagger-models) - tomcat-embed-core (from http://tomcat.apache.org/) - tomcat-embed-websocket (from https://tomcat.apache.org/) +- xercesImpl (from https://repo1.maven.org/maven2/xerces/xercesImpl) - xml-apis (from ) ======================================================================== @@ -647,7 +647,7 @@ The following software have components provided under the terms of this license: - Hamcrest (from http://hamcrest.org/JavaHamcrest/) - Hamcrest Core (from http://hamcrest.org/) - HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/) -- Plexus Common Utilities (from http://plexus.codehaus.org/plexus-utils) +- Plexus Common Utilities (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils) - Reflections (from http://github.com/ronmamo/reflections) - Stax2 API (from http://github.com/FasterXML/stax2-api) - ThreeTen backport (from https://www.threeten.org/threetenbp) @@ -676,7 +676,6 @@ The following software have components provided under the terms of this license: - Hamcrest (from http://hamcrest.org/JavaHamcrest/) - Hamcrest Core (from http://hamcrest.org/) - HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/) -- JSch (from http://www.jcraft.com/jsch/) - JavaBeans Activation Framework (from https://repo1.maven.org/maven2/com/sun/activation/jakarta.activation) - JavaBeans Activation Framework API jar (from ) - Microsoft Application Insights Java SDK Core (from https://github.com/Microsoft/ApplicationInsights-Java) @@ -684,7 +683,7 @@ The following software have components provided under the terms of this license: - Microsoft Application Insights Java SDK Web Module (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Log4j 2 Appender (from https://github.com/Microsoft/ApplicationInsights-Java) - Netty/Codec/HTTP (from https://repo1.maven.org/maven2/io/netty/netty-codec-http) -- Plexus Common Utilities (from http://plexus.codehaus.org/plexus-utils) +- Plexus Common Utilities (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils) - Protocol Buffers [Core] (from https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java) - Protocol Buffers [Util] (from https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java-util) - Reflections (from http://github.com/ronmamo/reflections) @@ -694,6 +693,7 @@ The following software have components provided under the terms of this license: - classworlds (from http://classworlds.codehaus.org/) - jakarta.xml.bind-api (from ) - jaxen (from http://jaxen.codehaus.org/) +- jsch (from https://repo1.maven.org/maven2/com/jcraft/jsch) ======================================================================== CC-BY-2.5 @@ -724,7 +724,7 @@ CDDL-1.0 ======================================================================== The following software have components provided under the terms of this license: -- Servlet Specification 2.5 API (from ) +- Servlet Specification 2.5 API (from http://jetty.mortbay.org) ======================================================================== CDDL-1.1 @@ -732,7 +732,7 @@ CDDL-1.1 The following software have components provided under the terms of this license: - JavaBeans Activation Framework (from ) -- Servlet Specification 2.5 API (from ) +- Servlet Specification 2.5 API (from http://jetty.mortbay.org) - javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250) - tomcat-embed-core (from http://tomcat.apache.org/) @@ -758,20 +758,20 @@ The following software have components provided under the terms of this license: - Expression Language 3.0 (from https://projects.eclipse.org/projects/ee4j.el) - JUnit Jupiter (Aggregator) (from https://junit.org/junit5/) -- Logback Classic Module (from https://repo1.maven.org/maven2/ch/qos/logback/logback-classic) +- JUnit Jupiter API (from https://junit.org/junit5/) +- JUnit Jupiter Engine (from https://junit.org/junit5/) +- JUnit Jupiter Params (from https://junit.org/junit5/) +- Logback Classic Module (from http://logback.qos.ch) - Logback Contrib :: JSON :: Classic (from ) - Logback Contrib :: JSON :: Core (from ) - Logback Contrib :: Jackson (from ) -- Logback Core Module (from https://repo1.maven.org/maven2/ch/qos/logback/logback-core) +- Logback Core Module (from http://logback.qos.ch) - Microsoft Application Insights Java SDK Core (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Java SDK Spring Boot starter (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Java SDK Web Module (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Log4j 2 Appender (from https://github.com/Microsoft/ApplicationInsights-Java) - SnakeYAML (from http://code.google.com/p/snakeyaml/) - jakarta.annotation-api (from https://projects.eclipse.org/projects/ee4j.ca) -- org.junit.jupiter:junit-jupiter-api (from http://junit.org/junit5/) -- org.junit.jupiter:junit-jupiter-engine (from http://junit.org/junit5/) -- org.junit.jupiter:junit-jupiter-params (from http://junit.org/junit5/) - org.junit.platform:junit-platform-commons (from http://junit.org/junit5/) - org.junit.platform:junit-platform-engine (from http://junit.org/junit5/) @@ -782,10 +782,10 @@ The following software have components provided under the terms of this license: - Expression Language 3.0 (from https://projects.eclipse.org/projects/ee4j.el) - JUnit Jupiter (Aggregator) (from https://junit.org/junit5/) +- JUnit Jupiter API (from https://junit.org/junit5/) +- JUnit Jupiter Engine (from https://junit.org/junit5/) +- JUnit Jupiter Params (from https://junit.org/junit5/) - jakarta.annotation-api (from https://projects.eclipse.org/projects/ee4j.ca) -- org.junit.jupiter:junit-jupiter-api (from http://junit.org/junit5/) -- org.junit.jupiter:junit-jupiter-engine (from http://junit.org/junit5/) -- org.junit.jupiter:junit-jupiter-params (from http://junit.org/junit5/) - org.junit.platform:junit-platform-commons (from http://junit.org/junit5/) - org.junit.platform:junit-platform-engine (from http://junit.org/junit5/) @@ -861,15 +861,15 @@ The following software have components provided under the terms of this license: - Cobertura (from http://cobertura.sourceforge.net) - Commons Lang (from http://commons.apache.org/lang/) -- Java Native Access (from https://github.com/java-native-access/jna) +- Java Native Access (from https://repo1.maven.org/maven2/net/java/dev/jna/jna) - Java Native Access Platform (from https://github.com/java-native-access/jna) - Javassist (from http://www.javassist.org/) - Javassist (from http://www.javassist.org/) -- Logback Classic Module (from https://repo1.maven.org/maven2/ch/qos/logback/logback-classic) +- Logback Classic Module (from http://logback.qos.ch) - Logback Contrib :: JSON :: Classic (from ) - Logback Contrib :: JSON :: Core (from ) - Logback Contrib :: Jackson (from ) -- Logback Core Module (from https://repo1.maven.org/maven2/ch/qos/logback/logback-core) +- Logback Core Module (from http://logback.qos.ch) - Microsoft Application Insights Java SDK Core (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Java SDK Spring Boot starter (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Java SDK Web Module (from https://github.com/Microsoft/ApplicationInsights-Java) @@ -907,6 +907,7 @@ The following software have components provided under the terms of this license: - Azure Spring Boot AutoConfigure (from https://github.com/Azure/azure-sdk-for-java) - Bouncy Castle Provider (from http://www.bouncycastle.org/java.html) - Checker Qual (from https://checkerframework.org) +- Default Plexus Container (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-container-default) - Extensions on Apache Proton-J library (from https://github.com/Azure/qpid-proton-j-extensions) - JUL to SLF4J bridge (from http://www.slf4j.org) - Java Client Runtime for AutoRest (from https://github.com/Azure/autorest-clientruntime-for-java) @@ -930,7 +931,6 @@ The following software have components provided under the terms of this license: - Microsoft Azure internal Avro module for Storage (from https://github.com/Azure/azure-sdk-for-java) - Netty/Codec/HTTP (from https://repo1.maven.org/maven2/io/netty/netty-codec-http) - Netty/Common (from https://repo1.maven.org/maven2/io/netty/netty-common) -- Plexus :: Default Container (from ) - Plexus Default Interactivity Handler (from ) - Project Lombok (from https://projectlombok.org) - Project Lombok (from https://projectlombok.org) @@ -948,7 +948,7 @@ The following software have components provided under the terms of this license: - mockito-junit-jupiter (from https://github.com/mockito/mockito) - msal4j (from https://github.com/AzureAD/microsoft-authentication-library-for-java) - msal4j-persistence-extension (from https://github.com/AzureAD/microsoft-authentication-extensions-for-java) -- spring-security-core (from https://spring.io/spring-security) +- spring-security-core (from http://spring.io/spring-security) ======================================================================== MPL-1.1 @@ -966,7 +966,7 @@ The following software have components provided under the terms of this license: - Javassist (from http://www.javassist.org/) - Javassist (from http://www.javassist.org/) -- OkHttp (from https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp) +- okhttp (from https://square.github.io/okhttp/) ======================================================================== PHP-3.01 @@ -982,7 +982,7 @@ Public-Domain ======================================================================== The following software have components provided under the terms of this license: -- Plexus Common Utilities (from http://plexus.codehaus.org/plexus-utils) +- Plexus Common Utilities (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils) - Spongy Castle (from http://rtyley.github.io/spongycastle/) ======================================================================== @@ -998,7 +998,7 @@ SPL-1.0 The following software have components provided under the terms of this license: - Checker Qual (from https://checkerframework.org) -- Servlet Specification 2.5 API (from ) +- Servlet Specification 2.5 API (from http://jetty.mortbay.org) ======================================================================== W3C @@ -1007,7 +1007,7 @@ The following software have components provided under the terms of this license: - Apache Ant Core (from http://ant.apache.org/) - JTidy (from http://jtidy.sourceforge.net) -- Xerces2-j (from https://xerces.apache.org/xerces2-j/) +- xercesImpl (from https://repo1.maven.org/maven2/xerces/xercesImpl) - xml-apis (from ) ======================================================================== @@ -1061,13 +1061,13 @@ The following software have components provided under the terms of this license: - JTidy (from http://jtidy.sourceforge.net) - JUnit (from http://junit.org) - JUnit Jupiter (Aggregator) (from https://junit.org/junit5/) +- JUnit Jupiter API (from https://junit.org/junit5/) +- JUnit Jupiter Engine (from https://junit.org/junit5/) +- JUnit Jupiter Params (from https://junit.org/junit5/) - JavaBeans Activation Framework (from https://repo1.maven.org/maven2/com/sun/activation/jakarta.activation) - JavaBeans Activation Framework API jar (from ) - Spongy Castle (from http://rtyley.github.io/spongycastle/) - jakarta.xml.bind-api (from ) -- org.junit.jupiter:junit-jupiter-api (from http://junit.org/junit5/) -- org.junit.jupiter:junit-jupiter-engine (from http://junit.org/junit5/) -- org.junit.jupiter:junit-jupiter-params (from http://junit.org/junit5/) - org.junit.platform:junit-platform-commons (from http://junit.org/junit5/) - org.junit.platform:junit-platform-engine (from http://junit.org/junit5/) - xml-apis (from ) diff --git a/devops/gcp/configmap/templates/partition-variables.yml b/devops/gcp/configmap/templates/partition-variables.yml index 1eb6ac15..9896f564 100644 --- a/devops/gcp/configmap/templates/partition-variables.yml +++ b/devops/gcp/configmap/templates/partition-variables.yml @@ -7,7 +7,7 @@ metadata: namespace: "{{ .Release.Namespace }}" data: GOOGLE_CLOUD_PROJECT: "{{ .Values.data.google_cloud_project }}" - PARTITION_ADMIN_ACCOUNT: "{{ .Values.data.partition_admin_account }}" + PARTITION_ADMIN_ACCOUNTS: "{{ .Values.data.partition_admin_accounts }}" GOOGLE_AUDIENCES: "{{ .Values.data.google_audiences }}" KEY_RING: "{{ .Values.data.key_ring }}" KMS_KEY: "{{ .Values.data.kms_key }}" diff --git a/devops/gcp/configmap/values.yaml b/devops/gcp/configmap/values.yaml index fa714ddf..ae3a9c09 100644 --- a/devops/gcp/configmap/values.yaml +++ b/devops/gcp/configmap/values.yaml @@ -1,6 +1,6 @@ data: google_cloud_project: "" - partition_admin_account: "" + partition_admin_accounts: "" google_audiences: "" key_ring: "" kms_key: "" diff --git a/provider/partition-gcp/README.md b/provider/partition-gcp/README.md index 8c50e5fa..c03c9659 100644 --- a/provider/partition-gcp/README.md +++ b/provider/partition-gcp/README.md @@ -22,7 +22,7 @@ In order to run the service locally or remotely, you will need to have the follo | `AUTHORIZE_API` | ex `https://entitlements.com/entitlements/v1` | Entitlements API endpoint | no | output of infrastructure deployment | | `GOOGLE_CLOUD_PROJECT` | ex `osdu-cicd-epam` | Google Cloud Project Id| no | output of infrastructure deployment | | `GOOGLE_AUDIENCES` | ex `*****.apps.googleusercontent.com` | Client ID for getting access to cloud resources | yes | https://console.cloud.google.com/apis/credentials | -| `PARTITION_ADMIN_ACCOUNT` | ex `admin@domen.iam.gserviceaccount.com` | Partition Admin account email | no | - | +| `PARTITION_ADMIN_ACCOUNTS` | ex `admin@domen.iam.gserviceaccount.com,osdu-gcp-sa,workload-identity` | List of partition admin account emails, could be in full form like `admin@domen.iam.gserviceaccount.com` or in `starts with` pattern like `osdu-gcp-sa`| no | - | | `GOOGLE_APPLICATION_CREDENTIALS` | ex `/path/to/directory/service-key.json` | Service account credentials, you only need this if running locally | yes | https://console.cloud.google.com/iam-admin/serviceaccounts | | `KEY_RING` | ex `csqp` | A key ring holds keys in a specific Google Cloud location and permit us to manage access control on groups of keys | yes | https://cloud.google.com/kms/docs/resource-hierarchy#key_rings | | `KMS_KEY` | ex `partitionService` | A key exists on one key ring linked to a specific location. | yes | https://cloud.google.com/kms/docs/resource-hierarchy#key_rings | diff --git a/provider/partition-gcp/src/main/java/org/opengroup/osdu/partition/provider/gcp/config/IDTokenVerifierConfiguration.java b/provider/partition-gcp/src/main/java/org/opengroup/osdu/partition/provider/gcp/config/IDTokenVerifierConfiguration.java new file mode 100644 index 00000000..fce0f246 --- /dev/null +++ b/provider/partition-gcp/src/main/java/org/opengroup/osdu/partition/provider/gcp/config/IDTokenVerifierConfiguration.java @@ -0,0 +1,44 @@ +/* + * Copyright 2021 Google LLC + * Copyright 2021 EPAM Systems, Inc + * + * 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 + * + * https://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. + */ + +package org.opengroup.osdu.partition.provider.gcp.config; + +import com.google.api.client.googleapis.auth.oauth2.GoogleIdTokenVerifier; +import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport; +import com.google.api.client.json.jackson2.JacksonFactory; +import java.io.IOException; +import java.security.GeneralSecurityException; +import java.util.Collections; +import lombok.RequiredArgsConstructor; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +@RequiredArgsConstructor +public class IDTokenVerifierConfiguration { + + private final PropertiesConfiguration configuration; + + @Bean + public GoogleIdTokenVerifier buildTokenVerifier() throws GeneralSecurityException, IOException { + return new GoogleIdTokenVerifier.Builder( + GoogleNetHttpTransport.newTrustedTransport(), + JacksonFactory.getDefaultInstance()) + .setAudience(Collections.singleton(configuration.getGoogleAudiences())) + .build(); + } +} diff --git a/provider/partition-gcp/src/main/java/org/opengroup/osdu/partition/provider/gcp/config/PropertiesConfiguration.java b/provider/partition-gcp/src/main/java/org/opengroup/osdu/partition/provider/gcp/config/PropertiesConfiguration.java index 5d236f42..7edd2c7b 100644 --- a/provider/partition-gcp/src/main/java/org/opengroup/osdu/partition/provider/gcp/config/PropertiesConfiguration.java +++ b/provider/partition-gcp/src/main/java/org/opengroup/osdu/partition/provider/gcp/config/PropertiesConfiguration.java @@ -17,6 +17,9 @@ package org.opengroup.osdu.partition.provider.gcp.config; +import java.util.List; +import java.util.Objects; +import javax.annotation.PostConstruct; import lombok.Getter; import lombok.Setter; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -30,9 +33,21 @@ public class PropertiesConfiguration { private String googleAudiences; - private String partitionAdminAccount; + private List partitionAdminAccounts; + + private String googleCloudProject; private int cacheExpiration; private int cacheMaxSize; + + private String serviceAccountTail; + + @PostConstruct + public void setUp() { + if (Objects.isNull(serviceAccountTail) || serviceAccountTail.isEmpty()) { + this.serviceAccountTail = googleCloudProject + ".iam.gserviceaccount.com"; + } + } + } diff --git a/provider/partition-gcp/src/main/java/org/opengroup/osdu/partition/provider/gcp/security/AuthorizationService.java b/provider/partition-gcp/src/main/java/org/opengroup/osdu/partition/provider/gcp/security/AuthorizationService.java index 0eb18091..2fe2c619 100644 --- a/provider/partition-gcp/src/main/java/org/opengroup/osdu/partition/provider/gcp/security/AuthorizationService.java +++ b/provider/partition-gcp/src/main/java/org/opengroup/osdu/partition/provider/gcp/security/AuthorizationService.java @@ -19,9 +19,7 @@ package org.opengroup.osdu.partition.provider.gcp.security; import com.google.api.client.googleapis.auth.oauth2.GoogleIdToken; import com.google.api.client.googleapis.auth.oauth2.GoogleIdTokenVerifier; -import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport; -import com.google.api.client.json.jackson2.JacksonFactory; -import java.util.Collections; +import java.util.List; import java.util.Objects; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -43,6 +41,8 @@ public class AuthorizationService implements IAuthorizationService { private final DpsHeaders headers; + private final GoogleIdTokenVerifier verifier; + @Override public boolean isDomainAdminServiceAccount() { if (Objects.isNull(headers.getAuthorization()) || headers.getAuthorization().isEmpty()) { @@ -50,13 +50,6 @@ public class AuthorizationService implements IAuthorizationService { } String email = null; try { - GoogleIdTokenVerifier verifier = - new GoogleIdTokenVerifier.Builder( - GoogleNetHttpTransport.newTrustedTransport(), - JacksonFactory.getDefaultInstance()) - .setAudience(Collections.singleton(configuration.getGoogleAudiences())) - .build(); - String authorization = headers.getAuthorization().replace("Bearer ", ""); GoogleIdToken googleIdToken = verifier.verify(authorization); if (Objects.isNull(googleIdToken)) { @@ -64,25 +57,37 @@ public class AuthorizationService implements IAuthorizationService { throw AppException.createUnauthorized("Unauthorized. The JWT token could not be validated"); } email = googleIdToken.getPayload().getEmail(); - String partitionAdminAccount = configuration.getPartitionAdminAccount(); - if (Objects.nonNull(partitionAdminAccount) && !partitionAdminAccount.isEmpty()) { - if (email.equals(partitionAdminAccount)) { - return true; - } else { - throw AppException - .createUnauthorized(String.format("Unauthorized. The user %s is untrusted.", email)); - } + List partitionAdminAccounts = configuration.getPartitionAdminAccounts(); + if (Objects.nonNull(partitionAdminAccounts) && !partitionAdminAccounts.isEmpty()) { + return isAllowedAccount(email); } else { - if (StringUtils.endsWithIgnoreCase(email, "gserviceaccount.com")) { + if (StringUtils.endsWith(email, configuration.getServiceAccountTail())) { return true; } else { throw AppException.createUnauthorized( String.format("Unauthorized. The user %s is not Service Principal", email)); } } + } catch (AppException e){ + throw e; } catch (Exception ex) { log.warn(String.format("User %s is not unauthorized. %s.", email, ex)); throw AppException.createUnauthorized("Unauthorized. The JWT token could not be validated"); } } + + private boolean isAllowedAccount(String accountEmail) { + if (StringUtils.endsWith(accountEmail, configuration.getServiceAccountTail())) { + for (String partitionAdmin : configuration.getPartitionAdminAccounts()) { + if (partitionAdmin.equals(accountEmail)) { + return true; + } + if (StringUtils.startsWith(accountEmail, partitionAdmin)) { + return true; + } + } + } + throw AppException + .createUnauthorized(String.format("Unauthorized. The user %s is untrusted.", accountEmail)); + } } diff --git a/provider/partition-gcp/src/main/resources/application.properties b/provider/partition-gcp/src/main/resources/application.properties index aea6a99c..2e9ae364 100644 --- a/provider/partition-gcp/src/main/resources/application.properties +++ b/provider/partition-gcp/src/main/resources/application.properties @@ -18,7 +18,7 @@ KEY_RING=${key-ring} KMS_KEY=${kms-key} GOOGLE_CLOUD_PROJECT=${google-cloud-project} google-audiences=123.apps.googleusercontent.com -partition-admin-account=admin@domen.iam.gserviceaccount.com +partition-admin-accounts=osdu-gcp-sa #logging configuration logging.level.org.springframework.web=${LOG_LEVEL:DEBUG} diff --git a/provider/partition-gcp/src/test/java/org/opengroup/osdu/partition/provider/gcp/security/AuthorizationServiceTest.java b/provider/partition-gcp/src/test/java/org/opengroup/osdu/partition/provider/gcp/security/AuthorizationServiceTest.java new file mode 100644 index 00000000..93fbdd64 --- /dev/null +++ b/provider/partition-gcp/src/test/java/org/opengroup/osdu/partition/provider/gcp/security/AuthorizationServiceTest.java @@ -0,0 +1,127 @@ +/* + * Copyright 2021 Google LLC + * Copyright 2021 EPAM Systems, Inc + * + * 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 + * + * https://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. + */ + +package org.opengroup.osdu.partition.provider.gcp.security; + +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.when; + +import com.google.api.client.googleapis.auth.oauth2.GoogleIdToken; +import com.google.api.client.googleapis.auth.oauth2.GoogleIdToken.Payload; +import com.google.api.client.googleapis.auth.oauth2.GoogleIdTokenVerifier; +import com.google.common.collect.ImmutableList; +import java.io.IOException; +import java.security.GeneralSecurityException; +import java.util.List; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.experimental.theories.DataPoints; +import org.junit.experimental.theories.FromDataPoints; +import org.junit.experimental.theories.Theories; +import org.junit.experimental.theories.Theory; +import org.junit.rules.ExpectedException; +import org.junit.runner.RunWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.opengroup.osdu.core.common.model.http.AppException; +import org.opengroup.osdu.core.common.model.http.DpsHeaders; +import org.opengroup.osdu.partition.provider.gcp.config.PropertiesConfiguration; + +@RunWith(Theories.class) +public class AuthorizationServiceTest { + + private final String token = "abc"; + + private final String serviceAccountTail = "project-id.iam.gserviceaccount.com"; + + private final List partitionAdminAccounts = ImmutableList.of("osdu-gcp-sa", "service.account@project-id.iam.gserviceaccount.com"); + + @Rule + public ExpectedException exceptionRule = ExpectedException.none(); + + @DataPoints("VALID_ACCOUNTS") + public static List validTestSet() { + return ImmutableList.of( + "osdu-gcp-sa-first@project-id.iam.gserviceaccount.com", + "osdu-gcp-sa-second@project-id.iam.gserviceaccount.com", + "osdu-gcp-sa-third@project-id.iam.gserviceaccount.com", + "osdu-gcp-sa-fourth@project-id.iam.gserviceaccount.com"); + } + + @DataPoints("NOT_VALID_ACCOUNTS") + public static List notValidTestSet() { + return ImmutableList.of( + "osdu-gcp-sa-first@google.com", + "osdu-gcp-sa-second@project-id.iam.gserviceaccount.com.not.valid", + "user-osdu-gcp-sa-third@project-id.iam.gserviceaccount.com"); + } + + @Mock + private PropertiesConfiguration configuration; + + @Mock + private GoogleIdTokenVerifier verifier; + + @Mock + private GoogleIdToken googleIdToken; + + @Mock + private DpsHeaders headers; + + private Payload payload = new Payload(); + + @InjectMocks + private AuthorizationService authorizationService; + + @Before + public void setUp() throws GeneralSecurityException, IOException { + MockitoAnnotations.initMocks(this); + when(configuration.getPartitionAdminAccounts()).thenReturn(partitionAdminAccounts); + when(configuration.getServiceAccountTail()).thenReturn(serviceAccountTail); + when(headers.getAuthorization()).thenReturn(token); + when(verifier.verify(token)).thenReturn(googleIdToken); + when(googleIdToken.getPayload()).thenReturn(payload); + + } + + @Test + public void testProvidedInConfigAdminAccountShouldReturnTrue() { + payload.setEmail("service.account@project-id.iam.gserviceaccount.com"); + assertTrue(authorizationService.isDomainAdminServiceAccount()); + } + + @Test(expected = AppException.class) + public void testNotProvidedInConfigAdminAccountShouldThrowException() { + payload.setEmail("user@google.com"); + authorizationService.isDomainAdminServiceAccount(); + } + + @Theory + public void testProvidedInConfigPatternShouldReturnTrue(@FromDataPoints("VALID_ACCOUNTS") String account) { + payload.setEmail(account); + assertTrue(authorizationService.isDomainAdminServiceAccount()); + } + + @Theory + public void testNotProvidedInConfigPatternShouldReturnTrue(@FromDataPoints("NOT_VALID_ACCOUNTS") String account) { + exceptionRule.expect(AppException.class); + payload.setEmail(account); + authorizationService.isDomainAdminServiceAccount(); + } +} \ No newline at end of file -- GitLab From 81420e3f8b891918cbc38b0ed55405812699f1c2 Mon Sep 17 00:00:00 2001 From: "Mikhail Piatliou (EPAM)" Date: Tue, 3 Aug 2021 08:57:38 +0000 Subject: [PATCH 26/26] Update resources limits [GONRG-2974] --- devops/gcp/deploy/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devops/gcp/deploy/values.yaml b/devops/gcp/deploy/values.yaml index eb04941e..5c61ec5a 100644 --- a/devops/gcp/deploy/values.yaml +++ b/devops/gcp/deploy/values.yaml @@ -4,7 +4,7 @@ data: requests_cpu: "0.25" - requests_memory: "128M" + requests_memory: "256M" limits_cpu: "1" limits_memory: "1G" serviceAccountName: "" -- GitLab