refactor: improve path handling in standardising workflow

linz · Nov 5, 2024 · e9393f6 · e9393f6
1 parent 41fe8d3
commit e9393f6
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/workflows/raster/standardising.yaml b/workflows/raster/standardising.yaml
@@ -394,7 +394,7 @@ spec:
                 - name: collection-id
                   value: '{{tasks.collection-id-setup.outputs.parameters.collection-id}}'
                 - name: target
-                  value: '{{tasks.get-location.outputs.parameters.location}}flat/'
+                  value: '{{=sprig.trimSuffix("/", tasks["get-location"].outputs.parameters.location)}}/flat/'
               artifacts:
                 - name: group_data
                   from: '{{ tasks.group.outputs.artifacts.output }}'
@@ -418,7 +418,7 @@ spec:
             arguments:
               parameters:
                 - name: uri
-                  value: '{{tasks.get-location.outputs.parameters.location}}flat/collection.json'
+                  value: '{{=sprig.trimSuffix("/", tasks["get-location"].outputs.parameters.location)}}/flat/collection.json'
               artifacts:
                 - name: stac-result
                   raw:
@@ -460,7 +460,7 @@ spec:
             arguments:
               parameters:
                 - name: source
-                  value: '{{tasks.get-location.outputs.parameters.location}}flat/'
+                  value: '{{=sprig.trimSuffix("/", tasks["get-location"].outputs.parameters.location)}}/flat/'
                 - name: target_bucket_name
                   value: '{{workflow.parameters.target_bucket_name}}'
                 - name: copy_option
@@ -565,7 +565,7 @@ spec:
           - python
           - '/app/scripts/collection_from_items.py'
           - '--uri'
-          - '{{inputs.parameters.location}}flat/'
+          - '{{=sprig.trimSuffix("/", inputs.parameters.location)}}/flat/'
           - '--collection-id'
           - '{{inputs.parameters.collection-id}}'
           - '--category'
@@ -614,9 +614,9 @@ spec:
             '-V',
             'create-overview',
             '--source',
-            '{{inputs.parameters.location}}flat/',
+            '{{=sprig.trimSuffix("/", inputs.parameters.location)}}/flat/',
             '--output',
-            '{{inputs.parameters.location}}flat/',
+            '{{=sprig.trimSuffix("/", inputs.parameters.location)}}/flat/',
           ]
 
     - name: create-config
@@ -634,7 +634,7 @@ spec:
             value: s3://linz-bucket-config/config.basemaps.json
         args:
           - 'config'
-          - '{{ inputs.parameters.location }}flat/'
+          - '{{=sprig.trimSuffix("/", inputs.parameters.location)}}/flat/'
       outputs:
         parameters:
           - name: url
@@ -650,7 +650,7 @@ spec:
             path: '/tmp/cogify/config-url'
             s3:
               bucket: '{{inputs.parameters.bucket}}'
-              key: '{{inputs.parameters.key}}/flat/config-url'
+              key: '{{=sprig.trimSuffix("/", inputs.parameters.key)}}/flat/config-url'
             archive:
               none: {}