Skip to content
GitLab
Commit a6fe77c5 authored by neelesh thakur's avatar neelesh thakur
Browse files

rebase

parents ac99c1e0 4da680b0
Pipeline #50429 failed with stages
in 44 minutes and 30 seconds
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
View file @ a6fe77c5
......@@ -17,7 +17,7 @@ variables:
# --- osdu gcp specific variables for cloudrun ---
OSDU_GCP_SERVICE: search
OSDU_GCP_VENDOR: gcp
OSDU_GCP_ENV_VARS: ENVIRONMENT=$OSDU_GCP_SPRING_PROFILES_ACTIVE,GOOGLE_CLOUD_PROJECT=$OSDU_GCP_PROJECT,REDIS_SEARCH_HOST=$REDIS_SEARCH_HOST,REDIS_SEARCH_PORT=$OSDU_GCP_REDIS_SEARCH_PORT,REDIS_GROUP_HOST=$REDIS_GROUP_HOST,INDEXER_HOST=$OSDU_GCP_INDEXER_HOST_SEARCH,AUTHORIZE_API=$OSDU_GCP_AUTHORIZE_API,ENTITLEMENTS_HOST=$OSDU_GCP_ENTITLEMENTS_URL,SECURITY_HTTPS_CERTIFICATE_TRUST=$OSDU_SECURITY_HTTPS_CERTIFICATE_TRUST,GOOGLE_AUDIENCES=$GOOGLE_AUDIENCE,PARTITION_API=$OSDU_GCP_PARTITION_API,POLICY_API=$OSDU_GCP_POLICY_API --vpc-connector=$OSDU_GCP_VPC_CONNECTOR
OSDU_GCP_ENV_VARS: ENVIRONMENT=$OSDU_GCP_SPRING_PROFILES_ACTIVE,GOOGLE_CLOUD_PROJECT=$OSDU_GCP_PROJECT,REDIS_SEARCH_HOST=$REDIS_SEARCH_HOST,REDIS_SEARCH_PORT=$OSDU_GCP_REDIS_SEARCH_PORT,REDIS_GROUP_HOST=$REDIS_GROUP_HOST,INDEXER_HOST=$OSDU_GCP_INDEXER_HOST_SEARCH,AUTHORIZE_API=$OSDU_GCP_AUTHORIZE_API,ENTITLEMENTS_HOST=$OSDU_GCP_ENTITLEMENTS_URL,SECURITY_HTTPS_CERTIFICATE_TRUST=$OSDU_SECURITY_HTTPS_CERTIFICATE_TRUST,GOOGLE_AUDIENCES=$GOOGLE_AUDIENCE,PARTITION_API=$OSDU_GCP_PARTITION_API,POLICY_API=$OSDU_GCP_POLICY_API,POLICY_ID=search --vpc-connector=$OSDU_GCP_VPC_CONNECTOR
# Variables should be partially removed after migration on cloudrun gcp
OSDU_GCP_BUILD_SUBDIR: provider/search-gcp
OSDU_GCP_INT_TEST_SUBDIR: testing/integration-tests/search-test-gcp
......
NOTICE
View file @ a6fe77c5
......@@ -86,6 +86,8 @@ The following software have components provided under the terms of this license:
- Elastic JNA Distribution (from https://github.com/java-native-access/jna)
- Elasticsearch: 5.0.0-alpha5 (from https://github.com/elastic/elasticsearch)
- Elasticsearch: 5.0.0-alpha5 (from https://github.com/elastic/elasticsearch)
- Expression Language 3.0 (from http://uel.java.net)
- Expression Language 3.0 API (from http://uel.java.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 )
......@@ -148,6 +150,7 @@ The following software have components provided under the terms of this license:
- Jakarta Bean Validation API (from https://beanvalidation.org)
- Java Native Access (from https://github.com/java-native-access/jna)
- Java Native Access Platform (from https://github.com/java-native-access/jna)
- Java Servlet API (from http://servlet-spec.java.net)
- Java UUID Generator (from http://wiki.fasterxml.com/JugHome)
- Java archiving library (from http://rauschig.org/jarchivelib)
- Javassist (from http://www.javassist.org/)
......@@ -200,9 +203,9 @@ The following software have components provided under the terms of this license:
- Microsoft Azure Java Core Library (from https://github.com/Azure/azure-sdk-for-java)
- Microsoft Azure Netty HTTP Client Library (from https://github.com/Azure/azure-sdk-for-java)
- Microsoft Azure SDK for SQL API of Azure Cosmos DB Service (from https://github.com/Azure/azure-sdk-for-java)
- Mockito (from http://mockito.org)
- Mockito (from http://www.mockito.org)
- Mockito (from http://mockito.org)
- Mockito (from http://mockito.org)
- Mockito (from http://www.mockito.org)
- MongoDB Driver (from http://www.mongodb.org)
- MongoDB Java Driver Core (from http://www.mongodb.org)
......@@ -359,6 +362,7 @@ The following software have components provided under the terms of this license:
- javatuples (from http://www.javatuples.org)
- javax.inject (from http://code.google.com/p/atinject/)
- javax.ws.rs-api (from http://jax-rs-spec.java.net)
- javax.ws.rs-api (from http://jax-rs-spec.java.net)
- jersey-container-servlet (from git://java.net/jersey~code/project/jersey-container-servlet)
- jersey-container-servlet-core (from git://java.net/jersey~code/project/jersey-container-servlet-core)
- jersey-core (from )
......@@ -442,6 +446,7 @@ The following software have components provided under the terms of this license:
- Lucene Common Analyzers (from )
- Lucene Common Analyzers (from )
- Lucene Core (from )
- Lucene Core (from )
- Reflections (from http://github.com/ronmamo/reflections)
- Stax2 API (from http://github.com/FasterXML/stax2-api)
- ThreeTen backport (from https://www.threeten.org/threetenbp)
......@@ -456,7 +461,8 @@ The following software have components provided under the terms of this license:
- API Common (from https://github.com/googleapis)
- ASM Core (from )
- ASM library repackaged as OSGi bundle (from )
- Common Annotations 1.3 API (from )
- Apache Commons Codec (from http://commons.apache.org/proper/commons-codec/)
- Apache Commons Compress (from http://commons.apache.org/proper/commons-compress/)
- GAX (Google Api eXtensions) (from https://github.com/googleapis)
- GAX (Google Api eXtensions) (from https://github.com/googleapis)
- GAX (Google Api eXtensions) (from https://github.com/googleapis)
......@@ -480,6 +486,8 @@ The following software have components provided under the terms of this license:
- Protocol Buffer Java API (from https://developers.google.com/protocol-buffers/)
- Protocol Buffer Java API (from https://developers.google.com/protocol-buffers/)
- Protocol Buffers [Util] (from )
- Reflections (from http://github.com/ronmamo/reflections)
- SnakeYAML (from http://www.snakeyaml.org)
- Spring Core (from https://github.com/spring-projects/spring-framework)
- Spring Data KeyValue (from )
- ThreeTen backport (from https://www.threeten.org/threetenbp)
......@@ -514,11 +522,6 @@ CC0-1.0
========================================================================
The following software have components provided under the terms of this license:
- Guava: Google Core Libraries for Java (from https://github.com/google/guava.git)
- HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/)
- LatencyUtils (from http://latencyutils.github.io/LatencyUtils/)
- MongoDB Java Driver Core (from http://www.mongodb.org)
- Netty/Common (from )
- reactive-streams (from http://www.reactive-streams.org/)
========================================================================
......@@ -527,9 +530,7 @@ CDDL-1.0
The following software have components provided under the terms of this license:
- ASM library repackaged as OSGi bundle (from )
- Apache Log4j Core (from )
- Class Model for Hk2 (from )
- HK2 API module (from git://java.net/hk2~git/hk2-api)
- HK2 Implementation Utilities (from )
- HK2 Spring Bridge (from )
- HK2 config types (from )
......@@ -537,7 +538,6 @@ The following software have components provided under the terms of this license:
- HK2 core module (from )
- HK2 module of HK2 itself (from )
- JavaBeans Activation Framework API jar (from )
- JavaBeans(TM) Activation Framework (from http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp)
- Run Level Service (from )
- ServiceLocator Default Implementation (from git://java.net/hk2~git/hk2-locator)
- aopalliance-repackaged (from )
......@@ -560,10 +560,16 @@ CDDL-1.1
========================================================================
The following software have components provided under the terms of this license:
- Expression Language 3.0 (from http://uel.java.net)
- Expression Language 3.0 API (from http://uel.java.net)
- JSR 353 (JSON Processing) Default Provider (from http://jsonp.java.net)
- Java Architecture For XML Binding (from )
- Java Servlet API (from http://servlet-spec.java.net)
- JavaBeans Activation Framework (from )
- JavaBeans(TM) Activation Framework (from http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp)
- JavaMail API (from )
- OSGi resource locator (from )
- javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250)
- javax.ws.rs-api (from http://jax-rs-spec.java.net)
- jersey-ext-bean-validation (from )
- jersey-spring4 (from )
......@@ -576,15 +582,16 @@ CPL-1.0
The following software have components provided under the terms of this license:
- JUnit (from http://junit.org)
- System Rules (from http://stefanbirkner.github.io/system-rules/)
========================================================================
DOC
========================================================================
The following software have components provided under the terms of this license:
- JTS Topology Suite (from http://sourceforge.net/projects/jts-topo-suite)
- Lucene Core (from )
- Lucene Core (from )
- Woodstox (from https://github.com/FasterXML/woodstox)
- aalto-xml (from )
========================================================================
EPL-1.0
......@@ -593,12 +600,15 @@ The following software have components provided under the terms of this license:
- Common Annotations 1.3 API (from )
- JAX-RS 2.1: The Java(TM) API for RESTful Web Services (from )
- Logback Classic Module (from )
- Logback Contrib :: JSON :: Classic (from )
- Logback Contrib :: JSON :: Core (from )
- Logback Contrib :: Jackson (from )
- Logback Core Module (from )
- Microsoft Application Insights Java SDK Spring Boot starter (from https://github.com/Microsoft/ApplicationInsights-Java)
- Microsoft Application Insights Java SDK Web Module (from https://github.com/Microsoft/ApplicationInsights-Java)
- Microsoft Application Insights Log4j 2 Appender (from https://github.com/Microsoft/ApplicationInsights-Java)
- SnakeYAML (from http://www.snakeyaml.org)
- jts-core (from )
- jts-io-common (from )
......@@ -617,10 +627,8 @@ The following software have components provided under the terms of this license:
- ASM library repackaged as OSGi bundle (from )
- Class Model for Hk2 (from )
- Common Annotations 1.3 API (from )
- Expression Language 3.0 (from http://uel.java.net)
- Expression Language 3.0 API (from http://uel.java.net)
- HK2 API module (from git://java.net/hk2~git/hk2-api)
- HK2 Implementation Utilities (from )
- HK2 Spring Bridge (from )
- HK2 config types (from )
......@@ -628,13 +636,16 @@ The following software have components provided under the terms of this license:
- HK2 core module (from )
- HK2 module of HK2 itself (from )
- JSR 353 (JSON Processing) Default Provider (from http://jsonp.java.net)
- Java Architecture For XML Binding (from )
- Java Servlet API (from http://servlet-spec.java.net)
- JavaBeans Activation Framework (from )
- OSGi resource locator (from )
- Run Level Service (from )
- ServiceLocator Default Implementation (from git://java.net/hk2~git/hk2-locator)
- aopalliance-repackaged (from )
- javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250)
- javax.ws.rs-api (from http://jax-rs-spec.java.net)
- javax.ws.rs-api (from http://jax-rs-spec.java.net)
- jersey-client (from )
- jersey-container-servlet (from git://java.net/jersey~code/project/jersey-container-servlet)
- jersey-container-servlet-core (from git://java.net/jersey~code/project/jersey-container-servlet-core)
......@@ -650,6 +661,13 @@ The following software have components provided under the terms of this license:
- jersey-spring4 (from )
- tomcat-embed-core (from http://tomcat.apache.org/)
========================================================================
GPL-2.0-or-later
========================================================================
The following software have components provided under the terms of this license:
- SnakeYAML (from http://www.snakeyaml.org)
========================================================================
GPL-2.0-with-classpath-exception
========================================================================
......@@ -657,13 +675,19 @@ The following software have components provided under the terms of this license:
- Checker Qual (from https://checkerframework.org)
- Common Annotations 1.3 API (from )
- Expression Language 3.0 (from http://uel.java.net)
- Expression Language 3.0 API (from http://uel.java.net)
- HK2 Implementation Utilities (from )
- JAX-RS 2.1: The Java(TM) API for RESTful Web Services (from )
- JSR 353 (JSON Processing) Default Provider (from http://jsonp.java.net)
- Java Architecture For XML Binding (from )
- Java Servlet API (from http://servlet-spec.java.net)
- JavaBeans Activation Framework (from )
- OSGi resource locator (from )
- ServiceLocator Default Implementation (from git://java.net/hk2~git/hk2-locator)
- aopalliance-repackaged (from )
- javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250)
- javax.ws.rs-api (from http://jax-rs-spec.java.net)
- javax.ws.rs-api (from http://jax-rs-spec.java.net)
- jersey-client (from )
- jersey-container-servlet (from git://java.net/jersey~code/project/jersey-container-servlet)
......@@ -688,36 +712,19 @@ The following software have components provided under the terms of this license:
- Common Annotations 1.3 API (from )
- JAX-RS 2.1: The Java(TM) API for RESTful Web Services (from )
- Project Lombok (from https://projectlombok.org)
- Project Lombok (from https://projectlombok.org)
- javax.ws.rs-api (from http://jax-rs-spec.java.net)
- javax.ws.rs-api (from http://jax-rs-spec.java.net)
- jersey-client (from )
- jersey-core (from )
========================================================================
ISC
========================================================================
The following software have components provided under the terms of this license:
- Java Native Access Platform (from https://github.com/java-native-access/jna)
========================================================================
ImageMagick
========================================================================
The following software have components provided under the terms of this license:
- Data Mapper for Jackson (from http://jackson.codehaus.org)
- Jackson (from http://jackson.codehaus.org)
- Jackson (from http://jackson.codehaus.org)
- Stax2 API (from http://github.com/FasterXML/stax2-api)
- Woodstox (from https://github.com/FasterXML/woodstox)
- aalto-xml (from )
========================================================================
Info-ZIP
========================================================================
The following software have components provided under the terms of this license:
- Apache Commons Compress (from http://commons.apache.org/proper/commons-compress/)
========================================================================
JSON
......@@ -736,19 +743,32 @@ The following software have components provided under the terms of this license:
- Java Native Access (from https://github.com/java-native-access/jna)
- Java Native Access Platform (from https://github.com/java-native-access/jna)
- Javassist (from http://www.javassist.org/)
- Logback Classic Module (from )
- Logback Contrib :: JSON :: Classic (from )
- Logback Contrib :: JSON :: Core (from )
- Logback Contrib :: Jackson (from )
- Logback Core Module (from )
- Microsoft Application Insights Java SDK Spring Boot starter (from https://github.com/Microsoft/ApplicationInsights-Java)
- Microsoft Application Insights Java SDK Web Module (from https://github.com/Microsoft/ApplicationInsights-Java)
- Microsoft Application Insights Log4j 2 Appender (from https://github.com/Microsoft/ApplicationInsights-Java)
- json-patch (from https://github.com/fge/json-patch)
========================================================================
LGPL-2.1-or-later
========================================================================
The following software have components provided under the terms of this license:
- JTS Topology Suite (from http://sourceforge.net/projects/jts-topo-suite)
- Javassist (from http://www.javassist.org/)
- SnakeYAML (from http://www.snakeyaml.org)
========================================================================
LGPL-3.0-only
========================================================================
The following software have components provided under the terms of this license:
- Apache Log4j API (from )
- Apache Log4j Core (from )
- BTF (from https://github.com/fge/btf)
- JTS Topology Suite (from http://sourceforge.net/projects/jts-topo-suite)
- Jackson CoreUtils (from https://github.com/fge/jackson-coreutils)
......@@ -763,7 +783,6 @@ The following software have components provided under the terms of this license:
- AWS Java SDK for AWS Lambda (from https://aws.amazon.com/sdkforjava)
- Animal Sniffer Annotations (from )
- Animal Sniffer Annotations (from )
- Apache Log4j SLF4J Binding (from )
- Azure Java Client Authentication Library for AutoRest (from https://github.com/Azure/autorest-clientruntime-for-java)
- Azure Java Client Runtime for ARM (from https://github.com/Azure/autorest-clientruntime-for-java)
- Azure Java Client Runtime for AutoRest (from https://github.com/Azure/autorest-clientruntime-for-java)
......@@ -799,9 +818,9 @@ The following software have components provided under the terms of this license:
- Microsoft Azure common module for Storage (from https://github.com/Azure/azure-sdk-for-java)
- Microsoft Azure internal Avro module for Storage (from https://github.com/Azure/azure-sdk-for-java)
- Mockito (from http://www.mockito.org)
- Mockito (from http://mockito.org)
- Mockito (from http://www.mockito.org)
- Mockito (from http://mockito.org)
- Mockito (from http://mockito.org)
- Netty/Codec/HTTP (from )
- Netty/Common (from )
- Project Lombok (from https://projectlombok.org)
......@@ -817,12 +836,20 @@ The following software have components provided under the terms of this license:
- msal4j-persistence-extension (from https://github.com/AzureAD/microsoft-authentication-extensions-for-java)
- spring-security-core (from http://spring.io/spring-security)
========================================================================
MPL-1.1
========================================================================
The following software have components provided under the terms of this license:
- Javassist (from http://www.javassist.org/)
========================================================================
MPL-2.0
========================================================================
The following software have components provided under the terms of this license:
- Javassist (from http://www.javassist.org/)
- OkHttp (from )
========================================================================
MS-RL
......@@ -850,26 +877,41 @@ The following software have components provided under the terms of this license:
- jts-core (from )
========================================================================
WTFPL
SPL-1.0
========================================================================
The following software have components provided under the terms of this license:
- Reflections (from http://github.com/ronmamo/reflections)
- Checker Qual (from https://checkerframework.org)
========================================================================
X11
SunPro
========================================================================
The following software have components provided under the terms of this license:
- Guava: Google Core Libraries for Java (from https://github.com/google/guava.git)
- MongoDB Java Driver Core (from http://www.mongodb.org)
- Lucene Core (from )
- Lucene Core (from )
========================================================================
bzip2-1.0.6
TCL
========================================================================
The following software have components provided under the terms of this license:
- Apache Commons Compress (from http://commons.apache.org/proper/commons-compress/)
- HK2 API module (from git://java.net/hk2~git/hk2-api)
========================================================================
WTFPL
========================================================================
The following software have components provided under the terms of this license:
- Reflections (from http://github.com/ronmamo/reflections)
========================================================================
X11
========================================================================
The following software have components provided under the terms of this license:
- Lucene Core (from )
- Lucene Core (from )
========================================================================
public-domain
......@@ -878,6 +920,9 @@ The following software have components provided under the terms of this license:
- AWS Java SDK :: SDK Core (from https://aws.amazon.com/sdkforjava)
- Asynchronous Http Client (from )
- Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs (from http://www.bouncycastle.org/java.html)
- Bouncy Castle Provider (from http://www.bouncycastle.org/java.html)
- Guava: Google Core Libraries for Java (from https://github.com/google/guava.git)
- HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/)
- Joda-Time (from http://www.joda.org/joda-time/)
- LatencyUtils (from http://latencyutils.github.io/LatencyUtils/)
......@@ -886,11 +931,13 @@ The following software have components provided under the terms of this license:
- Microsoft Azure SDK for SQL API of Azure Cosmos DB Service (from https://github.com/Azure/azure-sdk-for-java)
- Microsoft Azure client library for Blob Storage (from https://github.com/Azure/azure-sdk-for-java)
- Project Lombok (from https://projectlombok.org)
- Project Lombok (from https://projectlombok.org)
- RESTEasy JAX-RS Implementation (from )
- Spring Security JWT Library (from http://github.com/spring-projects/spring-security-oauth)
- Spring Web (from https://github.com/spring-projects/spring-framework)
- azure-documentdb (from https://azure.microsoft.com/en-us/services/cosmos-db/)
- msal4j (from https://github.com/AzureAD/microsoft-authentication-library-for-java)
- reactive-streams (from http://www.reactive-streams.org/)
========================================================================
unknown
......
provider/search-gcp/src/main/resources/application.properties
View file @ a6fe77c5
......@@ -38,6 +38,7 @@ google.audiences=${GOOGLE_AUDIENCES}
osdu.gcp.storage.gcs.googleAudiences=${GOOGLE_AUDIENCES}
service.policy.enabled=true
service.policy.id=${POLICY_ID}
POLICY_API=http://localhost:8081/police/api/policy/v1
PARTITION_API=${partition_service_endpoint}
partition_service_endpoint=https://os-partition-jvmvia5dea-uc.a.run.app/api/partition/v1
......
Supports Markdown
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