Merge branch 'gcp-partition' into 'master'

Partion service as tenantinfo provider(GONRG-2196)

See merge request !12

NOTICE

@@ -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 )
 - Apache Commons Codec (from http://commons.apache.org/proper/commons-codec/)
 - 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 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 NIO (from http://hc.apache.org/httpcomponents-core-ga)
 - Apache Log4j API (from )
 - Apache Log4j to SLF4J Adapter (from )
 - AssertJ fluent assertions (from )
+- AutoValue Annotations (from )
 - Bean Validation API (from http://beanvalidation.org)
 - Byte Buddy (without dependencies) (from )
 - Byte Buddy Java agent (from )
@@ -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)
 - Expression Language 3.0 (from https://projects.eclipse.org/projects/ee4j.el)
 - 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 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)
@@ -511,6 +515,7 @@ unknown
 The following software have components provided under the terms of this license:
 
 - Byte Buddy (without dependencies) (from )
+- Checker Qual (from https://checkerframework.org)
 - JUnit (from http://junit.org)
 - JUnit Jupiter (Aggregator) (from https://junit.org/junit5/)
 - JavaBeans Activation Framework API jar (from )

backup-core/pom.xml

@@ -14,7 +14,7 @@
   </parent>
 
   <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>
   </properties>
 

backup-core/src/main/java/org/opengroup/osdu/backup/di/EntitlementsClientFactory.java

@@ -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.EntitlementsFactory;
 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.stereotype.Component;
 
@@ -31,13 +32,14 @@ import org.springframework.stereotype.Component;
 public class EntitlementsClientFactory extends AbstractFactoryBean<IEntitlementsFactory> {
 
 	final EntitlementProperties entitlementProperties;
+	final private HttpResponseBodyMapper httpResponseBodyMapper;
 
 	@Override
 	protected IEntitlementsFactory createInstance() {
 		return new EntitlementsFactory(EntitlementsAPIConfig.builder()
 			.rootUrl(entitlementProperties.getUrl())
 			.apiKey(entitlementProperties.getAppKey())
-			.build());
+			.build(), httpResponseBodyMapper);
 	}
 
 	@Override

provider/backup-gcp/README.md

@@ -29,7 +29,9 @@ 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 |  |
 | `GCP_SQL_BACKUP_KIND` | ex `sql#backupRun` |  | 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
 
 | name | value | description | default |

provider/backup-gcp/pom.xml

@@ -45,7 +45,7 @@
 		<dependency>
 			<groupId>org.opengroup.osdu</groupId>
 			<artifactId>core-lib-gcp</artifactId>
-			<version>0.7.0</version>
+			<version>0.9.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>

provider/backup-gcp/src/main/resources/application.properties

@@ -25,4 +25,9 @@ spring.cloud.gcp.sql.instanceConnectionName=osdu-cicd-epam:us-central1:test-post
 gcp.sql-backup-kind=sql#backupRun
 gcp.sql-restore-backup-kind=sql#restoreBackupContext
 
-LOG_PREFIX=${log.prefix}
\ No newline at end of file
+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