Move label-related logic into a separated package #163
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
This was referenced Oct 17, 2020
AkihiroSuda
reviewed
Oct 17, 2020
cmd/containerd-stargz-grpc/main.go
Outdated
| if err == nil { | ||
| return src, nil | ||
| } | ||
| allErr = errors.Wrapf(allErr, "%v;", err) |
There was a problem hiding this comment.
Can we use https://github.com/hashicorp/go-multierror ?
There was a problem hiding this comment.
Thanks. Fixed to use go-multierrror.
This commit separates labels-related logic from the filesystem core. This introduces a new package `source` and defines a logic to convert snapshot labels into blob sources information `source.Source`. `source` package defines an interface of that converter (`source.GetSources func(labels map[string]string) (source []Source, err error)`), and contains the default implementation based on `containerd.io/snapshot/remote/stargz...` labels (which is previously embedded in the filesystem core). Now the filesystem uses `source.GetSources` for acquiring blob source information. By default, it uses the implementation by `source` package but it accepts any user-defined ones through a constructor option `WithGetSources`. `containerd-stargz-grpc` uses the following `source.GetSources` implementations. - a parser of default labels `containerd.io/snapshot/remote/stargz...` (implemented in `source` package). - a parser of labels `containerd.io/snapshot/cri...` passed from CRI, which previously embedded in the filesystem core. Another note comes with this change is that the filesystem is now agnostic about (source-related) labels. `source.GetSources` implementations aren't required to use these labels so they can provide blob source information leveraging other media instead of these labels (e.g. using manifest-like JSON data + content store). Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
AkihiroSuda
approved these changes
Oct 18, 2020
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.
Previous: #161
Related: moby/buildkit#1733
This commit separates labels-related logic from the filesystem core. This introduces a new package
source(github.com/containerd/stargz-snapshotter/stargz/source) and defines a logic to convert snapshot labels into blob sources informationsource.Source.sourcepackage defines an interface of that converter (GetSources) , and contains the default implementation based oncontainerd.io/snapshot/remote/stargz...labels (which is previously embedded in the filesystem core).Now the filesystem uses
source.GetSourcesfor acquiring blob source information. By default, it uses the implementation bysourcepackage but it accepts any user-defined ones through a constructor optionWithGetSources.containerd-stargz-grpcuses the followingsource.GetSourcesimplementations.containerd.io/snapshot/remote/stargz...(implemented insourcepackage).containerd.io/snapshot/cri...passed from CRI, which previously embedded in the filesystem core.Another note comes with this change is that the filesystem is now agnostic about (source-related) labels.
source.GetSourcesimplementations aren't required to use these labels so they can provide blob source information leveraging other media instead of these labels (e.g. using manifest-like JSON data + content store).