From 728de140f121c524b55eb736b3566c198f6ebe31 Mon Sep 17 00:00:00 2001
From: Zoran Regvart <zoran@regvart.com>
Date: Thu, 16 May 2024 17:01:28 +0200
Subject: [PATCH] Use consistent naming for -oci-ta Tasks

We should be consistent in our naming, makes for easier manipulation via
tools.
---
 .../0.1/git-clone-oci-ta.yaml                 |  4 ++--
 .../0.1/prefetch-dependencies-oci-ta.yaml     | 20 +++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/task/git-clone-oci-ta/0.1/git-clone-oci-ta.yaml b/task/git-clone-oci-ta/0.1/git-clone-oci-ta.yaml
index fdd96a9c9e..fbda3d50a5 100644
--- a/task/git-clone-oci-ta/0.1/git-clone-oci-ta.yaml
+++ b/task/git-clone-oci-ta/0.1/git-clone-oci-ta.yaml
@@ -95,7 +95,7 @@ spec:
   - description: The precise URL that was fetched by this Task.
     name: url
   - description: The OCI reference to the trusted source artifact containing the cloned git repo.
-    name: sourceArtifact
+    name: SOURCE_ARTIFACT
     type: string
   steps:
   - name: clone
@@ -260,7 +260,7 @@ spec:
       - create
       - --store
       - $(params.ociStorage)
-      - $(results.sourceArtifact.path)=/var/source
+      - $(results.SOURCE_ARTIFACT.path)=/var/source
 
   workspaces:
   - description: |
diff --git a/task/prefetch-dependencies-oci-ta/0.1/prefetch-dependencies-oci-ta.yaml b/task/prefetch-dependencies-oci-ta/0.1/prefetch-dependencies-oci-ta.yaml
index e3a34710db..e159d58873 100644
--- a/task/prefetch-dependencies-oci-ta/0.1/prefetch-dependencies-oci-ta.yaml
+++ b/task/prefetch-dependencies-oci-ta/0.1/prefetch-dependencies-oci-ta.yaml
@@ -18,17 +18,17 @@ spec:
   - description: Configures project packages that will have their dependencies prefetched.
     name: input
   - description: The trusted artifact URI containing the application source code.
-    name: source-artifact
+    name: SOURCE_ARTIFACT
     type: string
   - description: >-
       The OCI repository where the trusted artifacts with the modified cloned repository and
       the prefetched depedencies will be stored.
-    name: oci-storage
+    name: ociStorage
     type: string
   - description: >-
       Expiration date for the trusted artifacts created in the OCI repository. An empty string means
       the artifacts do not expire.
-    name: oci-artifact-expires-after
+    name: ociArtifactExpiresAfter
     type: string
     default: ""
   - description: >
@@ -49,10 +49,10 @@ spec:
     default: ca-bundle.crt
   results:
     - description: The trusted artifact URI containing the modified application source.
-      name: source-artifact
+      name: SOURCE_ARTIFACT
       type: string
     - description: The trusted artifact URI containing the fetched dependencies.
-      name: cachi2-artifact
+      name: CACHI2_ARTIFACT
   stepTemplate:
     volumeMounts:
       - mountPath: /var/workdir
@@ -62,7 +62,7 @@ spec:
     name: use-trusted-artifact
     args:
       - use
-      - $(params.source-artifact)=/var/workdir/source
+      - $(params.SOURCE_ARTIFACT)=/var/workdir/source
   - image: quay.io/redhat-appstudio/cachi2:0.7.0@sha256:1fc772aa3636fd0b43d62120d832e5913843e028e8cac42814b487c3a0a32bd8
     name: prefetch-dependencies
     env:
@@ -136,13 +136,13 @@ spec:
     name: create-trusted-artifact
     env:
     - name: IMAGE_EXPIRES_AFTER
-      value: $(params.oci-artifact-expires-after)
+      value: $(params.ociArtifactExpiresAfter)
     args:
       - create
       - --store
-      - $(params.oci-storage)
-      - $(results.source-artifact.path)=/var/workdir/source
-      - $(results.cachi2-artifact.path)=/var/workdir/cachi2
+      - $(params.ociStorage)
+      - $(results.SOURCE_ARTIFACT.path)=/var/workdir/source
+      - $(results.CACHI2_ARTIFACT.path)=/var/workdir/cachi2
   workspaces:
   - name: git-basic-auth
     description: |