.copywrite.hcl

@@ -1,6 +1,6 @@
 project {
   license = "BUSL-1.1"
-  copyright_year = 2023
+  copyright_year = 2024
   header_ignore = [
     "*.hcl2spec.go", # generated code specs, since they'll be wiped out until we support adding the headers at generation-time
     "hcl2template/testdata/**",

.github/ISSUE_TEMPLATE/plugin_integration.md

@@ -0,0 +1,21 @@
+---
+name: Plugin Integration Request
+about: Open request to add your plugin as a Packer integration (https://developer.hashicorp.com/packer/integrations)
+labels: integration-request
+---
+
+#### Description
+
+A written description of your plugin along with a link to the plugin repository. 
+
+#### Integration Tier
+<!--- By default all integrations are registered as community integrations.
+HashiCorp Technology partners https://www.hashicorp.com/partners/find-a-partner will be registered as a partner once verified. --->
+
+#### Checklist
+- [] Has valid [`metadata.hcl`](https://github.com/hashicorp/integration-template) file in plugin repository.
+- [] Has added integration scripts [packer-plugin-scaffolding](https://github.com/hashicorp/packer-plugin-scoffolding) to plugin repository.
+- [] Has added top-level integration README.md file to plugin `docs` directory.
+- [] All plugins components have one README.md describing their usage.
+- [] Has a fully synced `.web-docs` directory ready for publishing to the integrations portal.
+

.go-version

@@ -1 +1 @@
-1.20.11
+1.20.12

CHANGELOG.md

@@ -1,4 +1,68 @@
-## 1.10.1 (Upcoming)
+## 1.11.0 (Upcoming)
+
+### NOTES:
+**Breaking Change**: Support for loading single-component plugins has been removed from Packer. [GH-12785](https://github.com/hashicorp/packer/pull/12785)
+
+### IMPROVEMENTS:
+* core: remove support single-component plugins. [GH-12785](https://github.com/hashicorp/packer/pull/12785)
+
+## 1.10.1 (January 30, 2024)
+
+### NOTES:
+* **HCP Packer** has been updated to follow an artifact-agnostic approach for 
+     publishing and consuming built artifacts. To best support the new approach, HCP Packer components within Packer have
+     been updated to use the v2 nomenclature when publishing build metadata to
+     HCP Packer. These changes include data source components for consuming HCP
+     Packer stored artifacts. The data source components [hcp-packer-version](https://developer.hashicorp.com/packer/docs/datasources/hcp/hcp-packer-version) 
+     and [hcp-packer-artifact](https://developer.hashicorp.com/packer/docs/datasources/hcp/hcp-packer-artifact) respectively replace, the now deprecated, 
+     [hcp-packer-iteration](https://developer.hashicorp.com/packer/docs/datasources/hcp/hcp-packer-iteration) 
+     and [hcp-packer-image](https://developer.hashicorp.com/packer/docs/datasources/hcp/hcp-packer-image)
+     component data sources. The added changes are compatible with all existing HCP Packer workflows and do not warrant any
+     immediate template changes by the user. However, we encourage all HCP Packer users to visit the updated 
+     HCP Packer [CHANGELOG](https://developer.hashicorp.com/hcp/docs/changelog) to familiarize themselves with the nomenclature changes. 
+     [GH-12794](https://github.com/hashicorp/packer/pull/12794) [GH-12799](https://github.com/hashicorp/packer/pull/12799)
+* The `hcp-packer-image` data source has been deprecated, please use HCP Packer
+     Artifact data source instead.
+     [GH-12794](https://github.com/hashicorp/packer/pull/12794)
+* The `hcp-packer-iteration` data source has been deprecated, please use HCP
+     Packer Version data source instead.
+     [GH-12794](https://github.com/hashicorp/packer/pull/12794)
+* The contextual variable `packer.iterationID` has been deprecated, please use
+     the new contextual variable `packer.versionFingerprint`. The iterationID
+     represents the HCP Packer iteration that build metadata has been publish
+     to, with this release an Iteration is now referred to as a Version and the
+     ID has been replaced by the Version Fingerprint.
+     [GH-12803](https://github.com/hashicorp/packer/pull/12803)
+
+### FEATURES:
+* **New Data source** `hcp-packer-artifact` The HCP Packer Artifact Data Source
+     retrieves information about an artifact from the HCP Packer Registry.
+     [GH-12794](https://github.com/hashicorp/packer/pull/12794)
+* **New Data source** `hcp-packer-version`  The HCP Packer Version Data Source
+     retrieves information about HCP Packer Version from the HCP Packer.
+     Registry. [GH-12794](https://github.com/hashicorp/packer/pull/12794)
+
+### SECURITY:
+* core: Bump Go dependencies to address various CVEs. [GH-12777](https://github.com/hashicorp/packer/pull/12777)
+* core: Bump github.com/cloudflare/circl to address GHSA-9763-4f94-gfch. [GH-12781](https://github.com/hashicorp/packer/pull/12781)
+
+### IMPROVEMENTS:
+* core: Bump github.com/hashicorp/hcp-sdk-go from 0.79.0 to 0.81.0
+     [GH-12792](https://github.com/hashicorp/packer/pull/12792)
+     [GH-12764](https://github.com/hashicorp/packer/pull/12764)
+* core: Update error messaging for HCP incompatible plugin builds.
+     [GH-12800](https://github.com/hashicorp/packer/pull/12800)
+* core: Update HCP Packer integration to use HCP Packer v2 nomenclature, with
+     this change HCP Packer iterations are now referred to as Versions, and
+     Images are now referred to as Artifacts. The data sources for interacting
+     with HCP Packer have been respectively renamed to align with the terminology
+     of Version and Artifact.
+     [GH-12794](https://github.com/hashicorp/packer/pull/12794)
+     [GH-12799](https://github.com/hashicorp/packer/pull/12799)
+* core: Update spacing for flags within Help text.
+     [GH-12742](https://github.com/hashicorp/packer/pull/12742)
+     [GH-12743](https://github.com/hashicorp/packer/pull/12743)
+
 
 ## 1.10.0 (December 5, 2023)
 

LICENSE

@@ -1,32 +1,33 @@
 License text copyright (c) 2020 MariaDB Corporation Ab, All Rights Reserved.
-“Business Source License” is a trademark of MariaDB Corporation Ab.
+"Business Source License" is a trademark of MariaDB Corporation Ab.
 
 Parameters
 
 Licensor:             HashiCorp, Inc.
-Licensed Work:        Packer 1.10.0. The Licensed Work is (c) 2023 HashiCorp, Inc.
+Licensed Work:        Packer Version 1.10.0 or later. The Licensed Work is (c) 2024
+                      HashiCorp, Inc.
 Additional Use Grant: You may make production use of the Licensed Work, provided
                       Your use does not include offering the Licensed Work to third
                       parties on a hosted or embedded basis in order to compete with 
-                      HashiCorp’s paid version(s) of the Licensed Work. For purposes 
+                      HashiCorp's paid version(s) of the Licensed Work. For purposes 
                       of this license:
 
-                      A “competitive offering” is a Product that is offered to third
+                      A "competitive offering" is a Product that is offered to third
                       parties on a paid basis, including through paid support 
                       arrangements, that significantly overlaps with the capabilities 
-                      of HashiCorp’s paid version(s) of the Licensed Work. If Your 
+                      of HashiCorp's paid version(s) of the Licensed Work. If Your 
                       Product is not a competitive offering when You first make it 
                       generally available, it will not become a competitive offering
                       later due to HashiCorp releasing a new version of the Licensed 
                       Work with additional capabilities. In addition, Products that 
                       are not provided on a paid basis are not competitive.
 
-                      “Product” means software that is offered to end users to manage 
+                      "Product" means software that is offered to end users to manage 
                       in their own environments or offered as a service on a hosted 
                       basis.
 
-                      “Embedded” means including the source code or executable code 
-                      from the Licensed Work in a competitive offering. “Embedded” 
+                      "Embedded" means including the source code or executable code 
+                      from the Licensed Work in a competitive offering. "Embedded" 
                       also means packaging the competitive offering in such a way 
                       that the Licensed Work must be accessed or downloaded for the 
                       competitive offering to operate.
@@ -85,7 +86,7 @@ Licensor or its affiliates (provided that you may use a trademark or logo of
 Licensor as expressly required by this License).
 
 TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVIDED ON
-AN “AS IS” BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS,
+AN "AS IS" BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS,
 EXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF
 MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND
 TITLE.

command/build.go

@@ -25,6 +25,10 @@ import (
 	"github.com/posener/complete"
 )
 
+const (
+	hcpReadyIntegrationURL = "https://developer.hashicorp.com/packer/integrations?flags=hcp-ready"
+)
+
 type BuildCommand struct {
 	Meta
 }
@@ -105,13 +109,13 @@ func (c *BuildCommand) RunContext(buildCtx context.Context, cla *BuildArgs) int
 		return ret
 	}
 
-	defer hcpRegistry.IterationStatusSummary()
+	defer hcpRegistry.VersionStatusSummary()
 
-	err := hcpRegistry.PopulateIteration(buildCtx)
+	err := hcpRegistry.PopulateVersion(buildCtx)
 	if err != nil {
 		return writeDiags(c.Ui, nil, hcl.Diagnostics{
 			&hcl.Diagnostic{
-				Summary:  "HCP: populating iteration failed",
+				Summary:  "HCP: populating version failed",
 				Severity: hcl.DiagError,
 				Detail:   err.Error(),
 			},
@@ -202,6 +206,8 @@ func (c *BuildCommand) RunContext(buildCtx context.Context, cla *BuildArgs) int
 		m map[string]error
 	}{m: make(map[string]error)}
 	limitParallel := semaphore.NewWeighted(cla.ParallelBuilds)
+
+	var hasPossibleIncompatibleHCPIntegration bool
 	for i := range builds {
 		if err := buildCtx.Err(); err != nil {
 			log.Println("Interrupted, not going to start any more builds.")
@@ -267,12 +273,13 @@ func (c *BuildCommand) RunContext(buildCtx context.Context, cla *BuildArgs) int
 				writeDiags(c.Ui, nil, hcl.Diagnostics{
 					&hcl.Diagnostic{
 						Summary: fmt.Sprintf(
-							"failed to complete HCP-enabled build %q",
+							"publishing build metadata to HCP Packer for %q failed",
 							name),
 						Severity: hcl.DiagError,
 						Detail:   hcperr.Error(),
 					},
 				})
+				hasPossibleIncompatibleHCPIntegration = true
 			}
 
 			if err != nil {
@@ -384,6 +391,15 @@ func (c *BuildCommand) RunContext(buildCtx context.Context, cla *BuildArgs) int
 		c.Ui.Say("\n==> Builds finished but no artifacts were created.")
 	}
 
+	if hasPossibleIncompatibleHCPIntegration {
+		msg := fmt.Sprintf(`
+It looks like one or more plugins in your build may be incompatible with HCP Packer.
+Check that you are using an HCP Ready integration before trying again:
+%s`, hcpReadyIntegrationURL)
+
+		c.Ui.Error(msg)
+	}
+
 	if len(errs.m) > 0 {
 		// If any errors occurred, exit with a non-zero exit status
 		ret = 1

command/plugin.go

@@ -15,8 +15,10 @@ import (
 
 	filebuilder "github.com/hashicorp/packer/builder/file"
 	nullbuilder "github.com/hashicorp/packer/builder/null"
+	hcppackerartifactdatasource "github.com/hashicorp/packer/datasource/hcp-packer-artifact"
 	hcppackerimagedatasource "github.com/hashicorp/packer/datasource/hcp-packer-image"
 	hcppackeriterationdatasource "github.com/hashicorp/packer/datasource/hcp-packer-iteration"
+	hcppackerversiondatasource "github.com/hashicorp/packer/datasource/hcp-packer-version"
 	httpdatasource "github.com/hashicorp/packer/datasource/http"
 	nulldatasource "github.com/hashicorp/packer/datasource/null"
 	artificepostprocessor "github.com/hashicorp/packer/post-processor/artifice"
@@ -63,8 +65,10 @@ var PostProcessors = map[string]packersdk.PostProcessor{
 }
 
 var Datasources = map[string]packersdk.Datasource{
+	"hcp-packer-artifact":  new(hcppackerartifactdatasource.Datasource),
 	"hcp-packer-image":     new(hcppackerimagedatasource.Datasource),
 	"hcp-packer-iteration": new(hcppackeriterationdatasource.Datasource),
+	"hcp-packer-version":   new(hcppackerversiondatasource.Datasource),
 	"http":                 new(httpdatasource.Datasource),
 	"null":                 new(nulldatasource.Datasource),
 }