Support ip_extra_args (cirruslabs#98)

Fixes cirruslabs#96
sc0rp10 · Sep 19, 2023 · ed5b2b3 · ed5b2b3
1 parent 8f608bd
commit ed5b2b3
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git a/builder/tart/builder.go b/builder/tart/builder.go
@@ -41,6 +41,7 @@ type Config struct {
 	Recovery        bool          `mapstructure:"recovery"`
 	Rosetta         string        `mapstructure:"rosetta"`
 	RunExtraArgs    []string      `mapstructure:"run_extra_args"`
+	IpExtraArgs     []string      `mapstructure:"ip_extra_args"`
 
 	ctx interpolate.Context
 }
@@ -100,8 +101,10 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	if !b.config.Recovery {
 		steps = append(steps,
 			&communicator.StepConnect{
-				Config:    &b.config.CommunicatorConfig,
-				Host:      TartMachineIP(ctx, b.config.VMName),
+				Config: &b.config.CommunicatorConfig,
+				Host: func(state multistep.StateBag) (string, error) {
+					return TartMachineIP(ctx, b.config.VMName, b.config.IpExtraArgs)
+				},
 				SSHConfig: b.config.CommunicatorConfig.SSHConfigFunc(),
 			},
 			new(stepResize),

diff --git a/builder/tart/builder.hcl2spec.go b/builder/tart/builder.hcl2spec.go
diff --git a/builder/tart/ssh.go b/builder/tart/ssh.go
@@ -2,11 +2,12 @@ package tart
 
 import (
 	"context"
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
 )
 
-func TartMachineIP(ctx context.Context, vmName string) func(multistep.StateBag) (string, error) {
-	return func(state multistep.StateBag) (string, error) {
-		return TartExec(ctx, "ip", "--wait", "120", vmName)
+func TartMachineIP(ctx context.Context, vmName string, ipExtraArgs []string) (string, error) {
+	ipArgs := []string{"ip", "--wait", "120", vmName}
+	if len(ipExtraArgs) > 0 {
+		ipArgs = append(ipArgs, ipExtraArgs...)
 	}
+	return TartExec(ctx, ipArgs...)
 }
diff --git a/builder/tart/step_run.go b/builder/tart/step_run.go
@@ -251,7 +251,7 @@ func detectHostIP(ctx context.Context, config *Config) (string, error) {
 		return config.HTTPAddress, nil
 	}
 
-	vmIPRaw, err := TartExec(ctx, "ip", "--wait", "120", config.VMName)
+	vmIPRaw, err := TartMachineIP(ctx, config.VMName, config.IpExtraArgs)
 	if err != nil {
 		return "", fmt.Errorf("%w: while running \"tart ip\": %v",
 			ErrFailedToDetectHostIP, err)

diff --git a/docs/builders/tart.mdx b/docs/builders/tart.mdx
@@ -50,6 +50,7 @@ Below we'll go through available options of this Packer plugin.
 - `recovery` (bool) — Whether to boot the VM in recovery mode. Useful for disabling the System Integrity Protection automatically for the already created VMs.
 - `rosetta` (string) - Whether to enable Rosetta support of a Linux guest VM. Useful for running non-arm64 binaries in the guest VM. A common used value is `rosetta`, for further details and explanation run `tart run --help`.
 - `run_extra_args` (list(string)) - Extra arguments to pass to `tart run` command. For example, you can enable bridged networking by specifying `--net-bridged=en0`.
+- `ip_extra_args` (list(string)) - Extra arguments to pass to `tart ip` command. For example, you can use a different resolver in case of bridged network by specifying `--resolver=arp`.
 - `vm_base_name` (string) - The name of the VM to be used for the initial cloning. Can be either a local VM or a remote VM that will be pulled from a registry. Mutually exclusive with `from_ipsw` and `from_iso`.
 
 ### SSH connection configuration