Merge branch 'update-terraform-template' into 'master'

Update Terraform.latest.gitlab-ci.yml template

See merge request gitlab-org/gitlab!71188

lib/gitlab/ci/templates/Terraform.latest.gitlab-ci.yml

@@ -7,20 +7,17 @@ include:
   - template: Terraform/Base.latest.gitlab-ci.yml  # https://gitlab.com/gitlab-org/gitlab/blob/master/lib/gitlab/ci/templates/Terraform/Base.latest.gitlab-ci.yml
 
 stages:
-  - init
   - validate
   - build
   - deploy
-  - cleanup
-
-init:
-  extends: .terraform:init
 
 fmt:
   extends: .terraform:fmt
+  needs: []
 
 validate:
   extends: .terraform:validate
+  needs: []
 
 build:
   extends: .terraform:build

lib/gitlab/ci/templates/Terraform/Base.latest.gitlab-ci.yml

@@ -21,18 +21,11 @@ cache:
   paths:
     - ${TF_ROOT}/.terraform/
 
-.terraform:init: &terraform_init
-  stage: init
-  script:
-    - cd ${TF_ROOT}
-    - gitlab-terraform init
-
 .terraform:fmt: &terraform_fmt
   stage: validate
-  needs: []
   script:
     - cd ${TF_ROOT}
-    - gitlab-terraform fmt -check -recursive
+    - gitlab-terraform fmt
   allow_failure: true
 
 .terraform:validate: &terraform_validate

spec/lib/gitlab/ci/templates/terraform_latest_gitlab_ci_yaml_spec.rb

@@ -27,7 +27,7 @@ RSpec.describe 'Terraform.latest.gitlab-ci.yml' do
     context 'on master branch' do
       it 'creates init, validate and build jobs', :aggregate_failures do
         expect(pipeline.errors).to be_empty
-        expect(build_names).to include('init', 'validate', 'build', 'deploy')
+        expect(build_names).to include('validate', 'build', 'deploy')
       end
     end