From 0c8e1fb398797099374050729d181456a89d1666 Mon Sep 17 00:00:00 2001
From: Fabrice Brito <fabrice.brito@terradue.com>
Date: Fri, 20 Oct 2023 23:02:45 +0200
Subject: [PATCH] fixes on build and cwl-wrapper

---
 .github/workflows/build.yaml               |  4 ++--
 containers/cwl-wrapper/templates/main.yaml | 11 ++++++++++-
 stage/stage-out.yaml                       |  8 ++++----
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 0c9bf09..0851176 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -166,8 +166,8 @@ jobs:
       - run: yq -i eval '(.$graph[] | select (.id == "norm_diff") ).hints.DockerRequirement.dockerPull = "ghcr.io/terradue/ogc-eo-application-package-hands-on/norm_diff:${{needs.version.outputs.app-version}}"' water-bodies/app-package-cloud-native.cwl
       - run: yq -i eval '(.$graph[] | select (.id == "otsu") ).hints.DockerRequirement.dockerPull = "ghcr.io/terradue/ogc-eo-application-package-hands-on/otsu:${{needs.version.outputs.app-version}}"' water-bodies/app-package-cloud-native.cwl
       - run: yq -i eval '(.$graph[] | select (.id == "stac") ).hints.DockerRequirement.dockerPull = "ghcr.io/terradue/ogc-eo-application-package-hands-on/stac:${{needs.version.outputs.app-version}}"' water-bodies/app-package-cloud-native.cwl
-      - run: yq -i eval '(.requirements.DockerRequirement.dockerPull = "ghcr.io/terradue/ogc-eo-application-package-hands-on/stage:${{needs.version.outputs.app-version}}"' stage/stage-in.yaml 
-      - run: yq -i eval '(.requirements.DockerRequirement.dockerPull = "ghcr.io/terradue/ogc-eo-application-package-hands-on/stage:${{needs.version.outputs.app-version}}"' stage/stage-out.yaml
+      - run: yq -i eval '.requirements.DockerRequirement.dockerPull = "ghcr.io/terradue/ogc-eo-application-package-hands-on/stage:${{needs.version.outputs.app-version}}"' stage/stage-in.yaml 
+      - run: yq -i eval '.requirements.DockerRequirement.dockerPull = "ghcr.io/terradue/ogc-eo-application-package-hands-on/stage:${{needs.version.outputs.app-version}}"' stage/stage-out.yaml
       - run: mkdir downloads
       - run: cp water-bodies/app-package.cwl downloads/app-water-bodies.${{needs.version.outputs.app-version}}.cwl
       - run: cp water-bodies/app-package-cloud-native.cwl downloads/app-water-bodies-cloud-native.${{needs.version.outputs.app-version}}.cwl
diff --git a/containers/cwl-wrapper/templates/main.yaml b/containers/cwl-wrapper/templates/main.yaml
index 27371a2..6e5c805 100644
--- a/containers/cwl-wrapper/templates/main.yaml
+++ b/containers/cwl-wrapper/templates/main.yaml
@@ -1,11 +1,20 @@
 class: Workflow
+$namespaces:
+  cwltool: http://commonwl.org/cwltool#
 doc: Main stage manager
 id: main
 label: macro-cwl
+hints:
+  "cwltool:Secrets":
+    secrets: []
 inputs: {}
 outputs: {}
 
 requirements:
   SubworkflowFeatureRequirement: {}
   ScatterFeatureRequirement: {}
-  InlineJavascriptRequirement: {}
+steps:
+  node_stage_out:
+    in: {}
+    out: []
+    run: ''
\ No newline at end of file
diff --git a/stage/stage-out.yaml b/stage/stage-out.yaml
index 2da2e8b..bfb677e 100644
--- a/stage/stage-out.yaml
+++ b/stage/stage-out.yaml
@@ -14,10 +14,10 @@ hints:
     dockerPull: stac-asset:latest
   "cwltool:Secrets":
     secrets:
-    - AWS_SERVICEURL
-    - AWS_REGION
-    - AWS_ACCESS_KEY_ID
-    - AWS_SECRET_ACCESS_KEY
+    - aws_access_key_id
+    - aws_secret_access_key
+    - region_name
+    - endpoint_url
 
 inputs: 
   s3_bucket: