Move GetPackerMetadata

hashicorp · Apr 3, 2024 · 6a3bcfb · 6a3bcfb
1 parent f911809
commit 6a3bcfb
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 22 deletions.
diff --git a/internal/hcp/registry/types.version.go b/internal/hcp/registry/types.version.go
@@ -186,6 +186,23 @@ func (version *Version) AddMetadataToBuild(
 		return err
 	}
 
-	buildToUpdate.Metadata.Packer = metadata.GetPackerMetadata()
+	buildToUpdate.Metadata.Packer = GetPackerMetadataFrom(metadata)
 	return nil
 }
+
+func GetPackerMetadataFrom(bm packer.BuildMetadata) map[string]interface{} {
+	packerMetadata := make(map[string]interface{})
+	packerMetadata["version"] = bm.PackerVersion
+
+	var pluginsMetadata []map[string]interface{}
+	for _, plugin := range bm.Plugins {
+		pluginMetadata := map[string]interface{}{
+			"version": plugin.Description.Version,
+			"name":    plugin.Name,
+		}
+		pluginsMetadata = append(pluginsMetadata, pluginMetadata)
+	}
+	packerMetadata["plugins"] = pluginsMetadata
+
+	return packerMetadata
+}
diff --git a/packer/build.go b/packer/build.go
@@ -57,23 +57,6 @@ type BuildMetadata struct {
 	Plugins       map[string]PluginDetails
 }
 
-func (bm *BuildMetadata) GetPackerMetadata() map[string]interface{} {
-	packerMetadata := make(map[string]interface{})
-	packerMetadata["version"] = bm.PackerVersion
-
-	var pluginsMetadata []map[string]interface{}
-	for _, plugin := range bm.Plugins {
-		pluginMetadata := map[string]interface{}{
-			"version": plugin.Description.Version,
-			"name":    plugin.Name,
-		}
-		pluginsMetadata = append(pluginsMetadata, pluginMetadata)
-	}
-	packerMetadata["plugins"] = pluginsMetadata
-
-	return packerMetadata
-}
-
 func (b *CoreBuild) getPluginsMetadata() map[string]PluginDetails {
 	resp := map[string]PluginDetails{}
 

diff --git a/packer/plugin.go b/packer/plugin.go
@@ -152,9 +152,7 @@ func (c *PluginConfig) DiscoverMultiPlugin(pluginName, pluginPath string) error
 			return c.Client(pluginPath, "start", "builder", builderName).Builder()
 		})
 		PluginsDetailsStorage[fmt.Sprintf("%q-%q", PluginComponentBuilder, key)] = pluginDetails
-
 	}
-
 	if len(desc.Builders) > 0 {
 		log.Printf("[INFO] found external %v builders from %s plugin", desc.Builders, pluginName)
 	}
@@ -170,7 +168,6 @@ func (c *PluginConfig) DiscoverMultiPlugin(pluginName, pluginPath string) error
 		})
 		PluginsDetailsStorage[fmt.Sprintf("%q-%q", PluginComponentPostProcessor, key)] = pluginDetails
 	}
-
 	if len(desc.PostProcessors) > 0 {
 		log.Printf("[INFO] found external %v post-processors from %s plugin", desc.PostProcessors, pluginName)
 	}
@@ -185,7 +182,6 @@ func (c *PluginConfig) DiscoverMultiPlugin(pluginName, pluginPath string) error
 			return c.Client(pluginPath, "start", "provisioner", provisionerName).Provisioner()
 		})
 		PluginsDetailsStorage[fmt.Sprintf("%q-%q", PluginComponentProvisioner, key)] = pluginDetails
-
 	}
 	if len(desc.Provisioners) > 0 {
 		log.Printf("found external %v provisioner from %s plugin", desc.Provisioners, pluginName)