iSharkFly-Docs/Packer-Cn
2
0
Fork 0
mirror of https://github.com/hashicorp/packer.git synced 2026-09-24 08:51:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

packer: remove path argument to discover installed

Browse Source 
Since the plugin directory should now be unique instead of a list, we
can use it directly from the receiver's structure instead of as a
parameter to the function.
This commit is contained in:
Lucas Bajolet
2024-02-23 14:24:11 -05:00
parent be323c0d6f
commit e7d4bf2deb
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packer/plugin.go
+4 -4
View File
@@ -71,7 +71,7 @@ func (c *PluginConfig) Discover() error {
c.PluginDirectory, _ = PluginFolder()
}
if err := c.discoverInstalledComponents(c.PluginDirectory); err != nil {
if err := c.discoverInstalledComponents(); err != nil {
return err
}
@@ -260,7 +260,7 @@ func (c *PluginConfig) Client(path string, args ...string) *PluginClient {
// discoverInstalledComponents scans the provided path for plugins installed by running packer plugins install or packer init.
// Valid plugins contain a matching system binary and valid checksum file.
func (c *PluginConfig) discoverInstalledComponents(path string) error {
func (c *PluginConfig) discoverInstalledComponents() error {
//Check for installed plugins using the `packer plugins install` command
binInstallOpts := plugingetter.BinaryInstallationOptions{
OS: runtime.GOOS,
@@ -276,7 +276,7 @@ func (c *PluginConfig) discoverInstalledComponents(path string) error {
binInstallOpts.Ext = ".exe"
}
pluginPath := filepath.Join(path, "*", "*", "*", fmt.Sprintf("packer-plugin-*%s", binInstallOpts.FilenameSuffix()))
pluginPath := filepath.Join(c.PluginDirectory, "*", "*", "*", fmt.Sprintf("packer-plugin-*%s", binInstallOpts.FilenameSuffix()))
pluginPaths, err := c.discoverSingle(pluginPath)
if err != nil {
return err
@@ -300,7 +300,7 @@ func (c *PluginConfig) discoverInstalledComponents(path string) error {
}
if !checksumOk {
log.Printf("[WARN] No checksum found for %q ignoring possibly unsafe binary", path)
log.Printf("[WARN] No checksum found for %q ignoring possibly unsafe binary", pluginPath)
continue
}