Skip to content

Commit

Permalink
draft
Browse files Browse the repository at this point in the history
  • Loading branch information
SKozlovsky committed Dec 20, 2019
1 parent fa691ea commit 9be37ee
Show file tree
Hide file tree
Showing 17 changed files with 7 additions and 1,153 deletions.
7 changes: 4 additions & 3 deletions autogen/variables.tf.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ variable "disable_services_on_destroy" {
}

variable "default_service_account" {
description = "Project default service account setting: can be one of `delete`, `depriviledge`, `disable`, or `keep`."
description = "Project default service account setting: can be one of `delete`, `deprivilege`, `disable`, or `keep`."
default = "disable"
type = string
}
Expand Down Expand Up @@ -213,22 +213,23 @@ variable "python_interpreter_path" {
type = string
default = "python3"
}

{% if gsuite_enabled %}

variable "create_group" {
type = bool
description = "Whether to create the group or not"
default = false
}

variable "sa_group" {
type = string
description = "A G Suite group to place the default Service Account for the project in"
default = ""
}

variable "api_sa_group" {
type = string
description = "A G Suite group to place the Google APIs Service Account for the project in"
default = ""
}

{% endif %}
3 changes: 1 addition & 2 deletions modules/gsuite_enabled/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ variable "disable_services_on_destroy" {
}

variable "default_service_account" {
description = "Project default service account setting: can be one of `delete`, `depriviledge`, `disable`, or `keep`."
description = "Project default service account setting: can be one of `delete`, `deprivilege`, `disable`, or `keep`."
default = "disable"
type = string
}
Expand Down Expand Up @@ -196,4 +196,3 @@ variable "api_sa_group" {
description = "A G Suite group to place the Google APIs Service Account for the project in"
default = ""
}

3 changes: 1 addition & 2 deletions modules/shared_vpc/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ variable "disable_services_on_destroy" {
}

variable "default_service_account" {
description = "Project default service account setting: can be one of `delete`, `depriviledge`, `disable`, or `keep`."
description = "Project default service account setting: can be one of `delete`, `deprivilege`, `disable`, or `keep`."
default = "disable"
type = string
}
Expand All @@ -174,4 +174,3 @@ variable "python_interpreter_path" {
type = string
default = "python3"
}

114 changes: 0 additions & 114 deletions orig_files/gsuite_enabled/README.md

This file was deleted.

101 changes: 0 additions & 101 deletions orig_files/gsuite_enabled/main.tf

This file was deleted.

78 changes: 0 additions & 78 deletions orig_files/gsuite_enabled/outputs.tf

This file was deleted.

Loading

0 comments on commit 9be37ee

Please sign in to comment.