From 9da5d69e2bc44ca0f43b38ab9a49f249877476a6 Mon Sep 17 00:00:00 2001
From: Duvelis Carao <dcarao@slb.com>
Date: Wed, 7 Oct 2020 14:55:18 -0400
Subject: [PATCH] multi-tenancy updates for Indexer in azure
---
.gitignore | 1 +
devops/azure/chart/helm-config.yaml | 14 ++++
devops/azure/chart/templates/deployment.yaml | 53 ++++--------
devops/azure/development-pipeline.yml | 82 +++++++++++++++++++
devops/azure/pipeline.yml | 82 +++++++++++++++++++
provider/indexer-azure/README.md | 24 +-----
provider/indexer-azure/pom.xml | 9 +-
.../azure/config/AzureBootstrapConfig.java | 27 +-----
.../indexer/azure/di/TenantFactoryImpl.java | 72 ----------------
.../osdu/indexer/azure/di/TenantInfoDoc.java | 36 --------
.../indexer/azure/publish/PublisherImpl.java | 12 ++-
.../src/main/resources/application.properties | 14 ++--
provider/indexer-gcp/pom.xml | 2 +-
provider/indexer-ibm/pom.xml | 2 +-
testing/indexer-test-azure/pom.xml | 4 +-
testing/indexer-test-core/pom.xml | 2 +-
16 files changed, 224 insertions(+), 212 deletions(-)
create mode 100644 devops/azure/chart/helm-config.yaml
create mode 100644 devops/azure/development-pipeline.yml
create mode 100644 devops/azure/pipeline.yml
delete mode 100644 provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/TenantFactoryImpl.java
delete mode 100644 provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/TenantInfoDoc.java
diff --git a/.gitignore b/.gitignore
index 80fb6f6fb..9e269f1b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,3 +40,4 @@ provider/indexer-gcp/bin/*
# Environment configuration
*.env
+.envrc
diff --git a/devops/azure/chart/helm-config.yaml b/devops/azure/chart/helm-config.yaml
new file mode 100644
index 000000000..cf8438efe
--- /dev/null
+++ b/devops/azure/chart/helm-config.yaml
@@ -0,0 +1,14 @@
+# This file contains the essential configs for the osdu on azure helm chart
+global:
+
+ # Service(s) Replica Count
+ replicaCount: 2
+
+################################################################################
+# Specify the Gitlab branch being used for image creation
+# ie: community.opengroup.org:5555/osdu/platform/system/storage/{{ .Values.global.branch }}/storage:latest
+#
+image:
+ repository: #{container-registry}#.azurecr.io
+ branch: #{ENVIRONMENT_NAME}#
+ tag: #{Build.SourceVersion}#
diff --git a/devops/azure/chart/templates/deployment.yaml b/devops/azure/chart/templates/deployment.yaml
index a614af30a..f625bb35f 100644
--- a/devops/azure/chart/templates/deployment.yaml
+++ b/devops/azure/chart/templates/deployment.yaml
@@ -63,60 +63,35 @@ spec:
configMapKeyRef:
name: osdu-svc-properties
key: ENV_KEYVAULT
- - name: AZURE_TENANT_ID
- valueFrom:
- configMapKeyRef:
- name: osdu-svc-properties
- key: ENV_TENANT_ID
- name: AZURE_CLIENT_ID
valueFrom:
secretKeyRef:
- name: clientid
- key: clientid
+ name: active-directory
+ key: principal-clientid
- name: AZURE_CLIENT_SECRET
valueFrom:
secretKeyRef:
- name: clientpassword
- key: clientpassword
+ name: active-directory
+ key: principal-clientpassword
+ - name: AZURE_TENANT_ID
+ valueFrom:
+ secretKeyRef:
+ name: active-directory
+ key: tenantid
- name: aad_client_id
valueFrom:
secretKeyRef:
- name: appid
- key: appid
+ name: active-directory
+ key: application-appid
- name: appinsights_key
valueFrom:
secretKeyRef:
- name: appinsights
+ name: central-logging
key: appinsights
- - name: cosmosdb_account
- valueFrom:
- configMapKeyRef:
- name: osdu-svc-properties
- key: ENV_COSMOSDB_HOST
- - name: cosmosdb_key
- valueFrom:
- secretKeyRef:
- name: cosmos
- key: cosmos
- name: cosmosdb_database
value: osdu-db
- - name: servicebus_namespace_name
- valueFrom:
- configMapKeyRef:
- name: osdu-svc-properties
- key: ENV_SERVICEBUS_NAMESPACE
- - name: servicebus_connection_string
- valueFrom:
- secretKeyRef:
- name: servicebus
- key: servicebus
- name: servicebus_topic_name
value: recordstopic
- - name: storage_account
- valueFrom:
- configMapKeyRef:
- name: osdu-svc-properties
- key: ENV_STORAGE_ACCOUNT
- name: entitlements_service_endpoint
value: http://entitlements-azure/entitlements/v1
- name: entitlements_service_api_key
@@ -129,5 +104,9 @@ spec:
value: http://storage/api/storage/v2/query/records:batch
- name: STORAGE_QUERY_RECORD_HOST
value: http://storage/api/storage/v2/records
+ - name: partition_service_endpoint
+ value: http://partition/api/partition/v1
- name: azure_istioauth_enabled
value: "true"
+ - name: azure_activedirectory_AppIdUri
+ value: "api://$(aad_client_id)"
diff --git a/devops/azure/development-pipeline.yml b/devops/azure/development-pipeline.yml
new file mode 100644
index 000000000..3b09fa1b0
--- /dev/null
+++ b/devops/azure/development-pipeline.yml
@@ -0,0 +1,82 @@
+# 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
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# 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.
+
+trigger:
+ batch: true
+ branches:
+ include:
+ - master
+ paths:
+ exclude:
+ - /**/*.md
+ - .gitignore
+ - /docs
+ - /indexer/storage-aws
+ - /indexer/storage-byoc
+ - /indexer/storage-gcp
+ - /indexer/storage-ibm
+
+resources:
+ repositories:
+ - repository: FluxRepo
+ type: git
+ name: k8-gitops-manifests
+ - repository: TemplateRepo
+ type: git
+ name: infra-azure-provisioning
+
+variables:
+ - group: 'Azure - OSDU'
+ - group: 'Azure - OSDU Secrets'
+
+ - name: serviceName
+ value: "indexer-service"
+ - name: chartPath
+ value: "devops/azure/chart"
+ - name: valuesFile
+ value: "devops/azure/chart/helm-config.yaml"
+ - name: 'MANIFEST_REPO'
+ value: $[ resources.repositories['FluxRepo'].name ]
+ - name: SKIP_TESTS
+ value: 'false'
+
+stages:
+ - template: /devops/build-stage.yml@TemplateRepo
+ 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'
+ chartPath: ${{ variables.chartPath }}
+ - template: /devops/deploy-stages.yml@TemplateRepo
+ parameters:
+ serviceName: ${{ variables.serviceName }}
+ chartPath: ${{ variables.chartPath }}
+ valuesFile: ${{ variables.valuesFile }}
+ testCoreMavenPomFile: 'testing/indexer-test-core/pom.xml'
+ testCoreMavenOptions: '--settings $(System.DefaultWorkingDirectory)/drop/deploy/testing/maven/settings.xml'
+ skipDeploy: ${{ variables.SKIP_DEPLOY }}
+ skipTest: ${{ variables.SKIP_TESTS }}
+ providers:
+ - name: Azure
+ environments: ['dev']
diff --git a/devops/azure/pipeline.yml b/devops/azure/pipeline.yml
new file mode 100644
index 000000000..dbfc9fae6
--- /dev/null
+++ b/devops/azure/pipeline.yml
@@ -0,0 +1,82 @@
+# 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
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# 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.
+
+trigger:
+ batch: true
+ branches:
+ include:
+ - master
+ paths:
+ exclude:
+ - /**/*.md
+ - .gitignore
+ - /docs
+ - /indexer/storage-aws
+ - /indexer/storage-byoc
+ - /indexer/storage-gcp
+ - /indexer/storage-ibm
+
+resources:
+ repositories:
+ - repository: FluxRepo
+ type: git
+ name: k8-gitops-manifests
+ - repository: TemplateRepo
+ type: git
+ name: infra-azure-provisioning
+
+variables:
+ - group: 'Azure - OSDU'
+ - group: 'Azure - OSDU Secrets'
+
+ - name: serviceName
+ value: "indexer-service"
+ - name: chartPath
+ value: "devops/azure/chart"
+ - name: valuesFile
+ value: "devops/azure/chart/helm-config.yaml"
+ - name: 'MANIFEST_REPO'
+ value: $[ resources.repositories['FluxRepo'].name ]
+ - name: SKIP_TESTS
+ value: 'false'
+
+stages:
+ - template: /devops/build-stage.yml@TemplateRepo
+ 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'
+ chartPath: ${{ variables.chartPath }}
+ - template: /devops/deploy-stages.yml@TemplateRepo
+ parameters:
+ serviceName: ${{ variables.serviceName }}
+ chartPath: ${{ variables.chartPath }}
+ valuesFile: ${{ variables.valuesFile }}
+ testCoreMavenPomFile: 'testing/indexer-test-core/pom.xml'
+ testCoreMavenOptions: '--settings $(System.DefaultWorkingDirectory)/drop/deploy/testing/maven/settings.xml'
+ skipDeploy: ${{ variables.SKIP_DEPLOY }}
+ skipTest: ${{ variables.SKIP_TESTS }}
+ providers:
+ - name: Azure
+ environments: ['demo']
diff --git a/provider/indexer-azure/README.md b/provider/indexer-azure/README.md
index 285c7bc46..6772abca8 100644
--- a/provider/indexer-azure/README.md
+++ b/provider/indexer-azure/README.md
@@ -44,18 +44,17 @@ az keyvault secret show --vault-name $KEY_VAULT_NAME --name $KEY_VAULT_SECRET_NA
| `STORAGE_SCHEMA_HOST` | `${storage_service_url}/schemas` | Endpoint of schema API | no | - |
| `STORAGE_QUERY_RECORD_HOST` | `${storage_service_url}/query/records` | Endpoint of records API | no | - |
| `STORAGE_QUERY_RECORD_FOR_CONVERSION_HOST` | `${storage_service_url}/query/records:batch` | Endpoint of records batch API | no | - |
-| `servicebus_namespace_name` | ex `foo-sb-namespace` | . | . | . |
| `KEYVAULT_URI` | ex `https://foo-kv.vault.azure.net/` | . | . | . |
| `appinsights_key` | `********` | App Insights key | yes | output of infrastructure deployments |
| `aad_client_id` | `********` | AAD client application ID | yes | output of infrastructure deployment |
-| `cosmosdb_account` | ex `devintosdur2cosmosacct` | Cosmos account name | no | output of infrastructure deployment |
-| `cosmosdb_key` | `********` | Key for CosmosDB | yes | output of infrastructure deployments |
| `cosmosdb_database` | ex `dev-osdu-r2-db` | Cosmos database for documents | no | output of infrastructure deployment |
| `servicebus_topic_name` | `recordstopic` | Service Bus topic name | no | output of infrastructure deployments |
| `entitlements_service_endpoint` | ex `https://entitlements.azurewebsites.net` | Entitlements service endpoint | no | Service Bus topic name |
| `AZURE_CLIENT_ID` | `********` | Identity to run the service locally. This enables access to Azure resources. You only need this if running locally | yes | keyvault secret: `$KEYVAULT_URI/secrets/app-dev-sp-username` |
| `AZURE_TENANT_ID` | `********` | AD tenant to authenticate users from | yes | keyvault secret: `$KEYVAULT_URI/secrets/app-dev-sp-tenant-id` |
| `AZURE_CLIENT_SECRET` | `********` | Secret for `$AZURE_CLIENT_ID` | yes | keyvault secret: `$KEYVAULT_URI/secrets/app-dev-sp-password` |
+| `partition_service_endpoint` | ex `https://foo-partition.azurewebsites.net` | Partition Service API endpoint | no | output of infrastructure deployment |
+| `azure.activedirectory.app-resource-id` | `********` | AAD client application ID | yes | output of infrastructure deployment |
| `azure_istioauth_enabled` | `true` | Flag to Disable AAD auth | no | -- |
**Required to run integration tests**
@@ -90,25 +89,6 @@ Java version: 1.8.0_212, vendor: AdoptOpenJDK, runtime: /usr/lib/jvm/jdk8u212-b0
...
```
-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"?>
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
- <servers>
- <server>
- <id>os-core</id>
- <username>mvn-pat</username>
- <!-- Treat this auth token like a password. Do not share it with anyone, including Microsoft support. -->
- <!-- The generated token expires on or before 11/14/2019 -->
- <password>$PERSONAL_ACCESS_TOKEN_GOES_HERE</password>
- </server>
- </servers>
-</settings>
-```
-
### Build and run the application
After configuring your environment as specified above, you can follow these steps to build and run the application. These steps should be invoked from the *repository root.*
diff --git a/provider/indexer-azure/pom.xml b/provider/indexer-azure/pom.xml
index 343a293f7..7f2f93821 100644
--- a/provider/indexer-azure/pom.xml
+++ b/provider/indexer-azure/pom.xml
@@ -139,20 +139,15 @@
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
</dependency>
- <dependency>
- <groupId>com.microsoft.azure</groupId>
- <artifactId>azure-cosmosdb-spring-boot-starter</artifactId>
- <version>${azure.version}</version>
- </dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common</artifactId>
+ <version>0.3.12</version>
</dependency>
-
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>core-lib-azure</artifactId>
- <version>0.0.28</version>
+ <version>0.0.33</version>
</dependency>
<dependency>
diff --git a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/config/AzureBootstrapConfig.java b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/config/AzureBootstrapConfig.java
index 918869920..09f69ecde 100644
--- a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/config/AzureBootstrapConfig.java
+++ b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/config/AzureBootstrapConfig.java
@@ -25,18 +25,12 @@ import javax.inject.Named;
@Component
public class AzureBootstrapConfig {
- @Value("${aad.oboApi}")
- private String aadOboAPI;
-
@Value("${azure.keyvault.url}")
private String keyVaultURL;
@Value("${azure.servicebus.topic-name}")
private String serviceBusTopicName;
- @Value("${azure.servicebus.namespace-name}")
- private String serviceBusNamespaceName;
-
@Value("${ELASTIC_CACHE_EXPIRATION}")
private Integer elasticCacheExpiration;
@@ -45,16 +39,10 @@ public class AzureBootstrapConfig {
@Bean
@Named("KEY_VAULT_URL")
- public String getKeyVaultURL(){
+ public String getKeyVaultURL() {
return keyVaultURL;
}
- @Bean
- @Named("SERVICE_BUS_NAMESPACE")
- public String serviceBusNamespaceName() {
- return serviceBusNamespaceName;
- }
-
@Bean
@Named("SERVICE_BUS_TOPIC")
public String serviceBusTopicName() {
@@ -64,22 +52,13 @@ public class AzureBootstrapConfig {
@Bean
@Named("ELASTIC_CACHE_EXPIRATION")
public Integer getElasticCacheExpiration() {
- return elasticCacheExpiration;
+ return elasticCacheExpiration;
}
@Bean
@Named("MAX_CACHE_VALUE_SIZE")
public Integer getMaxCacheValueSize() {
- return maxCacheValueSize;
- }
-
- private String authority;
- private String secretKey;
-
- @Bean
- @Named("AAD_OBO_API")
- public String aadClientID() {
- return aadOboAPI;
+ return maxCacheValueSize;
}
@Bean
diff --git a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/TenantFactoryImpl.java b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/TenantFactoryImpl.java
deleted file mode 100644
index df488c799..000000000
--- a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/TenantFactoryImpl.java
+++ /dev/null
@@ -1,72 +0,0 @@
-// 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
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// 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.
-
-package org.opengroup.osdu.indexer.azure.di;
-
-import org.opengroup.osdu.core.common.cache.ICache;
-import org.opengroup.osdu.core.common.provider.interfaces.ITenantFactory;
-import org.opengroup.osdu.core.common.model.tenant.TenantInfo;
-import org.springframework.stereotype.Component;
-import org.springframework.web.context.annotation.RequestScope;
-
-import javax.inject.Inject;
-import java.util.*;
-
-@Component
-@RequestScope
-public class TenantFactoryImpl implements ITenantFactory {
- @Inject
- private CosmosDBTenantInfo db;
-
- private Map<String, TenantInfo> tenants;
-
- public boolean exists(String tenantName)
- {
- if (this.tenants == null)
- initTenants();
- return this.tenants.containsKey(tenantName);
- }
-
- public TenantInfo getTenantInfo(String tenantName) {
- if (this.tenants == null)
- initTenants();
- return this.tenants.get(tenantName);
- }
-
- public Collection<TenantInfo> listTenantInfo() {
- if (this.tenants == null)
- initTenants();
- return this.tenants.values();
- }
-
- public <V> ICache<String, V> createCache(String tenantName, String host, int port, int expireTimeSeconds, Class<V> classOfV)
- {
- return null;
- }
-
- public void flushCache() {}
-
- private void initTenants() {
- this.tenants = new HashMap<>();
-
- db.findAll().forEach(doc -> {
- TenantInfo ti = new TenantInfo();
- String tenantName = doc.getId();
- ti.setName(tenantName);
- //set serviceprincipalAppId in Azure side instead of ServiceAccount in Gcp
- ti.setServiceAccount(doc.getServiceprincipalAppId());
- this.tenants.put(tenantName, ti) ;
- });
- }
-}
diff --git a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/TenantInfoDoc.java b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/TenantInfoDoc.java
deleted file mode 100644
index 58d3ee84e..000000000
--- a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/TenantInfoDoc.java
+++ /dev/null
@@ -1,36 +0,0 @@
-// 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
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// 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.
-
-package org.opengroup.osdu.indexer.azure.di;
-
-import com.microsoft.azure.spring.data.cosmosdb.core.mapping.Document;
-import com.microsoft.azure.spring.data.cosmosdb.core.mapping.PartitionKey;
-import com.microsoft.azure.spring.data.cosmosdb.repository.DocumentDbRepository;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.springframework.data.annotation.Id;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Document(collection = "TenantInfo") //collection name
-public class TenantInfoDoc {
- @PartitionKey
- @Id
- private String id;
- private String serviceprincipalAppId;
-}
-
-interface CosmosDBTenantInfo extends DocumentDbRepository<TenantInfoDoc, String> {}
diff --git a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/publish/PublisherImpl.java b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/publish/PublisherImpl.java
index 0aa05f37c..7c5d2f854 100644
--- a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/publish/PublisherImpl.java
+++ b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/publish/PublisherImpl.java
@@ -21,7 +21,7 @@ import com.google.gson.GsonBuilder;
import com.google.gson.JsonElement;
import com.microsoft.azure.servicebus.Message;
-import com.microsoft.azure.servicebus.TopicClient;
+import org.opengroup.osdu.azure.servicebus.ITopicClientFactory;
import org.elasticsearch.common.Strings;
import org.opengroup.osdu.core.common.model.http.DpsHeaders;
@@ -34,6 +34,7 @@ import org.springframework.stereotype.Component;
import org.springframework.web.context.annotation.RequestScope;
import javax.inject.Inject;
+import javax.inject.Named;
import java.lang.reflect.Type;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
@@ -46,11 +47,16 @@ public class PublisherImpl implements IPublisher {
@Inject
- private TopicClient topicClient;
+ private ITopicClientFactory topicClientFactory;
@Inject
private JaxRsDpsLog logger;
+ @Inject
+ @Named("SERVICE_BUS_TOPIC")
+ private String serviceBusTopic;
+
+
@Override
public void publishStatusChangedTagsToTopic(DpsHeaders headers, JobStatus indexerBatchStatus) throws Exception {
@@ -68,7 +74,7 @@ public class PublisherImpl implements IPublisher {
try {
logger.info("Indexer publishes message " + headers.getCorrelationId());
- topicClient.send(message);
+ topicClientFactory.getClient(headers.getPartitionId(), serviceBusTopic).send(message);
}
catch (Exception e)
{
diff --git a/provider/indexer-azure/src/main/resources/application.properties b/provider/indexer-azure/src/main/resources/application.properties
index 242afa544..f6cb597db 100644
--- a/provider/indexer-azure/src/main/resources/application.properties
+++ b/provider/indexer-azure/src/main/resources/application.properties
@@ -23,7 +23,6 @@ AUTHORIZE_API=${entitlements_service_endpoint}
AUTHORIZE_API_KEY=${entitlements_service_api_key}
LEGALTAG_API=${legal_service_endpoint}
-
SCHEMA_CACHE_EXPIRATION=60
INDEX_CACHE_EXPIRATION=60
ELASTIC_CACHE_EXPIRATION=1440
@@ -43,6 +42,10 @@ STORAGE_RECORDS_BATCH_SIZE=20
INDEXER_QUEUE_HOST=http://127.0.0.1:9000
+# Partition Service configuration
+PARTITION_API=${partition_service_endpoint}
+azure.activedirectory.app-resource-id=${aad_client_id}
+
#AzureADconfiguration, commented below settings to disable AAD AuthN ,
#Uncomment it In the Istio AUTHN disabled Scenario
#azure.activedirectory.session-stateless=true
@@ -51,12 +54,9 @@ INDEXER_QUEUE_HOST=http://127.0.0.1:9000
# Istio Auth Enabled
azure.istio.auth.enabled=${azure_istioauth_enabled}
-azure.cosmosdb.uri=${cosmosdb_account}
-azure.cosmosdb.key=${cosmosdb_key}
azure.cosmosdb.database=${cosmosdb_database}
#AzureServiceBusconfiguration
-azure.servicebus.namespace-name=${servicebus_namespace_name}
azure.servicebus.topic-name=${servicebus_topic_name}
#Indexer-Queue-header
@@ -69,8 +69,10 @@ azure.application-insights.instrumentation-key=${appinsights_key}
spring.application.name=indexer-azure
DEPLOYMENT_ENVIRONMENT=CLOUD
-aad.oboApi=${aad_client_id}
logging.transaction.enabled=true
logging.slf4jlogger.enabled=true
-logging.mdccontext.enabled=true
\ No newline at end of file
+logging.mdccontext.enabled=true
+
+# core-lib-azure configuration
+tenantFactoryImpl.required=true
diff --git a/provider/indexer-gcp/pom.xml b/provider/indexer-gcp/pom.xml
index 0473381a0..7b936e801 100644
--- a/provider/indexer-gcp/pom.xml
+++ b/provider/indexer-gcp/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-core</artifactId>
- <version>1.0.5-SNAPSHOT</version>
+ <version>1.0.6-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/provider/indexer-ibm/pom.xml b/provider/indexer-ibm/pom.xml
index 67fab6b3e..ae6917c09 100644
--- a/provider/indexer-ibm/pom.xml
+++ b/provider/indexer-ibm/pom.xml
@@ -55,7 +55,7 @@
<dependency>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-core</artifactId>
- <version>1.0.5-SNAPSHOT</version>
+ <version>1.0.6-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/testing/indexer-test-azure/pom.xml b/testing/indexer-test-azure/pom.xml
index 26ee0981f..47465e7b5 100644
--- a/testing/indexer-test-azure/pom.xml
+++ b/testing/indexer-test-azure/pom.xml
@@ -63,7 +63,7 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>core-lib-azure</artifactId>
- <version>0.0.9</version>
+ <version>0.0.33</version>
</dependency>
<dependency>
@@ -181,7 +181,7 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>core-lib-azure</artifactId>
- <version>0.0.28</version>
+ <version>0.0.33</version>
<scope>test</scope>
<exclusions>
<exclusion>
diff --git a/testing/indexer-test-core/pom.xml b/testing/indexer-test-core/pom.xml
index 5b8d0fef0..e3fdc18af 100644
--- a/testing/indexer-test-core/pom.xml
+++ b/testing/indexer-test-core/pom.xml
@@ -12,7 +12,7 @@
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<cucumber.version>1.2.5</cucumber.version>
- <os-core-common.version>0.3.6</os-core-common.version>
+ <os-core-common.version>0.3.12</os-core-common.version>
</properties>
<!-- testing core depends on core libraries in OSDU, so the repository needs to be configured -->
--
GitLab