Added "source" annotation to the Task metadata. #5
Conversation
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
vdemeester
reviewed
Jan 25, 2024
internal/catalog/catalog.go
Outdated
| if !ok { | ||
| annotations = make(map[string]interface{}) | ||
| } | ||
| annotations["source"] = fmt.Sprintf("%s/releases/download/%s", strings.TrimPrefix(url, "https://www.github.com/"), version) |
There was a problem hiding this comment.
- I think we could just print out the repository URI (so https://github.com/openshift-pipelines/task-containers for example)
- Why do we trim the github.com part ?
There was a problem hiding this comment.
I was assuming that people will by default understand that the prefix will be "https://www.github.com/" .
internal/catalog/catalog.go
Outdated
Comment on lines
66
to
84
| taskFile := filepath.Join(path, "tasks", name, version, name+".yaml") | ||
| if err := addSourceAnnotationToTask(taskFile, uri, version); err != nil { | ||
| fmt.Fprintf(os.Stderr, "Failed to add source annotation to Task YAML file %s: %v\n", taskFile, err) | ||
| } |
There was a problem hiding this comment.
There could be multiple tasks we pull from there. I think an example here is task-containers. I think this would try to mutate a task-containers.yaml file that doesn't exists, wouldn't it ?
Senjuti256
force-pushed
the
SourceAnno
branch
from
371c10e to
0e13ca2
Compare
$ catalog-cd catalog generate --config ./externals.yaml .
Generating a catalog from ./externals.yaml in .
# Fetching resources from golang-tasks
## Fetching version 0.4.0
Error traversing task directory tasks/golang-tasks/0.4.0: lstat tasks/golang-tasks/0.4.0: no such file or directory
## Fetching version 0.5.0
Error traversing task directory tasks/golang-tasks/0.5.0: lstat tasks/golang-tasks/0.5.0: no such file or directory |
vdemeester
requested changes
Feb 6, 2024
There was a problem hiding this comment.
So few things:
- For some reason, the code indentation is wrong (files need to go through
gofmt.. usually editors automatically do that) - It did skip some Tasks (see output below)
- URL should point to the repository, not the resource.tar.gz imo (
source: https://github.com/openshift-pipelines/task-maven/releases/download/v0.1.0/resources.tar.gzshould probably besource: https://github.com/openshift-pipelines/task-maven/)
Generating a catalog from ../tektoncd-catalog/externals.yaml in /tmp/foo
# Fetching resources from task-git
## Fetching version 0.2.0
Adding source annotation to Task YAML file: /tmp/foo/tasks/task-git/0.2.0/task-git.yaml
## Fetching version 0.1.0
Adding source annotation to Task YAML file: /tmp/foo/tasks/task-git/0.1.0/task-git.yaml
# Fetching resources from task-maven
## Fetching version 0.1.0
Adding source annotation to Task YAML file: /tmp/foo/tasks/task-maven/0.1.0/task-maven.yaml
# Fetching resources from task-openshift
# Fetching resources from task-containers
## Fetching version 0.2.0
## Fetching version 0.1.1
It didn't do anything for task-containers tasks.
Senjuti256
force-pushed
the
SourceAnno
branch
from
c213301 to
8de592e
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Signed off :- @Senjuti256 [email protected]