Skip to content
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

Refacor packager deploy #3408

Closed
wants to merge 2 commits into from
Closed

Refacor packager deploy #3408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb855c0
Refactor packager deploy
phillebaba Jan 14, 2025
6782ee7
Refactor deploy package
phillebaba Jan 16, 2025
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
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ require (
github.com/DataDog/zstd v1.5.5 // indirect
github.com/MakeNowJust/heredoc v1.0.0 // indirect
github.com/Masterminds/goutils v1.1.1 // indirect
github.com/Masterminds/semver v1.5.0 // indirect
github.com/Masterminds/semver v1.5.0
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
github.com/Masterminds/squirrel v1.5.4 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
Expand Down
20 changes: 10 additions & 10 deletions src/cmd/package.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,25 +213,25 @@ func (o *PackageDeployOptions) PreRun(_ *cobra.Command, _ []string) {
// Run performs the execution of 'package deploy' sub-command.
func (o *PackageDeployOptions) Run(cmd *cobra.Command, args []string) error {
ctx := cmd.Context()
packageSource, err := choosePackage(ctx, args)

src, err := choosePackage(ctx, args)
if err != nil {
return err
}
pkgConfig.PkgOpts.PackageSource = packageSource

v := common.GetViper()
pkgConfig.PkgOpts.SetVariables = helpers.TransformAndMergeMap(
v.GetStringMapString(common.VPkgDeploySet), pkgConfig.PkgOpts.SetVariables, strings.ToUpper)
setVariables := helpers.TransformAndMergeMap(v.GetStringMapString(common.VPkgDeploySet), pkgConfig.PkgOpts.SetVariables, strings.ToUpper)

pkgClient, err := packager.New(&pkgConfig, packager.WithContext(cmd.Context()))
if err != nil {
return err
deployOpt := packager2.DeployOptions{
Source: src,
SetVariables: setVariables,
OptionalComponents: pkgConfig.PkgOpts.OptionalComponents,
}
defer pkgClient.ClearTempPaths()

if err := pkgClient.Deploy(ctx); err != nil {
deployedComponents, err := packager2.Deploy(ctx, deployOpt)
if err != nil {
return fmt.Errorf("failed to deploy package: %w", err)
}
fmt.Println(deployedComponents)
return nil
}

Expand Down
Loading
Loading