fix: alter gcp var prefix

sap_bw4hana_single_node_install/gcp_ce_vm/main.tf

@@ -36,9 +36,9 @@ module "run_account_init_module" {
 
   module_var_resource_prefix                = var.resource_prefix
 
-  module_var_gcp_region                     = local.google_cloud_region
-  module_var_gcp_vpc_subnet_create_boolean  = local.google_cloud_vpc_subnet_create_boolean
-  module_var_gcp_vpc_subnet_name            = local.google_cloud_vpc_subnet_create_boolean ? 0 : var.google_cloud_vpc_subnet_name
+  module_var_gcp_region                     = local.gcp_region
+  module_var_gcp_vpc_subnet_create_boolean  = local.gcp_vpc_subnet_create_boolean
+  module_var_gcp_vpc_subnet_name            = local.gcp_vpc_subnet_create_boolean ? 0 : var.gcp_vpc_subnet_name
 
 }
 
@@ -70,8 +70,8 @@ module "run_bastion_inject_module" {
 
   module_var_resource_prefix                = var.resource_prefix
 
-  module_var_gcp_region                     = local.google_cloud_region
-  module_var_gcp_region_zone                = var.google_cloud_region_zone
+  module_var_gcp_region                     = local.gcp_region
+  module_var_gcp_region_zone                = var.gcp_region_zone
   module_var_gcp_vpc_subnet_name            = module.run_account_init_module.output_vpc_subnet_name
 
   module_var_bastion_user                   = var.bastion_user
@@ -133,7 +133,7 @@ module "run_host_provision_module" {
 
   module_var_resource_prefix                = var.resource_prefix
 
-  module_var_gcp_region_zone                = var.google_cloud_region_zone
+  module_var_gcp_region_zone                = var.gcp_region_zone
   module_var_gcp_vpc_subnet_name            = module.run_account_init_module.output_vpc_subnet_name
 
   module_var_dns_root_domain_name           = var.dns_root_domain

sap_bw4hana_single_node_install/gcp_ce_vm/variable_locals.tf

@@ -1,8 +1,8 @@
 locals {
 
-  google_cloud_vpc_subnet_create_boolean = var.google_cloud_vpc_subnet_name == "new" ? true : false
+  gcp_vpc_subnet_create_boolean = var.gcp_vpc_subnet_name == "new" ? true : false
 
-  google_cloud_region = replace(var.google_cloud_region_zone, "/-[^-]*$/", "")
+  gcp_region = replace(var.gcp_region_zone, "/-[^-]*$/", "")
 
   # Directories start with "C:..." on Windows; All other OSs use "/" for root.
   detect_windows = substr(pathexpand("~"), 0, 1) == "/" ? false : true

sap_bw4hana_single_node_install/gcp_ce_vm/variables.tf

@@ -1,17 +1,17 @@
 
-variable "google_cloud_project" {
+variable "gcp_project" {
   description = "Target GCP Project ID"
 }
 
-variable "google_cloud_region_zone" {
+variable "gcp_region_zone" {
   description = "Target GCP Zone, the GCP Region will be calculated from this value (e.g. europe-west9-a)"
 }
 
-variable "google_cloud_credentials_json" {
+variable "gcp_credentials_json" {
   description = "Enter path to GCP Key File for Service Account (or Google Application Default Credentials JSON file for GCloud CLI)"
 }
 
-variable "google_cloud_vpc_subnet_name" {
+variable "gcp_vpc_subnet_name" {
   description = "Enter existing/target VPC Subnet name, or enter 'new' to create a VPC"
 }
 

sap_bw4hana_single_node_install/gcp_ce_vm/versions.tf

@@ -25,10 +25,10 @@ terraform {
 # Terraform Provider declaration
 
 provider "google" {
-  project     = var.google_cloud_project
-  region      = local.google_cloud_region
-  zone        = var.google_cloud_region_zone
+  project     = var.gcp_project
+  region      = local.gcp_region
+  zone        = var.gcp_region_zone
 
-  credentials = var.google_cloud_credentials_json
+  credentials = var.gcp_credentials_json
 
 }

sap_ecc_hana_single_node_install/gcp_ce_vm/main.tf

@@ -36,9 +36,9 @@ module "run_account_init_module" {
 
   module_var_resource_prefix                = var.resource_prefix
 
-  module_var_gcp_region                     = local.google_cloud_region
-  module_var_gcp_vpc_subnet_create_boolean  = local.google_cloud_vpc_subnet_create_boolean
-  module_var_gcp_vpc_subnet_name            = local.google_cloud_vpc_subnet_create_boolean ? 0 : var.google_cloud_vpc_subnet_name
+  module_var_gcp_region                     = local.gcp_region
+  module_var_gcp_vpc_subnet_create_boolean  = local.gcp_vpc_subnet_create_boolean
+  module_var_gcp_vpc_subnet_name            = local.gcp_vpc_subnet_create_boolean ? 0 : var.gcp_vpc_subnet_name
 
 }
 
@@ -70,8 +70,8 @@ module "run_bastion_inject_module" {
 
   module_var_resource_prefix                = var.resource_prefix
 
-  module_var_gcp_region                     = local.google_cloud_region
-  module_var_gcp_region_zone                = var.google_cloud_region_zone
+  module_var_gcp_region                     = local.gcp_region
+  module_var_gcp_region_zone                = var.gcp_region_zone
   module_var_gcp_vpc_subnet_name            = module.run_account_init_module.output_vpc_subnet_name
 
   module_var_bastion_user                   = var.bastion_user
@@ -133,7 +133,7 @@ module "run_host_provision_module" {
 
   module_var_resource_prefix                = var.resource_prefix
 
-  module_var_gcp_region_zone                = var.google_cloud_region_zone
+  module_var_gcp_region_zone                = var.gcp_region_zone
   module_var_gcp_vpc_subnet_name            = module.run_account_init_module.output_vpc_subnet_name
 
   module_var_dns_root_domain_name           = var.dns_root_domain

sap_ecc_hana_single_node_install/gcp_ce_vm/variable_locals.tf

@@ -1,8 +1,8 @@
 locals {
 
-  google_cloud_vpc_subnet_create_boolean = var.google_cloud_vpc_subnet_name == "new" ? true : false
+  gcp_vpc_subnet_create_boolean = var.gcp_vpc_subnet_name == "new" ? true : false
 
-  google_cloud_region = replace(var.google_cloud_region_zone, "/-[^-]*$/", "")
+  gcp_region = replace(var.gcp_region_zone, "/-[^-]*$/", "")
 
   # Directories start with "C:..." on Windows; All other OSs use "/" for root.
   detect_windows = substr(pathexpand("~"), 0, 1) == "/" ? false : true

sap_ecc_hana_single_node_install/gcp_ce_vm/variables.tf

@@ -1,17 +1,17 @@
 
-variable "google_cloud_project" {
+variable "gcp_project" {
   description = "Target GCP Project ID"
 }
 
-variable "google_cloud_region_zone" {
+variable "gcp_region_zone" {
   description = "Target GCP Zone, the GCP Region will be calculated from this value (e.g. europe-west9-a)"
 }
 
-variable "google_cloud_credentials_json" {
+variable "gcp_credentials_json" {
   description = "Enter path to GCP Key File for Service Account (or Google Application Default Credentials JSON file for GCloud CLI)"
 }
 
-variable "google_cloud_vpc_subnet_name" {
+variable "gcp_vpc_subnet_name" {
   description = "Enter existing/target VPC Subnet name, or enter 'new' to create a VPC"
 }
 

sap_ecc_hana_single_node_install/gcp_ce_vm/versions.tf

@@ -25,10 +25,10 @@ terraform {
 # Terraform Provider declaration
 
 provider "google" {
-  project     = var.google_cloud_project
-  region      = local.google_cloud_region
-  zone        = var.google_cloud_region_zone
+  project     = var.gcp_project
+  region      = local.gcp_region
+  zone        = var.gcp_region_zone
 
-  credentials = var.google_cloud_credentials_json
+  credentials = var.gcp_credentials_json
 
 }

sap_ecc_ibmdb2_single_node_install/gcp_ce_vm/main.tf

@@ -36,9 +36,9 @@ module "run_account_init_module" {
 
   module_var_resource_prefix                = var.resource_prefix
 
-  module_var_gcp_region                     = local.google_cloud_region
-  module_var_gcp_vpc_subnet_create_boolean  = local.google_cloud_vpc_subnet_create_boolean
-  module_var_gcp_vpc_subnet_name            = local.google_cloud_vpc_subnet_create_boolean ? 0 : var.google_cloud_vpc_subnet_name
+  module_var_gcp_region                     = local.gcp_region
+  module_var_gcp_vpc_subnet_create_boolean  = local.gcp_vpc_subnet_create_boolean
+  module_var_gcp_vpc_subnet_name            = local.gcp_vpc_subnet_create_boolean ? 0 : var.gcp_vpc_subnet_name
 
 }
 
@@ -70,8 +70,8 @@ module "run_bastion_inject_module" {
 
   module_var_resource_prefix                = var.resource_prefix
 
-  module_var_gcp_region                     = local.google_cloud_region
-  module_var_gcp_region_zone                = var.google_cloud_region_zone
+  module_var_gcp_region                     = local.gcp_region
+  module_var_gcp_region_zone                = var.gcp_region_zone
   module_var_gcp_vpc_subnet_name            = module.run_account_init_module.output_vpc_subnet_name
 
   module_var_bastion_user                   = var.bastion_user
@@ -133,7 +133,7 @@ module "run_host_provision_module" {
 
   module_var_resource_prefix                = var.resource_prefix
 
-  module_var_gcp_region_zone                = var.google_cloud_region_zone
+  module_var_gcp_region_zone                = var.gcp_region_zone
   module_var_gcp_vpc_subnet_name            = module.run_account_init_module.output_vpc_subnet_name
 
   module_var_dns_root_domain_name           = var.dns_root_domain

sap_ecc_ibmdb2_single_node_install/gcp_ce_vm/variable_locals.tf

@@ -1,8 +1,8 @@
 locals {
 
-  google_cloud_vpc_subnet_create_boolean = var.google_cloud_vpc_subnet_name == "new" ? true : false
+  gcp_vpc_subnet_create_boolean = var.gcp_vpc_subnet_name == "new" ? true : false
 
-  google_cloud_region = replace(var.google_cloud_region_zone, "/-[^-]*$/", "")
+  gcp_region = replace(var.gcp_region_zone, "/-[^-]*$/", "")
 
   # Directories start with "C:..." on Windows; All other OSs use "/" for root.
   detect_windows = substr(pathexpand("~"), 0, 1) == "/" ? false : true

sap_ecc_ibmdb2_single_node_install/gcp_ce_vm/variables.tf

@@ -1,17 +1,17 @@
 
-variable "google_cloud_project" {
+variable "gcp_project" {
   description = "Target GCP Project ID"
 }
 
-variable "google_cloud_region_zone" {
+variable "gcp_region_zone" {
   description = "Target GCP Zone, the GCP Region will be calculated from this value (e.g. europe-west9-a)"
 }
 
-variable "google_cloud_credentials_json" {
+variable "gcp_credentials_json" {
   description = "Enter path to GCP Key File for Service Account (or Google Application Default Credentials JSON file for GCloud CLI)"
 }
 
-variable "google_cloud_vpc_subnet_name" {
+variable "gcp_vpc_subnet_name" {
   description = "Enter existing/target VPC Subnet name, or enter 'new' to create a VPC"
 }
 

sap_ecc_ibmdb2_single_node_install/gcp_ce_vm/versions.tf

@@ -25,10 +25,10 @@ terraform {
 # Terraform Provider declaration
 
 provider "google" {
-  project     = var.google_cloud_project
-  region      = local.google_cloud_region
-  zone        = var.google_cloud_region_zone
+  project     = var.gcp_project
+  region      = local.gcp_region
+  zone        = var.gcp_region_zone
 
-  credentials = var.google_cloud_credentials_json
+  credentials = var.gcp_credentials_json
 
 }

sap_ecc_oracledb_single_node_install/gcp_ce_vm/main.tf

@@ -36,9 +36,9 @@ module "run_account_init_module" {
 
   module_var_resource_prefix                = var.resource_prefix
 
-  module_var_gcp_region                     = local.google_cloud_region
-  module_var_gcp_vpc_subnet_create_boolean  = local.google_cloud_vpc_subnet_create_boolean
-  module_var_gcp_vpc_subnet_name            = local.google_cloud_vpc_subnet_create_boolean ? 0 : var.google_cloud_vpc_subnet_name
+  module_var_gcp_region                     = local.gcp_region
+  module_var_gcp_vpc_subnet_create_boolean  = local.gcp_vpc_subnet_create_boolean
+  module_var_gcp_vpc_subnet_name            = local.gcp_vpc_subnet_create_boolean ? 0 : var.gcp_vpc_subnet_name
 
 }
 
@@ -70,8 +70,8 @@ module "run_bastion_inject_module" {
 
   module_var_resource_prefix                = var.resource_prefix
 
-  module_var_gcp_region                     = local.google_cloud_region
-  module_var_gcp_region_zone                = var.google_cloud_region_zone
+  module_var_gcp_region                     = local.gcp_region
+  module_var_gcp_region_zone                = var.gcp_region_zone
   module_var_gcp_vpc_subnet_name            = module.run_account_init_module.output_vpc_subnet_name
 
   module_var_bastion_user                   = var.bastion_user
@@ -133,7 +133,7 @@ module "run_host_provision_module" {
 
   module_var_resource_prefix                = var.resource_prefix
 
-  module_var_gcp_region_zone                = var.google_cloud_region_zone
+  module_var_gcp_region_zone                = var.gcp_region_zone
   module_var_gcp_vpc_subnet_name            = module.run_account_init_module.output_vpc_subnet_name
 
   module_var_dns_root_domain_name           = var.dns_root_domain

sap_ecc_oracledb_single_node_install/gcp_ce_vm/variable_locals.tf

@@ -1,8 +1,8 @@
 locals {
 
-  google_cloud_vpc_subnet_create_boolean = var.google_cloud_vpc_subnet_name == "new" ? true : false
+  gcp_vpc_subnet_create_boolean = var.gcp_vpc_subnet_name == "new" ? true : false
 
-  google_cloud_region = replace(var.google_cloud_region_zone, "/-[^-]*$/", "")
+  gcp_region = replace(var.gcp_region_zone, "/-[^-]*$/", "")
 
   # Directories start with "C:..." on Windows; All other OSs use "/" for root.
   detect_windows = substr(pathexpand("~"), 0, 1) == "/" ? false : true

sap_ecc_oracledb_single_node_install/gcp_ce_vm/variables.tf

@@ -1,17 +1,17 @@
 
-variable "google_cloud_project" {
+variable "gcp_project" {
   description = "Target GCP Project ID"
 }
 
-variable "google_cloud_region_zone" {
+variable "gcp_region_zone" {
   description = "Target GCP Zone, the GCP Region will be calculated from this value (e.g. europe-west9-a)"
 }
 
-variable "google_cloud_credentials_json" {
+variable "gcp_credentials_json" {
   description = "Enter path to GCP Key File for Service Account (or Google Application Default Credentials JSON file for GCloud CLI)"
 }
 
-variable "google_cloud_vpc_subnet_name" {
+variable "gcp_vpc_subnet_name" {
   description = "Enter existing/target VPC Subnet name, or enter 'new' to create a VPC"
 }
 

sap_ecc_oracledb_single_node_install/gcp_ce_vm/versions.tf

@@ -25,10 +25,10 @@ terraform {
 # Terraform Provider declaration
 
 provider "google" {
-  project     = var.google_cloud_project
-  region      = local.google_cloud_region
-  zone        = var.google_cloud_region_zone
+  project     = var.gcp_project
+  region      = local.gcp_region
+  zone        = var.gcp_region_zone
 
-  credentials = var.google_cloud_credentials_json
+  credentials = var.gcp_credentials_json
 
 }

sap_ecc_sapase_single_node_install/gcp_ce_vm/main.tf

@@ -36,9 +36,9 @@ module "run_account_init_module" {
 
   module_var_resource_prefix                = var.resource_prefix
 
-  module_var_gcp_region                     = local.google_cloud_region
-  module_var_gcp_vpc_subnet_create_boolean  = local.google_cloud_vpc_subnet_create_boolean
-  module_var_gcp_vpc_subnet_name            = local.google_cloud_vpc_subnet_create_boolean ? 0 : var.google_cloud_vpc_subnet_name
+  module_var_gcp_region                     = local.gcp_region
+  module_var_gcp_vpc_subnet_create_boolean  = local.gcp_vpc_subnet_create_boolean
+  module_var_gcp_vpc_subnet_name            = local.gcp_vpc_subnet_create_boolean ? 0 : var.gcp_vpc_subnet_name
 
 }
 
@@ -70,8 +70,8 @@ module "run_bastion_inject_module" {
 
   module_var_resource_prefix                = var.resource_prefix
 
-  module_var_gcp_region                     = local.google_cloud_region
-  module_var_gcp_region_zone                = var.google_cloud_region_zone
+  module_var_gcp_region                     = local.gcp_region
+  module_var_gcp_region_zone                = var.gcp_region_zone
   module_var_gcp_vpc_subnet_name            = module.run_account_init_module.output_vpc_subnet_name
 
   module_var_bastion_user                   = var.bastion_user
@@ -133,7 +133,7 @@ module "run_host_provision_module" {
 
   module_var_resource_prefix                = var.resource_prefix
 
-  module_var_gcp_region_zone                = var.google_cloud_region_zone
+  module_var_gcp_region_zone                = var.gcp_region_zone
   module_var_gcp_vpc_subnet_name            = module.run_account_init_module.output_vpc_subnet_name
 
   module_var_dns_root_domain_name           = var.dns_root_domain

sap_ecc_sapase_single_node_install/gcp_ce_vm/variable_locals.tf

@@ -1,8 +1,8 @@
 locals {
 
-  google_cloud_vpc_subnet_create_boolean = var.google_cloud_vpc_subnet_name == "new" ? true : false
+  gcp_vpc_subnet_create_boolean = var.gcp_vpc_subnet_name == "new" ? true : false
 
-  google_cloud_region = replace(var.google_cloud_region_zone, "/-[^-]*$/", "")
+  gcp_region = replace(var.gcp_region_zone, "/-[^-]*$/", "")
 
   # Directories start with "C:..." on Windows; All other OSs use "/" for root.
   detect_windows = substr(pathexpand("~"), 0, 1) == "/" ? false : true

sap_ecc_sapase_single_node_install/gcp_ce_vm/variables.tf

@@ -1,17 +1,17 @@
 
-variable "google_cloud_project" {
+variable "gcp_project" {
   description = "Target GCP Project ID"
 }
 
-variable "google_cloud_region_zone" {
+variable "gcp_region_zone" {
   description = "Target GCP Zone, the GCP Region will be calculated from this value (e.g. europe-west9-a)"
 }
 
-variable "google_cloud_credentials_json" {
+variable "gcp_credentials_json" {
   description = "Enter path to GCP Key File for Service Account (or Google Application Default Credentials JSON file for GCloud CLI)"
 }
 
-variable "google_cloud_vpc_subnet_name" {
+variable "gcp_vpc_subnet_name" {
   description = "Enter existing/target VPC Subnet name, or enter 'new' to create a VPC"
 }