diff --git a/NOTICE b/NOTICE index 1e12b6559fece0e3377dd8b5745c0cbed20a1b33..f731b6a8a52aa37f2c40f020f67854d8aa3c0d83 100644 --- a/NOTICE +++ b/NOTICE @@ -369,6 +369,7 @@ The following software have components provided under the terms of this license: - Cloud Key Management Service (KMS) API v1-rev20220407-1.32.1 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-cloudkms) - Cloud Storage JSON API (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage) - Cloud Storage JSON API v1-rev20220604-1.32.1 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage) +- Cloud Storage JSON API v1-rev20220608-1.32.1 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage) - 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) @@ -404,6 +405,7 @@ The following software have components provided under the terms of this license: - Google OAuth Client Library for Java (from https://repo1.maven.org/maven2/com/google/oauth-client/google-oauth-client) - Gson (from http://code.google.com/p/google-gson/, https://repo1.maven.org/maven2/com/google/code/gson/gson) - Guava InternalFutureFailureAccess and InternalFutures (from https://repo1.maven.org/maven2/com/google/guava/failureaccess) +- Guava ListenableFuture only (from https://repo1.maven.org/maven2/com/google/guava/listenablefuture) - Guava: Google Core Libraries for Java (from http://code.google.com/p/guava-libraries, https://github.com/google/guava, 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 (from https://repo1.maven.org/maven2/org/hibernate/hibernate-validator, https://repo1.maven.org/maven2/org/hibernate/validator/hibernate-validator) diff --git a/devops/gcp/configmap/templates/configmap-bootstrap.yml b/devops/gcp/configmap/templates/configmap-bootstrap.yml index dacb725d77efe4d8201b97c885a3ab9099dcfb14..e7225a6e65b1e8ed65628bdede9e0ede1a898181 100644 --- a/devops/gcp/configmap/templates/configmap-bootstrap.yml +++ b/devops/gcp/configmap/templates/configmap-bootstrap.yml @@ -6,7 +6,7 @@ metadata: name: "{{ .Values.conf.configmap }}-bootstrap" namespace: "{{ .Release.Namespace }}" data: - PARTITION_NAME: "{{ .Values.data.partitionName }}.{{ .Release.Namespace }}.svc.cluster.local" + PARTITION_NAME: "{{ .Values.data.partitionName }}" SERVICE_ACCOUNT: {{ printf "%s@%s.iam.gserviceaccount.com" .Values.data.datafierSa .Values.data.projectId | quote }} DATA_PARTITION_ID: "{{ .Values.data.dataPartitionId }}" ENVIRONMENT: "{{ .Values.data.springProfilesActive }}" diff --git a/devops/gcp/deploy/templates/deploy.yml b/devops/gcp/deploy/templates/deploy.yml index 3714004424e0875835410f110c9375cd5c1fa1ba..f7136812751771f2c4fb80f876748e63f2115bf8 100644 --- a/devops/gcp/deploy/templates/deploy.yml +++ b/devops/gcp/deploy/templates/deploy.yml @@ -19,9 +19,6 @@ spec: - image: "{{ .Values.data.image }}" imagePullPolicy: "{{ .Values.data.imagePullPolicy }}" name: "{{ .Values.conf.appName }}" - env: - - name: "ACCEPT_HTTP" - value: "true" envFrom: - configMapRef: name: "{{ .Values.conf.configmap }}" diff --git a/devops/gcp/deploy/templates/request-authentication.yml b/devops/gcp/deploy/templates/request-authentication.yml index 2aa6d550fd20664ff07d850f50a529daed3cd0ed..65cdee849450c2467d51c9d300079c49e6cab676 100644 --- a/devops/gcp/deploy/templates/request-authentication.yml +++ b/devops/gcp/deploy/templates/request-authentication.yml @@ -1,21 +1,21 @@ -{{- if .Values.conf.onPremEnabled }} -apiVersion: security.istio.io/v1beta1 -kind: RequestAuthentication -metadata: - name: "{{ .Values.conf.appName }}-jwt-policy" - namespace: "{{ .Release.Namespace }}" -spec: - selector: - matchLabels: - app: "{{ .Values.conf.appName }}" - jwtRules: - - issuer: "https://keycloak.{{ .Values.conf.domain }}/auth/realms/{{ .Values.auth.realm }}" - jwksUri: "http://keycloak.{{ .Release.Namespace }}.svc.cluster.local/auth/realms/{{ .Values.auth.realm }}/protocol/openid-connect/certs" - forwardOriginalToken: true - - issuer: "http://keycloak.{{ .Values.conf.domain }}/auth/realms/{{ .Values.auth.realm }}" - jwksUri: "http://keycloak.{{ .Release.Namespace }}.svc.cluster.local/auth/realms/{{ .Values.auth.realm }}/protocol/openid-connect/certs" - forwardOriginalToken: true - - issuer: "http://keycloak.{{ .Release.Namespace }}.svc.cluster.local/auth/realms/{{ .Values.auth.realm }}" - jwksUri: "http://keycloak.{{ .Release.Namespace }}.svc.cluster.local/auth/realms/{{ .Values.auth.realm }}/protocol/openid-connect/certs" - forwardOriginalToken: true -{{- end }} +{{- if .Values.conf.onPremEnabled }} +apiVersion: security.istio.io/v1beta1 +kind: RequestAuthentication +metadata: + name: "{{ .Values.conf.appName }}-jwt-policy" + namespace: "{{ .Release.Namespace }}" +spec: + selector: + matchLabels: + app: "{{ .Values.conf.appName }}" + jwtRules: + - issuer: "https://keycloak.{{ .Values.conf.domain }}/auth/realms/{{ .Values.auth.realm }}" + jwksUri: "http://keycloak.{{ .Release.Namespace }}.svc.cluster.local/auth/realms/{{ .Values.auth.realm }}/protocol/openid-connect/certs" + forwardOriginalToken: true + - issuer: "http://keycloak.{{ .Values.conf.domain }}/auth/realms/{{ .Values.auth.realm }}" + jwksUri: "http://keycloak.{{ .Release.Namespace }}.svc.cluster.local/auth/realms/{{ .Values.auth.realm }}/protocol/openid-connect/certs" + forwardOriginalToken: true + - issuer: "http://keycloak.{{ .Release.Namespace }}.svc.cluster.local/auth/realms/{{ .Values.auth.realm }}" + jwksUri: "http://keycloak.{{ .Release.Namespace }}.svc.cluster.local/auth/realms/{{ .Values.auth.realm }}/protocol/openid-connect/certs" + forwardOriginalToken: true +{{- end }} diff --git a/provider/partition-gcp/bootstrap/bootstrap_partition.sh b/provider/partition-gcp/bootstrap/bootstrap_partition.sh index a20ff5954d8b56483847b4923c307773ef4d8433..f4de1eebb72a9f08dccf55c686c0217e8882ae1f 100644 --- a/provider/partition-gcp/bootstrap/bootstrap_partition.sh +++ b/provider/partition-gcp/bootstrap/bootstrap_partition.sh @@ -34,7 +34,7 @@ generate_post_data() { }, "bucket": { "sensitive": false, - "value": "${PROJECT_ID}-records" + "value": "${PROJECT_ID}-${DATA_PARTITION_ID}-records" }, "crmAccountID": { "sensitive": false, diff --git a/provider/partition-gcp/src/main/resources/application.properties b/provider/partition-gcp/src/main/resources/application.properties index bff52e44e0ecddc94e1a6a9736a48c0d2d2a3ccf..548f12fb6e6b3a2fdaba6c97e19a18f102b396d8 100644 --- a/provider/partition-gcp/src/main/resources/application.properties +++ b/provider/partition-gcp/src/main/resources/application.properties @@ -1,6 +1,6 @@ # -# Copyright 2020-2021 Google LLC -# Copyright 2020-2021 EPAM Systems, Inc +# Copyright 2020-2022 Google LLC +# Copyright 2020-2022 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. @@ -21,6 +21,7 @@ server.port=8080 springfox.documentation.swagger.v2.path=/api-docs management.endpoint.health.show-details=always management.health.diskspace.enabled=false +ACCEPT_HTTP=true #logging configuration logging.level.org.springframework.web=${LOG_LEVEL:DEBUG} @@ -33,6 +34,3 @@ cache-maxSize=1000 #service config partition-property-kind=PartitionProperty partition-namespace=partition - - -