Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removes preconditions.py script into the module #478

Merged
merged 10 commits into from
Oct 14, 2020
Prev Previous commit
Next Next commit
Removes variables python_interpreter_path and pip_executable_path
  • Loading branch information
thiagonache committed Oct 14, 2020
commit 443bbce5e2a114a5fe2ab3239a785fa1415e66d4
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,7 @@ determining that location is as follows:
| lien | Add a lien on the project to prevent accidental deletion | bool | `"false"` | no |
| name | The name for the project | string | n/a | yes |
| org\_id | The organization ID. | string | n/a | yes |
| pip\_executable\_path | Pip executable path for precondition requirements.txt install. | string | `"pip3"` | no |
| project\_id | The ID to give the project. If not provided, the `name` will be used. | string | `""` | no |
| python\_interpreter\_path | Python interpreter path for precondition check script. | string | `"python3"` | no |
| random\_project\_id | Adds a suffix of 4 random characters to the `project_id` | bool | `"false"` | no |
| sa\_role | A role to give the default Service Account for the project (defaults to none) | string | `""` | no |
| shared\_vpc | The ID of the host project which hosts the shared VPC | string | `""` | no |
Expand Down
2 changes: 0 additions & 2 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,6 @@ module "project-factory" {
disable_services_on_destroy = var.disable_services_on_destroy
default_service_account = var.default_service_account
disable_dependent_services = var.disable_dependent_services
python_interpreter_path = var.python_interpreter_path
pip_executable_path = var.pip_executable_path
use_tf_google_credentials_env_var = var.use_tf_google_credentials_env_var
skip_gcloud_download = var.skip_gcloud_download
vpc_service_control_attach_enabled = var.vpc_service_control_attach_enabled
Expand Down
12 changes: 0 additions & 12 deletions modules/core_project_factory/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -193,18 +193,6 @@ variable "enable_shared_vpc_host_project" {
default = false
}

variable "python_interpreter_path" {
description = "Python interpreter path for precondition check script."
type = string
default = "python3"
}

variable "pip_executable_path" {
description = "Pip executable path for precondition requirements.txt install."
type = string
default = "pip3"
}

variable "use_tf_google_credentials_env_var" {
description = "Use GOOGLE_CREDENTIALS environment variable to run gcloud auth activate-service-account with."
type = bool
Expand Down
1 change: 0 additions & 1 deletion modules/gsuite_enabled/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ The roles granted are specifically:
| name | The name for the project | string | n/a | yes |
| org\_id | The organization ID. | string | n/a | yes |
| project\_id | The ID to give the project. If not provided, the `name` will be used. | string | `""` | no |
| python\_interpreter\_path | Python interpreter path for precondition check script. | string | `"python3"` | no |
| random\_project\_id | Adds a suffix of 4 random characters to the `project_id` | string | `"false"` | no |
| sa\_group | A G Suite group to place the default Service Account for the project in | string | `""` | no |
| sa\_role | A role to give the default Service Account for the project (defaults to none) | string | `""` | no |
Expand Down
1 change: 0 additions & 1 deletion modules/gsuite_enabled/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ module "project-factory" {
disable_services_on_destroy = var.disable_services_on_destroy
default_service_account = var.default_service_account
disable_dependent_services = var.disable_dependent_services
python_interpreter_path = var.python_interpreter_path
use_tf_google_credentials_env_var = var.use_tf_google_credentials_env_var
skip_gcloud_download = var.skip_gcloud_download
}
Expand Down
6 changes: 0 additions & 6 deletions modules/gsuite_enabled/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -183,12 +183,6 @@ variable "enable_shared_vpc_host_project" {
default = false
}

variable "python_interpreter_path" {
description = "Python interpreter path for precondition check script."
type = string
default = "python3"
}

variable "budget_amount" {
description = "The amount to use for a budget alert"
type = number
Expand Down
1 change: 0 additions & 1 deletion modules/shared_vpc/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ module "project-factory" {
disable_services_on_destroy = var.disable_services_on_destroy
default_service_account = var.default_service_account
disable_dependent_services = var.disable_dependent_services
python_interpreter_path = var.python_interpreter_path
use_tf_google_credentials_env_var = var.use_tf_google_credentials_env_var
skip_gcloud_download = var.skip_gcloud_download
}
Expand Down
6 changes: 0 additions & 6 deletions modules/shared_vpc/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -177,12 +177,6 @@ variable "shared_vpc_enabled" {
default = false
}

variable "python_interpreter_path" {
description = "Python interpreter path for precondition check script."
type = string
default = "python3"
}

variable "budget_amount" {
description = "The amount to use for a budget alert"
type = number
Expand Down
12 changes: 0 additions & 12 deletions variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -188,18 +188,6 @@ variable "disable_dependent_services" {
type = bool
}

variable "python_interpreter_path" {
description = "Python interpreter path for precondition check script."
type = string
default = "python3"
}

variable "pip_executable_path" {
description = "Pip executable path for precondition requirements.txt install."
type = string
default = "pip3"
}

variable "use_tf_google_credentials_env_var" {
description = "Use GOOGLE_CREDENTIALS environment variable to run gcloud auth activate-service-account with."
type = bool
Expand Down