feat(package): Check for Version variable #1359
Merged
Conversation
This file contains hidden or 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
disq
requested review from
erezrokah,
hermanschaaf and
yevgenypats
as code owners
disq
commented
Nov 9, 2023
serve/package.go
Outdated
| return err | ||
| } | ||
| defer f.Close() | ||
| if ok, err := fileContains(f, "Version"); err != nil { |
Member
Author
There was a problem hiding this comment.
could also have a regex that requires whitespace around Version...
Member
There was a problem hiding this comment.
Or maybe a regex that checks for Version\s*=?
hermanschaaf
reviewed
Nov 9, 2023
hermanschaaf
approved these changes
Nov 9, 2023
Co-authored-by: Herman Schaaf <hermanschaaf@gmail.com>
hermanschaaf
reviewed
Nov 9, 2023
serve/package.go
Outdated
| return fmt.Errorf("plugin directory must contain at least one of the following directories: %s", strings.Join(checkRelativeDirs, ", ")) | ||
| } | ||
|
|
||
| versionRegex := regexp.MustCompile(`^\s?Version\s*=`) |
Member
There was a problem hiding this comment.
Suggested change
| versionRegex := regexp.MustCompile(`^\s?Version\s*=`) | |
| versionRegex := regexp.MustCompile(`Version\s*=`) |
otherwise var Version = "development" would fail
Member
Author
There was a problem hiding this comment.
Fixed by adding (var)?
var Version = wouldn't work (preceding space before var) but I think that's fine, or I could add another \s?...
hermanschaaf
reviewed
Nov 9, 2023
serve/package.go
Outdated
| return fmt.Errorf("plugin directory must contain at least one of the following directories: %s", strings.Join(checkRelativeDirs, ", ")) | ||
| } | ||
|
|
||
| versionRegex := regexp.MustCompile(`^(var)?\s?Version\s*=`) |
Member
There was a problem hiding this comment.
Suggested change
| versionRegex := regexp.MustCompile(`^(var)?\s?Version\s*=`) | |
| versionRegex := regexp.MustCompile(`^\s*(var\s+)?Version\s*=`) |
Member
Author
There was a problem hiding this comment.
do we really want to allow that though? Would lead to more false matches (inside a function... I know others also do)
Member
There was a problem hiding this comment.
oh yeah I guess it would be a false match inside a function. fair enough
hermanschaaf
approved these changes
Nov 9, 2023
hermanschaaf
approved these changes
Nov 9, 2023
yevgenypats
approved these changes
Nov 9, 2023
kodiakhq bot
pushed a commit
that referenced
this pull request
Nov 9, 2023
🤖 I have created a release *beep* *boop* --- ## [4.18.0](v4.17.2...v4.18.0) (2023-11-09) ### Features * **package:** Check for Version variable ([#1359](#1359)) ([2f1aff8](2f1aff8)) ### Bug Fixes * **deps:** Update module github.com/cloudquery/cloudquery-api-go to v1.4.3 ([#1357](#1357)) ([f5cd387](f5cd387)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Also adds another ldflag path (
resources/plugin) to setVersionwhich is what we already have in github releases.