Skip to content

Commit 3dc52df

Browse files
psschweitekton-robot
psschwei
authored and
tekton-robot
committed
allow dot character in resource names
1 parent 1896d4e commit 3dc52df

File tree

12 files changed

+194
-139
lines changed

12 files changed

+194
-139
lines changed

‎examples/v1beta1/pipelineruns/pipelinerun.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ roleRef:
1717
apiVersion: tekton.dev/v1beta1
1818
kind: Task
1919
metadata:
20-
name: unit-tests
20+
name: "unit.tests"
2121
spec:
2222
workspaces:
2323
- name: source
@@ -222,7 +222,7 @@ spec:
222222
apiVersion: tekton.dev/v1beta1
223223
kind: Pipeline
224224
metadata:
225-
name: demo-pipeline
225+
name: "demo.pipeline"
226226
spec:
227227
params:
228228
- name: image-registry
@@ -244,7 +244,7 @@ spec:
244244
- name: skaffold-unit-tests
245245
runAfter: [fetch-from-git]
246246
taskRef:
247-
name: unit-tests
247+
name: "unit.tests"
248248
workspaces:
249249
- name: source
250250
workspace: git-source
@@ -313,7 +313,7 @@ metadata:
313313
name: demo-pipeline-run-1
314314
spec:
315315
pipelineRef:
316-
name: demo-pipeline
316+
name: "demo.pipeline"
317317
serviceAccountName: 'default'
318318
workspaces:
319319
- name: git-source

‎pkg/apis/pipeline/v1alpha1/condition_validation_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ func TestCondition_Invalid(t *testing.T) {
5656
}{{
5757
name: "invalid meta",
5858
cond: &v1alpha1.Condition{
59-
ObjectMeta: metav1.ObjectMeta{Name: "invalid.,name"},
59+
ObjectMeta: metav1.ObjectMeta{Name: "invalid,name"},
6060
},
6161
expectedError: apis.FieldError{
62-
Message: "Invalid resource name: special character . must not be present",
62+
Message: `invalid resource name "invalid,name": must be a valid DNS label`,
6363
Paths: []string{"metadata.name"},
6464
},
6565
}, {

‎pkg/apis/pipeline/v1alpha1/pipeline_validation_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ func TestPipeline_Validate(t *testing.T) {
4545
},
4646
failureExpected: false,
4747
}, {
48-
name: "period in name",
48+
name: "comma in name",
4949
p: &v1alpha1.Pipeline{
50-
ObjectMeta: metav1.ObjectMeta{Name: "pipe.line"},
50+
ObjectMeta: metav1.ObjectMeta{Name: "pipe,line"},
5151
Spec: v1alpha1.PipelineSpec{
5252
Tasks: []v1alpha1.PipelineTask{{
5353
Name: "foo",

‎pkg/apis/pipeline/v1alpha1/pipelinerun_validation_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,18 +48,18 @@ func TestPipelineRun_Invalidate(t *testing.T) {
4848
name: "invalid pipelinerun metadata",
4949
pr: v1alpha1.PipelineRun{
5050
ObjectMeta: metav1.ObjectMeta{
51-
Name: "pipelinerun.name",
51+
Name: "pipelinerun,name",
5252
},
5353
},
5454
want: &apis.FieldError{
55-
Message: "Invalid resource name: special character . must not be present",
55+
Message: `invalid resource name "pipelinerun,name": must be a valid DNS label`,
5656
Paths: []string{"metadata.name"},
5757
},
5858
}, {
5959
name: "no pipeline reference",
6060
pr: v1alpha1.PipelineRun{
6161
ObjectMeta: metav1.ObjectMeta{
62-
Name: "pipelinelineName",
62+
Name: "pipelinelinename",
6363
},
6464
Spec: v1alpha1.PipelineRunSpec{
6565
ServiceAccountName: "foo",
@@ -70,7 +70,7 @@ func TestPipelineRun_Invalidate(t *testing.T) {
7070
name: "negative pipeline timeout",
7171
pr: v1alpha1.PipelineRun{
7272
ObjectMeta: metav1.ObjectMeta{
73-
Name: "pipelinelineName",
73+
Name: "pipelinelinename",
7474
},
7575
Spec: v1alpha1.PipelineRunSpec{
7676
PipelineRef: &v1alpha1.PipelineRef{
@@ -102,7 +102,7 @@ func TestPipelineRun_Validate(t *testing.T) {
102102
name: "normal case",
103103
pr: v1alpha1.PipelineRun{
104104
ObjectMeta: metav1.ObjectMeta{
105-
Name: "pipelinelineName",
105+
Name: "pipelinelinename",
106106
},
107107
Spec: v1alpha1.PipelineRunSpec{
108108
PipelineRef: &v1alpha1.PipelineRef{
@@ -114,7 +114,7 @@ func TestPipelineRun_Validate(t *testing.T) {
114114
name: "no timeout",
115115
pr: v1alpha1.PipelineRun{
116116
ObjectMeta: metav1.ObjectMeta{
117-
Name: "pipelinelineName",
117+
Name: "pipelinelinename",
118118
},
119119
Spec: v1alpha1.PipelineRunSpec{
120120
PipelineRef: &v1alpha1.PipelineRef{

‎pkg/apis/pipeline/v1alpha1/run_validation_test.go‎

Lines changed: 34 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,18 @@ func TestRun_Invalid(t *testing.T) {
3636
want *apis.FieldError
3737
}{{
3838
name: "missing spec",
39-
run: &v1alpha1.Run{},
40-
want: apis.ErrMissingField("spec"),
41-
}, {
42-
name: "invalid metadata",
4339
run: &v1alpha1.Run{
44-
ObjectMeta: metav1.ObjectMeta{Name: "run.name"},
45-
},
46-
want: &apis.FieldError{
47-
Message: "Invalid resource name: special character . must not be present",
48-
Paths: []string{"metadata.name"},
40+
ObjectMeta: metav1.ObjectMeta{
41+
Name: "temp",
42+
},
4943
},
44+
want: apis.ErrMissingField("spec"),
5045
}, {
5146
name: "missing ref",
5247
run: &v1alpha1.Run{
48+
ObjectMeta: metav1.ObjectMeta{
49+
Name: "temp",
50+
},
5351
Spec: v1alpha1.RunSpec{
5452
Ref: nil,
5553
},
@@ -58,6 +56,9 @@ func TestRun_Invalid(t *testing.T) {
5856
}, {
5957
name: "missing apiVersion",
6058
run: &v1alpha1.Run{
59+
ObjectMeta: metav1.ObjectMeta{
60+
Name: "temp",
61+
},
6162
Spec: v1alpha1.RunSpec{
6263
Ref: &v1alpha1.TaskRef{
6364
APIVersion: "",
@@ -68,6 +69,9 @@ func TestRun_Invalid(t *testing.T) {
6869
}, {
6970
name: "missing kind",
7071
run: &v1alpha1.Run{
72+
ObjectMeta: metav1.ObjectMeta{
73+
Name: "temp",
74+
},
7175
Spec: v1alpha1.RunSpec{
7276
Ref: &v1alpha1.TaskRef{
7377
APIVersion: "blah",
@@ -79,6 +83,9 @@ func TestRun_Invalid(t *testing.T) {
7983
}, {
8084
name: "non-unique params",
8185
run: &v1alpha1.Run{
86+
ObjectMeta: metav1.ObjectMeta{
87+
Name: "temp",
88+
},
8289
Spec: v1alpha1.RunSpec{
8390
Ref: &v1alpha1.TaskRef{
8491
APIVersion: "blah",
@@ -111,6 +118,9 @@ func TestRun_Valid(t *testing.T) {
111118
}{{
112119
name: "no params",
113120
run: &v1alpha1.Run{
121+
ObjectMeta: metav1.ObjectMeta{
122+
Name: "temp",
123+
},
114124
Spec: v1alpha1.RunSpec{
115125
Ref: &v1alpha1.TaskRef{
116126
APIVersion: "blah",
@@ -122,6 +132,9 @@ func TestRun_Valid(t *testing.T) {
122132
}, {
123133
name: "unnamed",
124134
run: &v1alpha1.Run{
135+
ObjectMeta: metav1.ObjectMeta{
136+
Name: "temp",
137+
},
125138
Spec: v1alpha1.RunSpec{
126139
Ref: &v1alpha1.TaskRef{
127140
APIVersion: "blah",
@@ -132,6 +145,9 @@ func TestRun_Valid(t *testing.T) {
132145
}, {
133146
name: "unique params",
134147
run: &v1alpha1.Run{
148+
ObjectMeta: metav1.ObjectMeta{
149+
Name: "temp",
150+
},
135151
Spec: v1alpha1.RunSpec{
136152
Ref: &v1alpha1.TaskRef{
137153
APIVersion: "blah",
@@ -149,6 +165,9 @@ func TestRun_Valid(t *testing.T) {
149165
}, {
150166
name: "valid workspace",
151167
run: &v1alpha1.Run{
168+
ObjectMeta: metav1.ObjectMeta{
169+
Name: "temp",
170+
},
152171
Spec: v1alpha1.RunSpec{
153172
Ref: &v1alpha1.TaskRef{
154173
APIVersion: "blah",
@@ -177,6 +196,9 @@ func TestRun_Workspaces_Invalid(t *testing.T) {
177196
}{{
178197
name: "make sure WorkspaceBinding validation invoked",
179198
run: &v1alpha1.Run{
199+
ObjectMeta: metav1.ObjectMeta{
200+
Name: "temp",
201+
},
180202
Spec: v1alpha1.RunSpec{
181203
Ref: &v1alpha1.TaskRef{
182204
APIVersion: "blah",
@@ -194,6 +216,9 @@ func TestRun_Workspaces_Invalid(t *testing.T) {
194216
}, {
195217
name: "bind same workspace twice",
196218
run: &v1alpha1.Run{
219+
ObjectMeta: metav1.ObjectMeta{
220+
Name: "temp",
221+
},
197222
Spec: v1alpha1.RunSpec{
198223
Ref: &v1alpha1.TaskRef{
199224
APIVersion: "blah",

‎pkg/apis/pipeline/v1alpha1/taskrun_validation_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ func TestTaskRun_Invalid(t *testing.T) {
4242
want: apis.ErrMissingField("spec"),
4343
}, {
4444
name: "invalid taskrun metadata",
45-
task: tb.TaskRun("task.name"),
45+
task: tb.TaskRun("task,name"),
4646
want: &apis.FieldError{
47-
Message: "Invalid resource name: special character . must not be present",
47+
Message: `invalid resource name "task,name": must be a valid DNS label`,
4848
Paths: []string{"metadata.name"},
4949
},
5050
}}

‎pkg/apis/pipeline/v1beta1/pipeline_validation_test.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ func TestPipeline_Validate_Success(t *testing.T) {
4848
}, {
4949
name: "pipelinetask custom task references",
5050
p: &Pipeline{
51+
ObjectMeta: metav1.ObjectMeta{Name: "pipeline"},
5152
Spec: PipelineSpec{
5253
Tasks: []PipelineTask{{Name: "foo", TaskRef: &TaskRef{APIVersion: "example.dev/v0", Kind: "Example", Name: ""}}},
5354
},
@@ -134,15 +135,15 @@ func TestPipeline_Validate_Failure(t *testing.T) {
134135
expectedError apis.FieldError
135136
wc func(context.Context) context.Context
136137
}{{
137-
name: "period in name",
138+
name: "comma in name",
138139
p: &Pipeline{
139-
ObjectMeta: metav1.ObjectMeta{Name: "pipe.line"},
140+
ObjectMeta: metav1.ObjectMeta{Name: "pipe,line"},
140141
Spec: PipelineSpec{
141142
Tasks: []PipelineTask{{Name: "foo", TaskRef: &TaskRef{Name: "foo-task"}}},
142143
},
143144
},
144145
expectedError: apis.FieldError{
145-
Message: `Invalid resource name: special character . must not be present`,
146+
Message: `invalid resource name "pipe,line": must be a valid DNS label`,
146147
Paths: []string{"metadata.name"},
147148
},
148149
}, {
@@ -154,7 +155,7 @@ func TestPipeline_Validate_Failure(t *testing.T) {
154155
},
155156
},
156157
expectedError: apis.FieldError{
157-
Message: `Invalid resource name: length must be no more than 63 characters`,
158+
Message: "Invalid resource name: length must be no more than 63 characters",
158159
Paths: []string{"metadata.name"},
159160
},
160161
}, {

0 commit comments

Comments
 (0)