diff --git a/command/execute.go b/command/execute.go index 308c159c3..1e303858d 100644 --- a/command/execute.go +++ b/command/execute.go @@ -28,7 +28,7 @@ import ( shelllocalpostprocessor "github.com/hashicorp/packer/post-processor/shell-local" breakpointprovisioner "github.com/hashicorp/packer/provisioner/breakpoint" fileprovisioner "github.com/hashicorp/packer/provisioner/file" - hcp_sbomprovisioner "github.com/hashicorp/packer/provisioner/hcp_sbom" + hcpsbomprovisioner "github.com/hashicorp/packer/provisioner/hcp-sbom" powershellprovisioner "github.com/hashicorp/packer/provisioner/powershell" shellprovisioner "github.com/hashicorp/packer/provisioner/shell" shelllocalprovisioner "github.com/hashicorp/packer/provisioner/shell-local" @@ -49,7 +49,7 @@ var Builders = map[string]packersdk.Builder{ var Provisioners = map[string]packersdk.Provisioner{ "breakpoint": new(breakpointprovisioner.Provisioner), "file": new(fileprovisioner.Provisioner), - "hcp_sbom": new(hcp_sbomprovisioner.Provisioner), + "hcp-sbom": new(hcpsbomprovisioner.Provisioner), "powershell": new(powershellprovisioner.Provisioner), "shell": new(shellprovisioner.Provisioner), "shell-local": new(shelllocalprovisioner.Provisioner), diff --git a/hcl2template/types.packer_config.go b/hcl2template/types.packer_config.go index 49ca88729..1f909aca3 100644 --- a/hcl2template/types.packer_config.go +++ b/hcl2template/types.packer_config.go @@ -516,7 +516,7 @@ func (cfg *PackerConfig) getCoreBuildProvisioner(source SourceUseBlock, pb *Prov } } - if pb.PType == "hcp_sbom" { + if pb.PType == "hcp-sbom" { provisioner = &packer.SBOMInternalProvisioner{ Provisioner: provisioner, } diff --git a/packer/core.go b/packer/core.go index 66e41a7e8..9d574294c 100644 --- a/packer/core.go +++ b/packer/core.go @@ -297,7 +297,7 @@ func (c *Core) generateCoreBuildProvisioner(rawP *template.Provisioner, rawName } } - if rawP.Type == "hcp_sbom" { + if rawP.Type == "hcp-sbom" { provisioner = &SBOMInternalProvisioner{ Provisioner: provisioner, } diff --git a/packer/provisioner.go b/packer/provisioner.go index fcea43a64..1bdee785d 100644 --- a/packer/provisioner.go +++ b/packer/provisioner.go @@ -9,7 +9,7 @@ import ( "log" "os" - hcpSbomProvisioner "github.com/hashicorp/packer/provisioner/hcp_sbom" + hcpSbomProvisioner "github.com/hashicorp/packer/provisioner/hcp-sbom" "github.com/klauspost/compress/zstd" @@ -241,9 +241,9 @@ func (p *DebuggedProvisioner) Provision(ctx context.Context, ui packersdk.Ui, co return p.Provisioner.Provision(ctx, ui, comm, generatedData) } -// SBOMInternalProvisioner is a wrapper provisioner for the `hcp_sbom` provisioner +// SBOMInternalProvisioner is a wrapper provisioner for the `hcp-sbom` provisioner // that sets the path for SBOM file download and, after the successful execution of -// the `hcp_sbom` provisioner, compresses the SBOM and prepares the data for API +// the `hcp-sbom` provisioner, compresses the SBOM and prepares the data for API // integration. type SBOMInternalProvisioner struct { Provisioner packersdk.Provisioner diff --git a/provisioner/hcp_sbom/provisioner.go b/provisioner/hcp-sbom/provisioner.go similarity index 99% rename from provisioner/hcp_sbom/provisioner.go rename to provisioner/hcp-sbom/provisioner.go index 6eae46a80..1f6555862 100644 --- a/provisioner/hcp_sbom/provisioner.go +++ b/provisioner/hcp-sbom/provisioner.go @@ -80,7 +80,7 @@ func (p *Provisioner) Provision( ctx context.Context, ui packersdk.Ui, comm packersdk.Communicator, generatedData map[string]interface{}, ) error { - log.Println("Starting to provision with `hcp_sbom` provisioner") + log.Println("Starting to provision with `hcp-sbom` provisioner") if generatedData == nil { generatedData = make(map[string]interface{}) diff --git a/provisioner/hcp_sbom/provisioner.hcl2spec.go b/provisioner/hcp-sbom/provisioner.hcl2spec.go similarity index 100% rename from provisioner/hcp_sbom/provisioner.hcl2spec.go rename to provisioner/hcp-sbom/provisioner.hcl2spec.go diff --git a/provisioner/hcp_sbom/validate.go b/provisioner/hcp-sbom/validate.go similarity index 100% rename from provisioner/hcp_sbom/validate.go rename to provisioner/hcp-sbom/validate.go diff --git a/provisioner/hcp_sbom/version/version.go b/provisioner/hcp-sbom/version/version.go similarity index 100% rename from provisioner/hcp_sbom/version/version.go rename to provisioner/hcp-sbom/version/version.go diff --git a/website/content/partials/provisioner/hcp_sbom/Config-not-required.mdx b/website/content/partials/provisioner/hcp-sbom/Config-not-required.mdx similarity index 88% rename from website/content/partials/provisioner/hcp_sbom/Config-not-required.mdx rename to website/content/partials/provisioner/hcp-sbom/Config-not-required.mdx index a46cec04b..eb241a06c 100644 --- a/website/content/partials/provisioner/hcp_sbom/Config-not-required.mdx +++ b/website/content/partials/provisioner/hcp-sbom/Config-not-required.mdx @@ -1,4 +1,4 @@ - + - `destination` (string) - Destination is an optional field that specifies the path where the SBOM file will be downloaded to for the user. @@ -10,4 +10,4 @@ a "Permission Denied" error will occur. If the source path is a file, it is recommended that the destination path be a file as well. - + diff --git a/website/content/partials/provisioner/hcp_sbom/Config-required.mdx b/website/content/partials/provisioner/hcp-sbom/Config-required.mdx similarity index 72% rename from website/content/partials/provisioner/hcp_sbom/Config-required.mdx rename to website/content/partials/provisioner/hcp-sbom/Config-required.mdx index 936c435f6..2f227c2b0 100644 --- a/website/content/partials/provisioner/hcp_sbom/Config-required.mdx +++ b/website/content/partials/provisioner/hcp-sbom/Config-required.mdx @@ -1,7 +1,7 @@ - + - `source` (string) - Source is a required field that specifies the path to the SBOM file that needs to be downloaded. It can be a file path or a URL. - +