Skip to content
Snippets Groups Projects
Commit bc1642bb authored by Zhibin Mai's avatar Zhibin Mai
Browse files

Merge branch 'master' of https://community.opengroup.org/osdu/platform/system/indexer-service

parents 66043c6f 52b2a553
No related branches found
No related tags found
1 merge request!465Index extended properties defined in property configurations
Pipeline #188511 failed
Stage: review
Stage: build
Stage: coverage
Stage: containerize
Stage: scan
Stage: deploy
Stage: integration
Hide whitespace changes
Inline Side-by-side
Showing
with 35 additions and 35 deletions
devops/gc/pipeline/override-stages.yml
+ 2
− 2
View file @ bc1642bb
...@@ -2,6 +2,6 @@ variables: ...@@ -2,6 +2,6 @@ variables:
GC_SERVICE: indexer GC_SERVICE: indexer
GC_VENDOR: gc GC_VENDOR: gc
gc-anthos-test: gc-baremetal-test:
variables: variables:
GC_VENDOR: anthos GC_VENDOR: baremetal
indexer-core/pom.xml
+ 2
− 2
View file @ bc1642bb
...@@ -4,12 +4,12 @@ ...@@ -4,12 +4,12 @@
<parent> <parent>
<groupId>org.opengroup.osdu.indexer</groupId> <groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-service</artifactId> <artifactId>indexer-service</artifactId>
<version>0.21.0-SNAPSHOT</version> <version>0.22.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>indexer-core</artifactId> <artifactId>indexer-core</artifactId>
<version>0.21.0-SNAPSHOT</version> <version>0.22.0-SNAPSHOT</version>
<name>indexer-core</name> <name>indexer-core</name>
<description>Indexer Service Core</description> <description>Indexer Service Core</description>
<packaging>jar</packaging> <packaging>jar</packaging>
......
pom.xml
+ 1
− 1
View file @ bc1642bb
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<groupId>org.opengroup.osdu.indexer</groupId> <groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-service</artifactId> <artifactId>indexer-service</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>0.21.0-SNAPSHOT</version> <version>0.22.0-SNAPSHOT</version>
<description>Indexer Service</description> <description>Indexer Service</description>
<properties> <properties>
......
provider/indexer-aws/pom.xml
+ 3
− 3
View file @ bc1642bb
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<parent> <parent>
<groupId>org.opengroup.osdu.indexer</groupId> <groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-service</artifactId> <artifactId>indexer-service</artifactId>
<version>0.21.0-SNAPSHOT</version> <version>0.22.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<artifactId>indexer-aws</artifactId> <artifactId>indexer-aws</artifactId>
<description>Indexer service on AWS</description> <description>Indexer service on AWS</description>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>0.21.0-SNAPSHOT</version> <version>0.22.0-SNAPSHOT</version>
<properties> <properties>
<aws.version>1.11.1018</aws.version> <aws.version>1.11.1018</aws.version>
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
<dependency> <dependency>
<groupId>org.opengroup.osdu.indexer</groupId> <groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-core</artifactId> <artifactId>indexer-core</artifactId>
<version>0.21.0-SNAPSHOT</version> <version>0.22.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.opengroup.osdu.core.aws</groupId> <groupId>org.opengroup.osdu.core.aws</groupId>
......
provider/indexer-aws/src/main/resources/application.properties
+ 1
− 1
View file @ bc1642bb
...@@ -45,7 +45,7 @@ aws.elasticache.cluster.schema.expiration=60 ...@@ -45,7 +45,7 @@ aws.elasticache.cluster.schema.expiration=60
# AWS user agent variables # AWS user agent variables
aws.disableUserAgent=${DISABLE_USER_AGENT} aws.disableUserAgent=${DISABLE_USER_AGENT}
aws.osduVersion={OSDU_VERSION} aws.osduVersion=${OSDU_VERSION}
# Maximum size of cache value # Maximum size of cache value
MAX_CACHE_VALUE_SIZE=1000 MAX_CACHE_VALUE_SIZE=1000
......
provider/indexer-azure/pom.xml
+ 3
− 3
View file @ bc1642bb
...@@ -21,12 +21,12 @@ ...@@ -21,12 +21,12 @@
<parent> <parent>
<groupId>org.opengroup.osdu.indexer</groupId> <groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-service</artifactId> <artifactId>indexer-service</artifactId>
<version>0.21.0-SNAPSHOT</version> <version>0.22.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<artifactId>indexer-azure</artifactId> <artifactId>indexer-azure</artifactId>
<version>0.21.0-SNAPSHOT</version> <version>0.22.0-SNAPSHOT</version>
<name>indexer-azure</name> <name>indexer-azure</name>
<description>Indexer Service Azure</description> <description>Indexer Service Azure</description>
<packaging>jar</packaging> <packaging>jar</packaging>
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<azure.appservice.subscription /> <azure.appservice.subscription />
<log4j.version>2.17.1</log4j.version> <log4j.version>2.17.1</log4j.version>
<nimbus-jose-jwt.version>8.20.2</nimbus-jose-jwt.version> <nimbus-jose-jwt.version>8.20.2</nimbus-jose-jwt.version>
<indexer-core.version>0.21.0-SNAPSHOT</indexer-core.version> <indexer-core.version>0.22.0-SNAPSHOT</indexer-core.version>
<spring-security-jwt.version>1.1.1.RELEASE</spring-security-jwt.version> <spring-security-jwt.version>1.1.1.RELEASE</spring-security-jwt.version>
<osdu.corelibazure.version>0.20.0-rc5</osdu.corelibazure.version> <osdu.corelibazure.version>0.20.0-rc5</osdu.corelibazure.version>
<os-core-common.version>0.21.0-rc4</os-core-common.version> <os-core-common.version>0.21.0-rc4</os-core-common.version>
......
provider/indexer-gc/README.md
+ 6
− 6
View file @ bc1642bb
...@@ -21,9 +21,9 @@ These instructions will get you a copy of the project up and running on your loc ...@@ -21,9 +21,9 @@ These instructions will get you a copy of the project up and running on your loc
## Service Configuration ## Service Configuration
### Anthos ### Baremetal
[Anthos service configuration](docs/anthos/README.md) [Baremetal service configuration](docs/baremetal/README.md)
### Google Cloud ### Google Cloud
...@@ -57,9 +57,9 @@ In the current version, the mappers are equipped with several drivers to the sto ...@@ -57,9 +57,9 @@ In the current version, the mappers are equipped with several drivers to the sto
* GCloud SDK with java (latest version) * GCloud SDK with java (latest version)
### Anthos Service Configuration ### Baremetal Service Configuration
[Anthos service configuration](docs/anthos/README.md) [Baremetal service configuration](docs/baremetal/README.md)
### Google Cloud Service Configuration ### Google Cloud Service Configuration
...@@ -161,9 +161,9 @@ $ (cd testing/indexer-test-core/ && mvn clean install) ...@@ -161,9 +161,9 @@ $ (cd testing/indexer-test-core/ && mvn clean install)
This section describes how to run cloud OSDU E2E tests. This section describes how to run cloud OSDU E2E tests.
### Anthos test configuration ### Baremetal test configuration
[Anthos service configuration](docs/anthos/README.md) [Baremetal service configuration](docs/baremetal/README.md)
### Google Cloud test configuration ### Google Cloud test configuration
......
provider/indexer-gc/cloudbuild/Dockerfile.cloudbuild
+ 1
− 1
View file @ bc1642bb
FROM azul/zulu-openjdk-alpine:8-latest FROM azul/zulu-openjdk:8-latest
WORKDIR /app WORKDIR /app
ARG PROVIDER_NAME ARG PROVIDER_NAME
ENV PROVIDER_NAME $PROVIDER_NAME ENV PROVIDER_NAME $PROVIDER_NAME
......
provider/indexer-gc/docs/anthos/README.md
+ 2
− 2
View file @ bc1642bb
...@@ -32,7 +32,7 @@ Defined in default application property file but possible to override: ...@@ -32,7 +32,7 @@ Defined in default application property file but possible to override:
| `STORAGE_HOST` | ex `https://storage.com` | Storage host | no | output of infrastructure deployment | | `STORAGE_HOST` | ex `https://storage.com` | Storage host | no | output of infrastructure deployment |
| `SCHEMA_BASE_HOST` | ex `https://schema.com` | Schema service host | no | output of infrastructure deployment | | `SCHEMA_BASE_HOST` | ex `https://schema.com` | Schema service host | no | output of infrastructure deployment |
These variables define service behavior, and are used to switch between `anthos` or `gcp` environments, their overriding and usage in mixed mode was not tested. These variables define service behavior, and are used to switch between `baremetal` or `gcp` environments, their overriding and usage in mixed mode was not tested.
Usage of spring profiles is preferred. Usage of spring profiles is preferred.
| name | value | description | sensitive? | source | | name | value | description | sensitive? | source |
...@@ -263,5 +263,5 @@ Execute following command to build code and run all the integration tests: ...@@ -263,5 +263,5 @@ Execute following command to build code and run all the integration tests:
```bash ```bash
# Note: this assumes that the environment variables for integration tests as outlined # Note: this assumes that the environment variables for integration tests as outlined
# above are already exported in your environment. # above are already exported in your environment.
$ (cd testing/indexer-test-anthos/ && mvn clean test) $ (cd testing/indexer-test-baremetal/ && mvn clean test)
``` ```
provider/indexer-gc/pom.xml
+ 3
− 3
View file @ bc1642bb
...@@ -5,12 +5,12 @@ ...@@ -5,12 +5,12 @@
<parent> <parent>
<groupId>org.opengroup.osdu.indexer</groupId> <groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-service</artifactId> <artifactId>indexer-service</artifactId>
<version>0.21.0-SNAPSHOT</version> <version>0.22.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<artifactId>indexer-gc</artifactId> <artifactId>indexer-gc</artifactId>
<version>0.21.0-SNAPSHOT</version> <version>0.22.0-SNAPSHOT</version>
<name>indexer-gc</name> <name>indexer-gc</name>
<description>Indexer Service Google Cloud</description> <description>Indexer Service Google Cloud</description>
<packaging>jar</packaging> <packaging>jar</packaging>
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<dependency> <dependency>
<groupId>org.opengroup.osdu.indexer</groupId> <groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-core</artifactId> <artifactId>indexer-core</artifactId>
<version>0.21.0-SNAPSHOT</version> <version>0.22.0-SNAPSHOT</version>
<!-- excluded due to runtime conflict with latest core-lib-gcp transient dependencies --> <!-- excluded due to runtime conflict with latest core-lib-gcp transient dependencies -->
<exclusions> <exclusions>
<exclusion> <exclusion>
......
provider/indexer-ibm/pom.xml
+ 2
− 2
View file @ bc1642bb
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<parent> <parent>
<groupId>org.opengroup.osdu.indexer</groupId> <groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-service</artifactId> <artifactId>indexer-service</artifactId>
<version>0.21.0-SNAPSHOT</version> <version>0.22.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
<dependency> <dependency>
<groupId>org.opengroup.osdu.indexer</groupId> <groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-core</artifactId> <artifactId>indexer-core</artifactId>
<version>0.21.0-SNAPSHOT</version> <version>0.22.0-SNAPSHOT</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
......
testing/indexer-test-aws/pom.xml
+ 3
− 3
View file @ bc1642bb
...@@ -21,13 +21,13 @@ ...@@ -21,13 +21,13 @@
<parent> <parent>
<groupId>org.opengroup.osdu</groupId> <groupId>org.opengroup.osdu</groupId>
<artifactId>indexer-test</artifactId> <artifactId>indexer-test</artifactId>
<version>0.21.0-SNAPSHOT</version> <version>0.22.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<groupId>org.opengroup.osdu.indexer</groupId> <groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-test-aws</artifactId> <artifactId>indexer-test-aws</artifactId>
<version>0.21.0-SNAPSHOT</version> <version>0.22.0-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<properties> <properties>
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<dependency> <dependency>
<groupId>org.opengroup.osdu.indexer</groupId> <groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-test-core</artifactId> <artifactId>indexer-test-core</artifactId>
<version>0.21.0-SNAPSHOT</version> <version>0.22.0-SNAPSHOT</version>
</dependency> </dependency>
<!-- AWS specific packages --> <!-- AWS specific packages -->
......
testing/indexer-test-azure/pom.xml
+ 3
− 3
View file @ bc1642bb
...@@ -21,13 +21,13 @@ ...@@ -21,13 +21,13 @@
<parent> <parent>
<groupId>org.opengroup.osdu</groupId> <groupId>org.opengroup.osdu</groupId>
<artifactId>indexer-test</artifactId> <artifactId>indexer-test</artifactId>
<version>0.21.0-SNAPSHOT</version> <version>0.22.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<groupId>org.opengroup.osdu.indexer</groupId> <groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-test-azure</artifactId> <artifactId>indexer-test-azure</artifactId>
<version>0.21.0-SNAPSHOT</version> <version>0.22.0-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<properties> <properties>
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
<dependency> <dependency>
<groupId>org.opengroup.osdu.indexer</groupId> <groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-test-core</artifactId> <artifactId>indexer-test-core</artifactId>
<version>0.21.0-SNAPSHOT</version> <version>0.22.0-SNAPSHOT</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
......
testing/indexer-test-anthos/pom.xml → testing/indexer-test-baremetal/pom.xml
+ 3
− 3
View file @ bc1642bb
...@@ -20,11 +20,11 @@ ...@@ -20,11 +20,11 @@
<parent> <parent>
<artifactId>indexer-test</artifactId> <artifactId>indexer-test</artifactId>
<groupId>org.opengroup.osdu</groupId> <groupId>org.opengroup.osdu</groupId>
<version>0.21.0-SNAPSHOT</version> <version>0.22.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>indexer-test-anthos</artifactId> <artifactId>indexer-test-baremetal</artifactId>
<properties> <properties>
<maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.target>1.8</maven.compiler.target>
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<dependency> <dependency>
<groupId>org.opengroup.osdu.indexer</groupId> <groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-test-core</artifactId> <artifactId>indexer-test-core</artifactId>
<version>0.21.0-SNAPSHOT</version> <version>0.22.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.nimbusds</groupId> <groupId>com.nimbusds</groupId>
......
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