Commit 05765b88 authored by Riabokon Stanislav(EPAM)[GCP]'s avatar Riabokon Stanislav(EPAM)[GCP]
Browse files

Merge branch 'gcp-partition' into 'master'

Partion service as tenantinfo provider(GONRG-2196)

See merge request !12
parents 787458ff c0f9622e
Pipeline #42632 passed with stages
in 9 minutes and 26 seconds
...@@ -19,13 +19,16 @@ The following software have components provided under the terms of this license: ...@@ -19,13 +19,16 @@ The following software have components provided under the terms of this license:
- ASM based accessors helper used by json-smart (from ) - ASM based accessors helper used by json-smart (from )
- Apache Commons Codec (from http://commons.apache.org/proper/commons-codec/) - Apache Commons Codec (from http://commons.apache.org/proper/commons-codec/)
- Apache Commons Lang (from http://commons.apache.org/proper/commons-lang/) - Apache Commons Lang (from http://commons.apache.org/proper/commons-lang/)
- Apache Commons Logging (from http://commons.apache.org/proper/commons-logging/)
- Apache HttpAsyncClient (from http://hc.apache.org/httpcomponents-asyncclient) - Apache HttpAsyncClient (from http://hc.apache.org/httpcomponents-asyncclient)
- Apache HttpClient (from http://hc.apache.org/httpcomponents-client) - 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 HttpCore (from http://hc.apache.org/httpcomponents-core-ga)
- Apache HttpCore NIO (from http://hc.apache.org/httpcomponents-core-ga) - Apache HttpCore NIO (from http://hc.apache.org/httpcomponents-core-ga)
- Apache Log4j API (from ) - Apache Log4j API (from )
- Apache Log4j to SLF4J Adapter (from ) - Apache Log4j to SLF4J Adapter (from )
- AssertJ fluent assertions (from ) - AssertJ fluent assertions (from )
- AutoValue Annotations (from )
- Bean Validation API (from http://beanvalidation.org) - Bean Validation API (from http://beanvalidation.org)
- Byte Buddy (without dependencies) (from ) - Byte Buddy (without dependencies) (from )
- Byte Buddy Java agent (from ) - Byte Buddy Java agent (from )
...@@ -40,6 +43,7 @@ The following software have components provided under the terms of this license: ...@@ -40,6 +43,7 @@ The following software have components provided under the terms of this license:
- Evo Inflector (from http://atteo.org/static/evo-inflector) - Evo Inflector (from http://atteo.org/static/evo-inflector)
- Expression Language 3.0 (from https://projects.eclipse.org/projects/ee4j.el) - Expression Language 3.0 (from https://projects.eclipse.org/projects/ee4j.el)
- FindBugs-jsr305 (from http://findbugs.sourceforge.net/) - FindBugs-jsr305 (from http://findbugs.sourceforge.net/)
- GSON extensions to the Google HTTP Client Library for Java. (from )
- Google APIs Client Library for Java (from ) - Google APIs Client Library for Java (from )
- Google App Engine extensions to the Google HTTP 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 (from https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-core)
...@@ -511,6 +515,7 @@ unknown ...@@ -511,6 +515,7 @@ unknown
The following software have components provided under the terms of this license: The following software have components provided under the terms of this license:
- Byte Buddy (without dependencies) (from ) - Byte Buddy (without dependencies) (from )
- Checker Qual (from https://checkerframework.org)
- JUnit (from http://junit.org) - JUnit (from http://junit.org)
- JUnit Jupiter (Aggregator) (from https://junit.org/junit5/) - JUnit Jupiter (Aggregator) (from https://junit.org/junit5/)
- JavaBeans Activation Framework API jar (from ) - JavaBeans Activation Framework API jar (from )
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</parent> </parent>
<properties> <properties>
<os-core-common.version>0.3.5</os-core-common.version> <os-core-common.version>0.9.0-SNAPSHOT</os-core-common.version>
<openapi.version>1.4.8</openapi.version> <openapi.version>1.4.8</openapi.version>
</properties> </properties>
......
...@@ -22,6 +22,7 @@ import org.opengroup.osdu.backup.config.property.EntitlementProperties; ...@@ -22,6 +22,7 @@ import org.opengroup.osdu.backup.config.property.EntitlementProperties;
import org.opengroup.osdu.core.common.entitlements.EntitlementsAPIConfig; import org.opengroup.osdu.core.common.entitlements.EntitlementsAPIConfig;
import org.opengroup.osdu.core.common.entitlements.EntitlementsFactory; import org.opengroup.osdu.core.common.entitlements.EntitlementsFactory;
import org.opengroup.osdu.core.common.entitlements.IEntitlementsFactory; import org.opengroup.osdu.core.common.entitlements.IEntitlementsFactory;
import org.opengroup.osdu.core.common.http.json.HttpResponseBodyMapper;
import org.springframework.beans.factory.config.AbstractFactoryBean; import org.springframework.beans.factory.config.AbstractFactoryBean;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
...@@ -31,13 +32,14 @@ import org.springframework.stereotype.Component; ...@@ -31,13 +32,14 @@ import org.springframework.stereotype.Component;
public class EntitlementsClientFactory extends AbstractFactoryBean<IEntitlementsFactory> { public class EntitlementsClientFactory extends AbstractFactoryBean<IEntitlementsFactory> {
final EntitlementProperties entitlementProperties; final EntitlementProperties entitlementProperties;
final private HttpResponseBodyMapper httpResponseBodyMapper;
@Override @Override
protected IEntitlementsFactory createInstance() { protected IEntitlementsFactory createInstance() {
return new EntitlementsFactory(EntitlementsAPIConfig.builder() return new EntitlementsFactory(EntitlementsAPIConfig.builder()
.rootUrl(entitlementProperties.getUrl()) .rootUrl(entitlementProperties.getUrl())
.apiKey(entitlementProperties.getAppKey()) .apiKey(entitlementProperties.getAppKey())
.build()); .build(), httpResponseBodyMapper);
} }
@Override @Override
......
...@@ -29,6 +29,8 @@ In order to run the service locally or remotely, you will need to have the follo ...@@ -29,6 +29,8 @@ In order to run the service locally or remotely, you will need to have the follo
| `SPRING_CLOUD_GCP_SQL_INSTANCECONNECTIONNAME` | ex `xxx-xx-xxxx:us-central1:test-mysql` | Connection name | yes | | | `SPRING_CLOUD_GCP_SQL_INSTANCECONNECTIONNAME` | ex `xxx-xx-xxxx:us-central1:test-mysql` | Connection name | yes | |
| `GCP_SQL_BACKUP_KIND` | ex `sql#backupRun` | | yes | | | `GCP_SQL_BACKUP_KIND` | ex `sql#backupRun` | | yes | |
| `GCP_SQL_RESTORE_BACKUP_KIND` | ex `sql#restoreBackupContext` | | yes | | | `GCP_SQL_RESTORE_BACKUP_KIND` | ex `sql#restoreBackupContext` | | yes | |
| `GOOGLE_AUDIENCES` | ex `*****.apps.googleusercontent.com` | Client ID for getting access to cloud resources | yes | https://console.cloud.google.com/apis/credentials |
| `PARTITION_API` | ex `http://localhost:8081/api/partition/v1` | Partition service endpoint | no | - |
Schedulers can be configured with following variables, if not defined default values will be used Schedulers can be configured with following variables, if not defined default values will be used
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
<dependency> <dependency>
<groupId>org.opengroup.osdu</groupId> <groupId>org.opengroup.osdu</groupId>
<artifactId>core-lib-gcp</artifactId> <artifactId>core-lib-gcp</artifactId>
<version>0.7.0</version> <version>0.9.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
......
...@@ -26,3 +26,8 @@ gcp.sql-backup-kind=sql#backupRun ...@@ -26,3 +26,8 @@ gcp.sql-backup-kind=sql#backupRun
gcp.sql-restore-backup-kind=sql#restoreBackupContext gcp.sql-restore-backup-kind=sql#restoreBackupContext
LOG_PREFIX=${log.prefix} LOG_PREFIX=${log.prefix}
GOOGLE_AUDIENCES=.apps.googleusercontent.com
PARTITION_API=http://localhsot:8080/api/partition/v1
partition.api=${PARTITION_API}
google.audiences=${GOOGLE_AUDIENCES}
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment