Made the code more DRY

hashicorp · Nov 16, 2015 · c01f2a3 · c01f2a3
1 parent 041f48d
commit c01f2a3
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 16 deletions.
diff --git a/client/driver/docker.go b/client/driver/docker.go
@@ -215,12 +215,12 @@ func (d *DockerDriver) createContainer(ctx *ExecContext, task *structs.Task, dri
 		return c, fmt.Errorf("Unable to parse docker.privileged.enabled: %s", err)
 	}
 
-	if taskPrivileged := driverConfig.Privileged; taskPrivileged {
-		if taskPrivileged && !hostPrivileged {
+	if driverConfig.Privileged {
+		if !hostPrivileged {
 			return c, fmt.Errorf(`Unable to set privileged flag since "docker.privileged.enabled" is false`)
 		}
 
-		hostConfig.Privileged = taskPrivileged
+		hostConfig.Privileged = driverConfig.Privileged
 	}
 
 	// set DNS servers
@@ -303,8 +303,7 @@ func (d *DockerDriver) createContainer(ctx *ExecContext, task *structs.Task, dri
 		config.ExposedPorts = exposedPorts
 	}
 
-	rawArgs := driverConfig.Args
-	parsedArgs, err := args.ParseAndReplace(rawArgs, env.Map())
+	parsedArgs, err := args.ParseAndReplace(driverConfig.Args, env.Map())
 	if err != nil {
 		return c, err
 	}

diff --git a/client/driver/exec.go b/client/driver/exec.go
@@ -92,8 +92,8 @@ func (d *ExecDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandle,
 
 	// Look for arguments
 	var args []string
-	if argRaw := driverConfig.Args; argRaw != "" {
-		args = append(args, argRaw)
+	if driverConfig.Args != "" {
+		args = append(args, driverConfig.Args)
 	}
 
 	// Setup the command

diff --git a/client/driver/executor/test_harness.go b/client/driver/executor/test_harness.go
@@ -21,7 +21,7 @@ var (
 		Networks: []*structs.NetworkResource{
 			&structs.NetworkResource{
 				MBits:        50,
-				DynamicPorts: []structs.Port{structs.Port{Label: "http"}},
+				DynamicPorts: []structs.Port{{Label: "http"}},
 			},
 		},
 	}

diff --git a/client/driver/java.go b/client/driver/java.go
@@ -133,8 +133,8 @@ func (d *JavaDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandle,
 
 	// Build the argument list.
 	args = append(args, "-jar", filepath.Join(allocdir.TaskLocal, jarName))
-	if argRaw := driverConfig.Args; argRaw != "" {
-		args = append(args, argRaw)
+	if driverConfig.Args != "" {
+		args = append(args, driverConfig.Args)
 	}
 
 	// Setup the command

diff --git a/client/driver/qemu.go b/client/driver/qemu.go
@@ -115,8 +115,8 @@ func (d *QemuDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandle,
 	// Parse configuration arguments
 	// Create the base arguments
 	accelerator := "tcg"
-	if acc := driverConfig.Accelerator; acc != "" {
-		accelerator = acc
+	if driverConfig.Accelerator != "" {
+		accelerator = driverConfig.Accelerator
 	}
 	// TODO: Check a lower bounds, e.g. the default 128 of Qemu
 	mem := fmt.Sprintf("%dM", task.Resources.MemoryMB)

diff --git a/client/driver/raw_exec.go b/client/driver/raw_exec.go
@@ -94,8 +94,8 @@ func (d *RawExecDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandl
 
 	// Look for arguments
 	var args []string
-	if argRaw := driverConfig.Args; argRaw != "" {
-		args = append(args, argRaw)
+	if driverConfig.Args != "" {
+		args = append(args, driverConfig.Args)
 	}
 
 	// Setup the command

diff --git a/client/driver/rkt.go b/client/driver/rkt.go
@@ -149,8 +149,8 @@ func (d *RktDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandle, e
 	}
 
 	// Add user passed arguments.
-	if userArgs := driverConfig.Args; userArgs != "" {
-		parsed, err := args.ParseAndReplace(userArgs, envVars.Map())
+	if driverConfig.Args != "" {
+		parsed, err := args.ParseAndReplace(driverConfig.Args, envVars.Map())
 		if err != nil {
 			return nil, err
 		}