test: Add workerconfig variable tests

Author: jimmidyson

api/v1alpha1/workerconfig_types.go

@@ -7,7 +7,6 @@ import (
 	"maps"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 )
 
@@ -32,7 +31,7 @@ type WorkerConfigSpec struct {
 	Docker *DockerWorkerSpec `json:"docker,omitempty"`
 }
 
-func (s WorkerConfigSpec) VariableSchema() clusterv1.VariableSchema { //nolint:gocritic,lll // Passed by value for no potential side-effect.
+func (s WorkerConfigSpec) VariableSchema() clusterv1.VariableSchema {
 	workerConfigProps := GenericWorkerConfig{}.VariableSchema()
 
 	switch {
@@ -65,8 +64,7 @@ func (s WorkerConfigSpec) VariableSchema() clusterv1.VariableSchema { //nolint:g
 	return workerConfigProps
 }
 
-type GenericWorkerConfig struct {
-}
+type GenericWorkerConfig struct{}
 
 func (GenericWorkerConfig) VariableSchema() clusterv1.VariableSchema {
 	return clusterv1.VariableSchema{

api/v1alpha1/zz_generated.deepcopy.go

@@ -37,30 +37,32 @@ func ValidateDiscoverVariables[T mutation.DiscoverVariables](
 
 	t.Parallel()
 
+	g := gomega.NewWithT(t)
+	h := handlerCreator()
+	resp := &runtimehooksv1.DiscoverVariablesResponse{}
+	h.DiscoverVariables(
+		context.Background(),
+		&runtimehooksv1.DiscoverVariablesRequest{},
+		resp,
+	)
+
+	g.Expect(resp.Status).To(gomega.Equal(runtimehooksv1.ResponseStatusSuccess))
+	g.Expect(resp.Variables).To(gomega.HaveLen(1))
+
+	variable := resp.Variables[0]
+	g.Expect(variable).To(gstruct.MatchFields(gstruct.IgnoreExtras, gstruct.Fields{
+		"Name":     gomega.Equal(variableName),
+		"Required": gomega.Equal(variableRequired),
+		"Schema":   gomega.Equal(*variableSchema),
+	}))
+
 	for idx := range variableTestDefs {
 		tt := variableTestDefs[idx]
 
 		t.Run(tt.Name, func(t *testing.T) {
 			t.Parallel()
 
 			g := gomega.NewWithT(t)
-			h := handlerCreator()
-			resp := &runtimehooksv1.DiscoverVariablesResponse{}
-			h.DiscoverVariables(
-				context.Background(),
-				&runtimehooksv1.DiscoverVariablesRequest{},
-				resp,
-			)
-
-			g.Expect(resp.Status).To(gomega.Equal(runtimehooksv1.ResponseStatusSuccess))
-			g.Expect(resp.Variables).To(gomega.HaveLen(1))
-
-			variable := resp.Variables[0]
-			g.Expect(variable).To(gstruct.MatchFields(gstruct.IgnoreExtras, gstruct.Fields{
-				"Name":     gomega.Equal(variableName),
-				"Required": gomega.Equal(variableRequired),
-				"Schema":   gomega.Equal(*variableSchema),
-			}))
 
 			encodedVals, err := json.Marshal(tt.Vals)
 			g.Expect(err).NotTo(gomega.HaveOccurred())

common/pkg/testutils/capitest/variables.go

@@ -1,7 +1,7 @@
 // Copyright 2023 D2iQ, Inc. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package clusterconfig
+package workerconfig
 
 import (
 	"context"

pkg/handlers/aws/workerconfig/variables.go

@@ -0,0 +1,24 @@
+// Copyright 2023 D2iQ, Inc. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package workerconfig
+
+import (
+	"testing"
+
+	"k8s.io/utils/ptr"
+
+	"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
+	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/testutils/capitest"
+	"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/workerconfig"
+)
+
+func TestVariableValidation(t *testing.T) {
+	capitest.ValidateDiscoverVariables(
+		t,
+		workerconfig.MetaVariableName,
+		ptr.To(v1alpha1.WorkerConfigSpec{AWS: &v1alpha1.AWSWorkerSpec{}}.VariableSchema()),
+		false,
+		NewVariable,
+	)
+}

pkg/handlers/aws/workerconfig/variables_test.go

@@ -0,0 +1,24 @@
+// Copyright 2023 D2iQ, Inc. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package workerconfig
+
+import (
+	"testing"
+
+	"k8s.io/utils/ptr"
+
+	"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
+	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/testutils/capitest"
+	"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/workerconfig"
+)
+
+func TestVariableValidation(t *testing.T) {
+	capitest.ValidateDiscoverVariables(
+		t,
+		workerconfig.MetaVariableName,
+		ptr.To(v1alpha1.WorkerConfigSpec{Docker: &v1alpha1.DockerWorkerSpec{}}.VariableSchema()),
+		false,
+		NewVariable,
+	)
+}

pkg/handlers/docker/workerconfig/variables_test.go

@@ -0,0 +1,23 @@
+// Copyright 2023 D2iQ, Inc. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package workerconfig
+
+import (
+	"testing"
+
+	"k8s.io/utils/ptr"
+
+	"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
+	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/testutils/capitest"
+)
+
+func TestVariableValidation(t *testing.T) {
+	capitest.ValidateDiscoverVariables(
+		t,
+		MetaVariableName,
+		ptr.To(v1alpha1.GenericWorkerConfig{}.VariableSchema()),
+		false,
+		NewVariable,
+	)
+}