[profiles] Improve DAP name length error

pkg/agentprofile/agent_profile.go

@@ -29,6 +29,7 @@ const (
 	OldProfileLabelKey  = "agent.datadoghq.com/profile"
 	defaultProfileName  = "default"
 	daemonSetNamePrefix = "datadog-agent-with-profile-"
+	labelValueMaxLength = 63
 )
 
 // ProfileToApply validates a profile spec and returns a map that maps each
@@ -44,6 +45,14 @@ func ProfileToApply(logger logr.Logger, profile *datadoghqv1alpha1.DatadogAgentP
 		profileStatus.CurrentHash = hash
 	}
 
+	if err := validateProfileName(profile.Name); err != nil {
+		logger.Error(err, "profile name is invalid, skipping", "datadogagentprofile", profile.Name, "datadogagentprofile_namespace", profile.Namespace)
+		profileStatus.Conditions = SetDatadogAgentProfileCondition(profileStatus.Conditions, NewDatadogAgentProfileCondition(ValidConditionType, metav1.ConditionFalse, now, InvalidConditionReason, err.Error()))
+		profileStatus.Valid = metav1.ConditionFalse
+		UpdateProfileStatus(profile, profileStatus, now)
+		return profileAppliedByNode, err
+	}
+
 	if err := datadoghqv1alpha1.ValidateDatadogAgentProfileSpec(&profile.Spec); err != nil {
 		logger.Error(err, "profile spec is invalid, skipping", "datadogagentprofile", profile.Name, "datadogagentprofile_namespace", profile.Namespace)
 		profileStatus.Conditions = SetDatadogAgentProfileCondition(profileStatus.Conditions, NewDatadogAgentProfileCondition(ValidConditionType, metav1.ConditionFalse, now, InvalidConditionReason, err.Error()))
@@ -350,3 +359,16 @@ func nodeSelectorOperatorToSelectionOperator(op v1.NodeSelectorOperator) selecti
 		return ""
 	}
 }
+
+func validateProfileName(profileName string) error {
+	// Label values can be empty but a profile's name should not be empty
+	if profileName == "" {
+		return fmt.Errorf("Profile name cannot be empty")
+	}
+	// We add the profile name as a label value, which can be 63 characters max
+	if len(profileName) > labelValueMaxLength {
+		return fmt.Errorf("Profile name must be no more than 63 characters")
+	}
+
+	return nil
+}

pkg/agentprofile/agent_profile_test.go

@@ -50,7 +50,7 @@ func TestProfileToApply(t *testing.T) {
 			},
 			profileAppliedByNode:           map[string]types.NamespacedName{},
 			expectedProfilesAppliedPerNode: map[string]types.NamespacedName{},
-			expectedErr:                    fmt.Errorf("profileAffinity must be defined"),
+			expectedErr:                    fmt.Errorf("Profile name cannot be empty"),
 		},
 		{
 			name:    "empty profile, non-empty profileAppliedByNode",
@@ -77,7 +77,7 @@ func TestProfileToApply(t *testing.T) {
 					Name:      "linux",
 				},
 			},
-			expectedErr: fmt.Errorf("profileAffinity must be defined"),
+			expectedErr: fmt.Errorf("Profile name cannot be empty"),
 		},
 		{
 			name:    "empty profile, , non-empty profileAppliedByNode, no nodes",
@@ -95,7 +95,7 @@ func TestProfileToApply(t *testing.T) {
 					Name:      "linux",
 				},
 			},
-			expectedErr: fmt.Errorf("profileAffinity must be defined"),
+			expectedErr: fmt.Errorf("Profile name cannot be empty"),
 		},
 		{
 			name:    "non-conflicting profile, empty profileAppliedByNode",
@@ -549,3 +549,33 @@ func configWithCPURequestOverrideForCoreAgent(cpuRequest string) *v1alpha1.Confi
 		},
 	}
 }
+
+func Test_validateProfileName(t *testing.T) {
+	tests := []struct {
+		name          string
+		profileName   string
+		expectedError error
+	}{
+		{
+			name:          "empty profile name",
+			profileName:   "",
+			expectedError: fmt.Errorf("Profile name cannot be empty"),
+		},
+		{
+			name:          "valid profile name",
+			profileName:   "foo",
+			expectedError: nil,
+		},
+		{
+			name:          "profile name too long",
+			profileName:   "foo123456789012345678901234567890123456789012345678901234567890bar",
+			expectedError: fmt.Errorf("Profile name must be no more than 63 characters"),
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			assert.Equal(t, test.expectedError, validateProfileName(test.profileName))
+		})
+	}
+}