Merge pull request #37 from rundeck-plugins/rse740-not-importing-logs…

…-from-S3logstore RSE-812: Fix: not importing logs from azure
rundeck-plugins · Oct 26, 2023 · ea6e082 · ea6e082
2 parents 4dd07dc + 9f680c9
commit ea6e082
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -40,7 +40,7 @@ configurations {
 
 dependencies {
     implementation 'org.codehaus.groovy:groovy-all:3.0.9'
-    implementation group: 'org.rundeck', name: 'rundeck-core', version: '4.3.+'
+    implementation group: 'org.rundeck', name: 'rundeck-core', version: '4.17.2-rc1-20231025'
 
     pluginLibs (group: 'com.microsoft.azure', name: 'azure', version: '1.41.4'){
         exclude group: "com.fasterxml.jackson.core"

diff --git a/src/main/groovy/com/rundeck/plugins/azure/plugin/AzureFileStoragePlugin.groovy b/src/main/groovy/com/rundeck/plugins/azure/plugin/AzureFileStoragePlugin.groovy
@@ -131,6 +131,14 @@ class AzureFileStoragePlugin implements ExecutionFileStoragePlugin, ExecutionMul
         container.createIfNotExists()
     }
 
+    /**
+     * @param context execution context
+     * @return true if the given context has the expanded path of the log files in the `outputfilepath` variable
+     */
+    protected static boolean isImportedExecution(Map<String, ?> context){
+        return context != null && context.get("isRemoteFilePath") != null && context.get("isRemoteFilePath") == "true"
+    }
+
     @Override
     boolean isAvailable(String filetype) throws ExecutionFileStorageException {
         try {
@@ -225,7 +233,10 @@ class AzureFileStoragePlugin implements ExecutionFileStoragePlugin, ExecutionMul
      */
     static String expandPath(String pathFormat, Map<String, ?> context) {
         String result = pathFormat.replaceAll("^/+", "");
-        if (null != context) {
+
+        if(isImportedExecution(context))
+            result = String.valueOf(context.get("outputfilepath").toString())
+        else if (null != context) {
             result = DataContextUtils.replaceDataReferences(
                     result,
                     DataContextUtils.addContext("job", stringMap(context), new HashMap<>()),
@@ -252,12 +263,16 @@ class AzureFileStoragePlugin implements ExecutionFileStoragePlugin, ExecutionMul
     }
 
     String getFileName(String fileType){
-        String executionId=context.get(META_EXECID)
-        String project=context.get(META_PROJECT)
-
-        String fileName="${project}/${executionId}.${fileType}"
+        String fileName
+        if(isImportedExecution(this.context))
+            fileName = expandedPath.substring(expandedPath.indexOf("/"), expandedPath.length()).toLowerCase()
+        else{
+            String executionId=context.get(META_EXECID)
+            String project=context.get(META_PROJECT)
+            fileName = "${project}/${executionId}"
+        }
 
-        return fileName
+        return fileName + ".${fileType}"
     }
 
 
@@ -299,5 +314,8 @@ class AzureFileStoragePlugin implements ExecutionFileStoragePlugin, ExecutionMul
         return blob
     }
 
-
+    @Override
+    public String getConfiguredPathTemplate(){
+        return this.path;
+    }
 }
diff --git a/src/test/groovy/com/rundeck/plugins/azure/plugin/AzureFileStoragePluginSpec.groovy b/src/test/groovy/com/rundeck/plugins/azure/plugin/AzureFileStoragePluginSpec.groovy
@@ -53,6 +53,21 @@ class AzureFileStoragePluginSpec  extends Specification{
         thrown IllegalArgumentException
     }
 
+    def "return true if it was initialized with an imported execution"(){
+        when:
+        boolean isImportedExecution = AzureFileStoragePlugin.isImportedExecution(context)
+
+        then:
+        isImportedExecution == expected
+
+        where:
+        context                      | expected
+        ['isRemoteFilePath': 'asd']  | false
+        ['isRemoteFilePath': 'true'] | true
+        [:]                          | false
+        null                         | false
+    }
+
 
     private HashMap<String, Object> testContext() {
         HashMap<String, Object> stringHashMap = new HashMap<String, Object>();