Merge pull request #644 from shiftstack/scaffolding-fixes

mandre · web-flow · commit f5a4f9e0f50c · 2026-01-15T14:37:13.000Z
Scaffolding fixes
diff --git a/cmd/scaffold-controller/data/tests/create-full/00-create-resource.yaml.template b/cmd/scaffold-controller/data/tests/create-full/00-create-resource.yaml.template
@@ -7,7 +7,7 @@ metadata:
   name: {{ $packageName }}-create-full
 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
@@ -21,7 +21,7 @@ metadata:
   name: {{ .PackageName }}-create-full
 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
diff --git a/cmd/scaffold-controller/data/tests/create-minimal/00-create-resource.yaml.template b/cmd/scaffold-controller/data/tests/create-minimal/00-create-resource.yaml.template
@@ -7,7 +7,7 @@ metadata:
   name: {{ $packageName }}-create-minimal
 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
@@ -21,7 +21,7 @@ metadata:
   name: {{ .PackageName }}-create-minimal
 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
@@ -30,7 +30,7 @@ spec:
 {{- if len .RequiredCreateDependencies }}
   resource:
 {{- range .RequiredCreateDependencies }}
-    {{ . | camelCase }}Ref: {{ $packageName }}-create-full
+    {{ . | camelCase }}Ref: {{ $packageName }}-create-minimal
 {{- end }}
 {{- else }}
   resource: {}
diff --git a/cmd/scaffold-controller/data/tests/dependency/01-create-dependencies.yaml.template b/cmd/scaffold-controller/data/tests/dependency/01-create-dependencies.yaml.template
@@ -14,7 +14,7 @@ metadata:
   name: {{ $packageName }}-dependency-pending
 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
@@ -29,7 +29,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
diff --git a/cmd/scaffold-controller/data/tests/import-dependency/01-create-trap-resource.yaml.template b/cmd/scaffold-controller/data/tests/import-dependency/01-create-trap-resource.yaml.template
@@ -7,22 +7,7 @@ metadata:
   name: {{ $packageName }}-import-dependency-not-this-one
 spec:
   cloudCredentialsRef:
-    # TODO(scaffolding): Use openstack-admin if the resouce needs admin credentials to be created
-    cloudName: openstack
-    secretName: openstack-clouds
-  managementPolicy: managed
-  # TODO(scaffolding): Add the necessary fields to create the resource
-  resource: {}
-{{ end -}}
-{{ range .RequiredCreateDependencies -}}
----
-apiVersion: openstack.k-orc.cloud/v1alpha1
-kind: {{ . }}
-metadata:
-  name: {{ $packageName }}-import-dependency-not-this-one
-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,14 +22,11 @@ metadata:
   name: {{ $packageName }}-import-dependency-not-this-one
 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
   resource:
-{{- range .RequiredCreateDependencies }}
-    {{ . | camelCase }}Ref: {{ $packageName }}-import-dependency-not-this-one
-{{- end }}
 {{- range .ImportDependencies }}
     {{ . | camelCase }}Ref: {{ $packageName }}-import-dependency-not-this-one
 {{- end }}
diff --git a/cmd/scaffold-controller/data/tests/import-dependency/02-create-resource.yaml.template b/cmd/scaffold-controller/data/tests/import-dependency/02-create-resource.yaml.template
@@ -1,19 +1,4 @@
 {{ $packageName := .PackageName -}}
-{{ range .RequiredCreateDependencies -}}
----
-apiVersion: openstack.k-orc.cloud/v1alpha1
-kind: {{ . }}
-metadata:
-  name: {{ $packageName }}-import-dependency-external
-spec:
-  cloudCredentialsRef:
-    # TODO(scaffolding): Use openstack-admin if the resouce needs admin credentials to be created
-    cloudName: openstack
-    secretName: openstack-clouds
-  managementPolicy: managed
-  # TODO(scaffolding): Add the necessary fields to create the resource
-  resource: {}
-{{ end -}}
 {{ range .ImportDependencies -}}
 ---
 apiVersion: openstack.k-orc.cloud/v1alpha1
@@ -22,7 +7,7 @@ metadata:
   name: {{ $packageName }}-import-dependency-external
 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
@@ -36,14 +21,11 @@ metadata:
   name: {{ $packageName }}-import-dependency-external
 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-admin
     secretName: openstack-clouds
   managementPolicy: managed
   resource:
-{{- range .RequiredCreateDependencies }}
-    {{ . | camelCase }}Ref: {{ $packageName }}-import-dependency-external
-{{- end }}
 {{- range .ImportDependencies }}
     {{ . | camelCase }}Ref: {{ $packageName }}-import-dependency-external
 {{- end }}
diff --git a/cmd/scaffold-controller/data/tests/import-error/00-create-resources.yaml.template b/cmd/scaffold-controller/data/tests/import-error/00-create-resources.yaml.template
@@ -7,7 +7,7 @@ metadata:
   name: {{ $packageName }}-import-error
 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
@@ -21,7 +21,7 @@ metadata:
   name: {{ .PackageName }}-import-error-external-1
 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
@@ -38,7 +38,7 @@ metadata:
   name: {{ .PackageName }}-import-error-external-2
 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
diff --git a/cmd/scaffold-controller/data/tests/import/01-create-trap-resource.yaml.template b/cmd/scaffold-controller/data/tests/import/01-create-trap-resource.yaml.template
@@ -7,7 +7,7 @@ metadata:
   name: {{ $packageName }}-import-external-not-this-one
 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
@@ -24,7 +24,7 @@ metadata:
   name: {{ .PackageName }}-import-external-not-this-one
 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
diff --git a/cmd/scaffold-controller/data/tests/import/02-create-resource.yaml.template b/cmd/scaffold-controller/data/tests/import/02-create-resource.yaml.template
@@ -7,7 +7,7 @@ metadata:
   name: {{ $packageName }}-import
 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
@@ -21,7 +21,7 @@ metadata:
   name: {{ .PackageName }}-import-external
 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
diff --git a/cmd/scaffold-controller/data/tests/update/00-minimal-resource.yaml.template b/cmd/scaffold-controller/data/tests/update/00-minimal-resource.yaml.template
@@ -7,7 +7,7 @@ metadata:
   name: {{ $packageName }}-update
 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
@@ -21,7 +21,7 @@ metadata:
   name: {{ .PackageName }}-update
 spec:
   cloudCredentialsRef:
-    # TODO(scaffolding): Use openstack-admin if the resouce needs admin credentials to be created or updated
+    # TODO(scaffolding): Use openstack-admin if the resource needs admin credentials to be created or updated
     cloudName: openstack
     secretName: openstack-clouds
   managementPolicy: managed
diff --git a/cmd/scaffold-controller/data/tests/update/00-secret.yaml.template b/cmd/scaffold-controller/data/tests/update/00-secret.yaml.template
diff --git a/config/samples/openstack_v1alpha1_domain.yaml b/config/samples/openstack_v1alpha1_domain.yaml
@@ -5,10 +5,9 @@ metadata:
   name: domain-sample
 spec:
   cloudCredentialsRef:
-    # TODO(scaffolding): Use openstack-admin if the resouce needs admin credentials to be created
-    cloudName: openstack
+    cloudName: openstack-admin
     secretName: openstack-clouds
   managementPolicy: managed
   resource:
     description: Sample Domain
-    # TODO(scaffolding): Add all fields the resource supports
+    enabled: true
diff --git a/internal/controllers/port/actuator.go b/internal/controllers/port/actuator.go
@@ -521,10 +521,10 @@ func handlePortSecurityUpdate(updateOpts ports.UpdateOptsBuilder, resource *reso
 	return updateOpts
 }
 
-func handleAdminStateUpUpdate(updateOpts *ports.UpdateOpts, resource *resourceSpecT, osResouce *osResourceT) {
+func handleAdminStateUpUpdate(updateOpts *ports.UpdateOpts, resource *resourceSpecT, osResource *osResourceT) {
 	adminStateUp := resource.AdminStateUp
 	if adminStateUp != nil {
-		if *adminStateUp != osResouce.AdminStateUp {
+		if *adminStateUp != osResource.AdminStateUp {
 			updateOpts.AdminStateUp = adminStateUp
 		}
 	}
