From cf74f397a7f06da9bb7c20fe8fd386db02e2468f Mon Sep 17 00:00:00 2001
From: Watson Sato <wsato@redhat.com>
Date: Mon, 30 Oct 2023 20:38:24 +0100
Subject: [PATCH] Minor workshop fixes

- Fix the path of the subscription yaml
- Fix the command used to create node rules
- Fix command that patches an incompliant nested yaml
---
 doc/tutorials/workshop/content/exercises/02-installation.md | 2 +-
 doc/tutorials/workshop/content/exercises/11-node-rules.md   | 4 ++--
 doc/tutorials/workshop/content/exercises/13-complex-yaml.md | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/tutorials/workshop/content/exercises/02-installation.md b/doc/tutorials/workshop/content/exercises/02-installation.md
index c94e95f25..f85a61e5c 100644
--- a/doc/tutorials/workshop/content/exercises/02-installation.md
+++ b/doc/tutorials/workshop/content/exercises/02-installation.md
@@ -44,7 +44,7 @@ subscription.operators.coreos.com/compliance-operator-sub created
 ```
 
 The Subscription file can be edited to optionally deploy a custom version,
-see the `startingCSV` attribute in the `deploy/olm-catalog/subscription.yaml`
+see the `startingCSV` attribute in the `config/catalog/subscription.yaml`
 file.
 
 After a minute or two, the operator should be installed. Verify that the
diff --git a/doc/tutorials/workshop/content/exercises/11-node-rules.md b/doc/tutorials/workshop/content/exercises/11-node-rules.md
index cc3eed569..887d41f50 100644
--- a/doc/tutorials/workshop/content/exercises/11-node-rules.md
+++ b/doc/tutorials/workshop/content/exercises/11-node-rules.md
@@ -32,7 +32,7 @@ $ ./utils/add_kubernetes_rule.py create node \
     --title "File /etc/system-release must be owned by root" \
     --description "We need to ensure that root owns the system release file"  \
     --template file_owner \
-    --template-vars "filepath: /etc/system-release, fileuid: '0'"
+    --template-vars "filepath: /etc/system-release, fileuid: 0"
 ```
 
 We already know the `rule`, `title` and `description` are for, they are
@@ -52,7 +52,7 @@ $ ./utils/add_kubernetes_rule.py create node \
     --title "Ensure ASLR is fully enabled" \
     --description "Make it harder to exploit vulnerabilities by employing full address space layout randomization"  \
     --template sysctl \
-    --template-vars "sysctlvar: kernel.randomize_va_space, sysctlval: '2', datatype: int"
+    --template-vars "sysctlvar: kernel.randomize_va_space, sysctlval: 2, datatype: int"
 ```
 
 ### Selecting the nodes to check
diff --git a/doc/tutorials/workshop/content/exercises/13-complex-yaml.md b/doc/tutorials/workshop/content/exercises/13-complex-yaml.md
index 0351e58fb..2bf22b86d 100644
--- a/doc/tutorials/workshop/content/exercises/13-complex-yaml.md
+++ b/doc/tutorials/workshop/content/exercises/13-complex-yaml.md
@@ -119,7 +119,7 @@ $ ./utils/add_kubernetes_rule.py cluster-test --rule check_nested_yaml
 
 If you'd like to test that the rule fails with incompliant values, patch the `ConfigMap` with an incompliant value, and run the test again.
 ```
-$ oc patch -n openshift configmap my-nested-compliance-configmap -p '{"data": {"my-config.yaml": "{foo: bar, nested-key: nested-not-compliant}"}}
+$ oc patch -n openshift configmap my-nested-compliance-configmap -p '{"data": {"my-config.yaml": "{foo: bar, nested-key: nested-not-compliant}"}}'
 configmap/my-nested-compliance-configmap patched
 $ ./utils/add_kubernetes_rule.py cluster-test --rule check_nested_yaml
 ...