Merge branch 'jmccann:master' into feature/fmt-recursive

CHANGELOG.md

@@ -1,3 +1,14 @@
+## 8.3-1.0.2 (2021-07-09)
+* Update embedded TF to `1.0.2`
+  * A continuation of `v0.15` release line but now following semver
+  * Please refer to [Terraform v1.0 Compatibility Promises](https://www.terraform.io/docs/language/v1-compatibility-promises.html)
+
+## 8.3-0.15.1 (2021-07-09)
+* fix: remove -lock and -lock-timeout for terraform init - https://github.com/jmccann/drone-terraform/pull/130
+
+## 8.2-0.15.1 (2021-06-02)
+* fix: `-force` -> `-auto-approve` - https://github.com/jmccann/drone-terraform/pull/128
+
 ## 8.1-0.15.1 (2021-04-27)
 * added ability to [disable refresh](https://github.com/jmccann/drone-terraform/pull/120)
 

build-docker.sh

@@ -12,7 +12,7 @@ fi
 major=$(echo $tag | awk -F. '{print $1}')
 minor=$(echo $tag | awk -F. '{print $2}')
 
-tf_ver="0.15.1"
+tf_ver="1.0.2"
 
 echo "Confirm building images for:"
 echo "  MAJOR: ${major}"

plugin.go

@@ -226,16 +226,6 @@ func initCommand(config InitOptions) *exec.Cmd {
 		args = append(args, fmt.Sprintf("-backend-config=%s", v))
 	}
 
-	// True is default in TF
-	if config.Lock != nil {
-		args = append(args, fmt.Sprintf("-lock=%t", *config.Lock))
-	}
-
-	// "0s" is default in TF
-	if config.LockTimeout != "" {
-		args = append(args, fmt.Sprintf("-lock-timeout=%s", config.LockTimeout))
-	}
-
 	// Fail Terraform execution on prompt
 	args = append(args, "-input=false")