Merge branch 'master' into feat/cron-stac-validate-tde-1136

templates/argo-tasks/README.md

@@ -211,8 +211,10 @@ See (https://github.com/linz/argo-tasks#stac-validate)
     parameters:
       - name: uri
         value: 's3://my-bucket/path/collection.json'
-      - name: checksum
-        value: '{{workflow.parameters.checksum}}'
+      - name: checksum_assets
+        value: '{{workflow.parameters.checksum_assets}}'
+      - name: checksum_links
+        value: '{{workflow.parameters.checksum_links}}'
       - name: recursive
         value: '{{workflow.parameters.recursive}}'
       - name: concurrency

templates/argo-tasks/copy.yml

@@ -21,7 +21,7 @@ spec:
 
           - name: version_argo_tasks
             description: version of argo-tasks to use
-            default: 'v3'
+            default: 'v4'
 
           - name: copy_option
             description: --no-clobber Skip overwriting existing files. --force Overwrite all files. --force-no-clobber Overwrite only changed files, skip unchanged files.

templates/argo-tasks/create-manifest.yml

@@ -24,7 +24,7 @@ spec:
 
           - name: version_argo_tasks
             description: version of argo-tasks to use
-            default: 'v3'
+            default: 'v4'
 
           - name: include
             description: A regular expression to match object path(s) or name(s) from within the source path to include in the copy

templates/argo-tasks/generate-path.yml

@@ -21,7 +21,7 @@ spec:
             description: target bucket name e.g. 'nz-imagery'
           - name: version
             description: argo-task Container version to use
-            default: 'v3'
+            default: 'v4'
 
       container:
         image: '019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/argo-tasks:{{= inputs.parameters.version }}'

templates/argo-tasks/group.yml

@@ -32,7 +32,7 @@ spec:
 
           - name: version
             description: argo-task Container version to use
-            default: 'v3'
+            default: 'v4'
 
       outputs:
         parameters:

templates/argo-tasks/push-to-github.yml

@@ -23,7 +23,7 @@ spec:
 
           - name: version_argo_tasks
             description: version of argo-tasks to use
-            default: 'v3'
+            default: 'v4'
 
           - name: repository
             description: Repository Name

templates/argo-tasks/stac-validate.yml

@@ -28,13 +28,17 @@ spec:
             description: Number of requests to run concurrently
             default: '50'
 
-          - name: checksum
-            description: Validate the file:checksum if it exists
+          - name: checksum_assets
+            description: Validate the file:checksum of each asset if it exists
+            default: 'false'
+
+          - name: checksum_links
+            description: Validate the file:checksum of each link if it exists
             default: 'false'
 
           - name: version
             description: container version to use
-            default: 'v3'
+            default: 'v4'
 
       container:
         image: '019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/argo-tasks:{{=sprig.trim(inputs.parameters.version)}}'
@@ -51,5 +55,6 @@ spec:
             - 'validate'
             - '--concurrency={{inputs.parameters.concurrency}}'
             - '--recursive={{inputs.parameters.recursive}}'
-            - '--checksum={{inputs.parameters.checksum}}'
+            - '--checksum-assets={{inputs.parameters.checksum_assets}}'
+            - '--checksum-links={{inputs.parameters.checksum_links}}'
             - '{{inputs.parameters.uri}}'

templates/argo-tasks/tile-index-validate.yml

@@ -45,7 +45,7 @@ spec:
 
           - name: version
             description: container version to use
-            default: 'v3'
+            default: 'v4'
 
       outputs:
         artifacts:

workflows/basemaps/imagery-import-cogify.yml

@@ -33,7 +33,7 @@ spec:
 
       - name: version_argo_tasks
         description: Version of the basemaps CLI docker container to use
-        value: v3
+        value: v4
 
       - name: ticket
         description: Ticket ID e.g. 'AIP-55'

workflows/basemaps/mapsheet-json.yaml

@@ -13,7 +13,7 @@ spec:
   arguments:
     parameters:
       - name: version_argo_tasks
-        value: 'v3'
+        value: 'v4'
       - name: layer
         value: '104687'
       - name: config

workflows/basemaps/vector-etl.yaml

@@ -13,7 +13,7 @@ spec:
     parameters:
       - name: version_argo_tasks
         description: Version of the Argo Tasks CLI docker container to use
-        value: 'v3'
+        value: 'v4'
 
       - name: version_basemaps_etl
         description: Version of the Basemaps ETL eks container to use

workflows/raster/copy.yaml

@@ -26,7 +26,7 @@ spec:
   arguments:
     parameters:
       - name: version_argo_tasks
-        value: 'v3'
+        value: 'v4'
       - name: ticket
         description: Ticket ID e.g. 'AIP-55'
         value: ''

workflows/raster/publish-odr.yaml

@@ -26,7 +26,7 @@ spec:
   arguments:
     parameters:
       - name: version_argo_tasks
-        value: 'v3'
+        value: 'v4'
       - name: ticket
         description: Ticket ID e.g. 'AIP-55'
         value: ''

workflows/raster/standardising.yaml

@@ -26,7 +26,7 @@ spec:
   arguments:
     parameters:
       - name: version_argo_tasks
-        value: 'v3'
+        value: 'v4'
       - name: version_basemaps_cli
         value: 'v7'
       - name: version_topo_imagery
@@ -212,6 +212,7 @@ spec:
             'Porirua City Council',
             'Queenstown-Lakes District Council',
             'Rangitīkei District Council',
+            'Regional Software Holdings Limited',
             'Rotorua District Council',
             'Ruapehu District Council',
             'Selwyn District Council',

workflows/stac/stac-validate-parallel.yaml

@@ -14,15 +14,21 @@ spec:
   arguments:
     parameters:
       - name: version_argo_tasks
-        value: 'v3'
+        value: 'v4'
       - name: uri
         description: 'Path(s) to the STAC file(s).'
         value: 's3://linz-imagery-staging/test/stac-validate/'
       - name: include
         value: 'collection.json$'
-      - name: checksum
-        description: 'Validate asset checksums.'
+      - name: checksum_assets
+        description: 'Validate the file:checksum of each asset if it exists'
         value: 'false'
+        enum:
+          - 'true'
+          - 'false'
+      - name: checksum_links
+        description: 'Validate the file:checksum of each link if it exists'
+        value: 'true'
         enum:
           - 'false'
           - 'true'
@@ -44,8 +50,10 @@ spec:
               parameters:
                 - name: uri
                   value: '{{item}}'
-                - name: checksum
-                  value: '{{workflow.parameters.checksum}}'
+                - name: checksum_assets
+                  value: '{{workflow.parameters.checksum_assets}}'
+                - name: checksum_links
+                  value: '{{workflow.parameters.checksum_links}}'
             depends: aws-list-collections
             withParam: '{{tasks.aws-list-collections.outputs.parameters.files}}'
     - name: aws-list-collections

workflows/test/generate-path.yaml

@@ -13,7 +13,7 @@ spec:
   arguments:
     parameters:
       - name: version_argo_tasks
-        value: 'v3'
+        value: 'v4'
       - name: source
         value: 's3://linz-imagery-staging/test/sample/'
       - name: target_bucket_name

workflows/util/create-thumbnails.yaml

@@ -16,7 +16,7 @@ spec:
   arguments:
     parameters:
       - name: version_argo_tasks
-        value: 'v3'
+        value: 'v4'
       - name: version_topo_imagery
         value: 'v4'
       - name: source