-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Explicitly substitute resource conditional variables.
Previously, we'd change the variable names to what the taskrun format and then rely on the taskrun's variable substitution logic. This approach is hacky and now we explicitly replace the resource variable strings with the right values without relying on the TaskRun logic. In the future, we should consider doing the same for parameter variables as well. Signed-off-by: Dibyo Mukherjee <dibyo@google.com>
- Loading branch information
1 parent
92d5bcc
commit ecddd2f
Showing
5 changed files
with
134 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| /* | ||
| Copyright 2019 The Tekton Authors | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package v1alpha1 | ||
|
|
||
| import "path/filepath" | ||
|
|
||
| // InputResourcePath returns the path where the given input resource | ||
| // will get mounted in a Pod | ||
| func InputResourcePath(r ResourceDeclaration) string { | ||
| return path("/workspace", r) | ||
| } | ||
|
|
||
| // OutputResourcePath returns the path to the output resouce in a Pod | ||
| func OutputResourcePath(r ResourceDeclaration) string { | ||
| return path("/workspace/output", r) | ||
| } | ||
|
|
||
| func path(root string, r ResourceDeclaration) string { | ||
| if r.TargetPath != "" { | ||
| return filepath.Join("/workspace", r.TargetPath) | ||
| } | ||
| return filepath.Join(root, r.Name) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| /* | ||
| Copyright 2019 The Tekton Authors | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package v1alpha1_test | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1" | ||
| ) | ||
|
|
||
| func TestInputResourcePath(t *testing.T) { | ||
| tcs := []struct { | ||
| name string | ||
| resource v1alpha1.ResourceDeclaration | ||
| expected string | ||
| }{{ | ||
| name: "default_path", | ||
| resource: v1alpha1.ResourceDeclaration{ | ||
| Name: "foo", | ||
| }, | ||
| expected: "/workspace/foo", | ||
| }, { | ||
| name: "with target path", | ||
| resource: v1alpha1.ResourceDeclaration{ | ||
| Name: "foo", | ||
| TargetPath: "bar", | ||
| }, | ||
| expected: "/workspace/bar", | ||
| }} | ||
|
|
||
| for _, tc := range tcs { | ||
| t.Run(tc.name, func(t *testing.T) { | ||
| if actual := v1alpha1.InputResourcePath(tc.resource); actual != tc.expected { | ||
| t.Errorf("Unexpected input resource path: %s", actual) | ||
| } | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| func TestOutputResourcePath(t *testing.T) { | ||
| tcs := []struct { | ||
| name string | ||
| resource v1alpha1.ResourceDeclaration | ||
| expected string | ||
| }{{ | ||
| name: "default_path", | ||
| resource: v1alpha1.ResourceDeclaration{ | ||
| Name: "foo", | ||
| }, | ||
| expected: "/workspace/output/foo", | ||
| }, { | ||
| name: "with target path", | ||
| resource: v1alpha1.ResourceDeclaration{ | ||
| Name: "foo", | ||
| TargetPath: "bar", | ||
| }, | ||
| expected: "/workspace/bar", | ||
| }} | ||
|
|
||
| for _, tc := range tcs { | ||
| t.Run(tc.name, func(t *testing.T) { | ||
| if actual := v1alpha1.OutputResourcePath(tc.resource); actual != tc.expected { | ||
| t.Errorf("Unexpected output resource path: %s", actual) | ||
| } | ||
| }) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters