From b33d873d82100fb86fb86b698262c35c2dc341ff Mon Sep 17 00:00:00 2001
From: Nathan Good <nathan.good@ibm.com>
Date: Wed, 7 Feb 2024 09:16:08 -0700
Subject: [PATCH 1/2] Fixed bad syntax on the OC apply command.

Signed-off-by: Nathan Good <nathan.good@ibm.com>
---
 src/commontasks.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/commontasks.ts b/src/commontasks.ts
index c1ba433..441a2b0 100644
--- a/src/commontasks.ts
+++ b/src/commontasks.ts
@@ -16,7 +16,7 @@ export const DefaultCatalogSourceNamespace: string = 'openshift-marketplace';
  */
 export function ApplyObjectTask(scope: Construct, id: string, input: any): TaskBuilder {
   return openshift_client(scope, id).withStringParam(new ParameterBuilder('SCRIPT').withValue(
-    ['oc apply -f <<EOF', Yaml.stringify(input), 'EOF'].join('\n')),
+    ['cat <<EOF | oc apply -f -', Yaml.stringify(input), 'EOF', ''].join('\n')),
   );
 }
 

From da1322ff0ebad509a3487aa2a18a367c536af7da Mon Sep 17 00:00:00 2001
From: Nathan Good <nathan.good@ibm.com>
Date: Wed, 7 Feb 2024 09:20:08 -0700
Subject: [PATCH 2/2] Updated snapshots for unit tests.

Signed-off-by: Nathan Good <nathan.good@ibm.com>
---
 test/__snapshots__/commonTasks.test.ts.snap   | 20 +++++++++++--------
 .../commonpipelines.test.ts.snap              | 20 +++++++++++--------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/test/__snapshots__/commonTasks.test.ts.snap b/test/__snapshots__/commonTasks.test.ts.snap
index 81de455..580e807 100644
--- a/test/__snapshots__/commonTasks.test.ts.snap
+++ b/test/__snapshots__/commonTasks.test.ts.snap
@@ -22,7 +22,7 @@ exports[`ApplyObjectTaskTest ApplyNamespaceObject 1`] = `
           "params": [
             {
               "name": "SCRIPT",
-              "value": "oc apply -f <<EOF
+              "value": "cat <<EOF | oc apply -f -
 apiVersion: v1
 kind: Namespace
 metadata:
@@ -30,7 +30,8 @@ metadata:
   labels:
     name: my-test-namespace
 
-EOF",
+EOF
+",
             },
             {
               "name": "VERSION",
@@ -56,7 +57,7 @@ EOF",
           "params": [
             {
               "name": "SCRIPT",
-              "value": "oc apply -f <<EOF
+              "value": "cat <<EOF | oc apply -f -
 apiVersion: operators.coreos.com/v1alpha1
 kind: CatalogSource
 metadata:
@@ -73,7 +74,8 @@ spec:
     registryPoll:
       interval: 45m
 
-EOF",
+EOF
+",
             },
             {
               "name": "VERSION",
@@ -102,14 +104,15 @@ EOF",
           "params": [
             {
               "name": "SCRIPT",
-              "value": "oc apply -f <<EOF
+              "value": "cat <<EOF | oc apply -f -
 apiVersion: operators.coreos.com/v1
 kind: OperatorGroup
 metadata:
   name: ibm-eventstreams
   namespace: ibm-eventautomation-operatorgroup
 
-EOF",
+EOF
+",
             },
             {
               "name": "VERSION",
@@ -138,7 +141,7 @@ EOF",
           "params": [
             {
               "name": "SCRIPT",
-              "value": "oc apply -f <<EOF
+              "value": "cat <<EOF | oc apply -f -
 apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
 metadata:
@@ -150,7 +153,8 @@ spec:
   source: ibm-operator-catalog
   sourceNamespace: openshift-marketplace
 
-EOF",
+EOF
+",
             },
             {
               "name": "VERSION",
diff --git a/test/__snapshots__/commonpipelines.test.ts.snap b/test/__snapshots__/commonpipelines.test.ts.snap
index 21f45e3..630c9ea 100644
--- a/test/__snapshots__/commonpipelines.test.ts.snap
+++ b/test/__snapshots__/commonpipelines.test.ts.snap
@@ -22,7 +22,7 @@ exports[`ApplyObjectTaskTest ApplyNamespaceObject 1`] = `
           "params": [
             {
               "name": "SCRIPT",
-              "value": "oc apply -f <<EOF
+              "value": "cat <<EOF | oc apply -f -
 apiVersion: v1
 kind: Namespace
 metadata:
@@ -30,7 +30,8 @@ metadata:
   labels:
     name: ibm-eventstreams
 
-EOF",
+EOF
+",
             },
             {
               "name": "VERSION",
@@ -56,7 +57,7 @@ EOF",
           "params": [
             {
               "name": "SCRIPT",
-              "value": "oc apply -f <<EOF
+              "value": "cat <<EOF | oc apply -f -
 apiVersion: operators.coreos.com/v1alpha1
 kind: CatalogSource
 metadata:
@@ -72,7 +73,8 @@ spec:
     registryPoll:
       interval: 45m
 
-EOF",
+EOF
+",
             },
             {
               "name": "VERSION",
@@ -101,14 +103,15 @@ EOF",
           "params": [
             {
               "name": "SCRIPT",
-              "value": "oc apply -f <<EOF
+              "value": "cat <<EOF | oc apply -f -
 apiVersion: operators.coreos.com/v1
 kind: OperatorGroup
 metadata:
   name: ibm-eventstreams-operator-group
   namespace: ibm-eventstreams
 
-EOF",
+EOF
+",
             },
             {
               "name": "VERSION",
@@ -137,7 +140,7 @@ EOF",
           "params": [
             {
               "name": "SCRIPT",
-              "value": "oc apply -f <<EOF
+              "value": "cat <<EOF | oc apply -f -
 apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
 metadata:
@@ -149,7 +152,8 @@ spec:
   source: ibm-operator-catalog
   sourceNamespace: openshift-marketplace
 
-EOF",
+EOF
+",
             },
             {
               "name": "VERSION",