fix: standardise source input so can be used as template

linz · Aug 28, 2023 · b84ec97 · b84ec97
1 parent 026d78e
commit b84ec97
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/workflows/imagery/ascii-standardise-publish.yaml b/workflows/imagery/ascii-standardise-publish.yaml
@@ -2,7 +2,7 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Workflow
 metadata:
-  generateName: imagery-standardising-publish-import-
+  generateName: ascii-imagery-standardising-publish-import-
   namespace: argo
 spec:
   parallelism: 50
@@ -70,6 +70,10 @@ spec:
             templateRef:
               name: imagery-standardising
               template: main
+            arguments:
+              parameters:
+                - name: source
+                  value: "{{tasks.get-location.outputs.parameters.location}}translated-asc-files/"
             depends: "convert-asc-files"
 
           - name: publish
@@ -79,7 +83,7 @@ spec:
             arguments:
               parameters:
                 - name: source
-                  value: "{{tasks.get-location.outputs.parameters.location}}translated-asc-files/"
+                  value: "{{tasks.get-location.outputs.parameters.location}}flat/"
                 - name: include
                   value: ".tiff?$|.json$"
                 - name: group

diff --git a/workflows/imagery/standardising.yaml b/workflows/imagery/standardising.yaml
@@ -208,6 +208,9 @@ spec:
       imagePullPolicy: Always
   templates:
     - name: main
+      inputs:
+        parameters:
+          - name: source
       dag:
         tasks:
           - name: generate-ulid
@@ -223,7 +226,7 @@ spec:
                 - name: include
                   value: "{{workflow.parameters.include}}"
                 - name: source
-                  value: "{{=sprig.trim(workflow.parameters.source)}}"
+                  value: "{{=sprig.trim(inputs.parameters.source)}}"
                 - name: source_epsg
                   value: "{{=sprig.trim(workflow.parameters['source-epsg'])}}"
                 - name: validate