Add ResourceName generic function for raycluster_webhook tests

Author: ChristianZaccaria

pkg/controllers/raycluster_webhook_test.go

@@ -17,6 +17,8 @@ limitations under the License.
 package controllers
 
 import (
+	"fmt"
+	"reflect"
 	"testing"
 
 	. "github.com/onsi/gomega"
@@ -103,7 +105,7 @@ func TestRayClusterWebhookDefault(t *testing.T) {
 			To(
 				And(
 					HaveLen(1),
-					ContainElement(WithTransform(ContainerName, Equal(oauthProxyContainerName))),
+					ContainElement(WithTransform(ResourceName, Equal(oauthProxyContainerName))),
 				),
 				"Expected the OAuth proxy container to be present in the head group",
 			)
@@ -114,9 +116,9 @@ func TestRayClusterWebhookDefault(t *testing.T) {
 			To(
 				And(
 					HaveLen(3),
-					ContainElement(WithTransform(VolumeName, Equal(oauthProxyVolumeName))),
-					ContainElement(WithTransform(VolumeName, Equal("ca-vol"))),
-					ContainElement(WithTransform(VolumeName, Equal("server-cert"))),
+					ContainElement(WithTransform(ResourceName, Equal(oauthProxyVolumeName))),
+					ContainElement(WithTransform(ResourceName, Equal("ca-vol"))),
+					ContainElement(WithTransform(ResourceName, Equal("server-cert"))),
 				),
 				"Expected the OAuth proxy TLS secret and CA volumes to be present in the head group",
 			)
@@ -133,12 +135,12 @@ func TestRayClusterWebhookDefault(t *testing.T) {
 			To(
 				And(
 					HaveLen(6),
-					ContainElement(WithTransform(EnvVarName, Equal("COOKIE_SECRET"))),
-					ContainElement(WithTransform(EnvVarName, Equal("MY_POD_IP"))),
-					ContainElement(WithTransform(EnvVarName, Equal("RAY_USE_TLS"))),
-					ContainElement(WithTransform(EnvVarName, Equal("RAY_TLS_SERVER_CERT"))),
-					ContainElement(WithTransform(EnvVarName, Equal("RAY_TLS_SERVER_KEY"))),
-					ContainElement(WithTransform(EnvVarName, Equal("RAY_TLS_CA_CERT"))),
+					ContainElement(WithTransform(ResourceName, Equal("COOKIE_SECRET"))),
+					ContainElement(WithTransform(ResourceName, Equal("MY_POD_IP"))),
+					ContainElement(WithTransform(ResourceName, Equal("RAY_USE_TLS"))),
+					ContainElement(WithTransform(ResourceName, Equal("RAY_TLS_SERVER_CERT"))),
+					ContainElement(WithTransform(ResourceName, Equal("RAY_TLS_SERVER_KEY"))),
+					ContainElement(WithTransform(ResourceName, Equal("RAY_TLS_CA_CERT"))),
 				),
 				"Expected the required environment variables to be present in the head group",
 			)
@@ -149,7 +151,7 @@ func TestRayClusterWebhookDefault(t *testing.T) {
 			To(
 				And(
 					HaveLen(1),
-					ContainElement(WithTransform(ContainerName, Equal(initContainerName))),
+					ContainElement(WithTransform(ResourceName, Equal(initContainerName))),
 				),
 				"Expected the create-cert init container to be present in the head group",
 			)
@@ -160,9 +162,9 @@ func TestRayClusterWebhookDefault(t *testing.T) {
 			To(
 				And(
 					HaveLen(3),
-					ContainElement(WithTransform(VolumeMountName, Equal(oauthProxyVolumeName))),
-					ContainElement(WithTransform(VolumeMountName, Equal("ca-vol"))),
-					ContainElement(WithTransform(VolumeMountName, Equal("server-cert"))),
+					ContainElement(WithTransform(ResourceName, Equal(oauthProxyVolumeName))),
+					ContainElement(WithTransform(ResourceName, Equal("ca-vol"))),
+					ContainElement(WithTransform(ResourceName, Equal("server-cert"))),
 				),
 				"Expected the OAuth proxy TLS secret and CA volume mounts to be present in the head group",
 			)
@@ -174,11 +176,11 @@ func TestRayClusterWebhookDefault(t *testing.T) {
 				To(
 					And(
 						HaveLen(5),
-						ContainElement(WithTransform(EnvVarName, Equal("MY_POD_IP"))),
-						ContainElement(WithTransform(EnvVarName, Equal("RAY_USE_TLS"))),
-						ContainElement(WithTransform(EnvVarName, Equal("RAY_TLS_SERVER_CERT"))),
-						ContainElement(WithTransform(EnvVarName, Equal("RAY_TLS_SERVER_KEY"))),
-						ContainElement(WithTransform(EnvVarName, Equal("RAY_TLS_CA_CERT"))),
+						ContainElement(WithTransform(ResourceName, Equal("MY_POD_IP"))),
+						ContainElement(WithTransform(ResourceName, Equal("RAY_USE_TLS"))),
+						ContainElement(WithTransform(ResourceName, Equal("RAY_TLS_SERVER_CERT"))),
+						ContainElement(WithTransform(ResourceName, Equal("RAY_TLS_SERVER_KEY"))),
+						ContainElement(WithTransform(ResourceName, Equal("RAY_TLS_CA_CERT"))),
 					),
 					"Expected the required environment variables to be present in each worker group",
 				)
@@ -191,8 +193,8 @@ func TestRayClusterWebhookDefault(t *testing.T) {
 				To(
 					And(
 						HaveLen(2),
-						ContainElement(WithTransform(VolumeName, Equal("ca-vol"))),
-						ContainElement(WithTransform(VolumeName, Equal("server-cert"))),
+						ContainElement(WithTransform(ResourceName, Equal("ca-vol"))),
+						ContainElement(WithTransform(ResourceName, Equal("server-cert"))),
 					),
 					"Expected the required CA volumes to be present in each worker group",
 				)
@@ -205,8 +207,8 @@ func TestRayClusterWebhookDefault(t *testing.T) {
 				To(
 					And(
 						HaveLen(2),
-						ContainElement(WithTransform(VolumeMountName, Equal("ca-vol"))),
-						ContainElement(WithTransform(VolumeMountName, Equal("server-cert"))),
+						ContainElement(WithTransform(ResourceName, Equal("ca-vol"))),
+						ContainElement(WithTransform(ResourceName, Equal("server-cert"))),
 					),
 					"Expected the required certificate volume mounts to be present in each worker group",
 				)
@@ -219,7 +221,7 @@ func TestRayClusterWebhookDefault(t *testing.T) {
 				To(
 					And(
 						HaveLen(1),
-						ContainElement(WithTransform(ContainerName, Equal(initContainerName))),
+						ContainElement(WithTransform(ResourceName, Equal(initContainerName))),
 					),
 					"Expected the required init container to be present in each worker group",
 				)
@@ -646,22 +648,10 @@ func TestValidateUpdate(t *testing.T) {
 	})
 }
 
-func ContainerName(container corev1.Container) string {
-	return container.Name
-}
-
-func VolumeName(volume corev1.Volume) string {
-	return volume.Name
-}
-
-func ServiceAccountName(serviceAccount corev1.ServiceAccount) string {
-	return serviceAccount.Name
-}
-
-func VolumeMountName(volumeMount corev1.VolumeMount) string {
-	return volumeMount.Name
-}
-
-func EnvVarName(envVar corev1.EnvVar) string {
-	return envVar.Name
+func ResourceName(obj any) (string, error) {
+	value := reflect.ValueOf(obj)
+	if value.Kind() != reflect.Struct {
+		return "", fmt.Errorf("input must be a struct")
+	}
+	return value.FieldByName("Name").String(), nil
 }