Skip to content

Commit

Permalink
allow dot character in resource names
Browse files Browse the repository at this point in the history
  • Loading branch information
psschwei committed Apr 19, 2021
1 parent 879ba4f commit ac92457
Show file tree
Hide file tree
Showing 10 changed files with 1 addition and 103 deletions.
9 changes: 0 additions & 9 deletions pkg/apis/pipeline/v1alpha1/condition_validation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
Expand Down
12 changes: 0 additions & 12 deletions pkg/apis/pipeline/v1alpha1/pipeline_validation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
11 changes: 0 additions & 11 deletions pkg/apis/pipeline/v1alpha1/pipelinerun_validation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
10 changes: 0 additions & 10 deletions pkg/apis/pipeline/v1alpha1/run_validation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand All @@ -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{
Expand Down
7 changes: 0 additions & 7 deletions pkg/apis/pipeline/v1alpha1/taskrun_validation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
12 changes: 0 additions & 12 deletions pkg/apis/pipeline/v1beta1/pipeline_validation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
Expand Down
19 changes: 1 addition & 18 deletions pkg/apis/pipeline/v1beta1/pipelinerun_validation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
14 changes: 0 additions & 14 deletions pkg/apis/pipeline/v1beta1/taskrun_validation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
9 changes: 0 additions & 9 deletions pkg/apis/validate/metadata.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ limitations under the License.
package validate

import (
"strings"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"knative.dev/pkg/apis"
)
Expand All @@ -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",
Expand Down
1 change: 0 additions & 1 deletion pkg/apis/validate/metadata_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit ac92457

Please sign in to comment.