Revert "Merge branch 'azure-workflow-upgrade' into 'master'"

This reverts merge request !22

NOTICE

@@ -27,7 +27,6 @@ The following software have components provided under the terms of this license:
 - Apache HttpAsyncClient (from http://hc.apache.org/httpcomponents-asyncclient)
 - Apache HttpClient (from http://hc.apache.org/httpcomponents-client)
 - Apache HttpClient (from http://hc.apache.org/httpcomponents-client)
-- Apache HttpClient Cache (from http://hc.apache.org/httpcomponents-client)
 - Apache HttpCore (from http://hc.apache.org/httpcomponents-core-ga)
 - Apache HttpCore (from http://hc.apache.org/httpcomponents-core-ga)
 - Apache HttpCore NIO (from http://hc.apache.org/httpcomponents-core-ga)
@@ -108,6 +107,7 @@ The following software have components provided under the terms of this license:
 - Java Native Access Platform (from https://github.com/java-native-access/jna)
 - Java UUID Generator (from http://wiki.fasterxml.com/JugHome)
 - Javassist (from http://www.javassist.org/)
+- Javassist (from http://www.javassist.org/)
 - Joda-Time (from http://www.joda.org/joda-time/)
 - Json Path (from https://github.com/jayway/JsonPath)
 - Lucene Common Analyzers (from )
@@ -526,6 +526,7 @@ The following software have components provided under the terms of this license:
 - Java Native Access (from https://github.com/java-native-access/jna)
 - Java Native Access Platform (from https://github.com/java-native-access/jna)
 - Javassist (from http://www.javassist.org/)
+- 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)
@@ -540,6 +541,7 @@ The following software have components provided under the terms of this license:
 
 - Java Native Access (from https://github.com/java-native-access/jna)
 - Java Native Access Platform (from https://github.com/java-native-access/jna)
+- Javassist (from http://www.javassist.org/)
 - SnakeYAML (from http://www.snakeyaml.org)
 
 ========================================================================
@@ -618,6 +620,7 @@ MPL-1.1
 ========================================================================
 The following software have components provided under the terms of this license:
 
+- Javassist (from http://www.javassist.org/)
 - Javassist (from http://www.javassist.org/)
 
 ========================================================================
@@ -625,6 +628,7 @@ MPL-2.0
 ========================================================================
 The following software have components provided under the terms of this license:
 
+- Javassist (from http://www.javassist.org/)
 - Javassist (from http://www.javassist.org/)
 - OkHttp (from )
 

provider/workflow-azure/pom.xml

@@ -31,7 +31,7 @@
 
   <properties>
     <azure.version>2.1.7</azure.version>
-    <osdu.azurecore.version>0.0.33</osdu.azurecore.version>
+    <osdu.azurecore.version>0.0.24</osdu.azurecore.version>
     <azure.appservice.resourcegroup></azure.appservice.resourcegroup>
     <azure.appservice.plan></azure.appservice.plan>
     <azure.appservice.appname></azure.appservice.appname>
@@ -72,11 +72,6 @@
       <artifactId>core-lib-azure</artifactId>
       <version>${osdu.azurecore.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>workflow-core</artifactId>

provider/workflow-azure/src/main/java/org/opengroup/osdu/workflow/provider/azure/config/AzureBootstrapConfig.java

@@ -14,10 +14,16 @@
 
 package org.opengroup.osdu.workflow.provider.azure.config;
 
+import com.azure.cosmos.CosmosClient;
+import com.azure.cosmos.CosmosContainer;
+import com.azure.security.keyvault.secrets.SecretClient;
+
+import org.opengroup.osdu.azure.KeyVaultFacade;
 import org.opengroup.osdu.common.Validators;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+
 import sun.misc.BASE64Encoder;
 
 import javax.inject.Named;
@@ -57,4 +63,16 @@ public class AzureBootstrapConfig {
   public String keyVaultURL() {
     return keyVaultURL;
   }
+
+  @Bean
+  @Named("COSMOS_ENDPOINT")
+  public String cosmosEndpoint(SecretClient kv) {
+    return KeyVaultFacade.getSecretWithValidation(kv, "cosmos-endpoint");
+  }
+
+  @Bean
+  @Named("COSMOS_KEY")
+  public String cosmosKey(SecretClient kv) {
+    return KeyVaultFacade.getSecretWithValidation(kv, "cosmos-primary-key");
+  }
 }

provider/workflow-azure/src/main/java/org/opengroup/osdu/workflow/provider/azure/repository/IngestionStrategyRepository.java

@@ -14,21 +14,28 @@
 
 package org.opengroup.osdu.workflow.provider.azure.repository;
 
+import java.util.List;
+import java.util.Optional;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.opengroup.osdu.azure.cosmosdb.CosmosStore;
+
+import org.opengroup.osdu.azure.CosmosStore;
 import org.opengroup.osdu.core.common.model.WorkflowType;
 import org.opengroup.osdu.core.common.model.http.DpsHeaders;
 import org.opengroup.osdu.workflow.model.IngestionStrategy;
+import org.opengroup.osdu.workflow.provider.azure.config.AzureBootstrapConfig;
 import org.opengroup.osdu.workflow.provider.azure.config.CosmosConfig;
 import org.opengroup.osdu.workflow.provider.azure.model.IngestionStrategyDoc;
 import org.opengroup.osdu.workflow.provider.interfaces.IIngestionStrategyRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 
-import java.util.Optional;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import com.azure.cosmos.CosmosContainer;
+
+import javax.inject.Named;
 
 @Repository
 @Slf4j

provider/workflow-azure/src/main/java/org/opengroup/osdu/workflow/provider/azure/repository/WorkflowStatusRepository.java

@@ -14,9 +14,13 @@
 
 package org.opengroup.osdu.workflow.provider.azure.repository;
 
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.Optional;
+
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.opengroup.osdu.azure.cosmosdb.CosmosStore;
+import org.opengroup.osdu.azure.CosmosStore;
 import org.opengroup.osdu.core.common.model.http.DpsHeaders;
 import org.opengroup.osdu.workflow.exception.WorkflowNotFoundException;
 import org.opengroup.osdu.workflow.model.WorkflowStatus;
@@ -27,9 +31,9 @@ import org.opengroup.osdu.workflow.provider.interfaces.IWorkflowStatusRepository
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 
-import java.util.Optional;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import com.azure.cosmos.CosmosContainer;
+
+import javax.inject.Named;
 
 @Repository
 @Slf4j

provider/workflow-azure/src/main/resources/application.properties

@@ -13,13 +13,6 @@
 #  limitations under the License.
 
 LOG_PREFIX=workflow
-# Server Path Configuration
-server.servlet.contextPath=/api/workflow/v1/
-
-# Partition service
-PARTITION_API=${partition_service_endpoint}
-
-azure.activedirectory.app-resource-id=${aad_client_id}
 
 # Azure AD configuration for OpenIDConnect
 azure.activedirectory.session-stateless=true

provider/workflow-azure/src/test/java/org/opengroup/osdu/workflow/provider/azure/repository/IngestionStrategyRepositoryTest.java

 package org.opengroup.osdu.workflow.provider.azure.repository;
 
-import com.azure.cosmos.CosmosClientException;
+import com.azure.cosmos.*;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
+
+
 import org.mockito.junit.MockitoJUnitRunner;
-import org.opengroup.osdu.azure.cosmosdb.CosmosStore;
+
+import org.opengroup.osdu.azure.CosmosStore;
 import org.opengroup.osdu.core.common.model.WorkflowType;
 import org.opengroup.osdu.core.common.model.http.AppException;
 import org.opengroup.osdu.core.common.model.http.DpsHeaders;
@@ -18,14 +21,17 @@ import org.opengroup.osdu.workflow.provider.azure.config.CosmosConfig;
 import org.opengroup.osdu.workflow.provider.azure.model.IngestionStrategyDoc;
 import org.springframework.boot.test.context.SpringBootTest;
 
-import java.io.IOException;
-import java.util.Optional;
-
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.when;
 
+import javax.inject.Named;
+
+import java.io.IOException;
+import java.util.Optional;
+
 
 @RunWith(MockitoJUnitRunner.class)
 @SpringBootTest(classes = {WorkflowApplication.class})

provider/workflow-azure/src/test/java/org/opengroup/osdu/workflow/provider/azure/repository/WorkflowStatusRepositoryTest.java

 package org.opengroup.osdu.workflow.provider.azure.repository;
 
-import com.azure.cosmos.CosmosClientException;
+import com.azure.cosmos.*;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
+
+
 import org.mockito.junit.MockitoJUnitRunner;
-import org.opengroup.osdu.azure.cosmosdb.CosmosStore;
+import org.opengroup.osdu.azure.CosmosStore;
 import org.opengroup.osdu.core.common.model.http.AppException;
 import org.opengroup.osdu.core.common.model.http.DpsHeaders;
 import org.opengroup.osdu.workflow.exception.WorkflowNotFoundException;
@@ -19,14 +21,20 @@ import org.opengroup.osdu.workflow.provider.azure.config.CosmosConfig;
 import org.opengroup.osdu.workflow.provider.azure.model.WorkflowStatusDoc;
 import org.springframework.boot.test.context.SpringBootTest;
 
-import java.io.IOException;
-import java.util.Optional;
-
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import javax.inject.Named;
+
+import java.io.IOException;
+import java.util.Optional;
+
 
 @RunWith(MockitoJUnitRunner.class)
 @SpringBootTest(classes = {WorkflowApplication.class})