From 7127118abe23a8bd9abe6eb3bb57b90f79d399de Mon Sep 17 00:00:00 2001
From: Daniel Lawton <dlawton@redhat.com>
Date: Fri, 9 Jan 2026 19:13:04 +0000
Subject: [PATCH] Scaffolder Minor Bug: Whitespace appearing at the top of line
 in dependency/00-create-resources-missing-deps.yaml 		      when
 using scaffolding tool to create a controller with
 -optional-create-dependency, 		      but without
 -required-create-dependency.

Why Fix it: Should want to fix the template because this will generate an obscure warning when running the kuttl tests.

What Fixed it: Replaced left trim with a right trim at the end of requiredCreateDependencies loop
	       and the beginning of the next loop OptionalCreateDependencies.

Signed-off-by: Daniel Lawton <dlawton@redhat.com>
---
 .../00-create-resources-missing-deps.yaml.template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/cmd/scaffold-controller/data/tests/dependency/00-create-resources-missing-deps.yaml.template b/cmd/scaffold-controller/data/tests/dependency/00-create-resources-missing-deps.yaml.template
index b07a4666c..d58086401 100644
--- a/cmd/scaffold-controller/data/tests/dependency/00-create-resources-missing-deps.yaml.template
+++ b/cmd/scaffold-controller/data/tests/dependency/00-create-resources-missing-deps.yaml.template
@@ -9,7 +9,7 @@ metadata:
   name: {{ $packageName }}-dependency
 spec:
   cloudCredentialsRef:
-    # TODO(scaffolding): Use openstack-admin if the resouce needs admin credentials to be created
+    # TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
     cloudName: openstack
     secretName: openstack-clouds
   managementPolicy: managed
@@ -25,7 +25,7 @@ metadata:
   name: {{ $packageName }}-dependency-no-{{ . | lower }}
 spec:
   cloudCredentialsRef:
-    # TODO(scaffolding): Use openstack-admin if the resouce needs admin credentials to be created
+    # TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
     cloudName: openstack
     secretName: openstack-clouds
   managementPolicy: managed
@@ -37,9 +37,9 @@ spec:
     {{ . | camelCase }}Ref: {{ $packageName }}-dependency
 {{- end }}
     # TODO(scaffolding): Add the necessary fields to create the resource
-{{- end }}
-{{- end }}
-{{- range .OptionalCreateDependencies }}
+{{ end -}}
+{{ end -}}
+{{ range .OptionalCreateDependencies -}}
 ---
 apiVersion: openstack.k-orc.cloud/v1alpha1
 kind: {{ $kind }}
@@ -47,7 +47,7 @@ metadata:
   name: {{ $packageName }}-dependency-no-{{ . | lower }}
 spec:
   cloudCredentialsRef:
-    # TODO(scaffolding): Use openstack-admin if the resouce needs admin credentials to be created
+    # TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
     cloudName: openstack
     secretName: openstack-clouds
   managementPolicy: managed
@@ -65,7 +65,7 @@ metadata:
   name: {{ .PackageName }}-dependency-no-secret
 spec:
   cloudCredentialsRef:
-    # TODO(scaffolding): Use openstack-admin if the resouce needs admin credentials to be created
+    # TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created
     cloudName: openstack
     secretName: {{ .PackageName }}-dependency
   managementPolicy: managed