From af641b69b9bd6e84068a18c0f5ec3b3a3479e2d7 Mon Sep 17 00:00:00 2001 From: "Eldor Pulatov [EPAM/GCP]" <eldor_pulatov@epam.com> Date: Thu, 3 Nov 2022 12:21:49 +0000 Subject: [PATCH] GONRG-5890-Change-to-GC --- .gitlab/merge_request_templates/default.md | 2 +- README.md | 4 ++-- devops/gcp/configmap/README.md | 8 ++++---- provider/register-gcp/README.md | 10 +++++----- provider/register-gcp/docs/anthos/README.md | 6 +++--- provider/register-gcp/docs/gcp/README.md | 4 ++-- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.gitlab/merge_request_templates/default.md b/.gitlab/merge_request_templates/default.md index 85da30c8f..e1ab2b14e 100644 --- a/.gitlab/merge_request_templates/default.md +++ b/.gitlab/merge_request_templates/default.md @@ -10,7 +10,7 @@ ## Does this introduce a change in the cloud provider implementation, if so which cloud? - [ ] AWS - [ ] Azure -- [ ] GCP +- [ ] Google Cloud - [ ] IBM ## Does this introduce a breaking change? diff --git a/README.md b/README.md index 3bbcd0289..8e1268f6d 100644 --- a/README.md +++ b/README.md @@ -16,9 +16,9 @@ limitations under the License. The Register Service is a Maven multi-module project with each cloud implementation placed in its submodule. -## GCP +## Google Cloud -Instructions for running the Google Cloud Platform implementation locally can be found [here](./provider/register-gcp/README.md). +Instructions for running the Google Cloud implementation locally can be found [here](./provider/register-gcp/README.md). ## Running integration tests See Integration-Testing [Readme](./testing/README.md). diff --git a/devops/gcp/configmap/README.md b/devops/gcp/configmap/README.md index 1e1c08a73..9b020b2bc 100644 --- a/devops/gcp/configmap/README.md +++ b/devops/gcp/configmap/README.md @@ -33,17 +33,17 @@ First you need to set variables in **values.yaml** file using any code editor. S **logLevel** | logging level | string | INFO | yes **springProfilesActive** | active spring profile | string | gcp | yes -### GCP variables +### Google Cloud variables | Name | Description | Type | Default |Required | |------|-------------|------|---------|---------| -**googleCloudProject** | your GCP cloud project | string | -| yes -**googleAudiences** | your GCP client ID | string | - | yes +**googleCloudProject** | your Google Cloud cloud project | string | -| yes +**googleAudiences** | your Google Cloud client ID | string | - | yes **entitlementsHost** | Entitlements host | string | "http://entitlements" | yes **partitionHost** | Partition host | string | "http://partition" | yes **recordsChangedPubsubEndpoint** | Endpoint to PubSub topic | string | - | yes **storageHost** | Storage host | string | "http://storage" | yes -**serviceIdentity** | Service account in GCP fo PubSub | string | "register-pubsub-identity" | yes +**serviceIdentity** | Service account in Google Cloud fo PubSub | string | "register-pubsub-identity" | yes **keyRing** | Type of keys | string | "csqp" | yes **kmsKey** | Key management service key (must be replaced during installation) | string | "registerService" | yes **subscriberPrivateKeyId** | Subscriber test private key id (must be replaced during installation) | string | "testkey" | yes diff --git a/provider/register-gcp/README.md b/provider/register-gcp/README.md index 43c2b45cd..74af06cd6 100644 --- a/provider/register-gcp/README.md +++ b/provider/register-gcp/README.md @@ -68,7 +68,7 @@ This service uses specific implementations of DestinationResolvers based on the - for PubSub: mappers/oqm/PsTenantOqmDestinationResolver.java #### Their algorithms are similar, -Except that they do not receive special properties from the Partition service for connection, because the location of the resources is unambiguously known - they are in the GCP project. And credentials are also not needed - access to data is made on behalf of the Google Identity SA under which the service itself is launched. Therefore, resolver takes only the value of the **projectId** property from PartitionInfo and uses it to connect to a resource in the corresponding GCP project. +Except that they do not receive special properties from the Partition service for connection, because the location of the resources is unambiguously known - they are in the Google Cloud project. And credentials are also not needed - access to data is made on behalf of the Google Identity SA under which the service itself is launched. Therefore, resolver takes only the value of the **projectId** property from PartitionInfo and uses it to connect to a resource in the corresponding Google Cloud project. # Configuration @@ -79,8 +79,8 @@ Most of them are common to all hosting environments, but there are properties th ### Anthos Service Configuration: [Anthos service configuration ](docs/anthos/README.md) -### GCP Service Configuration: -[Gcp service configuration ](docs/gcp/README.md) +### Google Cloud Service Configuration: +[Google Cloud service configuration ](docs/gcp/README.md) # Run and test the service ## Running Locally @@ -159,8 +159,8 @@ cd provider/register-gcp/ && mvn spring-boot:run -Dspring-boot.run.profiles=loca #### Anthos: [Anthos Testing](docs/anthos/README.md) -#### GCP: -[Gcp Testing](docs/gcp/README.md) +#### Google Cloud: +[Google Cloud Testing](docs/gcp/README.md) ## Deployment diff --git a/provider/register-gcp/docs/anthos/README.md b/provider/register-gcp/docs/anthos/README.md index 770de18cd..ef85981dd 100644 --- a/provider/register-gcp/docs/anthos/README.md +++ b/provider/register-gcp/docs/anthos/README.md @@ -8,7 +8,7 @@ Must have: | name | value | description | sensitive? | source | | --- | --- | --- | --- | --- | -| `SPRING_PROFILES_ACTIVE` | ex `anthos` | Spring profile that activate default configuration for GCP environment | false | - | +| `SPRING_PROFILES_ACTIVE` | ex `anthos` | Spring profile that activate default configuration for Google Cloud environment | false | - | | `OPENID_PROVIDER_CLIENT_ID` | `*****` | Client id that represents this service and serves to request tokens, example `workload-identity-legal` |yes| - | | `OPENID_PROVIDER_CLIENT_SECRET` | `*****` | This client secret that serves to request tokens| yes | - | | `OPENID_PROVIDER_URL` | `https://keycloack.com/auth/realms/master` | URL of OpenID Connect provider, it will be used as `<OpenID URL> + /.well-known/openid-configuration` to auto configure endpoint for token request | no | - | @@ -116,7 +116,7 @@ Example: **database structure** OSM works with data logically organized as "partition"->"namespace"->"kind"->"record"->"columns". The above sequence -describes how it is named in Google Datastore, where "partition" maps to "GCP project". +describes how it is named in Google Datastore, where "partition" maps to "Google Cloud project". For example, this is how **Datastore** OSM driver contains records for "SUBSCRIPTION" data register: @@ -133,7 +133,7 @@ for it. | Datastore hierarchy level | | Postgres alternative used | |---------------------------|-----|----------------------------| -| partition (GCP project) | == | Postgres server URL | +| partition (Google Cloud project) | == | Postgres server URL | | namespace | == | Schema | | kind | == | Table | | record | == | '<multiple table records>' | diff --git a/provider/register-gcp/docs/gcp/README.md b/provider/register-gcp/docs/gcp/README.md index 907951fa8..70ccecf7e 100644 --- a/provider/register-gcp/docs/gcp/README.md +++ b/provider/register-gcp/docs/gcp/README.md @@ -1,4 +1,4 @@ -## Service Configuration for GCP +## Service Configuration for Google Cloud ## Environment variables: @@ -10,7 +10,7 @@ Must have: | --- | --- | --- | --- | --- | | `GOOGLE_AUDIENCES` | ex `*****.apps.googleusercontent.com` | Client ID for getting access to cloud resources | yes | https://console.cloud.google.com/apis/credentials | | `GOOGLE_CLOUD_PROJECT` | ex `project-id` | Google Cloud Project Id | no | - | -| `SPRING_PROFILES_ACTIVE` | ex `gcp` | Spring profile that activate default configuration for GCP environment | false | - | +| `SPRING_PROFILES_ACTIVE` | ex `gcp` | Spring profile that activate default configuration for Google Cloud environment | false | - | | `SUBSCRIBER_PRIVATE_KEY_ID` | `********` | Private key id of DE_OPS_TESTER from notification int tests, required only for integration test| yes | output of infrastructure deployment | | `RECORDS_CHANGE_PUBSUB_ENDPOINT` | ex `https://os-notification-dot-opendes.appspot.com/api/notification/v1/push-handlers/records-changed` | Notification external API endpoint 'records-changed' | no | output of infrastructure deployment | -- GitLab