diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 29aea813863e3270b5412e143f841682193e3689..39767ed0de87222e2e1cf9da7617d95a9c417d66 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,6 +2,7 @@ variables:
AWS_BUILD_SUBDIR: provider/indexer-aws
AWS_APPLICATION_NAME: os-indexer
AWS_ENVIRONMENT: dev
+
GCP_BUILD_SUBDIR: provider/indexer-gcp
GCP_INT_TEST_SUBDIR: testing/indexer-test-gcp
GCP_APPLICATION_NAME: osdu-indexer
@@ -12,7 +13,19 @@ variables:
GCP_DOMAIN: cloud.slb-ds.com
GCP_STORAGE_URL: https://osdu-indexer-dot-opendes.appspot.com/api/storage/v2/
+ AZURE_SERVICE: indexer
+ AZURE_BUILD_SUBDIR: provider/indexer-azure
+ AZURE_TEST_SUBDIR: testing/indexer-test-azure
+
include:
- - project: 'osdu/platform/ci-cd-pipelines'
- ref: 'master'
- file: 'temp-service.gitlab-ci.yml'
+ - project: "osdu/platform/ci-cd-pipelines"
+ file: "standard-setup.yml"
+ - project: "osdu/platform/ci-cd-pipelines"
+ file: "build/maven.yml"
+ - project: "osdu/platform/ci-cd-pipelines"
+ ref: "master"
+ file: "cloud-providers/azure.yml"
+ - project: "osdu/platform/ci-cd-pipelines"
+ file: "scanners/fossa.yml"
+ - project: "osdu/platform/ci-cd-pipelines"
+ file: "scanners/gitlab-ultimate.yml"
diff --git a/.mvn/community-maven.settings.xml b/.mvn/community-maven.settings.xml
index 75718a6d51b789d04f859ab8906b094bfb76b825..3af866cf08df445892d0239db6d6d35235a153df 100644
--- a/.mvn/community-maven.settings.xml
+++ b/.mvn/community-maven.settings.xml
@@ -1,55 +1,65 @@
<settings>
- <profiles>
- <profile>
- <!-- This profile uses the CI-Token to authenticate with the server, and is the default case -->
- <id>GitLab-Authenticate-With-Job-Token</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <properties>
- <gitlab-server>community-maven-via-job-token</gitlab-server>
- </properties>
- </profile>
+ <profiles>
+ <profile>
+ <!-- This profile uses the CI-Token to authenticate with the server, and is the default case -->
+ <id>GitLab-Authenticate-With-Job-Token</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <properties>
+ <gitlab-server>community-maven-via-job-token</gitlab-server>
+ </properties>
+ </profile>
- <profile>
- <!-- This profile uses a personal token to authenticate, which is useful for local or manual runs. The
+ <profile>
+ <!-- This profile uses a personal token to authenticate, which is useful for local or manual runs. The
presence of the COMMUNITY_MAVEN_TOKEN variable triggers this and overrides the CI Token
based authentication -->
- <id>GitLab-Authenticate-With-Private-Token</id>
- <activation>
- <property>
- <name>env.COMMUNITY_MAVEN_TOKEN</name>
- </property>
- </activation>
- <properties>
- <gitlab-server>community-maven-via-private-token</gitlab-server>
- </properties>
- </profile>
- </profiles>
+ <id>GitLab-Authenticate-With-Private-Token</id>
+ <activation>
+ <property>
+ <name>env.COMMUNITY_MAVEN_TOKEN</name>
+ </property>
+ </activation>
+ <properties>
+ <gitlab-server>community-maven-via-private-token</gitlab-server>
+ </properties>
+ </profile>
+ </profiles>
- <servers>
- <server>
- <id>community-maven-via-job-token</id>
- <configuration>
- <httpHeaders>
- <property>
- <name>Job-Token</name>
- <value>${env.CI_JOB_TOKEN}</value>
- </property>
- </httpHeaders>
- </configuration>
- </server>
+ <servers>
+ <server>
+ <id>community-maven-via-job-token</id>
+ <configuration>
+ <httpHeaders>
+ <property>
+ <name>Job-Token</name>
+ <value>${env.CI_JOB_TOKEN}</value>
+ </property>
+ </httpHeaders>
+ </configuration>
+ </server>
- <server>
- <id>community-maven-via-private-token</id>
- <configuration>
- <httpHeaders>
- <property>
- <name>Private-Token</name>
- <value>${env.COMMUNITY_MAVEN_TOKEN}</value>
- </property>
- </httpHeaders>
- </configuration>
- </server>
- </servers>
+ <server>
+ <id>community-maven-via-private-token</id>
+ <configuration>
+ <httpHeaders>
+ <property>
+ <name>Private-Token</name>
+ <value>${env.COMMUNITY_MAVEN_TOKEN}</value>
+ </property>
+ </httpHeaders>
+ </configuration>
+ </server>
+
+ <server>
+ <id>azure-auth</id>
+ <configuration>
+ <tenant>${env.AZURE_TENANT_ID}</tenant>
+ <client>${env.AZURE_CLIENT_ID}</client>
+ <key>${env.AZURE_CLIENT_SECRET}</key>
+ <environment>AZURE</environment>
+ </configuration>
+ </server>
+ </servers>
</settings>
diff --git a/NOTICE b/NOTICE
index c2b2df630a852d6da44e3325304ee0e356bf8c2d..78ffe18c36f108b999403a21aca5561da549c439 100644
--- a/NOTICE
+++ b/NOTICE
@@ -2,12 +2,28 @@
Generated by fossa-cli (https://github.com/fossas/fossa-cli).
This software includes the following software and licenses:
+========================================================================
+Apache-1.1
+========================================================================
+The following software have components provided under the terms of this license:
+
+- Apache Commons CLI (from http://commons.apache.org/proper/commons-cli/)
+- Cobertura code coverage (from http://cobertura.sourceforge.net)
+- Plexus :: Default Container (from )
+- Plexus Common Utilities (from http://plexus.codehaus.org/plexus-utils)
+- oro (from )
+
========================================================================
Apache-2.0
========================================================================
The following software have components provided under the terms of this license:
+- ASM Analysis (from )
+- ASM Commons (from )
+- ASM Core (from )
- ASM Core (from )
+- ASM Tree (from )
+- ASM Util (from )
- ASM based accessors helper used by json-smart (from )
- AWS Java SDK for AWS AppSync (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Application Auto Scaling (from https://aws.amazon.com/sdkforjava)
@@ -140,35 +156,80 @@ The following software have components provided under the terms of this license:
- AWS SDK for Java - BOM (from https://aws.amazon.com/sdkforjava)
- AWS SDK for Java - Core (from https://aws.amazon.com/sdkforjava)
- AWS SDK for Java - Models (from https://aws.amazon.com/sdkforjava)
+- Adapter: RxJava (from )
+- Apache Ant + JUnit (from http://ant.apache.org/)
+- Apache Ant Core (from http://ant.apache.org/)
+- Apache Ant Launcher (from http://ant.apache.org/)
- Apache Commons BeanUtils (from http://commons.apache.org/proper/commons-beanutils/)
+- Apache Commons CLI (from http://commons.apache.org/proper/commons-cli/)
- Apache Commons Codec (from http://commons.apache.org/proper/commons-codec/)
- Apache Commons Codec (from http://commons.apache.org/proper/commons-codec/)
+- Apache Commons Collections (from http://commons.apache.org/proper/commons-collections/)
- Apache Commons Lang (from http://commons.apache.org/proper/commons-lang/)
- Apache Commons Logging (from http://commons.apache.org/proper/commons-logging/)
+- Apache Commons Logging (from http://commons.apache.org/proper/commons-logging/)
+- Apache Commons Text (from http://commons.apache.org/proper/commons-text/)
+- Apache Commons Validator (from http://commons.apache.org/proper/commons-validator/)
+- Apache Commons Validator (from http://commons.apache.org/proper/commons-validator/)
- Apache HttpAsyncClient (from http://hc.apache.org/httpcomponents-asyncclient)
- Apache HttpClient (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 Core (from )
+- Apache Log4j JUL Adapter (from )
- Apache Log4j to SLF4J Adapter (from )
+- Apache Maven Invoker (from )
+- Apache Maven Reporting Implementation (from )
+- Apache Maven Wagon :: API (from )
+- Apache Maven Wagon :: Providers :: File Provider (from )
+- Apache Maven Wagon :: Providers :: HTTP Shared Library (from )
+- Apache Maven Wagon :: Providers :: Lightweight HTTP Provider (from )
+- Apache Maven Wagon :: Providers :: SSH Common Library (from )
+- Apache Maven Wagon :: Providers :: SSH External Provider (from )
+- Apache Maven Wagon :: Providers :: SSH Provider (from )
+- Apache Velocity (from http://velocity.apache.org/engine/devel/)
- AssertJ fluent assertions (from )
+- Asynchronous Http Client (from )
+- Asynchronous Http Client Netty Utils (from )
+- AutoValue (from )
- Bean Validation API (from http://beanvalidation.org)
- Byte Buddy (without dependencies) (from )
- Byte Buddy Java agent (from )
- ClassMate (from http://github.com/cowtowncoder/java-classmate)
- Cloud Storage JSON API v1-rev58-1.21.0 (from )
- CloudWatch Metrics for AWS Java SDK (from https://aws.amazon.com/sdkforjava)
+- Cobertura code coverage (from http://cobertura.sourceforge.net)
+- Commons Digester (from http://commons.apache.org/digester/)
+- Commons Digester (from http://commons.apache.org/digester/)
+- Commons IO (from http://commons.apache.org/io/)
- Commons Lang (from http://commons.apache.org/lang/)
+- Converter: Jackson (from )
- Data Mapper for Jackson (from http://jackson.codehaus.org)
+- Doxia :: APT Module (from )
+- Doxia :: Core (from )
+- Doxia :: Decoration Model (from http://maven.apache.org/doxia/doxia-sitetools/doxia-decoration-model/)
+- Doxia :: FML Module (from )
+- Doxia :: Sink API (from )
+- Doxia :: Site Renderer (from http://maven.apache.org/doxia/doxia-sitetools/doxia-site-renderer/)
+- Doxia :: XDoc Module (from )
+- Doxia :: XHTML Module (from )
- Elastic JNA Distribution (from https://github.com/java-native-access/jna)
- Elasticsearch: 5.0.0-alpha5 (from https://github.com/elastic/elasticsearch)
- FindBugs-jsr305 (from http://findbugs.sourceforge.net/)
+- 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)
+- Google Cloud Core HTTP (from https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-core-http)
+- Google Cloud Core gRPC (from https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-core-grpc)
- Google Cloud Datastore (from https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-datastore)
- Google Cloud Key Management Service (KMS) API v1-rev22-1.23.0 (from )
- Google Cloud Logging (from https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-logging)
- Google Cloud Pub/Sub (from https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-pubsub)
+- Google Cloud Storage (from https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-storage)
- Google HTTP Client Library for Java (from https://github.com/google/google-http-java-client.git)
- Google HTTP Client Library for Java (from https://github.com/google/google-http-java-client.git)
+- Google OAuth Client Library for Java (from )
- Gson (from https://github.com/google/gson)
- Guava InternalFutureFailureAccess and InternalFutures (from )
- Guava ListenableFuture only (from )
@@ -176,9 +237,12 @@ 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)
- HPPC Collections (from http://labs.carrotsearch.com)
- Hibernate Validator Engine (from )
+- Identity and Access Management (IAM) API v1-rev247-1.23.0 (from )
+- J2ObjC Annotations (from https://github.com/google/j2objc/)
- J2ObjC Annotations (from https://github.com/google/j2objc/)
- JBoss Logging 3 (from http://www.jboss.org)
- JCIP Annotations under Apache License (from http://stephenc.github.com/jcip-annotations)
+- JDOM (from http://www.jdom.org)
- JMES Path Query library (from https://aws.amazon.com/sdkforjava)
- JSON Small and Fast Parser (from http://www.minidev.net/)
- JSON Web Token support for the JVM (from https://github.com/jwtk/jjwt.git)
@@ -186,18 +250,28 @@ The following software have components provided under the terms of this license:
- JSON.simple (from http://code.google.com/p/json-simple/)
- JSONassert (from https://github.com/skyscreamer/JSONassert)
- Jackson (from http://jackson.codehaus.org)
+- Jackson (from http://jackson.codehaus.org)
+- Jackson 2 extensions to the Google HTTP Client Library for Java. (from https://github.com/google/google-http-java-client.git/google-http-client-jackson2)
- Jackson dataformat: CBOR (from http://github.com/FasterXML/jackson-dataformats-binary)
- Jackson datatype: JSR310 (from http://wiki.fasterxml.com/JacksonModuleJSR310)
+- Jackson extensions to the Google HTTP Client Library for Java. (from )
- Jackson-annotations (from http://github.com/FasterXML/jackson)
- Jackson-core (from https://github.com/FasterXML/jackson-core)
- Jackson-dataformat-Smile (from http://github.com/FasterXML/jackson-dataformat-smile)
+- Jackson-dataformat-XML (from http://wiki.fasterxml.com/JacksonExtensionXmlDataBinding)
- Jackson-dataformat-YAML (from https://github.com/FasterXML/jackson)
+- Jackson-datatype-Joda (from http://wiki.fasterxml.com/JacksonModuleJoda)
- Jackson-datatype-jdk8 (from )
- Jackson-module-JAXB-annotations (from http://wiki.fasterxml.com/JacksonJAXBAnnotations)
- Jackson-module-parameter-names (from )
- Java Libraries for Amazon Simple WorkFlow (from https://aws.amazon.com/sdkforjava)
+- 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)
- Javassist (from http://www.javassist.org/)
+- Jetty Server (from )
+- Jetty Utilities (from )
- Joda-Time (from http://www.joda.org/joda-time/)
- Json Path (from https://github.com/jayway/JsonPath)
- Lucene Common Analyzers (from )
@@ -216,26 +290,71 @@ The following software have components provided under the terms of this license:
- Lucene Spatial Extras (from )
- Lucene Suggest (from )
- MapStruct Core (from )
+- Maven Artifact (from )
+- Maven Artifact Manager (from )
+- Maven Core (from https://git-wip-us.apache.org/repos/asf/maven.git/maven-core)
+- Maven Error Diagnostics (from )
+- Maven Model (from https://git-wip-us.apache.org/repos/asf/maven.git/maven-model)
+- Maven Monitor (from )
+- Maven Plugin API (from https://git-wip-us.apache.org/repos/asf/maven.git/maven-plugin-api)
+- Maven Plugin Descriptor Model (from )
+- Maven Plugin Parameter Documenter API (from )
+- Maven Plugin Registry Model (from )
+- Maven Profile Model (from )
+- Maven Project (from )
+- Maven Reporting API (from )
+- Maven Repository Metadata Model (from )
+- Maven Settings (from )
+- Metrics Core (from https://github.com/dropwizard/metrics)
+- Microsoft Application Insights Java SDK Core (from https://github.com/Microsoft/ApplicationInsights-Java)
+- 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)
- Microsoft Application Insights Logback Appender (from https://github.com/Microsoft/ApplicationInsights-Java)
+- Mockito (from http://www.mockito.org)
- Mockito (from http://mockito.org)
- Mockito (from http://mockito.org)
-- Mockito (from http://www.mockito.org)
- Mojo's Maven plugin for Cobertura (from http://mojo.codehaus.org/cobertura-maven-plugin/)
+- Netty Reactive Streams Implementation (from )
- Netty/Buffer (from http://netty.io/)
- Netty/Codec (from )
+- Netty/Codec/DNS (from )
- Netty/Codec/HTTP (from )
+- Netty/Codec/HTTP2 (from )
+- Netty/Codec/Socks (from )
- Netty/Common (from )
- Netty/Handler (from )
+- Netty/Handler/Proxy (from )
- Netty/Resolver (from )
+- Netty/Resolver/DNS (from )
+- Netty/TomcatNative [BoringSSL - Static] (from )
- Netty/Transport (from http://netty.io/)
+- Netty/Transport/Native/Unix/Common (from )
- Nimbus JOSE+JWT (from https://bitbucket.org/connect2id/nimbus-jose-jwt)
- Nimbus LangTag (from https://bitbucket.org/connect2id/nimbus-language-tags)
+- Non-Blocking Reactive Foundation for the JVM (from https://github.com/reactor/reactor)
- OAuth 2.0 SDK with OpenID Connect extensions (from https://bitbucket.org/connect2id/oauth-2.0-sdk-with-openid-connect-extensions)
- OAuth2 for Spring Security (from )
- Objenesis (from http://objenesis.org)
+- OkHttp (from )
+- OkHttp Logging Interceptor (from )
+- OkHttp URLConnection (from )
+- Okio (from )
+- OpenCensus (from https://github.com/census-instrumentation/opencensus-java)
- OpenCensus (from https://github.com/census-instrumentation/opencensus-java)
- OpenCensus (from https://github.com/census-instrumentation/opencensus-java)
+- OpenCensus (from https://github.com/census-instrumentation/opencensus-java)
+- OpenCensus (from https://github.com/census-instrumentation/opencensus-java)
+- Plexus :: Default Container (from )
+- Plexus Common Utilities (from http://plexus.codehaus.org/plexus-utils)
+- Plexus Default Interactivity Handler (from )
+- Plexus I18N Component (from )
+- Plexus Velocity Component (from )
- PowerMock (from http://www.powermock.org)
+- Protocol Buffer extensions to the Google HTTP Client Library for Java. (from )
+- Reactive Streams Netty driver (from https://github.com/reactor/reactor-netty)
+- Retrofit (from )
+- Servlet Specification 2.5 API (from )
- SnakeYAML (from http://www.snakeyaml.org)
- Spatial4J (from http://www.locationtech.org/projects/locationtech.spatial4j)
- Spring AOP (from https://github.com/spring-projects/spring-framework)
@@ -244,25 +363,20 @@ The following software have components provided under the terms of this license:
- Spring Boot Actuator (from http://projects.spring.io/spring-boot/)
- Spring Boot Actuator AutoConfigure (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-actuator-autoconfigure)
- Spring Boot Actuator Starter (from http://projects.spring.io/spring-boot/)
-- Spring Boot Actuator Starter (from http://projects.spring.io/spring-boot/)
- Spring Boot AutoConfigure (from http://projects.spring.io/spring-boot/)
- Spring Boot Configuration Processor (from http://projects.spring.io/spring-boot/)
- Spring Boot Dependencies (from http://projects.spring.io/spring-boot/)
- Spring Boot Jersey Starter (from http://projects.spring.io/spring-boot/)
-- Spring Boot Jersey Starter (from http://projects.spring.io/spring-boot/)
- Spring Boot Json Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-json)
+- Spring Boot Log4J2 Starter (from http://projects.spring.io/spring-boot/)
- Spring Boot Logging Starter (from http://projects.spring.io/spring-boot/)
- Spring Boot Security Starter (from http://projects.spring.io/spring-boot/)
-- Spring Boot Security Starter (from http://projects.spring.io/spring-boot/)
- Spring Boot Starter (from http://projects.spring.io/spring-boot/)
- Spring Boot Test (from http://projects.spring.io/spring-boot/)
- Spring Boot Test Auto-Configure (from http://projects.spring.io/spring-boot/)
- Spring Boot Test Starter (from http://projects.spring.io/spring-boot/)
-- Spring Boot Test Starter (from http://projects.spring.io/spring-boot/)
- Spring Boot Tomcat Starter (from http://projects.spring.io/spring-boot/)
- Spring Boot Validation Starter (from http://projects.spring.io/spring-boot/)
-- Spring Boot Validation Starter (from http://projects.spring.io/spring-boot/)
-- Spring Boot Web Starter (from http://projects.spring.io/spring-boot/)
- Spring Boot Web Starter (from http://projects.spring.io/spring-boot/)
- Spring Commons Logging Bridge (from https://github.com/spring-projects/spring-framework)
- Spring Context (from https://github.com/spring-projects/spring-framework)
@@ -273,20 +387,39 @@ The following software have components provided under the terms of this license:
- Spring Plugin - Metadata Extension (from )
- Spring Security JWT Library (from http://github.com/spring-projects/spring-security-oauth)
- Spring TestContext Framework (from https://github.com/spring-projects/spring-framework)
+- Spring Transaction (from https://github.com/spring-projects/spring-framework)
- Spring Web (from https://github.com/spring-projects/spring-framework)
- Spring Web MVC (from https://github.com/spring-projects/spring-framework)
- T-Digest (from https://github.com/tdunning/t-digest)
+- Woodstox (from https://github.com/FasterXML/woodstox)
+- Xerces2-j (from https://xerces.apache.org/xerces2-j/)
- aggs-matrix-stats (from https://github.com/elastic/elasticsearch)
- cli (from https://github.com/elastic/elasticsearch)
+- com.google.api.grpc:grpc-google-cloud-pubsub-v1 (from https://github.com/googleapis/googleapis)
+- com.google.api.grpc:proto-google-cloud-logging-v2 (from https://github.com/googleapis/googleapis)
+- com.google.api.grpc:proto-google-cloud-pubsub-v1 (from https://github.com/googleapis/googleapis)
+- com.google.api.grpc:proto-google-common-protos (from https://github.com/googleapis/googleapis)
- com.google.api.grpc:proto-google-iam-v1 (from https://github.com/googleapis/googleapis)
- commons-collections (from )
- compiler (from http://github.com/spullara/mustache.java)
+- datastore-v1-proto-client (from )
- elasticsearch-core (from https://github.com/elastic/elasticsearch)
- error-prone annotations (from )
+- error-prone annotations (from )
+- io.grpc:grpc-alts (from https://github.com/grpc/grpc-java)
+- io.grpc:grpc-auth (from https://github.com/grpc/grpc-java)
- io.grpc:grpc-context (from https://github.com/grpc/grpc-java)
+- io.grpc:grpc-context (from https://github.com/grpc/grpc-java)
+- io.grpc:grpc-core (from https://github.com/grpc/grpc-java)
+- io.grpc:grpc-grpclb (from https://github.com/grpc/grpc-java)
+- io.grpc:grpc-netty-shaded (from https://github.com/grpc/grpc-java)
+- io.grpc:grpc-protobuf (from https://github.com/grpc/grpc-java)
+- io.grpc:grpc-protobuf-lite (from https://github.com/grpc/grpc-java)
+- io.grpc:grpc-stub (from https://github.com/grpc/grpc-java)
- ion-java (from https://github.com/amznlabs/ion-java/)
- jackson-databind (from http://github.com/FasterXML/jackson)
- jackson-databind (from http://github.com/FasterXML/jackson)
+- 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)
- jersey-container-servlet (from git://java.net/jersey~code/project/jersey-container-servlet)
@@ -304,28 +437,31 @@ The following software have components provided under the terms of this license:
- lang-mustache (from https://github.com/elastic/elasticsearch)
- lettuce (from http://github.com/mp911de/lettuce/wiki)
- micrometer-core (from https://github.com/micrometer-metrics/micrometer)
+- micrometer-registry-azure-monitor (from https://github.com/micrometer-metrics/micrometer)
- org.xmlunit:xmlunit-core (from http://www.xmlunit.org/)
+- oro (from )
- parent-join (from https://github.com/elastic/elasticsearch)
- powermock-api-mockito (from )
- powermock-api-mockito-common (from )
- powermock-api-support (from )
+- powermock-api-support (from )
- powermock-core (from http://www.powermock.org)
- powermock-module-junit4 (from http://www.powermock.org)
- powermock-module-junit4-common (from )
- powermock-reflect (from )
+- proto-google-cloud-datastore-v1 (from https://github.com/googleapis/api-client-staging)
+- proton-j (from )
- rank-eval (from https://github.com/elastic/elasticsearch)
- rest (from https://github.com/elastic/elasticsearch)
- rest-high-level (from https://github.com/elastic/elasticsearch)
- rxjava (from https://github.com/ReactiveX/RxJava)
+- rxjava (from https://github.com/ReactiveX/RxJava)
- secure-sm (from https://github.com/elastic/elasticsearch)
- spring-security-config (from http://spring.io/spring-security)
- spring-security-core (from http://spring.io/spring-security)
- spring-security-oauth2-client (from http://spring.io/spring-security)
-- spring-security-oauth2-client (from http://spring.io/spring-security)
- spring-security-oauth2-core (from http://spring.io/spring-security)
- spring-security-oauth2-jose (from http://spring.io/spring-security)
-- spring-security-oauth2-jose (from http://spring.io/spring-security)
-- spring-security-test (from http://spring.io/spring-security)
- spring-security-test (from http://spring.io/spring-security)
- spring-security-web (from http://spring.io/spring-security)
- springfox-core (from https://github.com/springfox/springfox)
@@ -344,37 +480,70 @@ The following software have components provided under the terms of this license:
- tomcat-embed-el (from http://tomcat.apache.org/)
- tomcat-embed-websocket (from http://tomcat.apache.org/)
- x-content (from https://github.com/elastic/elasticsearch)
+- xml-apis (from )
========================================================================
BSD-2-Clause
========================================================================
The following software have components provided under the terms of this license:
+- Apache Commons CLI (from http://commons.apache.org/proper/commons-cli/)
+- 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)
- Hamcrest Core (from http://hamcrest.org/)
- Lucene Common Analyzers (from )
+- Plexus :: Default Container (from )
+- Plexus Common Utilities (from http://plexus.codehaus.org/plexus-utils)
- jersey-ext-bean-validation (from )
- jersey-spring4 (from )
+- oro (from )
========================================================================
BSD-3-Clause
========================================================================
The following software have components provided under the terms of this license:
+- API Common (from https://github.com/googleapis)
+- ASM Analysis (from )
+- ASM Commons (from )
- ASM Core (from )
+- ASM Core (from )
+- ASM Tree (from )
+- ASM Util (from )
- ASM library repackaged as OSGi bundle (from )
- Apache Commons Codec (from http://commons.apache.org/proper/commons-codec/)
- Apache Commons Codec (from http://commons.apache.org/proper/commons-codec/)
-- Byte Buddy (without dependencies) (from )
+- 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)
+- Google APIs Client Library for Java (from )
+- Google Auth Library for Java - Credentials (from )
+- Google Auth Library for Java - OAuth2 HTTP (from )
- Hamcrest library (from )
+- JDOM (from http://www.jdom.org)
+- JSch (from http://www.jcraft.com/jsch/)
- Lucene Common Analyzers (from )
- Lucene Core (from )
- Lucene Suggest (from )
+- Microsoft Application Insights Java SDK Core (from https://github.com/Microsoft/ApplicationInsights-Java)
+- 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)
- Microsoft Application Insights Logback Appender (from https://github.com/Microsoft/ApplicationInsights-Java)
- Mockito (from http://www.mockito.org)
+- NanoHttpd-Core (from )
- Netty/Codec/HTTP (from )
+- Plexus Common Utilities (from http://plexus.codehaus.org/plexus-utils)
+- 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)
+- Stax2 API (from http://github.com/FasterXML/stax2-api)
+- ThreeTen backport (from https://www.threeten.org/threetenbp)
+- classworlds (from http://classworlds.codehaus.org/)
+- jaxen (from http://jaxen.codehaus.org/)
- 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-client (from git://java.net/jersey~code/jersey-client)
@@ -383,6 +552,13 @@ The following software have components provided under the terms of this license:
- jersey-inject-hk2 (from )
- jersey-media-jaxb (from )
+========================================================================
+CC-BY-2.5
+========================================================================
+The following software have components provided under the terms of this license:
+
+- Checker Qual (from https://checkerframework.org)
+
========================================================================
CC-BY-3.0
========================================================================
@@ -395,8 +571,19 @@ CC-BY-4.0
========================================================================
The following software have components provided under the terms of this license:
+- Microsoft Application Insights Java SDK Core (from https://github.com/Microsoft/ApplicationInsights-Java)
+- 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)
- Microsoft Application Insights Logback Appender (from https://github.com/Microsoft/ApplicationInsights-Java)
+========================================================================
+CC0-1.0
+========================================================================
+The following software have components provided under the terms of this license:
+
+- reactive-streams (from http://www.reactive-streams.org/)
+
========================================================================
CDDL-1.0
========================================================================
@@ -415,6 +602,7 @@ The following software have components provided under the terms of this license:
- 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)
+- Servlet Specification 2.5 API (from )
- 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)
@@ -435,6 +623,7 @@ The following software have components provided under the terms of this license:
- Java Architecture For XML Binding (from )
- Java Servlet API (from http://servlet-spec.java.net)
+- JavaBeans Activation Framework (from )
- JavaMail API (from )
- OSGi resource locator (from )
- jersey-ext-bean-validation (from )
@@ -457,6 +646,10 @@ The following software have components provided under the terms of this license:
- JUnit (from http://junit.org)
- Logback Classic Module (from )
- Logback Core Module (from )
+- Microsoft Application Insights Java SDK Core (from https://github.com/Microsoft/ApplicationInsights-Java)
+- 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)
- Microsoft Application Insights Logback Appender (from https://github.com/Microsoft/ApplicationInsights-Java)
- SnakeYAML (from http://www.snakeyaml.org)
- jts-core (from )
@@ -469,6 +662,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 )
+- Cobertura Limited Runtime (from http://cobertura.sourceforge.net)
+- Cobertura code coverage (from http://cobertura.sourceforge.net)
- Commons Lang (from http://commons.apache.org/lang/)
- HK2 API module (from git://java.net/hk2~git/hk2-api)
- HK2 Implementation Utilities (from )
@@ -479,6 +674,7 @@ The following software have components provided under the terms of this license:
- HK2 module of HK2 itself (from )
- Java Architecture For XML Binding (from )
- Java Servlet API (from http://servlet-spec.java.net)
+- JavaBeans Activation Framework (from )
- JavaBeans Activation Framework API jar (from )
- JavaMail API (from )
- Mojo's Maven plugin for Cobertura (from http://mojo.codehaus.org/cobertura-maven-plugin/)
@@ -514,9 +710,12 @@ GPL-2.0-with-classpath-exception
========================================================================
The following software have components provided under the terms of this license:
+- Checker Qual (from https://checkerframework.org)
+- Cobertura code coverage (from http://cobertura.sourceforge.net)
- HK2 Implementation Utilities (from )
- Java Architecture For XML Binding (from )
- Java Servlet API (from http://servlet-spec.java.net)
+- JavaBeans Activation Framework (from )
- JavaBeans Activation Framework API jar (from )
- JavaMail API (from )
- OSGi resource locator (from )
@@ -548,23 +747,40 @@ The following software have components provided under the terms of this license:
- SnakeYAML (from http://www.snakeyaml.org)
- javax.ws.rs-api (from http://jax-rs-spec.java.net)
+========================================================================
+JSON
+========================================================================
+The following software have components provided under the terms of this license:
+
+- JSON in Java (from https://github.com/douglascrockford/JSON-java)
+
========================================================================
LGPL-2.1-only
========================================================================
The following software have components provided under the terms of this license:
+- Cobertura code coverage (from http://cobertura.sourceforge.net)
- Commons Lang (from http://commons.apache.org/lang/)
- Elastic JNA Distribution (from https://github.com/java-native-access/jna)
+- 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 Core Module (from )
+- Microsoft Application Insights Java SDK Core (from https://github.com/Microsoft/ApplicationInsights-Java)
+- 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)
- Microsoft Application Insights Logback Appender (from https://github.com/Microsoft/ApplicationInsights-Java)
+- java-getopt (from )
========================================================================
LGPL-2.1-or-later
========================================================================
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)
- SnakeYAML (from http://www.snakeyaml.org)
========================================================================
@@ -573,28 +789,59 @@ LGPL-3.0-only
The following software have components provided under the terms of this license:
- Apache Log4j API (from )
+- Apache Log4j Core (from )
========================================================================
MIT
========================================================================
The following software have components provided under the terms of this license:
+- Animal Sniffer Annotations (from )
+- Azure AD Spring Security Integration Spring Boot Starter (from https://github.com/Microsoft/azure-spring-boot)
+- Azure Cosmos DB Spring Boot Starter (from https://github.com/Microsoft/azure-spring-boot)
+- Azure Java Client Authentication Library for AutoRest (from https://github.com/Azure/autorest-clientruntime-for-java)
+- Azure Java Client Runtime for AutoRest (from https://github.com/Azure/autorest-clientruntime-for-java)
+- Azure Metrics Spring Boot Starter (from https://github.com/Microsoft/azure-spring-boot)
+- Azure Spring Boot AutoConfigure (from https://github.com/Microsoft/azure-spring-boot)
+- Azure Spring Boot Starter (from https://github.com/Microsoft/azure-spring-boot)
- Bouncy Castle Provider (from http://www.bouncycastle.org/java.html)
- Checker Qual (from https://checkerframework.org)
+- Checker Qual (from https://checkerframework.org)
- Elasticsearch: 5.0.0-alpha5 (from https://github.com/elastic/elasticsearch)
+- Extensions on Apache Proton-J library (from https://github.com/Azure/qpid-proton-j-extensions)
- JOpt Simple (from http://pholser.github.io/jopt-simple)
- JUL to SLF4J bridge (from http://www.slf4j.org)
+- Java Client Runtime for AutoRest (from https://github.com/Azure/autorest-clientruntime-for-java)
- Java JWT (from http://www.jwt.io)
- Lucene Core (from )
- Lucene Sandbox (from )
+- Microsoft Application Insights Java SDK Core (from https://github.com/Microsoft/ApplicationInsights-Java)
+- 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)
- Microsoft Application Insights Logback Appender (from https://github.com/Microsoft/ApplicationInsights-Java)
+- 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 annotations (from https://github.com/Microsoft/java-api-annotations)
+- Microsoft Azure SDK for SQL API of Azure Cosmos DB Service (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)
+- Microsoft Azure SDK for Service Bus (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)
+- Microsoft Azure client library for Identity (from https://github.com/Azure/azure-sdk-for-java)
+- Microsoft Azure client library for KeyVault Secrets (from https://github.com/Azure/azure-sdk-for-java)
+- Microsoft Azure common module for Storage (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)
- Netty/Codec/HTTP (from )
- Netty/Common (from )
+- Plexus :: Default Container (from )
+- Plexus Default Interactivity Handler (from )
- Project Lombok (from https://projectlombok.org)
- SLF4J API Module (from http://www.slf4j.org)
+- Spring Data for Azure Cosmos DB SQL API (from https://github.com/Microsoft/spring-data-cosmosdb)
+- adal4j (from https://github.com/AzureAD/azure-activedirectory-library-for-java)
+- azure-documentdb (from https://azure.microsoft.com/en-us/services/cosmos-db/)
- msal4j (from https://github.com/AzureAD/microsoft-authentication-library-for-java)
- powermock-api-mockito (from )
- spring-security-core (from http://spring.io/spring-security)
@@ -604,6 +851,7 @@ MPL-1.1
========================================================================
The following software have components provided under the terms of this license:
+- Cobertura code coverage (from http://cobertura.sourceforge.net)
- Javassist (from http://www.javassist.org/)
========================================================================
@@ -619,18 +867,40 @@ Public-Domain
The following software have components provided under the terms of this license:
- HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/)
+- JTidy (from http://jtidy.sourceforge.net)
- LatencyUtils (from http://latencyutils.github.io/LatencyUtils/)
+- Plexus Common Utilities (from http://plexus.codehaus.org/plexus-utils)
- jersey-core-common (from )
- jersey-core-server (from git://java.net/jersey~code/jersey-server)
- jts-core (from )
+- reactive-streams (from http://www.reactive-streams.org/)
+- xml-apis (from )
+
+========================================================================
+SISSL-1.2
+========================================================================
+The following software have components provided under the terms of this license:
+
+- Servlet Specification 2.5 API (from )
========================================================================
SPL-1.0
========================================================================
The following software have components provided under the terms of this license:
+- Checker Qual (from https://checkerframework.org)
- Checker Qual (from https://checkerframework.org)
+========================================================================
+W3C
+========================================================================
+The following software have components provided under the terms of this license:
+
+- JTidy (from http://jtidy.sourceforge.net)
+- Xerces2-j (from https://xerces.apache.org/xerces2-j/)
+- jaxen (from http://jaxen.codehaus.org/)
+- xml-apis (from )
+
========================================================================
WTFPL
========================================================================
@@ -644,6 +914,7 @@ public-domain
The following software have components provided under the terms of this license:
- AWS SDK for Java - Models (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)
@@ -651,6 +922,10 @@ The following software have components provided under the terms of this license:
- HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/)
- Joda-Time (from http://www.joda.org/joda-time/)
- LatencyUtils (from http://latencyutils.github.io/LatencyUtils/)
+- Microsoft Application Insights Java SDK Core (from https://github.com/Microsoft/ApplicationInsights-Java)
+- Microsoft Azure SDK for SQL API of Azure Cosmos DB Service (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)
+- Microsoft Azure client library for Blob Storage (from https://github.com/Azure/azure-sdk-for-java)
- Project Lombok (from https://projectlombok.org)
- Spring Security JWT Library (from http://github.com/spring-projects/spring-security-oauth)
- Spring Web (from https://github.com/spring-projects/spring-framework)
@@ -662,7 +937,10 @@ The following software have components provided under the terms of this license:
- 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)
+- Byte Buddy (without dependencies) (from )
+- Servlet Specification 2.5 API (from )
- System Rules (from http://stefanbirkner.github.io/system-rules/)
+- jaxen (from http://jaxen.codehaus.org/)
- 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-client (from git://java.net/jersey~code/jersey-client)
@@ -673,5 +951,6 @@ The following software have components provided under the terms of this license:
- jersey-spring4 (from )
- jts-core (from )
- jts-io-common (from )
+- xml-apis (from )
diff --git a/devops/azure-pipeline.yml b/devops/azure-pipeline.yml
new file mode 100644
index 0000000000000000000000000000000000000000..f18e06e92989fdc4ffd5830653af8c4f3907dcab
--- /dev/null
+++ b/devops/azure-pipeline.yml
@@ -0,0 +1,63 @@
+#####################
+# README: Defines a template to be used as a starting point for defining a service pipeline
+#####################
+
+trigger:
+ batch: true
+ branches:
+ include:
+ - master
+ paths:
+ exclude:
+ - /**/*.md
+ - .gitignore
+ - images/
+
+pr:
+ autoCancel: true
+ branches:
+ include:
+ - '*'
+ paths:
+ exclude:
+ - /**/*.md
+ - .gitignore
+ - images/
+
+resources:
+ repositories:
+ - repository: osdu-infrastructure
+ type: git
+ name: osdu-r2/osdu-infrastructure
+
+variables:
+ - group: 'Azure Common Secrets'
+ - group: 'Azure - Common'
+
+ - name: serviceName
+ value: 'indexer'
+
+stages:
+ - template: devops/service-pipelines/build-stage.yml@osdu-infrastructure
+ parameters:
+ mavenGoal: 'package'
+ mavenPublishJUnitResults: true
+ serviceCoreMavenOptions: '-P indexer-core'
+ mavenOptions: '-P indexer-azure'
+ copyFileContents: |
+ pom.xml
+ provider/indexer-azure/maven/settings.xml
+ provider/indexer-azure/pom.xml
+ provider/indexer-azure/target/*-spring-boot.jar
+ copyFileContentsToFlatten: ''
+ mavenSettingsFile: './maven/settings.xml'
+ serviceBase: ${{ variables.serviceName }}
+ testingRootFolder: 'testing'
+ - template: devops/service-pipelines/deploy-stages.yml@osdu-infrastructure
+ parameters:
+ serviceName: ${{ variables.serviceName }}
+ testCoreMavenPomFile: 'testing/indexer-test-core/pom.xml'
+ testCoreMavenOptions: '--settings $(System.DefaultWorkingDirectory)/drop/deploy/testing/maven/settings.xml'
+ providers:
+ - name: Azure
+ environments: ['demo']
diff --git a/provider/indexer-azure/README.md b/provider/indexer-azure/README.md
index 258014ddb6f2707175b3055aefefb7b98b7c8692..f3eb0638648711b8ede93e134bb12d89ff6e1dcf 100644
--- a/provider/indexer-azure/README.md
+++ b/provider/indexer-azure/README.md
@@ -88,7 +88,7 @@ Java version: 1.8.0_212, vendor: AdoptOpenJDK, runtime: /usr/lib/jvm/jdk8u212-b0
...
```
-You will need to configure access to the remote maven repository that holds the OSDU dependencies. This file should live within `~/.m2/settings.xml`:
+You may need to configure access to the remote maven repository that holds the OSDU dependencies. This file should live within `~/.m2/settings.xml`:
```bash
$ cat ~/.m2/settings.xml
<?xml version="1.0" encoding="UTF-8"?>
@@ -123,13 +123,16 @@ $ (cd provider/indexer-azure/ && mvn clean package)
# Note: this assumes that the environment variables for running the service as outlined
# above are already exported in your environment.
$ java -jar $(find provider/indexer-azure/target/ -name *-spring-boot.jar)
+
+# Alternately you can run using the Mavan Task
+$ mvn spring-boot:run
```
### Test the application
After the service has started it should be accessible via a web browser by visiting [http://localhost:8080/swagger-ui.html](http://localhost:8080/swagger-ui.html). If the request does not fail, you can then run the integration tests.
-> **Note**: the integration tests for `os-indexer-azure` work by validating that records submitted to `os-storage-azure` can eventually be queried by `os-search-azure`. This only works if the messages emitted by `os-storage-azure` can be consumed by `os-indexer-queue-azure`, which will submit the indexing request to `os-indexer-azure`.
+> **Note**: the integration tests for `os-indexer-azure` work by validating that records submitted to `os-storage-azure` can eventually be queried by `os-search-azure`. This only works if the messages emitted by `os-storage-azure` can be consumed by `os-indexer-queue-azure`, which will submit the indexing request to `os-indexer-azure`.
>
> In order to make sure that the integration tests are running against your local environment, you will need to make sure that the there is an instance of `os-indexer-queue-azure` that is configured to call your deployment of `os-indexer-azure`, and that this instance of `os-indexer-queue-azure` is the only consumer of the Service Bus topic.
>
@@ -156,8 +159,103 @@ Jet Brains - the authors of Intellij IDEA, have written an [excellent guide](htt
## Deploying service to Azure
-Service deployments into Azure are standardized to make the process the same for all services. The steps to deploy into
-Azure can be [found here](https://dev.azure.com/slb-des-ext-collaboration/open-data-ecosystem/_git/infrastructure-templates?path=%2Fdocs%2Fosdu%2FSERVICE_DEPLOYMENTS.md&_a=preview)
+Service deployments into Azure are standardized to make the process the same for all services if using ADO and are closely related to the infrastructure deployed. The steps to deploy into Azure can be [found here](https://github.com/azure/osdu-infrastructure)
+
+The default ADO pipeline is /devops/azure-pipeline.yml
+
+
+### Manual Deployment Steps
+
+__Environment Settings__
+
+The following environment variables are necessary to properly deploy a service to an Azure OSDU Environment.
+
+```bash
+# Group Level Variables
+export AZURE_TENANT_ID=""
+export AZURE_SUBSCRIPTION_ID=""
+export AZURE_SUBSCRIPTION_NAME=""
+export AZURE_PRINCIPAL_ID=""
+export AZURE_PRINCIPAL_SECRET=""
+export AZURE_APP_ID=""
+export AZURE_BASENAME_21=""
+export AZURE_BASENAME=""
+export AZURE_BASE=""
+export AZURE_ELASTIC_HOST=""
+export AZURE_ELASTIC_PASSWORD=""
+
+# Pipeline Level Variable
+export AZURE_SERVICE="indexer"
+export AZURE_BUILD_SUBDIR="provider/indexer-azure"
+export AZURE_TEST_SUBDIR="testing/indexer-test-azure"
+
+# Required for Azure Deployment
+export AZURE_CLIENT_ID="${AZURE_PRINCIPAL_ID}"
+export AZURE_CLIENT_SECRET="${AZURE_PRINCIPAL_SECRET}"
+export AZURE_RESOURCE_GROUP="${AZURE_BASENAME}-osdu-r2-app-rg"
+export AZURE_APPSERVICE_PLAN="${AZURE_BASENAME}-osdu-r2-sp"
+export AZURE_APPSERVICE_NAME="${AZURE_BASENAME_21}-au-${AZURE_SERVICE}"
+
+# Required for Testing
+export AZURE_AD_TENANT_ID="$AZURE_TENANT_ID"
+export INTEGRATION_TESTER="$AZURE_PRINCIPAL_ID"
+export AZURE_TESTER_SERVICEPRINCIPAL_SECRET="$AZURE_PRINCIPAL_SECRET"
+export AZURE_AD_APP_RESOURCE_ID="$AZURE_APP_ID"
+export aad_client_id="$AZURE_APP_ID"
+export STORAGE_HOST="https://{AZURE_BASENAME_21}-au-storage.azurewebsites.net/"
+export ELASTIC_HOST="$AZURE_ELASTIC_HOST"
+export ELASTIC_PORT="9243"
+export ELASTIC_USER_NAME="elastic"
+export ELASTIC_PASSWORD="$AZURE_ELASTIC_PASSWORD"
+export DEFAULT_DATA_PARTITION_ID_TENANT1="opendes"
+export DEFAULT_DATA_PARTITION_ID_TENANT2="common"
+export ENVIRONMENT="CLOUD"
+export ENTITLEMENTS_DOMAIN="contoso.com"
+export LEGAL_TAG="opendes-public-usa-dataset-7643990"
+export OTHER_RELEVANT_DATA_COUNTRIES="US"
+```
+
+
+__Azure Service Deployment__
+
+
+1. Deploy the service using the Maven Plugin _(azure_deploy)_
+
+```bash
+cd $AZURE_BUILD_SUBDIR
+mvn azure-webapp:deploy \
+ -DAZURE_TENANT_ID=$AZURE_TENANT_ID \
+ -Dazure.appservice.subscription=$AZURE_SUBSCRIPTION_ID \
+ -DAZURE_CLIENT_ID=$AZURE_CLIENT_ID \
+ -DAZURE_CLIENT_SECRET=$AZURE_CLIENT_SECRET \
+ -Dazure.appservice.resourcegroup=$AZURE_RESOURCE_GROUP \
+ -Dazure.appservice.plan=$AZURE_APPSERVICE_PLAN \
+ -Dazure.appservice.appname=$AZURE_APPSERVICE_NAME
+```
+
+2. Configure the Web App to start the SpringBoot Application _(azure_config)_
+
+```bash
+az login --service-principal -u $AZURE_CLIENT_ID -p $AZURE_CLIENT_SECRET --tenant $AZURE_TENANT_ID
+
+# Set the JAR FILE as required
+TARGET=$(find ./target/ -name '*-spring-boot.jar')
+JAR_FILE=${TARGET##*/}
+
+JAVA_COMMAND="java -jar /home/site/wwwroot/${JAR_FILE}"
+JSON_TEMPLATE='{"appCommandLine":"%s"}'
+JSON_FILE="config.json"
+echo $(printf "$JSON_TEMPLATE" "$JAVA_COMMAND") > $JSON_FILE
+
+az webapp config set --resource-group $AZURE_RESOURCE_GROUP --name $AZURE_APPSERVICE_NAME --generic-configurations @$JSON_FILE
+```
+
+3. Execute the Integration Tests against the Service Deployment _(azure_test)_
+
+```bash
+mvn clean test -f $AZURE_TEST_SUBDIR/pom.xml
+```
+
## License
@@ -165,7 +263,7 @@ Copyright © Microsoft Corporation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+You may obtain a copy of the License at
[http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
@@ -173,4 +271,4 @@ Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
-limitations under the License.
\ No newline at end of file
+limitations under the License.