Merge branch 'new-workflow-apis' into h2-ingestion

provider/workflow-azure/src/main/java/org/opengroup/osdu/workflow/provider/azure/fileshare/FileShareClientFactory.java

-package org.opengroup.osdu.workflow.provider.azure.fileshare;
-
-import com.azure.storage.file.share.ShareClient;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-@Component
-public class FileShareClientFactory implements IFileShareClientFactory {
-  @Autowired
-  private ShareClient client;
-
-  @Override
-  public ShareClient getClient() {
-    return this.client;
-  }
-}

provider/workflow-azure/src/main/java/org/opengroup/osdu/workflow/provider/azure/fileshare/FileShareConfig.java

@@ -11,4 +11,5 @@ import org.springframework.context.annotation.Configuration;
 @Setter
 public class FileShareConfig {
   private String shareName;
+  private String dagsFolder;
 }

provider/workflow-azure/src/main/java/org/opengroup/osdu/workflow/provider/azure/fileshare/FileShareStore.java

 package org.opengroup.osdu.workflow.provider.azure.fileshare;
 
-import com.azure.storage.file.share.ShareClient;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
+import com.azure.storage.file.share.ShareDirectoryClient;
 
 import java.io.ByteArrayInputStream;
 
-@Component
 public class FileShareStore {
-  @Autowired
-  private IFileShareClientFactory fileShareClientFactory;
+  private ShareDirectoryClient directoryClient;
+  public FileShareStore(final ShareDirectoryClient directoryClient) {
+    this.directoryClient = directoryClient;
+  }
 
   public void createFile(final String contents, final String name) {
-    getShareClient().createFile(name, contents.getBytes().length)
+    directoryClient.createFile(name, contents.getBytes().length)
         .upload(new ByteArrayInputStream(contents.getBytes()), contents.getBytes().length);
   }
-
-  private ShareClient getShareClient() {
-    return this.fileShareClientFactory.getClient();
-  }
 }

provider/workflow-azure/src/main/java/org/opengroup/osdu/workflow/provider/azure/fileshare/FileShareStoreProvider.java

+package org.opengroup.osdu.workflow.provider.azure.fileshare;
+
+import com.azure.storage.file.share.ShareClient;
+import com.azure.storage.file.share.ShareDirectoryClient;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class FileShareStoreProvider {
+  @Bean
+  @Qualifier("dags")
+  public FileShareStore buildDagsStore(ShareClient shareClient, FileShareConfig config) {
+    ShareDirectoryClient client = shareClient.getDirectoryClient(config.getDagsFolder());
+    return new FileShareStore(client);
+  }
+}

provider/workflow-azure/src/main/java/org/opengroup/osdu/workflow/provider/azure/fileshare/IFileShareClientFactory.java

-package org.opengroup.osdu.workflow.provider.azure.fileshare;
-
-import com.azure.storage.file.share.ShareClient;
-
-public interface IFileShareClientFactory {
-  ShareClient getClient();
-}

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

@@ -3,11 +3,13 @@ package org.opengroup.osdu.workflow.provider.azure.repository;
 import org.opengroup.osdu.workflow.provider.azure.fileshare.FileShareStore;
 import org.opengroup.osdu.workflow.provider.interfaces.IWorkflowDefinitionRepository;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 @Component
 public class WorkflowDefinitionRepository implements IWorkflowDefinitionRepository {
   @Autowired
+  @Qualifier("dags")
   private FileShareStore fileShareStore;
 
   @Override

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

@@ -13,13 +13,13 @@
 #  limitations under the License.
 
 # Application name
-spring.application.name=workflow
+spring.application.name=workflow-azure
 
 LOG_PREFIX=workflow
 # Server Path Configuration
 server.servlet.contextPath=/api/workflow/v1/
 
-# Istio Auth Config Toggle 
+# Istio Auth Config Toggle
 azure.istio.auth.enabled=${azure_istioauth_enabled}
 
 # Partition service
@@ -41,13 +41,13 @@ osdu.azure.cosmosdb.workflowRunCollection=WorkflowRun
 
 # Azure fileshare configuration
 osdu.azure.fileshare.shareName=airflowdags
+osdu.azure.fileshare.dagsFolder=dags
 
 # Azure KeyVault configuration
 azure.keyvault.url=${KEYVAULT_URI}
 
 # Azure App Insights configuration
 azure.application-insights.instrumentation-key=${appinsights_key}
-spring.application.name=workflow-azure
 
 # Airflow configuration
 osdu.azure.airflow.url=${airflow_url}

provider/workflow-azure/src/test/java/org/opengroup/osdu/workflow/provider/azure/fileshare/FileShareClientFactoryTest.java → provider/workflow-azure/src/test/java/org/opengroup/osdu/workflow/provider/azure/fileshare/FileShareStoreProviderTest.java

 package org.opengroup.osdu.workflow.provider.azure.fileshare;
 
 import com.azure.storage.file.share.ShareClient;
+import com.azure.storage.file.share.ShareDirectoryClient;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.springframework.beans.factory.annotation.Autowired;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 /**
- * Tests for {@link FileShareClientFactory}
+ * Tests for {@link FileShareStoreProvider}
  */
 @ExtendWith(MockitoExtension.class)
-public class FileShareClientFactoryTest {
+public class FileShareStoreProviderTest {
+  private static final String DAGS_FOLDER = "dagsTest";
   @Mock
   private ShareClient shareClient;
 
+  @Mock
+  private FileShareConfig config;
+
+  @Mock
+  private ShareDirectoryClient directoryClient;
+
   @InjectMocks
-  private FileShareClientFactory fileShareClientFactory;
+  private FileShareStoreProvider fileShareStoreProvider;
 
   @Test
-  public void testGetClient() {
-    assertThat(fileShareClientFactory.getClient(), equalTo(shareClient));
-  }
+  public void testBuildDagsStore() {
+    when(config.getDagsFolder()).thenReturn(DAGS_FOLDER);
+    when(shareClient.getDirectoryClient(eq(DAGS_FOLDER))).thenReturn(directoryClient);
+    fileShareStoreProvider.buildDagsStore(shareClient, config);
+    verify(config).getDagsFolder();
+    verify(shareClient).getDirectoryClient(eq(DAGS_FOLDER));
 
+  }
 }

provider/workflow-azure/src/test/java/org/opengroup/osdu/workflow/provider/azure/fileshare/FileShareStoreTest.java

 package org.opengroup.osdu.workflow.provider.azure.fileshare;
 
 import com.azure.storage.file.share.ShareClient;
+import com.azure.storage.file.share.ShareDirectoryClient;
 import com.azure.storage.file.share.ShareFileClient;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -30,10 +31,7 @@ public class FileShareStoreTest {
   private static final long CONTENT_LENGTH = CONTENTS.getBytes().length;
 
   @Mock
-  private IFileShareClientFactory fileShareClientFactory;
-
-  @Mock
-  private ShareClient shareClient;
+  private ShareDirectoryClient shareDirectoryClient;
 
   @Mock
   private ShareFileClient shareFileClient;
@@ -41,19 +39,13 @@ public class FileShareStoreTest {
   @InjectMocks
   private FileShareStore fileShareStore;
 
-  @BeforeEach
-  public void setup() {
-    when(fileShareClientFactory.getClient()).thenReturn(shareClient);
-  }
-
   @Test
   public void testCreateFile() {
-    when(shareClient.createFile(eq(NAME), eq(CONTENT_LENGTH))).thenReturn(shareFileClient);
+    when(shareDirectoryClient.createFile(eq(NAME), eq(CONTENT_LENGTH))).thenReturn(shareFileClient);
     final ArgumentCaptor<InputStream> inputStreamArgumentCaptor = ArgumentCaptor.forClass(InputStream.class);
     when(shareFileClient.upload(inputStreamArgumentCaptor.capture(), eq(CONTENT_LENGTH))).thenReturn(null);
     fileShareStore.createFile(CONTENTS, NAME);
-    verify(fileShareClientFactory, times(1)).getClient();
-    verify(shareClient, times(1)).createFile(eq(NAME), eq(CONTENT_LENGTH));
+    verify(shareDirectoryClient, times(1)).createFile(eq(NAME), eq(CONTENT_LENGTH));
     verify(shareFileClient, times(1)).upload(any(InputStream.class), eq(CONTENT_LENGTH));
   }
 }