use getters for object validation

gravitational · Sep 17, 2024 · 7b0a302 · 7b0a302
1 parent 6c98680
commit 7b0a302
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/api/types/userintegrationtasks/object.go b/api/types/userintegrationtasks/object.go
@@ -55,21 +55,19 @@ const (
 // ValidateUserIntegrationTask validates the UserIntegrationTask object without modifying it.
 func ValidateUserIntegrationTask(uit *userintegrationtasksv1.UserIntegrationTask) error {
 	switch {
-	case uit == nil:
-		return trace.BadParameter("user integration task is nil")
-	case uit.Kind != types.KindUserIntegrationTask:
+	case uit.GetKind() != types.KindUserIntegrationTask:
 		return trace.BadParameter("invalid kind")
-	case uit.Version != types.V1:
+	case uit.GetVersion() != types.V1:
 		return trace.BadParameter("invalid version")
-	case uit.SubKind != "":
+	case uit.GetSubKind() != "":
 		return trace.BadParameter("invalid sub kind, must be empty")
-	case uit.Metadata == nil:
+	case uit.GetMetadata() == nil:
 		return trace.BadParameter("user integration task metadata is nil")
-	case uit.Metadata.Name == "":
+	case uit.Metadata.GetName() == "":
 		return trace.BadParameter("user integration task name is empty")
-	case uit.Spec == nil:
+	case uit.GetSpec() == nil:
 		return trace.BadParameter("user integration task spec is nil")
-	case uit.Spec.Integration == "":
+	case uit.GetSpec().Integration == "":
 		return trace.BadParameter("integration is required")
 	}
 

diff --git a/lib/services/user_integration_task_test.go b/lib/services/user_integration_task_test.go
@@ -48,9 +48,9 @@ func TestMarshalUserIntegrationTaskRoundTrip(t *testing.T) {
 			Integration: "my-integration",
 			TaskType:    "discover-ec2",
 			IssueType:   "SSM_AGENT_MISSING",
+			State:       "OPEN",
 			DiscoverEc2: &userintegrationtasksv1.DiscoverEC2{Instances: map[string]*userintegrationtasksv1.DiscoverEC2Instance{
 				"i-1234567890": {
-					State:           "OPEN",
 					Name:            "instance-name",
 					Region:          "us-east-1",
 					InvocationUrl:   "https://example.com/",
@@ -114,9 +114,9 @@ spec:
 			Integration: "my-integration",
 			TaskType:    "discover-ec2",
 			IssueType:   "SSM_AGENT_MISSING",
+			State:       "OPEN",
 			DiscoverEc2: &userintegrationtasksv1.DiscoverEC2{Instances: map[string]*userintegrationtasksv1.DiscoverEC2Instance{
 				"i-1234567890": {
-					State:           "OPEN",
 					Name:            "instance-name",
 					Region:          "us-east-1",
 					InvocationUrl:   "https://example.com/",