From ac9245755175d93d453344777175267d695ad6f4 Mon Sep 17 00:00:00 2001 From: "Paul S. Schweigert" <44698588+psschwei@users.noreply.github.com> Date: Mon, 19 Apr 2021 15:42:41 -0400 Subject: [PATCH] allow dot character in resource names --- .../v1alpha1/condition_validation_test.go | 9 --------- .../v1alpha1/pipeline_validation_test.go | 12 ------------ .../v1alpha1/pipelinerun_validation_test.go | 11 ----------- .../pipeline/v1alpha1/run_validation_test.go | 10 ---------- .../v1alpha1/taskrun_validation_test.go | 7 ------- .../v1beta1/pipeline_validation_test.go | 12 ------------ .../v1beta1/pipelinerun_validation_test.go | 19 +------------------ .../v1beta1/taskrun_validation_test.go | 14 -------------- pkg/apis/validate/metadata.go | 9 --------- pkg/apis/validate/metadata_test.go | 1 - 10 files changed, 1 insertion(+), 103 deletions(-) diff --git a/pkg/apis/pipeline/v1alpha1/condition_validation_test.go b/pkg/apis/pipeline/v1alpha1/condition_validation_test.go index 2e408010f56..f71e02f768d 100644 --- a/pkg/apis/pipeline/v1alpha1/condition_validation_test.go +++ b/pkg/apis/pipeline/v1alpha1/condition_validation_test.go @@ -54,15 +54,6 @@ func TestCondition_Invalid(t *testing.T) { cond *v1alpha1.Condition expectedError apis.FieldError }{{ - name: "invalid meta", - cond: &v1alpha1.Condition{ - ObjectMeta: metav1.ObjectMeta{Name: "invalid.,name"}, - }, - expectedError: apis.FieldError{ - Message: "Invalid resource name: special character . must not be present", - Paths: []string{"metadata.name"}, - }, - }, { name: "no image", cond: &v1alpha1.Condition{ ObjectMeta: metav1.ObjectMeta{Name: "condname"}, diff --git a/pkg/apis/pipeline/v1alpha1/pipeline_validation_test.go b/pkg/apis/pipeline/v1alpha1/pipeline_validation_test.go index 61315899761..c01fc8b5102 100644 --- a/pkg/apis/pipeline/v1alpha1/pipeline_validation_test.go +++ b/pkg/apis/pipeline/v1alpha1/pipeline_validation_test.go @@ -44,18 +44,6 @@ func TestPipeline_Validate(t *testing.T) { }, }, failureExpected: false, - }, { - name: "period in name", - p: &v1alpha1.Pipeline{ - ObjectMeta: metav1.ObjectMeta{Name: "pipe.line"}, - Spec: v1alpha1.PipelineSpec{ - Tasks: []v1alpha1.PipelineTask{{ - Name: "foo", - TaskRef: &v1alpha1.TaskRef{Name: "foo-task"}, - }}, - }, - }, - failureExpected: true, }, { name: "pipeline name too long", p: &v1alpha1.Pipeline{ diff --git a/pkg/apis/pipeline/v1alpha1/pipelinerun_validation_test.go b/pkg/apis/pipeline/v1alpha1/pipelinerun_validation_test.go index 3ce98a0e69c..ca6132b1775 100644 --- a/pkg/apis/pipeline/v1alpha1/pipelinerun_validation_test.go +++ b/pkg/apis/pipeline/v1alpha1/pipelinerun_validation_test.go @@ -45,17 +45,6 @@ func TestPipelineRun_Invalidate(t *testing.T) { want: apis.ErrMissingField("spec"), }, { - name: "invalid pipelinerun metadata", - pr: v1alpha1.PipelineRun{ - ObjectMeta: metav1.ObjectMeta{ - Name: "pipelinerun.name", - }, - }, - want: &apis.FieldError{ - Message: "Invalid resource name: special character . must not be present", - Paths: []string{"metadata.name"}, - }, - }, { name: "no pipeline reference", pr: v1alpha1.PipelineRun{ ObjectMeta: metav1.ObjectMeta{ diff --git a/pkg/apis/pipeline/v1alpha1/run_validation_test.go b/pkg/apis/pipeline/v1alpha1/run_validation_test.go index baa827d7f4c..fbfc6b3e92a 100644 --- a/pkg/apis/pipeline/v1alpha1/run_validation_test.go +++ b/pkg/apis/pipeline/v1alpha1/run_validation_test.go @@ -25,7 +25,6 @@ import ( v1beta1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1" "github.com/tektoncd/pipeline/test/diff" corev1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "knative.dev/pkg/apis" ) @@ -38,15 +37,6 @@ func TestRun_Invalid(t *testing.T) { name: "missing spec", run: &v1alpha1.Run{}, want: apis.ErrMissingField("spec"), - }, { - name: "invalid metadata", - run: &v1alpha1.Run{ - ObjectMeta: metav1.ObjectMeta{Name: "run.name"}, - }, - want: &apis.FieldError{ - Message: "Invalid resource name: special character . must not be present", - Paths: []string{"metadata.name"}, - }, }, { name: "missing ref", run: &v1alpha1.Run{ diff --git a/pkg/apis/pipeline/v1alpha1/taskrun_validation_test.go b/pkg/apis/pipeline/v1alpha1/taskrun_validation_test.go index 2772ea1462b..7f96fcbb08d 100644 --- a/pkg/apis/pipeline/v1alpha1/taskrun_validation_test.go +++ b/pkg/apis/pipeline/v1alpha1/taskrun_validation_test.go @@ -40,13 +40,6 @@ func TestTaskRun_Invalid(t *testing.T) { name: "invalid taskspec", task: tb.TaskRun("taskmetaname"), want: apis.ErrMissingField("spec"), - }, { - name: "invalid taskrun metadata", - task: tb.TaskRun("task.name"), - want: &apis.FieldError{ - Message: "Invalid resource name: special character . must not be present", - Paths: []string{"metadata.name"}, - }, }} for _, ts := range tests { t.Run(ts.name, func(t *testing.T) { diff --git a/pkg/apis/pipeline/v1beta1/pipeline_validation_test.go b/pkg/apis/pipeline/v1beta1/pipeline_validation_test.go index 03c385c0123..37e394cb011 100644 --- a/pkg/apis/pipeline/v1beta1/pipeline_validation_test.go +++ b/pkg/apis/pipeline/v1beta1/pipeline_validation_test.go @@ -134,18 +134,6 @@ func TestPipeline_Validate_Failure(t *testing.T) { expectedError apis.FieldError wc func(context.Context) context.Context }{{ - name: "period in name", - p: &Pipeline{ - ObjectMeta: metav1.ObjectMeta{Name: "pipe.line"}, - Spec: PipelineSpec{ - Tasks: []PipelineTask{{Name: "foo", TaskRef: &TaskRef{Name: "foo-task"}}}, - }, - }, - expectedError: apis.FieldError{ - Message: `Invalid resource name: special character . must not be present`, - Paths: []string{"metadata.name"}, - }, - }, { name: "pipeline name too long", p: &Pipeline{ ObjectMeta: metav1.ObjectMeta{Name: "asdf123456789012345678901234567890123456789012345678901234567890"}, diff --git a/pkg/apis/pipeline/v1beta1/pipelinerun_validation_test.go b/pkg/apis/pipeline/v1beta1/pipelinerun_validation_test.go index aaa5d0e1296..0bebde6d08c 100644 --- a/pkg/apis/pipeline/v1beta1/pipelinerun_validation_test.go +++ b/pkg/apis/pipeline/v1beta1/pipelinerun_validation_test.go @@ -37,24 +37,7 @@ func TestPipelineRun_Invalid(t *testing.T) { pr v1beta1.PipelineRun want *apis.FieldError wc func(context.Context) context.Context - }{ - { - name: "invalid pipelinerun metadata", - pr: v1beta1.PipelineRun{ - ObjectMeta: metav1.ObjectMeta{ - Name: "pipelinerun.name", - }, - Spec: v1beta1.PipelineRunSpec{ - PipelineRef: &v1beta1.PipelineRef{ - Name: "prname", - }, - }, - }, - want: &apis.FieldError{ - Message: "Invalid resource name: special character . must not be present", - Paths: []string{"metadata.name"}, - }, - }, { + }{{ name: "no pipeline reference", pr: v1beta1.PipelineRun{ ObjectMeta: metav1.ObjectMeta{ diff --git a/pkg/apis/pipeline/v1beta1/taskrun_validation_test.go b/pkg/apis/pipeline/v1beta1/taskrun_validation_test.go index 4fe47be7ba4..2979aca5ea3 100644 --- a/pkg/apis/pipeline/v1beta1/taskrun_validation_test.go +++ b/pkg/apis/pipeline/v1beta1/taskrun_validation_test.go @@ -39,20 +39,6 @@ func TestTaskRun_Invalidate(t *testing.T) { name: "invalid taskspec", task: &v1beta1.TaskRun{}, want: apis.ErrMissingField("spec.taskref.name", "spec.taskspec"), - }, { - name: "invalid taskrun metadata", - task: &v1beta1.TaskRun{ - ObjectMeta: metav1.ObjectMeta{ - Name: "task.name", - }, - Spec: v1beta1.TaskRunSpec{ - TaskRef: &v1beta1.TaskRef{Name: "task"}, - }, - }, - want: &apis.FieldError{ - Message: "Invalid resource name: special character . must not be present", - Paths: []string{"metadata.name"}, - }, }} for _, ts := range tests { t.Run(ts.name, func(t *testing.T) { diff --git a/pkg/apis/validate/metadata.go b/pkg/apis/validate/metadata.go index d943d4a9ae1..147234ad4c4 100644 --- a/pkg/apis/validate/metadata.go +++ b/pkg/apis/validate/metadata.go @@ -17,8 +17,6 @@ limitations under the License. package validate import ( - "strings" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "knative.dev/pkg/apis" ) @@ -28,13 +26,6 @@ const MaxLength = 63 func ObjectMetadata(meta metav1.Object) *apis.FieldError { name := meta.GetName() - if strings.Contains(name, ".") { - return &apis.FieldError{ - Message: "Invalid resource name: special character . must not be present", - Paths: []string{"name"}, - } - } - if len(name) > MaxLength { return &apis.FieldError{ Message: "Invalid resource name: length must be no more than 63 characters", diff --git a/pkg/apis/validate/metadata_test.go b/pkg/apis/validate/metadata_test.go index 08db611bb15..1eeabe6c53b 100644 --- a/pkg/apis/validate/metadata_test.go +++ b/pkg/apis/validate/metadata_test.go @@ -28,7 +28,6 @@ func TestMetadataInvalidLongName(t *testing.T) { invalidMetas := []*metav1.ObjectMeta{ {Name: strings.Repeat("s", validate.MaxLength+1)}, - {Name: "bad.name"}, } for _, invalidMeta := range invalidMetas { if err := validate.ObjectMetadata(invalidMeta); err == nil {