chore: Remove terraform.lock.hcl from version control

Author: UMM KULSUM

.gitignore

@@ -1,26 +1,25 @@
-**/.terraform/**
-**tfstate*
-**/*.pem
-terraform.tfvars
+
 **/account.json
 **/credentials
-.DS_Store
-.terraform
-.terraform.tfstate.d
-*.pyc
 credentials*.json
-
-# JetBrains - PyCharm, IntelliJ, etc.
+.DS_Store
+**/Gemfile.lock
 .idea/
-__pycache__/
 *.iml
-.project
-
-# Kitchen files
 **/inspec.lock
+# JetBrains - PyCharm, IntelliJ, etc.
 **/.kitchen
+# Kitchen files
 **/kitchen.local.yml
-**/Gemfile.lock
-
-# tf lock file
+**/*.pem
+.project
+*.pyc
+__pycache__/
+**/.terraform/**
+.terraform
+.terraform.lock
 .terraform.lock.hcl
+.terraform.tfstate.d
+terraform.tfvars
+# tf lock file
+**tfstate*

.terraform.lock

@@ -24,40 +24,45 @@ REGISTRY_URL := gcr.io/cloud-foundation-cicd
 ENABLE_BPMETADATA := 1
 export ENABLE_BPMETADATA
 
-# This is the fix: A common set of flags for docker commands that need GCP authentication.
-# It removes the failing SERVICE_ACCOUNT_JSON and adds a volume mount for gcloud config.
-AUTH_DOCKER_FLAGS = --rm -it \
-	-e TF_VAR_org_id \
-	-e TF_VAR_folder_id \
-	-e TF_VAR_billing_account \
-	-v "$(CURDIR)":/workspace \
-	-v ~/.config/gcloud:/root/.config/gcloud
-
 # Enter docker container for local development
 .PHONY: docker_run
 docker_run:
-	docker run $(AUTH_DOCKER_FLAGS) \
+	docker run --rm -it \
+		-e SERVICE_ACCOUNT_JSON \
+		-v "$(CURDIR)":/workspace \
 		$(REGISTRY_URL)/${DOCKER_IMAGE_DEVELOPER_TOOLS}:${DOCKER_TAG_VERSION_DEVELOPER_TOOLS} \
 		/bin/bash
 
 # Execute prepare tests within the docker container
 .PHONY: docker_test_prepare
 docker_test_prepare:
-	docker run $(AUTH_DOCKER_FLAGS) \
+	docker run --rm -it \
+		-e SERVICE_ACCOUNT_JSON \
+		-e TF_VAR_org_id \
+		-e TF_VAR_folder_id \
+		-e TF_VAR_billing_account \
+		-v "$(CURDIR)":/workspace \
 		$(REGISTRY_URL)/${DOCKER_IMAGE_DEVELOPER_TOOLS}:${DOCKER_TAG_VERSION_DEVELOPER_TOOLS} \
 		/usr/local/bin/execute_with_credentials.sh prepare_environment
 
 # Clean up test environment within the docker container
 .PHONY: docker_test_cleanup
 docker_test_cleanup:
-	docker run $(AUTH_DOCKER_FLAGS) \
+	docker run --rm -it \
+		-e SERVICE_ACCOUNT_JSON \
+		-e TF_VAR_org_id \
+		-e TF_VAR_folder_id \
+		-e TF_VAR_billing_account \
+		-v "$(CURDIR)":/workspace \
 		$(REGISTRY_URL)/${DOCKER_IMAGE_DEVELOPER_TOOLS}:${DOCKER_TAG_VERSION_DEVELOPER_TOOLS} \
 		/usr/local/bin/execute_with_credentials.sh cleanup_environment
 
 # Execute integration tests within the docker container
 .PHONY: docker_test_integration
 docker_test_integration:
-	docker run $(AUTH_DOCKER_FLAGS) \
+	docker run --rm -it \
+		-e SERVICE_ACCOUNT_JSON \
+		-v "$(CURDIR)":/workspace \
 		$(REGISTRY_URL)/${DOCKER_IMAGE_DEVELOPER_TOOLS}:${DOCKER_TAG_VERSION_DEVELOPER_TOOLS} \
 		/usr/local/bin/test_integration.sh