fix: parameter fields

linz · Nov 5, 2024 · 7035759 · 7035759
1 parent 33eb125
commit 7035759
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 15 deletions.
diff --git a/templates/argo-tasks/stac-setup.yml b/templates/argo-tasks/stac-setup.yml
@@ -44,21 +44,22 @@ spec:
           - name: AWS_ROLE_CONFIG_PATH
             value: s3://linz-bucket-config/config.json
         args:
-          - 'stac-setup'
+          - 'stac'
+          - 'setup'
           - '--start-year={{=sprig.trunc(4, inputs.parameters.start_datetime)}}'
           - '--end-year={{=sprig.trunc(4, inputs.parameters.end_datetime)}}'
-          - '--gsd={{inputs.parameters.gsd)}}'
-          - '--region={{inputs.parameters.region)}}'
-          - '--geographic-description={{inputs.parameters.geographic_description)}}'
-          - '--geospatial-category={{inputs.parameters.geospatial_category)}}'
-          - '--odr-url={{inputs.parameters.gsd)}}'
+          - '--region={{inputs.parameters.region}}'
+          - '--geographic-description={{inputs.parameters.geographic_description}}'
+          - '--geospatial-category={{inputs.parameters.geospatial_category}}'
+          - '--gsd={{inputs.parameters.gsd}}'
+          - '--odr-url={{inputs.parameters.odr_url}}'
       outputs:
         parameters:
-          - name: collection-id
+          - name: collection_id
             description: ID for collection and item STAC
             valueFrom:
               path: '/tmp/stac-setup/collection-id'
-          - name: linz-slug
+          - name: linz_slug
             description: linz:slug field for collection STAC
             valueFrom:
-              path: '/tmp/stac-setup/linz-slug'
+              path: '/tmp/stac-setup/linz-slug'
diff --git a/workflows/raster/standardising.yaml b/workflows/raster/standardising.yaml
@@ -413,10 +413,10 @@ spec:
                   value: '{{item}}'
                 - name: collection_id
                   value: '{{tasks.stac-setup.outputs.parameters.collection_id}}'
-                - name: linz_slug
-                  value: '{{tasks.stac-setup.outputs.parameters.linz_slug}}'
                 - name: target
                   value: '{{tasks.get-location.outputs.parameters.location}}flat/'
+                - name: current_datetime
+                  value: '{{tasks.stac-setup.finishedAt}}'
               artifacts:
                 - name: group_data
                   from: '{{ tasks.group.outputs.artifacts.output }}'
@@ -429,6 +429,8 @@ spec:
               parameters:
                 - name: collection_id
                   value: '{{tasks.stac-setup.outputs.parameters.collection_id}}'
+                - name: linz_slug
+                  value: '{{tasks.stac-setup.outputs.parameters.linz_slug}}'
                 - name: location
                   value: '{{tasks.get-location.outputs.parameters.location}}'
             depends: 'standardise-validate'
@@ -504,7 +506,8 @@ spec:
       inputs:
         parameters:
           - name: group_id
-          - name: collection-id
+          - name: collection_id
+          - name: current_datetime
           - name: target
         artifacts:
           - name: group_data
@@ -533,7 +536,7 @@ spec:
           - '--end-datetime'
           - '{{=sprig.trim(workflow.parameters.end_datetime)}}'
           - '--collection-id'
-          - '{{inputs.parameters.collection-id}}'
+          - '{{inputs.parameters.collection_id}}'
           - '--create-footprints'
           - '{{workflow.parameters.create_capture_area}}'
           - '--cutline'
@@ -546,6 +549,8 @@ spec:
           - '{{=sprig.trim(workflow.parameters.gsd)}}'
           - '--published-path'
           - '{{=sprig.trim(workflow.parameters.odr_url)}}'
+          - '--current-datetime'
+          - '{{inputs.parameters.current_datetime}}'
 
     - name: create-collection
       nodeSelector:
@@ -577,8 +582,6 @@ spec:
           - '{{inputs.parameters.collection_id}}'
           - '--linz-slug'
           - '{{inputs.parameters.linz_slug}}'
-          - '--current-datetime'
-          - '{{tasks.standardise-validate.startedAt}}'
           - '--category'
           - '{{=sprig.trim(workflow.parameters.category)}}'
           - '--region'