Reorder example to be dependencies last

Author: rainshen49

mmv1/templates/terraform/examples/firebase_app_hosting_backend_full.tf.tmpl

@@ -1,3 +1,26 @@
+resource "google_firebase_app_hosting_backend" "example" {
+  project          = "{{index $.TestEnvVars "project_id"}}"
+
+  # Choose the region closest to your users
+  location         = "us-central1"
+  backend_id       = "{{index $.Vars "backend_id"}}"
+  app_id           = "1:0000000000:web:674cde32020e16fbce9dbd"
+  display_name     = "My Backend"
+  serving_locality = "GLOBAL_ACCESS"
+  service_account  = google_service_account.service_account.email
+  environment      = "prod"
+
+  annotations = {
+    "key" = "value"
+  }
+
+  labels = {
+    "key" = "value"
+  }
+
+  depends_on = [google_project_service.fah]
+}
+
 ### Include these blocks only once per project if you are starting from scratch ###
 resource "google_service_account" "service_account" {
   project = "{{index $.TestEnvVars "project_id"}}"
@@ -41,26 +64,3 @@ resource "google_project_service" "fah" {
   disable_on_destroy = false
 }
 ###
-
-resource "google_firebase_app_hosting_backend" "example" {
-  project          = "{{index $.TestEnvVars "project_id"}}"
-
-  # Choose the region closest to your users
-  location         = "us-central1"
-  backend_id       = "{{index $.Vars "backend_id"}}"
-  app_id           = "1:0000000000:web:674cde32020e16fbce9dbd"
-  display_name     = "My Backend"
-  serving_locality = "GLOBAL_ACCESS"
-  service_account  = google_service_account.service_account.email
-  environment      = "prod"
-
-  annotations = {
-    "key" = "value"
-  }
-
-  labels = {
-    "key" = "value"
-  }
-
-  depends_on = [google_project_service.fah]
-}

mmv1/templates/terraform/examples/firebase_app_hosting_backend_github.tf.tmpl

@@ -1,11 +1,27 @@
-resource "google_developer_connect_connection" "my-connection" {
-  project  = "{{index $.TestEnvVars "project_id"}}"
-  location = "us-central1"
-  connection_id = "tf-test-connection-new"
-  github_config {
-    github_app = "FIREBASE"
+resource "google_firebase_app_hosting_backend" "example" {
+  project          = "{{index $.TestEnvVars "project_id"}}"
+
+  # Choose the region closest to your users
+  location         = "us-central1"
+  backend_id       = "{{index $.Vars "backend_id"}}"
+  app_id           = "1:0000000000:web:674cde32020e16fbce9dbd"
+  display_name     = "My Backend"
+  serving_locality = "GLOBAL_ACCESS"
+  service_account  = "firebase-app-hosting-compute@{{index $.TestEnvVars "project_id"}}.iam.gserviceaccount.com"
+  environment      = "prod"
+
+  annotations = {
+    "key" = "value"
+  }
+
+  labels = {
+    "key" = "value"
+  }
+
+  codebase {
+    repository = google_developer_connect_git_repository_link.my-repository.name
+    root_directory = "/"
   }
-  depends_on = [google_project_iam_member.devconnect-secret]
 }
 
 resource "google_developer_connect_git_repository_link" "my-repository" {
@@ -17,12 +33,7 @@ resource "google_developer_connect_git_repository_link" "my-repository" {
   clone_uri = "https://github.com/myuser/myrepo.git"
 }
 
-output "next_steps" {
-  description = "Follow the action_uri if present to continue setup"
-  value = google_developer_connect_connection.my-connection.installation_state
-}
-
-# Setup permissions. Only needed once per project
+### Include these blocks only once per project if you are starting from scratch ###
 resource "google_project_service_identity" "devconnect-p4sa" {
   provider = google-beta
 
@@ -36,29 +47,21 @@ resource "google_project_iam_member" "devconnect-secret" {
   role     = "roles/secretmanager.admin"
   member   = google_project_service_identity.devconnect-p4sa.member
 }
+###
 
-resource "google_firebase_app_hosting_backend" "example" {
-  project          = "{{index $.TestEnvVars "project_id"}}"
-
-  # Choose the region closest to your users
-  location         = "us-central1"
-  backend_id       = "{{index $.Vars "backend_id"}}"
-  app_id           = "1:0000000000:web:674cde32020e16fbce9dbd"
-  display_name     = "My Backend"
-  serving_locality = "GLOBAL_ACCESS"
-  service_account  = "firebase-app-hosting-compute@{{index $.TestEnvVars "project_id"}}.iam.gserviceaccount.com"
-  environment      = "prod"
-
-  annotations = {
-    "key" = "value"
-  }
-
-  labels = {
-    "key" = "value"
+### Include these blocks only once per Github account ###
+resource "google_developer_connect_connection" "my-connection" {
+  project  = "{{index $.TestEnvVars "project_id"}}"
+  location = "us-central1"
+  connection_id = "tf-test-connection-new"
+  github_config {
+    github_app = "FIREBASE"
   }
+  depends_on = [google_project_iam_member.devconnect-secret]
+}
 
-  codebase {
-    repository = google_developer_connect_git_repository_link.my-repository.name
-    root_directory = "/"
-  }
-}
+output "next_steps" {
+  description = "Follow the action_uri if present to continue setup"
+  value = google_developer_connect_connection.my-connection.installation_state
+}
+###

mmv1/templates/terraform/examples/firebase_app_hosting_backend_minimal.tf.tmpl

@@ -1,3 +1,16 @@
+resource "google_firebase_app_hosting_backend" "example" {
+  project          = "{{index $.TestEnvVars "project_id"}}"
+  # Choose the region closest to your users
+
+  location         = "us-central1"
+  backend_id       = "{{index $.Vars "backend_id"}}"
+  app_id           = "1:0000000000:web:674cde32020e16fbce9dbd"
+  serving_locality = "GLOBAL_ACCESS"
+  service_account  = google_service_account.service_account.email
+
+  depends_on = [google_project_service.fah]
+}
+
 ### Include these blocks only once per project if you are starting from scratch ###
 resource "google_service_account" "service_account" {
   project = "{{index $.TestEnvVars "project_id"}}"
@@ -25,16 +38,3 @@ resource "google_project_service" "fah" {
   disable_on_destroy = false
 }
 ###
-
-resource "google_firebase_app_hosting_backend" "example" {
-  project          = "{{index $.TestEnvVars "project_id"}}"
-  # Choose the region closest to your users
-
-  location         = "us-central1"
-  backend_id       = "{{index $.Vars "backend_id"}}"
-  app_id           = "1:0000000000:web:674cde32020e16fbce9dbd"
-  serving_locality = "GLOBAL_ACCESS"
-  service_account  = google_service_account.service_account.email
-
-  depends_on = [google_project_service.fah]
-}