From 35496e533de73f57befe86ed277ca57b5685dcd2 Mon Sep 17 00:00:00 2001
From: Lucas Bajolet <lucas.bajolet@hashicorp.com>
Date: Thu, 20 Oct 2022 10:12:32 -0400
Subject: [PATCH] packer: include builder type in HCP name for JSON

JSON templates used only to report the builder's type in HCP builds,
even if the name was specified.

This commit changes this behaviour to include both if they're available,
in a similar fashion as what is done on the HCL2 templates.
---
 command/registry.go |  2 +-
 packer/core.go      | 28 +++++++++++++++++++++++++---
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/command/registry.go b/command/registry.go
index cf81b0cb6..943bf9bcf 100644
--- a/command/registry.go
+++ b/command/registry.go
@@ -158,7 +158,7 @@ func setupRegistryForPackerCore(cfg *CoreWrapper) hcl.Diagnostics {
 	cfg.Core.Bucket = bucket
 	for _, b := range cfg.Core.Template.Builders {
 		// Get all builds slated within config ignoring any only or exclude flags.
-		cfg.Core.Bucket.RegisterBuildForComponent(b.Name)
+		cfg.Core.Bucket.RegisterBuildForComponent(packer.HCPName(b))
 	}
 
 	return diags
diff --git a/packer/core.go b/packer/core.go
index 717a8a274..8556e4b1c 100644
--- a/packer/core.go
+++ b/packer/core.go
@@ -293,6 +293,24 @@ func (c *Core) GetBuilds(opts GetBuildsOptions) ([]packersdk.Build, hcl.Diagnost
 	return builds, diags
 }
 
+// HCPName is a helper to get a curated HCP name for a legacy JSON builder.
+//
+// In order to make the naming scheme between HCL2 and JSON more consistent,
+// we implement a similar kind of logic on both template types.
+//
+// This means that when for HCL2 templates we have a build name formed of
+// the source type and the source name, we will do the name here for JSON.
+func HCPName(builder *template.Builder) string {
+	// By default, if the name is unspecified, it will be assigned the type
+	//
+	// No need to repeat ourselves here, so we can keep the current behaviour
+	if builder.Name == builder.Type {
+		return builder.Name
+	}
+
+	return fmt.Sprintf("%s.%s", builder.Type, builder.Name)
+}
+
 // Build returns the Build object for the given name.
 func (c *Core) Build(n string) (packersdk.Build, error) {
 	// Setup the builder
@@ -320,6 +338,10 @@ func (c *Core) Build(n string) (packersdk.Build, error) {
 	// rawName is the uninterpolated name that we use for various lookups
 	rawName := configBuilder.Name
 
+	// hcpName is the name we use for HCP, i.e. a concatenation of type+name
+	// if both are specified.
+	hcpName := HCPName(configBuilder)
+
 	// Setup the provisioners for this build
 	provisioners := make([]CoreBuildProvisioner, 0, len(c.Template.Provisioners))
 	for _, rawP := range c.Template.Provisioners {
@@ -379,7 +401,7 @@ func (c *Core) Build(n string) (packersdk.Build, error) {
 
 			if c.Bucket != nil {
 				postProcessor = &RegistryPostProcessor{
-					BuilderType:               n,
+					BuilderType:               hcpName,
 					ArtifactMetadataPublisher: c.Bucket,
 					PostProcessor:             postProcessor,
 				}
@@ -405,7 +427,7 @@ func (c *Core) Build(n string) (packersdk.Build, error) {
 		postProcessors = append(postProcessors, []CoreBuildPostProcessor{
 			{
 				PostProcessor: &RegistryPostProcessor{
-					BuilderType:               n,
+					BuilderType:               hcpName,
 					ArtifactMetadataPublisher: c.Bucket,
 				},
 			},
@@ -416,7 +438,7 @@ func (c *Core) Build(n string) (packersdk.Build, error) {
 
 	if c.Bucket != nil {
 		builder = &RegistryBuilder{
-			Name:                      n,
+			Name:                      hcpName,
 			ArtifactMetadataPublisher: c.Bucket,
 			Builder:                   builder,
 		}