make cscli use crowdsec version for hub #194
Merged
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
added 10 commits
August 28, 2020 17:39
buixor
requested changes
Aug 31, 2020
cmd/crowdsec-cli/install.go
Outdated
| cwhub.HubBranch = "master" | ||
| } else { | ||
| log.Warnf("Crowdsec is not the latest version. Current version is '%s' and latest version is '%s'. Please update it!", cwversion.Version, latest) | ||
| cwhub.HubBranch = cwversion.Version |
There was a problem hiding this comment.
maybe we want to specify to which branch we're going to stick if it's not master ?
There was a problem hiding this comment.
I think this is what the ligne above does no ?
There was a problem hiding this comment.
mmh my bad, it doesn't precise the branch, but says what is the current crowdsec version and what is the latest. Is it enough ?
cmd/crowdsec-cli/update.go
Outdated
| /* | ||
| if no branch has been specified in flags for the hub, then use the one corresponding to crowdsec version | ||
| */ | ||
| if cwhub.HubBranch == "" { |
There was a problem hiding this comment.
Same answer as above
buixor
reviewed
Sep 1, 2020
cmd/crowdsec-cli/install.go
Outdated
| @@ -63,6 +63,10 @@ you should [update cscli](./cscli_update.md). | |||
| if !config.configured { | |||
| return fmt.Errorf("you must configure cli before interacting with hub") | |||
| } | |||
|
|
|||
| if err := setHubBranch(); err != nil { | |||
| log.Errorf("error while setting hub branch: %s", err) | |||
There was a problem hiding this comment.
I think we want to return the error here, so that the PersistentPreRunE can properly fail
buixor
requested changes
Sep 1, 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.
No description provided.