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

packer: remove directory slices from structs

Browse Source 
Since we'll only look in the plugin directory, and not from multiple
sources now, for installing/listing plugins, we can simplify the
structures which used to accept multiple directories so they only accept
one.
This commit is contained in:
Lucas Bajolet
2024-03-01 09:04:15 -05:00
committed by Lucas Bajolet
parent 664700d0c0
commit 4b00a81bf3
10 changed files with 150 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files
command/init.go
+2 -2
View File
@@ -76,7 +76,7 @@ for more info.`)
}
opts := plugingetter.ListInstallationsOptions{
FromFolders: []string{c.Meta.CoreConfig.Components.PluginConfig.PluginDirectory},
PluginDirectory: c.Meta.CoreConfig.Components.PluginConfig.PluginDirectory,
BinaryInstallationOptions: plugingetter.BinaryInstallationOptions{
OS: runtime.GOOS,
ARCH: runtime.GOARCH,
@@ -132,7 +132,7 @@ for more info.`)
}
newInstall, err := pluginRequirement.InstallLatest(plugingetter.InstallOptions{
InFolders: opts.FromFolders,
PluginDirectory: opts.PluginDirectory,
BinaryInstallationOptions: opts.BinaryInstallationOptions,
Getters: getters,
Force: cla.Force,
command/plugins_install.go
+3 -6
View File
@@ -121,7 +121,7 @@ func (c *PluginsInstallCommand) ParseArgs(args []string) (*PluginsInstallArgs, i
func (c *PluginsInstallCommand) RunContext(buildCtx context.Context, args *PluginsInstallArgs) int {
opts := plugingetter.ListInstallationsOptions{
FromFolders: []string{c.Meta.CoreConfig.Components.PluginConfig.PluginDirectory},
PluginDirectory: c.Meta.CoreConfig.Components.PluginConfig.PluginDirectory,
BinaryInstallationOptions: plugingetter.BinaryInstallationOptions{
OS: runtime.GOOS,
ARCH: runtime.GOARCH,
@@ -176,7 +176,7 @@ func (c *PluginsInstallCommand) RunContext(buildCtx context.Context, args *Plugi
}
newInstall, err := pluginRequirement.InstallLatest(plugingetter.InstallOptions{
InFolders: opts.FromFolders,
PluginDirectory: opts.PluginDirectory,
BinaryInstallationOptions: opts.BinaryInstallationOptions,
Getters: getters,
Force: args.Force,
@@ -201,10 +201,7 @@ func (c *PluginsInstallCommand) RunContext(buildCtx context.Context, args *Plugi
}
func (c *PluginsInstallCommand) InstallFromBinary(opts plugingetter.ListInstallationsOptions, pluginIdentifier *addrs.Plugin, args *PluginsInstallArgs) int {
// As with the other commands, we get the last plugin directory as it
// has precedence over the others, and is where we'll install the
// plugins to.
pluginDir := opts.FromFolders[len(opts.FromFolders)-1]
pluginDir := opts.PluginDirectory
var err error
command/plugins_installed.go
+1 -1
View File
@@ -43,7 +43,7 @@ func (c *PluginsInstalledCommand) Run(args []string) int {
func (c *PluginsInstalledCommand) RunContext(buildCtx context.Context) int {
opts := plugingetter.ListInstallationsOptions{
FromFolders: []string{c.Meta.CoreConfig.Components.PluginConfig.PluginDirectory},
PluginDirectory: c.Meta.CoreConfig.Components.PluginConfig.PluginDirectory,
BinaryInstallationOptions: plugingetter.BinaryInstallationOptions{
OS: runtime.GOOS,
ARCH: runtime.GOARCH,
command/plugins_remove.go
+1 -1
View File
@@ -52,7 +52,7 @@ func (c *PluginsRemoveCommand) RunContext(buildCtx context.Context, args []strin
}
opts := plugingetter.ListInstallationsOptions{
FromFolders: []string{c.Meta.CoreConfig.Components.PluginConfig.PluginDirectory},
PluginDirectory: c.Meta.CoreConfig.Components.PluginConfig.PluginDirectory,
BinaryInstallationOptions: plugingetter.BinaryInstallationOptions{
OS: runtime.GOOS,
ARCH: runtime.GOARCH,
command/plugins_required.go
+1 -1
View File
@@ -84,7 +84,7 @@ func (c *PluginsRequiredCommand) RunContext(buildCtx context.Context, cla *Plugi
}
opts := plugingetter.ListInstallationsOptions{
FromFolders: []string{c.Meta.CoreConfig.Components.PluginConfig.PluginDirectory},
PluginDirectory: c.Meta.CoreConfig.Components.PluginConfig.PluginDirectory,
BinaryInstallationOptions: plugingetter.BinaryInstallationOptions{
OS: runtime.GOOS,
ARCH: runtime.GOARCH,