Skip to content
Snippets Groups Projects
Commit e2112a66 authored by Morris Estepa's avatar Morris Estepa
Browse files

Merge branch 'master' into dev

parents d574a1ad 94c6f592
No related branches found
No related tags found
1 merge request!416Squashed commit of the following
Pipeline #146952 failed
...@@ -559,6 +559,7 @@ The following software have components provided under the terms of this license: ...@@ -559,6 +559,7 @@ The following software have components provided under the terms of this license:
- 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) - PWDB :: Database (from https://repo1.maven.org/maven2/org/linguafranca/pwdb/database)
- Plexus Common Utilities (from http://plexus.codehaus.org/plexus-utils, https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils) - Plexus Common Utilities (from http://plexus.codehaus.org/plexus-utils, https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils)
- Plexus I18N Component (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-i18n)
- Plexus Velocity Component (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-velocity) - Plexus Velocity Component (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-velocity)
- PostgreSQL JDBC Driver - PostgreSQL JDBC Driver
- PowerMock (from http://www.powermock.org, https://repo1.maven.org/maven2/org/powermock/powermock-api-mockito) - PowerMock (from http://www.powermock.org, https://repo1.maven.org/maven2/org/powermock/powermock-api-mockito)
......
...@@ -7,9 +7,9 @@ os-indexer-azure is a [Spring Boot](https://spring.io/projects/spring-boot) serv ...@@ -7,9 +7,9 @@ os-indexer-azure is a [Spring Boot](https://spring.io/projects/spring-boot) serv
The [os-indexer-azure README.md](./provider/indexer-azure/README.md) has all the information needed to get started The [os-indexer-azure README.md](./provider/indexer-azure/README.md) has all the information needed to get started
running the `os-indexer` Azure implementation running the `os-indexer` Azure implementation
## GCP Implementation ## Google Cloud Implementation
All documentation for the GCP implementation of `os-indexer` lives [here](./provider/indexer-gcp/README.md) All documentation for the Google Cloud implementation of `os-indexer` lives [here](./provider/indexer-gcp/README.md)
## AWS Implementation ## AWS Implementation
......
...@@ -41,11 +41,11 @@ First you need to set variables in **values.yaml** file using any code editor. S ...@@ -41,11 +41,11 @@ First you need to set variables in **values.yaml** file using any code editor. S
**springProfilesActive** | active spring profile | string | gcp | yes **springProfilesActive** | active spring profile | string | gcp | yes
**storageHost** | storage host | string | "http://storage" | yes **storageHost** | storage host | string | "http://storage" | yes
### GCP variables ### Google Cloud variables
| Name | Description | Type | Default |Required | | Name | Description | Type | Default |Required |
|------|-------------|------|---------|---------| |------|-------------|------|---------|---------|
**googleAudiences** | your GCP client ID | string | - | yes **googleAudiences** | your Google Cloud client ID | string | - | yes
### Config variables ### Config variables
......
...@@ -19,8 +19,8 @@ These instructions will get you a copy of the project up and running on your loc ...@@ -19,8 +19,8 @@ These instructions will get you a copy of the project up and running on your loc
## Service Configuration ## Service Configuration
### Anthos: ### Anthos:
[Anthos service configuration ](docs/anthos/README.md) [Anthos service configuration ](docs/anthos/README.md)
### GCP: ### Google Cloud:
[Gcp service configuration ](docs/gcp/README.md) [Google Cloud service configuration ](docs/gcp/README.md)
## Mappers ## Mappers
...@@ -48,8 +48,8 @@ In the current version, the mappers are equipped with several drivers to the sto ...@@ -48,8 +48,8 @@ In the current version, the mappers are equipped with several drivers to the sto
### Anthos Service Configuration: ### Anthos Service Configuration:
[Anthos service configuration ](docs/anthos/README.md) [Anthos service configuration ](docs/anthos/README.md)
### GCP Service Configuration: ### Google Cloud Service Configuration:
[Gcp service configuration ](docs/gcp/README.md) [Google Cloud service configuration ](docs/gcp/README.md)
## Run service ## Run service
...@@ -146,8 +146,8 @@ This section describes how to run cloud OSDU E2E tests. ...@@ -146,8 +146,8 @@ This section describes how to run cloud OSDU E2E tests.
### Anthos test configuration: ### Anthos test configuration:
[Anthos service configuration ](docs/anthos/README.md) [Anthos service configuration ](docs/anthos/README.md)
### GCP test configuration: ### Google Cloud test configuration:
[Gcp service configuration ](docs/gcp/README.md) [Google Cloud service configuration ](docs/gcp/README.md)
## Deployment ## Deployment
......
...@@ -8,7 +8,7 @@ Must have: ...@@ -8,7 +8,7 @@ Must have:
| name | value | description | sensitive? | source | | 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_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_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 | - | | `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 | - |
......
## Service Configuration for GCP ## Service Configuration for Google Cloud
## Environment variables: ## Environment variables:
...@@ -9,7 +9,7 @@ Must have: ...@@ -9,7 +9,7 @@ Must have:
| name | value | description | sensitive? | source | | name | value | description | sensitive? | source |
| --- | --- | --- | --- | --- | | --- | --- | --- | --- | --- |
| `GOOGLE_AUDIENCES` | ex `*****.apps.googleusercontent.com` | Client ID for getting access to cloud resources | yes | https://console.cloud.google.com/apis/credentials | | `GOOGLE_AUDIENCES` | ex `*****.apps.googleusercontent.com` | Client ID for getting access to cloud resources | yes | https://console.cloud.google.com/apis/credentials |
| `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 | - |
| `<ELASTICSEARCH_USER_ENV_VARIABLE_NAME>` | ex `user` | Elasticsearch user, name of that variable not defined at the service level, the name will be received through partition service. Each tenant can have it's own ENV name value, and it must be present in ENV of Indexer service, see [Partition properties set](#Properties-set-in-Partition-service) | yes | - | | `<ELASTICSEARCH_USER_ENV_VARIABLE_NAME>` | ex `user` | Elasticsearch user, name of that variable not defined at the service level, the name will be received through partition service. Each tenant can have it's own ENV name value, and it must be present in ENV of Indexer service, see [Partition properties set](#Properties-set-in-Partition-service) | yes | - |
| `<ELASTICSEARCH_PASSWORD_ENV_VARIABLE_NAME>` | ex `password` | Elasticsearch password, name of that variable not defined at the service level, the name will be received through partition service. Each tenant can have it's own ENV name value, and it must be present in ENV of Indexer service, see [Partition properties set](#Properties-set-in-Partition-service) | false | - | | `<ELASTICSEARCH_PASSWORD_ENV_VARIABLE_NAME>` | ex `password` | Elasticsearch password, name of that variable not defined at the service level, the name will be received through partition service. Each tenant can have it's own ENV name value, and it must be present in ENV of Indexer service, see [Partition properties set](#Properties-set-in-Partition-service) | false | - |
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment