Add a new validation to use or not upload API to install packages #2511
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
Reverted all changes related to get and validate the Stack subscription
mrodm
commented
Apr 3, 2025
| @@ -196,7 +196,7 @@ type Info struct { | |||
| Version struct { | |||
| Number string `json:"number"` | |||
| BuildFlavor string `json:"build_flavor"` | |||
| } `json:"version` | |||
| } `json:"version"` | |||
There was a problem hiding this comment.
Noticed while trying to get and use the Elastic stack subscription.
mrodm
changed the title
jsoriano
approved these changes
Apr 7, 2025
| @@ -27,6 +30,47 @@ func (c *Client) InstallPackage(ctx context.Context, name, version string) ([]pa | |||
| return processResults("install", statusCode, respBody) | |||
| } | |||
|
|
|||
| // EnsureZipPackageCanBeInstalled checks whether or not it can be installed a package using the upload API. | |||
| func (c *Client) EnsureZipPackageCanBeInstalled(ctx context.Context) error { | |||
There was a problem hiding this comment.
This is a bit hacky and would be prone to fail if this API would change, maybe add a comment mentioning that is only intended to be used between 8.7.0 and 8.8.2, and is only safe to be used on these versions.
There was a problem hiding this comment.
Added comment here 4da2bd9
Comment on lines
66
to
71
| if version.LessThan(semver8_7_0) { | ||
| return nil, fmt.Errorf("not supported uploading zip packages in Kibana %s (%s required)", version, semver8_7_0) | ||
| } | ||
| if version.LessThan(semver8_8_2) { | ||
| return nil, fmt.Errorf("not supported uploading zip packages in Kibana %s (%s required or Enteprise license)", version, semver8_8_2) | ||
| } |
There was a problem hiding this comment.
Nit. Maybe isAllowedInstallationViaApi could also return the reason, as we are checking with the same versions as here.
There was a problem hiding this comment.
Added a new return parameter that indicates the reason, just in the case there is an expected failure.
💚 Build Succeeded
History
cc @mrodm |
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.
This PR checks whether or not the Elastic stack allows to upload packages via API. If it cannot be used the upload API, packages will be installed from the Package Registry.
Until Elastic stack 8.8.2 the license required was
Enterpriseto use that API endpoint. In Elastic stack 8.8.2 onwards, the license required for this feature was changed tobasic.Relates Kibana PRs:
Relates elastic/integrations#13377
How to test this PR locally