Fix passing of extra arguments to terraform plan

Fix #25

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Deprecated
 ### Removed
 ### Fixed
+- Fix passing of extra arguments to `terraform plan` call
 ### Security
 
 

README.md

@@ -30,9 +30,10 @@ terraform-state-mover # inside a Terraform root directory
 
 Extra arguments after a `--` are passed to the `terraform plan` call. This makes the following possible:
 ```bash
-terraform-state-mover -- -var key=value  # setting variables
-terraform-state-mover -- -var-file=variables.tfvars  # using variable files
+terraform-state-mover -- -var key=value  # set variables
+terraform-state-mover -- -var-file=variables.tfvars  # use variable files
 terraform-state-mover -- -refresh=false  # skip state refresh
+terraform-state-mover -- -parallelism=50  # speed up plan by using more concurrent operations
 ```
 
 *Hint:*

main.go

@@ -60,13 +60,15 @@ func main() {
 }
 
 func action(ctx *cli.Context) error {
-	var args []string
-	if len(os.Args) >= 2 && os.Args[1] == "--" {
-		args = os.Args[2:]
+	var planArgs []string
+	for i, elem := range os.Args {
+		if "--" == elem {
+			planArgs = os.Args[i+1:]
+		}
 	}
 	cfg := readConfig(ctx)
 
-	changes, err := changes(cfg, args)
+	changes, err := changes(cfg, planArgs)
 	if err != nil {
 		return err
 	}

planner.go

@@ -11,15 +11,15 @@ import (
 	"strings"
 )
 
-func changes(cfg config, args []string) ([]ResChange, error) {
+func changes(cfg config, planArgs []string) ([]ResChange, error) {
 	tfPlan, err := ioutil.TempFile("", "tfplan")
 	if err != nil {
 		return nil, err
 	}
 	tfPlanName := tfPlan.Name()
 	defer os.Remove(tfPlanName)
 
-	if err := terraformExec(cfg, true, args, "plan", "-out="+tfPlanName); err != nil {
+	if err := terraformExec(cfg, true, planArgs, "plan", "-out="+tfPlanName); err != nil {
 		return nil, err
 	}