Merge pull request #237 from yrvine/main

Updated the datafusion and webhosting packages

Author: fellipeamedeiros

ecommerce-webhosting/infra/network.tf

@@ -23,13 +23,15 @@ resource "google_compute_subnetwork" "group1" {
   network                  = google_compute_network.default.self_link
   region                   = var.group1_region
   private_ip_google_access = true
+  depends_on               = [google_compute_network.default]
 }
 
 # Router and Cloud NAT are required for installing packages from repos (apache, php etc)
 resource "google_compute_router" "group1" {
   name    = "${var.network_name}-gw-group1"
   network = google_compute_network.default.self_link
   region  = var.group1_region
+  depends_on               = [google_compute_network.default]
 }
 
 module "cloud-nat-group1" {
@@ -39,6 +41,7 @@ module "cloud-nat-group1" {
   project_id = var.project_id
   region     = var.group1_region
   name       = "${var.network_name}-cloud-nat-group1"
+  depends_on               = [google_compute_network.default]
 }
 
 resource "google_compute_global_address" "service_range" {
@@ -48,10 +51,13 @@ resource "google_compute_global_address" "service_range" {
   address       = "10.200.0.0"
   prefix_length = 16
   network       = google_compute_network.default.self_link
+  depends_on               = [google_compute_network.default]
 }
 
 resource "google_service_networking_connection" "private_service_connection" {
   network                 = google_compute_network.default.id
   service                 = "servicenetworking.googleapis.com"
   reserved_peering_ranges = [google_compute_global_address.service_range.name]
+  depends_on               = [google_compute_network.default]
+
 }

private-cloud-data-fusion/prereq.sh

@@ -52,6 +52,7 @@ else
         container.googleapis.com \
         datafusion.googleapis.com \
         dataproc.googleapis.com \
+        datastream.googleapis.com \
         secretmanager.googleapis.com \
         servicenetworking.googleapis.com \
         sqladmin.googleapis.com \
@@ -62,7 +63,7 @@ else
 
     echo "Granting Cloud Build's Service Account IAM roles to deploy the resources..."
     PROJECT_NUMBER=$(gcloud projects describe $PROJECT_ID --format='value(projectNumber)')
-    MEMBER=serviceAccount:$PROJECT_NUMBER@cloudbuild.gserviceaccount.com
+    MEMBER=serviceAccount:$PROJECT_NUMBER-compute@developer.gserviceaccount.com
     add_iam_member $MEMBER roles/editor
     add_iam_member $MEMBER roles/iam.securityAdmin
     add_iam_member $MEMBER roles/compute.networkAdmin

private-cloud-data-fusion/terraform/cdf.tf

@@ -17,7 +17,7 @@ resource "google_data_fusion_instance" "cdf_private" {
   description                   = "Cloud Data Fusion private instance"
   region                        = var.region
   type                          = "DEVELOPER"
-  version                       = "6.7.2"
+  version                       = "6.10.1"
   enable_stackdriver_logging    = true
   enable_stackdriver_monitoring = true
   labels                        = local.resource_labels

private-cloud-data-fusion/terraform/gce.tf

@@ -21,7 +21,7 @@ resource "google_compute_instance" "cloudsql_proxy" {
 
   boot_disk {
     initialize_params {
-      image = "cos-cloud/cos-101-lts"
+      image = "cos-cloud/cos-121-lts"
       labels = {
         vm_name = "cloudsql-proxy"
       }