Add option to filter image names or tags, parser fixes #159
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
jhrozek
commented
Jun 17, 2024
pkg/utils/config/config.go
Outdated
| // ParseConfigFile parses a configuration file. | ||
| func ParseConfigFile(configfile string) (*Config, error) { | ||
| bfs := osfs.New(".") | ||
| return ParseConfigFileFromFS(bfs, configfile) | ||
| } | ||
|
|
||
| func defaultConfig() *Config { | ||
| return &Config{ | ||
| Platform: "linux/amd64", |
There was a problem hiding this comment.
Should we rather default to no platform set?
jhrozek
commented
Jun 17, 2024
| } | ||
| return nil, fmt.Errorf("failed to decode config file: %w", err) |
There was a problem hiding this comment.
This change makes sure that an empty file is parsed and defaults used.
jhrozek
commented
Jun 17, 2024
jhrozek
commented
Jun 17, 2024
| @@ -36,7 +38,7 @@ import ( | |||
| const ( | |||
| // ContainerImageRegex is regular expression pattern to match container image usage in YAML | |||
| // nolint:lll | |||
| ContainerImageRegex = `image\s*:\s*["']?([^\s"']+/[^\s"']+|[^\s"']+)(:[^\s"']+)?(@[^\s"']+)?["']?|FROM\s+([^\s]+(/[^\s]+)?(:[^\s]+)?(@[^\s]+)?)` | |||
| ContainerImageRegex = `image\s*:\s*["']?([^\s"']+/[^\s"']+|[^\s"']+)(:[^\s"']+)?(@[^\s"']+)?["']?|FROM\s+(--platform=[^\s]+[^\s]*\s+)?([^\s]+(/[^\s]+)?(:[^\s]+)?(@[^\s]+)?)` | |||
There was a problem hiding this comment.
This ensures lines with --platform even go through to the replacer.
jhrozek
commented
Jun 17, 2024
pkg/replacer/image/image.go
Outdated
| } | ||
|
|
||
| fullRepositoryName := nameRef.Context().Name() | ||
| parts := strings.Split(fullRepositoryName, "/") |
There was a problem hiding this comment.
I didn't find a better name to parse out the image name from the full repo path...
There was a problem hiding this comment.
Let's put this under a function, add a TODO item, and live with this for now. No biggie.
Adds two configuration options that let the user skip images that are either matching the configured image name or tag. Related: stacklok#150
- Fixes the default container regex to handle `FROM` directives that use a platform. Retains them when returning the modified reference - uses buildkit's dockerfile parser to get access to a real parser and use it to properly extract the image name and arguments such as `--platform` without brittle homecooked parsing - extends the image skipping to skip images or tags based on configuration - adds tests Fixes: stacklok#150 Fixes: stacklok#157
Adds a new configuration option that allows the user to set which branches should be excluded. By default, all are and thus frizbee only pins actions that are referred to with a tag. Fixes: stacklok#158
Let's reflect the recent changes in documentation
This was
linked to
issues
Jun 17, 2024
This will allow consumers to get the default configuration through an API and then customize only what they need.
rdimitrov
approved these changes
Jun 17, 2024
JAORMX
reviewed
Jun 18, 2024
| } | ||
|
|
||
| // TODO(jakub): this is a bit of a hack, but I didn't find a better way to get just the name | ||
| func getImageNameFromRef(nameRef name.Reference) string { |
There was a problem hiding this comment.
feel free to ignore this comment: What if we add unit tests specifically for this? That way, if someone refactors and comes up with a better way of doing it, it can be easy to spot problems or validate if the solution worked.
There was a problem hiding this comment.
good suggestion, I'll do it in a follow-up
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.
FROMdirectives that use a platform. Retains them when returning the modified reference. Uses buildkit's dockerfile parser to get access to a real parser and use it to properly extract the image name and arguments such as--platformwithout brittle homecooked parsing. Extends the image skipping to skip images or tags based on configuration. Adds tests.