mirror of
https://github.com/hashicorp/packer.git
synced 2026-06-19 05:29:11 -04:00
* build(deps): bump github.com/go-jose/go-jose/v4 Bumps [github.com/go-jose/go-jose/v4](https://github.com/go-jose/go-jose) from 4.1.3 to 4.1.4. - [Release notes](https://github.com/go-jose/go-jose/releases) - [Commits](https://github.com/go-jose/go-jose/compare/v4.1.3...v4.1.4) --- updated-dependencies: - dependency-name: github.com/go-jose/go-jose/v4 dependency-version: 4.1.4 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> * Update Go version and refresh dependencies Aligns project with Go 1.25.9 and updates several dependencies to incorporate bug fixes, security enhancements, and improved compatibility across packages. Ensures continued stability and support for the latest upstream features by tracking current releases. * build(deps): bump go.opentelemetry.io/otel/sdk Bumps [go.opentelemetry.io/otel/sdk](https://github.com/open-telemetry/opentelemetry-go) from 1.41.0 to 1.43.0. - [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-go/compare/v1.41.0...v1.43.0) --- updated-dependencies: - dependency-name: go.opentelemetry.io/otel/sdk dependency-version: 1.43.0 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> * Update error message in TestSourceNotExisting for clarity (#13616) * Feature/enforced provisioner (#13591) * added the parser for the enforced block * Enhance enforced provisioner parsing to support HCL and JSON formats - Updated ParseProvisionerBlocks to handle both HCL and JSON syntax, including legacy JSON format. - Added comprehensive test cases for JSON provisioner parsing. - Improved ExtractBuildProvisionerHCL to merge inline commands from shell provisioners. - Enhanced logging for enforced block operations in HCP Packer. * Remove PublishEnforcedBlocks function from Bucket struct * Remove ExtractBuildProvisionerHCL function and unused imports * Reverted the version upgrade * Added the internal-sdk for the enforcedProvsioner api changes * Enhance enforced provisioner handling and error reporting - Update error handling in FetchEnforcedBlocks to return detailed errors instead of warnings. - Modify GetCoreBuildProvisionerFromBlock to accept build name for overrides. - Add tests for FetchEnforcedBlocks to ensure correct behavior and error handling. - Implement diagnostics for unsupported legacy JSON templates. * Implement enforced provisioner parsing and handling - Introduced a new package `enforcedparser` to handle parsing of enforced provisioner blocks from HCL and JSON formats. - Refactored existing code to utilize the new `ParseProvisionerBlocks` function from the `enforcedparser` package. - Updated `GetCoreBuildProvisionerFromEnforcedBlock` method to convert enforced provisioner blocks into core build provisioners. - Enhanced error handling and logging during the parsing process. - Added tests for the new parsing functionality and ensured existing tests were updated to reflect changes. - Modified `InjectEnforcedProvisioners` method in JSON registry to utilize the new parsing logic. * Add test case for -skip-enforcement flag in BuildArgs * Refactor sensitive variable handling in provisioners and add related tests * Refactor enforced provisioner handling: remove internal parser, update tests, and streamline API interactions * Enhance provisioner block parsing: add error handling for invalid combinations and expand test coverage * Remove internal SDK replacement for enforced block types in go.mod * Update dependencies in go.mod and go.sum: bump hcp-sdk-go and packer-plugin-sdk versions, adjust syft version, and update OpenTelemetry packages * Update hcp-sdk-go dependency to v0.172.0 in go.mod and go.sum * Fix formatting in TestBuildCommand_ParseArgs and add newline at end of json_enforced_test.go * Refactor testJSONRegistryWithBuilds: remove environment variable setup and streamline registry initialization * Rename injected variable for clarity in InjectEnforcedProvisioners function --------- Co-authored-by: Hari Om <58305594+Madhav008@users.noreply.github.com> * Merge pull request #13610 from hashicorp/vulnerablity-fixes Update dependencies: bump cloud.google.com/go/auth to v0.18.2, cloud.… * Bumps Go version to 1.25.9 for compatibility * Update Go version and refresh dependencies Aligns project with Go 1.25.9 and updates several dependencies to incorporate bug fixes, security enhancements, and improved compatibility across packages. Ensures continued stability and support for the latest upstream features by tracking current releases. * Bump version to 1.15.2 and update changelog for new features and security improvements --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tanmay Jain <tanmay.jain@hashicorp.com> Co-authored-by: Hari Om <58305594+Madhav008@users.noreply.github.com>
238 lines
8.1 KiB
Go
238 lines
8.1 KiB
Go
// Copyright IBM Corp. 2013, 2025
|
|
// SPDX-License-Identifier: BUSL-1.1
|
|
|
|
package command
|
|
|
|
import (
|
|
"flag"
|
|
"strings"
|
|
|
|
"github.com/hashicorp/packer/command/enumflag"
|
|
kvflag "github.com/hashicorp/packer/command/flag-kv"
|
|
sliceflag "github.com/hashicorp/packer/command/flag-slice"
|
|
)
|
|
|
|
//go:generate enumer -type configType -trimprefix ConfigType -transform snake
|
|
type configType int
|
|
|
|
const (
|
|
ConfigTypeJSON configType = iota // default config type
|
|
ConfigTypeHCL2
|
|
)
|
|
|
|
func (c *configType) Set(value string) error {
|
|
v, err := configTypeString(value)
|
|
if err == nil {
|
|
*c = v
|
|
}
|
|
return err
|
|
}
|
|
|
|
// ConfigType tells what type of config we should use, it can return values
|
|
// like "hcl" or "json".
|
|
// Make sure Args was correctly set before.
|
|
func (ma *MetaArgs) GetConfigType() (configType, error) {
|
|
if ma.Path == "" {
|
|
return ma.ConfigType, nil
|
|
}
|
|
name := ma.Path
|
|
if name == "-" {
|
|
// TODO(azr): To allow piping HCL2 confs (when args is "-"), we probably
|
|
// will need to add a setting that says "this is an HCL config".
|
|
return ma.ConfigType, nil
|
|
}
|
|
if strings.HasSuffix(name, ".pkr.hcl") ||
|
|
strings.HasSuffix(name, ".pkr.json") {
|
|
return ConfigTypeHCL2, nil
|
|
}
|
|
isDir, err := isDir(name)
|
|
if isDir {
|
|
return ConfigTypeHCL2, err
|
|
}
|
|
return ma.ConfigType, err
|
|
}
|
|
|
|
// NewMetaArgs parses cli args and put possible values
|
|
func (ma *MetaArgs) AddFlagSets(fs *flag.FlagSet) {
|
|
fs.Var((*sliceflag.StringFlag)(&ma.Only), "only", "")
|
|
fs.Var((*sliceflag.StringFlag)(&ma.Except), "except", "")
|
|
fs.Var((*kvflag.Flag)(&ma.Vars), "var", "")
|
|
fs.Var((*kvflag.StringSlice)(&ma.VarFiles), "var-file", "")
|
|
fs.Var(&ma.ConfigType, "config-type", "set to 'hcl2' to run in hcl2 mode when no file is passed.")
|
|
}
|
|
|
|
// MetaArgs defines commonalities between all commands
|
|
type MetaArgs struct {
|
|
// TODO(azr): in the future, I want to allow passing multiple path to
|
|
// merge HCL confs together; but this will probably need an RFC first.
|
|
Path string
|
|
Paths []string
|
|
Only, Except []string
|
|
Vars map[string]string
|
|
VarFiles []string
|
|
// set to "hcl2" to force hcl2 mode
|
|
ConfigType configType
|
|
|
|
// WarnOnUndeclared does not have a common default, as the default varies per sub-command usage.
|
|
// Refer to individual command FlagSets for usage.
|
|
WarnOnUndeclaredVar bool
|
|
// UseSequential specifies to use a sequential/phased approach for
|
|
// evaluating datasources/locals instead of a DAG.
|
|
//
|
|
// This allows users to fall-back to using the approach used by Packer
|
|
// before the introduction of a DAG in case they run in an impasse/bug.
|
|
UseSequential bool
|
|
}
|
|
|
|
func (ba *BuildArgs) AddFlagSets(flags *flag.FlagSet) {
|
|
flags.BoolVar(&ba.Color, "color", true, "")
|
|
flags.BoolVar(&ba.Debug, "debug", false, "")
|
|
flags.BoolVar(&ba.Force, "force", false, "")
|
|
flags.BoolVar(&ba.TimestampUi, "timestamp-ui", false, "")
|
|
flags.BoolVar(&ba.MachineReadable, "machine-readable", false, "")
|
|
|
|
flags.Int64Var(&ba.ParallelBuilds, "parallel-builds", 0, "")
|
|
|
|
flagOnError := enumflag.New(&ba.OnError, "cleanup", "abort", "ask", "run-cleanup-provisioner")
|
|
flags.Var(flagOnError, "on-error", "")
|
|
|
|
flags.BoolVar(&ba.MetaArgs.WarnOnUndeclaredVar, "warn-on-undeclared-var", false, "Show warnings for variable files containing undeclared variables.")
|
|
flags.BoolVar(&ba.MetaArgs.UseSequential, "use-sequential-evaluation", false, "Fallback to using a sequential approach for local/datasource evaluation.")
|
|
|
|
flags.BoolVar(&ba.ReleaseOnly, "ignore-prerelease-plugins", false, "Disable the loading of prerelease plugin binaries (x.y.z-dev).")
|
|
|
|
flags.BoolVar(&ba.SkipEnforcement, "skip-enforcement", false, "Skip injection of HCP Packer enforced provisioners. Requires admin privileges.")
|
|
|
|
ba.MetaArgs.AddFlagSets(flags)
|
|
}
|
|
|
|
// GetCleanedBuildArgs returns a map containing build flags specified to build for tracking within
|
|
// the HCP Packer registry.
|
|
//
|
|
// Most of the arguments are kept as-is, except for the -var args, where only
|
|
// the keys are kept to avoid leaking potential secrets.
|
|
func GetCleanedBuildArgs(ba *BuildArgs) map[string]interface{} {
|
|
cleanedArgs := map[string]interface{}{
|
|
"debug": ba.Debug,
|
|
"force": ba.Force,
|
|
"only": ba.Only,
|
|
"except": ba.Except,
|
|
"var-files": ba.VarFiles,
|
|
"path": ba.Path,
|
|
}
|
|
|
|
var varNames []string
|
|
for k := range ba.Vars {
|
|
varNames = append(varNames, k)
|
|
}
|
|
cleanedArgs["vars"] = varNames
|
|
|
|
return cleanedArgs
|
|
}
|
|
|
|
// BuildArgs represents a parsed cli line for a `packer build`
|
|
type BuildArgs struct {
|
|
MetaArgs
|
|
Debug, Force bool
|
|
Color, TimestampUi, MachineReadable bool
|
|
ParallelBuilds int64
|
|
OnError string
|
|
ReleaseOnly bool
|
|
SkipEnforcement bool
|
|
}
|
|
|
|
func (ia *InitArgs) AddFlagSets(flags *flag.FlagSet) {
|
|
flags.BoolVar(&ia.Upgrade, "upgrade", false, "upgrade any present plugin to the highest allowed version.")
|
|
flags.BoolVar(&ia.Force, "force", false, "force installation of a plugin, even if already installed")
|
|
|
|
ia.MetaArgs.AddFlagSets(flags)
|
|
}
|
|
|
|
// InitArgs represents a parsed cli line for a `packer init <path>`
|
|
type InitArgs struct {
|
|
MetaArgs
|
|
Upgrade bool
|
|
Force bool
|
|
}
|
|
|
|
// PluginsRequiredArgs represents a parsed cli line for a `packer plugins required <path>`
|
|
type PluginsRequiredArgs struct {
|
|
MetaArgs
|
|
}
|
|
|
|
func (ca *ConsoleArgs) AddFlagSets(flags *flag.FlagSet) {
|
|
flags.BoolVar(&ca.MetaArgs.UseSequential, "use-sequential-evaluation", false, "Fallback to using a sequential approach for local/datasource evaluation.")
|
|
}
|
|
|
|
// ConsoleArgs represents a parsed cli line for a `packer console`
|
|
type ConsoleArgs struct {
|
|
MetaArgs
|
|
}
|
|
|
|
func (fa *FixArgs) AddFlagSets(flags *flag.FlagSet) {
|
|
flags.BoolVar(&fa.Validate, "validate", true, "")
|
|
|
|
fa.MetaArgs.AddFlagSets(flags)
|
|
}
|
|
|
|
// FixArgs represents a parsed cli line for a `packer fix`
|
|
type FixArgs struct {
|
|
MetaArgs
|
|
Validate bool
|
|
}
|
|
|
|
func (va *ValidateArgs) AddFlagSets(flags *flag.FlagSet) {
|
|
flags.BoolVar(&va.SyntaxOnly, "syntax-only", false, "check syntax only")
|
|
flags.BoolVar(&va.NoWarnUndeclaredVar, "no-warn-undeclared-var", false, "Ignore warnings for variable files containing undeclared variables.")
|
|
flags.BoolVar(&va.EvaluateDatasources, "evaluate-datasources", false, "evaluate datasources for validation (HCL2 only, may incur costs)")
|
|
flags.BoolVar(&va.ReleaseOnly, "ignore-prerelease-plugins", false, "Disable the loading of prerelease plugin binaries (x.y.z-dev).")
|
|
flags.BoolVar(&va.MetaArgs.UseSequential, "use-sequential-evaluation", false, "Fallback to using a sequential approach for local/datasource evaluation.")
|
|
|
|
va.MetaArgs.AddFlagSets(flags)
|
|
}
|
|
|
|
// ValidateArgs represents a parsed cli line for a `packer validate`
|
|
type ValidateArgs struct {
|
|
MetaArgs
|
|
SyntaxOnly, NoWarnUndeclaredVar bool
|
|
EvaluateDatasources bool
|
|
ReleaseOnly bool
|
|
}
|
|
|
|
func (va *InspectArgs) AddFlagSets(flags *flag.FlagSet) {
|
|
flags.BoolVar(&va.MetaArgs.UseSequential, "use-sequential-evaluation", false, "Fallback to using a sequential approach for local/datasource evaluation.")
|
|
va.MetaArgs.AddFlagSets(flags)
|
|
}
|
|
|
|
// InspectArgs represents a parsed cli line for a `packer inspect`
|
|
type InspectArgs struct {
|
|
MetaArgs
|
|
}
|
|
|
|
func (va *HCL2UpgradeArgs) AddFlagSets(flags *flag.FlagSet) {
|
|
flags.StringVar(&va.OutputFile, "output-file", "", "File where to put the hcl2 generated config. Defaults to JSON_TEMPLATE.pkr.hcl")
|
|
flags.BoolVar(&va.WithAnnotations, "with-annotations", false, "Adds helper annotations with information about the generated HCL2 blocks.")
|
|
|
|
va.MetaArgs.AddFlagSets(flags)
|
|
}
|
|
|
|
// HCL2UpgradeArgs represents a parsed cli line for a `packer hcl2_upgrade`
|
|
type HCL2UpgradeArgs struct {
|
|
MetaArgs
|
|
OutputFile string
|
|
WithAnnotations bool
|
|
}
|
|
|
|
func (va *FormatArgs) AddFlagSets(flags *flag.FlagSet) {
|
|
flags.BoolVar(&va.Check, "check", false, "check if the input is formatted")
|
|
flags.BoolVar(&va.Diff, "diff", false, "display the diff of formatting changes")
|
|
flags.BoolVar(&va.Write, "write", true, "overwrite source files instead of writing to stdout")
|
|
flags.BoolVar(&va.Recursive, "recursive", false, "Also process files in subdirectories")
|
|
va.MetaArgs.AddFlagSets(flags)
|
|
}
|
|
|
|
// FormatArgs represents a parsed cli line for `packer fmt`
|
|
type FormatArgs struct {
|
|
MetaArgs
|
|
Check, Diff, Write, Recursive bool
|
|
}
|