TF backend config file is not compliant with the canonical format when the S3 lockfile option is enabled (#193)

Author: vonZeppelin

main.tf

@@ -17,10 +17,9 @@ locals {
     var.terraform_backend_config_file_name
   )
 
-  terraform_backend_default_template_file = local.s3_state_lock_enabled ? "${path.module}/templates/terraform-s3-lock.tf.tpl" : "${path.module}/templates/terraform.tf.tpl"
-  terraform_version_minimum               = local.s3_state_lock_enabled ? "1.11.0" : "1.0.0"
-  terraform_version_requested             = var.terraform_version != null ? var.terraform_version : local.terraform_version_minimum
-  terraform_backend_config_template_file  = var.terraform_backend_config_template_file != "" ? var.terraform_backend_config_template_file : local.terraform_backend_default_template_file
+  terraform_version_minimum              = local.s3_state_lock_enabled ? "1.11.0" : "1.0.0"
+  terraform_version_requested            = var.terraform_version != null ? var.terraform_version : local.terraform_version_minimum
+  terraform_backend_config_template_file = var.terraform_backend_config_template_file != "" ? var.terraform_backend_config_template_file : "${path.module}/templates/terraform.tf.tpl"
 
   terraform_backend_config_content = templatefile(local.terraform_backend_config_template_file, {
     region = data.aws_region.current.name

templates/terraform-s3-lock.tf.tpl

@@ -13,9 +13,14 @@ terraform {
       role_arn = "${role_arn}"
     }
     %{~ endif ~}
+    %{~ if use_lockfile ~}
+
+    use_lockfile = true
+    %{~ else ~}
     %{~ if dynamodb_table != "" ~}
 
     dynamodb_table = "${dynamodb_table}"
     %{~ endif ~}
+    %{~ endif ~}
   }
 }