Merge pull request #6 from memes/master

Updates from field testing
NeudesicGCP · Mar 4, 2019 · 2ec917b · 2ec917b
2 parents 2b3e4a9 + 34da505
commit 2ec917b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/outputs.tf b/outputs.tf
@@ -4,9 +4,9 @@ output "project_id" {
   value = "${google_project.project.project_id}"
 }
 
-# Export the subnets as a map of name to region
-output "subnets" {
-  value = "${zipmap(google_compute_subnetwork.subnet.*.name, google_compute_subnetwork.subnet.*.region)}"
+# Export the project number so it can be used elsewhere
+output "project_number" {
+  value = "${google_project.project.number}"
 }
 
 # Export the service accounts as a map of account id to fully-qualified email

diff --git a/service_account.tf b/service_account.tf
@@ -13,7 +13,7 @@ resource "null_resource" "delete_default_service_account" {
 
   triggers {
     default_service_account = "${data.google_compute_default_service_account.default.id}"
-    activated_apis          = "${join(",", var.enable_apis)}y"
+    activated_apis          = "${join(",", var.enable_apis)}"
   }
 
   depends_on = ["google_project_service.api", "data.google_compute_default_service_account.default"]
@@ -60,6 +60,7 @@ data "null_data_source" "service_account_subnets" {
 # can bind to just those subnets.
 resource "google_compute_subnetwork_iam_member" "subnets" {
   count      = "${length(var.service_account_subnets)}"
+  provider   = "google-beta"
   region     = "${lookup(data.null_data_source.service_account_subnets.*.outputs[count.index], "region")}"
   subnetwork = "${lookup(data.null_data_source.service_account_subnets.*.outputs[count.index], "subnet")}"
   project    = "${local.service_account_network_project}"