From 6867456a72dd77bfcb4cdb745ea404e3d74ba913 Mon Sep 17 00:00:00 2001 From: Ilya Voronin Date: Tue, 18 May 2021 11:47:43 +0300 Subject: [PATCH] Implemented DEFAULT_NAME handling for datasource plugins (#11026) --- packer/plugin.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packer/plugin.go b/packer/plugin.go index c5e1b56b1..36e156a3c 100644 --- a/packer/plugin.go +++ b/packer/plugin.go @@ -320,7 +320,11 @@ func (c *PluginConfig) DiscoverMultiPlugin(pluginName, pluginPath string) error for _, datasourceName := range desc.Datasources { datasourceName := datasourceName // copy to avoid pointer overwrite issue - c.DataSources.Set(pluginPrefix+datasourceName, func() (packersdk.Datasource, error) { + key := pluginPrefix + datasourceName + if datasourceName == pluginsdk.DEFAULT_NAME { + key = pluginName + } + c.DataSources.Set(key, func() (packersdk.Datasource, error) { return c.Client(pluginPath, "start", "datasource", datasourceName).Datasource() }) }