Skip to content

Commit c0313cc

Browse files
authored
Merge pull request #4 from TerraHubCorp/dev
fix terraform issues
2 parents c324b43 + 0cbf1f3 commit c0313cc

File tree

9 files changed

+63
-9
lines changed

9 files changed

+63
-9
lines changed

.gitignore

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,4 @@
22
**/.terraform/*
33

44
# .tfstate files
5-
*.tfstate
6-
*.tfstate.*
7-
8-
# .tfvars files
9-
*.tfvars
5+
**/*.tf*

project/default.tfvars

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# Specify default values for variables defined in variables.tf
2+
3+
#############
4+
# top level #
5+
#############
6+
google_project_name = "project"
7+
google_project_id = "project"
8+
google_org_id = ""
9+
google_project_folder_id = ""
10+
google_billing_account = ""
11+
google_project_skip_delete = false
12+
google_project_auto_create_network = true
13+
google_location_id = "us-central"
14+
15+
##########
16+
# labels #
17+
##########
18+
default_labels = {
19+
"name" = "project"
20+
"description" = "managed-by-terrahub"
21+
"thubcode" = "f2754a99"
22+
"thubenv" = "default"
23+
}
24+
custom_labels = {}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Specify default values for variables defined in variables.tf
2+
3+
#############
4+
# top level #
5+
#############
6+
google_project_role = "roles/compute.instanceAdmin"
7+
google_project_members = ["demo@mail.com"]
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Specify default values for variables defined in variables.tf
2+
3+
#############
4+
# top level #
5+
#############
6+
google_project_role = "roles/storage.admin"
7+
google_project_members = ["demo@mail.com"]

project_iam_member/default.tfvars

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Specify default values for variables defined in variables.tf
2+
3+
#############
4+
# top level #
5+
#############
6+
google_project_role = "roles/viewer"
7+
google_project_member = "demo@mail.com"

project_iam_member/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
resource "google_project_iam_member" "project_iam_member" {
22
project = "${var.google_project_id}"
33
role = "${var.google_project_role}"
4-
members = "${var.google_project_members}"
4+
member = "${var.google_project_member}"
55
}

project_iam_member/variables.tf

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ variable "google_project_role" {
1111
description = "The project ID. If not specified, uses the ID of the project configured with the provider."
1212
}
1313

14-
variable "google_project_members" {
15-
type = "list"
16-
default = []
14+
variable "google_project_member" {
1715
description = "Identities that will be granted the privilege in role."
1816
}

service_account/default.tfvars

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Specify default values for variables defined in variables.tf
2+
3+
#############
4+
# top level #
5+
#############
6+
google_service_account_display_name = "service_account"

service_account_key/default.tfvars

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Specify default values for variables defined in variables.tf
2+
3+
#############
4+
# top level #
5+
#############
6+
google_service_account_key_algorithm = "KEY_ALG_RSA_2048"
7+
google_service_account_key_public_key_type = "TYPE_X509_PEM_FILE"
8+
google_service_account_key_private_key_type = "TYPE_GOOGLE_CREDENTIALS_FILE"
9+
google_project_id = "service_account_key"

0 commit comments

Comments
 (0)