Skip to content

Add skip validation flag in elastic-package install command #1176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 10, 2023
Merged

Add skip validation flag in elastic-package install command #1176

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c60258a
Skip validation when building package in install
mrodm Mar 7, 2023
40ed275
Add skip-validation flag
mrodm Mar 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions cmd/install.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ import (
"github.com/pkg/errors"
"github.com/spf13/cobra"

"github.com/elastic/package-spec/v2/code/go/pkg/validator"

"github.com/elastic/elastic-package/internal/builder"
"github.com/elastic/elastic-package/internal/cobraext"
"github.com/elastic/elastic-package/internal/kibana"
Expand All @@ -35,6 +37,7 @@ func setupInstallCommand() *cobraext.Command {
cmd.Flags().StringSliceP(cobraext.CheckConditionFlagName, "c", nil, cobraext.CheckConditionFlagDescription)
cmd.Flags().StringP(cobraext.PackageRootFlagName, cobraext.PackageRootFlagShorthand, "", cobraext.PackageRootFlagDescription)
cmd.Flags().StringP(cobraext.ZipPackageFilePathFlagName, cobraext.ZipPackageFilePathFlagShorthand, "", cobraext.ZipPackageFilePathFlagDescription)
cmd.Flags().Bool(cobraext.BuildSkipValidationFlagName, false, cobraext.BuildSkipValidationFlagDescription)

return cobraext.NewCommand(cmd, cobraext.ContextPackage)
}
Expand All @@ -48,6 +51,10 @@ func installCommandAction(cmd *cobra.Command, _ []string) error {
if err != nil {
return cobraext.FlagParsingError(err, cobraext.PackageRootFlagName)
}
skipValidation, err := cmd.Flags().GetBool(cobraext.BuildSkipValidationFlagName)
if err != nil {
return cobraext.FlagParsingError(err, cobraext.BuildSkipValidationFlagName)
}

kibanaClient, err := kibana.NewClient()
if err != nil {
Expand All @@ -62,7 +69,7 @@ func installCommandAction(cmd *cobra.Command, _ []string) error {
return fmt.Errorf("invalid Kibana version")
}

installer, err := newInstaller(zipPathFile, packageRootPath, v)
installer, err := newInstaller(zipPathFile, packageRootPath, v, skipValidation)
if err != nil {
return err
}
Expand Down Expand Up @@ -96,11 +103,19 @@ type packageInstaller interface {
install(cmd *cobra.Command, name, version string) error
}

func newInstaller(zipPath, packageRootPath string, kibanaVersion *semver.Version) (packageInstaller, error) {
func newInstaller(zipPath, packageRootPath string, kibanaVersion *semver.Version, skipValidation bool) (packageInstaller, error) {
if zipPath != "" {
if kibanaVersion.LessThan(semver8_7_0) {
return nil, fmt.Errorf("not supported uploading zip packages in Kibana %s", kibanaVersion)
}
if !skipValidation {
logger.Debugf("Validating built .zip package (path: %s)", zipPath)
err := validator.ValidateFromZip(zipPath)
if err != nil {
return nil, errors.Wrapf(err, "invalid content found in built zip package")
}
}
logger.Debug("Skip validation of the built .zip package")
return zipPackage{zipPath: zipPath}, nil
}
if packageRootPath == "" {
Expand All @@ -124,7 +139,7 @@ func newInstaller(zipPath, packageRootPath string, kibanaVersion *semver.Version
PackageRoot: packageRootPath,
CreateZip: true,
SignPackage: false,
SkipValidation: false,
SkipValidation: skipValidation,
})
if err != nil {
return nil, errors.Wrap(err, "building package failed")
Expand Down