fix lint and unit tests

Author: mdimiceli

commands/usage_test.go

@@ -39,11 +39,12 @@ Usage:
   bbl [GLOBAL OPTIONS] COMMAND [OPTIONS]
 
 Global Options:
-  --help       [-h]        Prints usage. Use "bbl [command] --help" for more information about a command
-  --state-dir  [-s]        Directory containing the bbl state                                            env:"BBL_STATE_DIRECTORY"
-  --debug      [-d]        Prints debugging output                                                       env:"BBL_DEBUG"
-  --version    [-v]        Prints version
-  --no-confirm [-n]        No confirm
+  --help                 [-h] Prints usage. Use "bbl [command] --help" for more information about a command
+  --state-dir            [-s] Directory containing the bbl state                                            env:"BBL_STATE_DIRECTORY"
+  --debug                [-d] Prints debugging output                                                       env:"BBL_DEBUG"
+  --version              [-v] Prints version
+  --no-confirm           [-n] No confirm
+  --use-tf-local-binary  [-u] Use the local terraform binary if it exists                                   env:"BBL_USE_TF_LOCAL_BINARY"
 
 Basic Commands: A good place to start
   up                      Deploys BOSH director on an IAAS, creates CF/Concourse load balancers. Updates existing director.
@@ -84,11 +85,12 @@ Troubleshooting Commands:
   bbl [GLOBAL OPTIONS] my-command [OPTIONS]
 
 Global Options:
-  --help       [-h]        Prints usage. Use "bbl [command] --help" for more information about a command
-  --state-dir  [-s]        Directory containing the bbl state                                            env:"BBL_STATE_DIRECTORY"
-  --debug      [-d]        Prints debugging output                                                       env:"BBL_DEBUG"
-  --version    [-v]        Prints version
-  --no-confirm [-n]        No confirm
+  --help                 [-h] Prints usage. Use "bbl [command] --help" for more information about a command
+  --state-dir            [-s] Directory containing the bbl state                                            env:"BBL_STATE_DIRECTORY"
+  --debug                [-d] Prints debugging output                                                       env:"BBL_DEBUG"
+  --version              [-v] Prints version
+  --no-confirm           [-n] No confirm
+  --use-tf-local-binary  [-u] Use the local terraform binary if it exists                                   env:"BBL_USE_TF_LOCAL_BINARY"
 
 [my-command command options]
   some message

terraform/binary_path.go

@@ -50,10 +50,10 @@ func NewBinary(tfUseLocalBinary bool) *Binary {
 func (binary *Binary) BinaryPath() (string, error) {
 	// if user has a terraform use it
 	if binary.UseLocalBinary {
-	    userTerraform, err := exec.LookPath(tfBinDataAssetName)
-	    if err == nil && userTerraform != "" {
-		    return userTerraform, nil
-	    }
+		userTerraform, err := exec.LookPath(tfBinDataAssetName)
+		if err == nil && userTerraform != "" {
+			return userTerraform, nil
+		}
 	}
 
 	destinationPath := fmt.Sprintf("%s/%s", binary.FS.GetTempDir(os.TempDir()), bblTfBinaryName)