From e9779e30edf39a59873a05817f0642d628270c3b Mon Sep 17 00:00:00 2001
From: Natalia Strelkova <nstrelkova@google.com>
Date: Fri, 7 Oct 2022 06:28:05 +0000
Subject: [PATCH] locals moved to main

---
 .../wordpress/cloudrun/locals.tf              | 40 -------------------
 .../wordpress/cloudrun/main.tf                | 27 +++++++++++++
 2 files changed, 27 insertions(+), 40 deletions(-)
 delete mode 100644 blueprints/third-party-solutions/wordpress/cloudrun/locals.tf

diff --git a/blueprints/third-party-solutions/wordpress/cloudrun/locals.tf b/blueprints/third-party-solutions/wordpress/cloudrun/locals.tf
deleted file mode 100644
index acf9220a..00000000
--- a/blueprints/third-party-solutions/wordpress/cloudrun/locals.tf
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Copyright 2022 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-locals {
-  all_principals_iam = [for k in var.principals : "user:${k}"]
-  cloudsql_conf = {
-    database_version = "MYSQL_8_0"
-    tier             = "db-g1-small"
-    db               = "wp-mysql"
-    user             = "admin"
-    pass             = var.cloudsql_password == null ? random_password.cloudsql_password.result : var.cloudsql_password
-  }
-  iam = {
-    # CloudSQL
-    "roles/cloudsql.admin"        = local.all_principals_iam
-    "roles/cloudsql.client"       = local.all_principals_iam
-    "roles/cloudsql.instanceUser" = local.all_principals_iam
-    # common roles
-    "roles/logging.admin"                  = local.all_principals_iam
-    "roles/iam.serviceAccountUser"         = local.all_principals_iam
-    "roles/iam.serviceAccountTokenCreator" = local.all_principals_iam
-  }
-  prefix  = var.prefix == null ? "" : "${var.prefix}-"
-  wp_user = "user"
-  wp_pass = var.wordpress_password == null ? random_password.wp_password.result : var.wordpress_password
-}
\ No newline at end of file
diff --git a/blueprints/third-party-solutions/wordpress/cloudrun/main.tf b/blueprints/third-party-solutions/wordpress/cloudrun/main.tf
index 41dda2e7..296f1715 100644
--- a/blueprints/third-party-solutions/wordpress/cloudrun/main.tf
+++ b/blueprints/third-party-solutions/wordpress/cloudrun/main.tf
@@ -15,6 +15,31 @@
  */
 
 
+locals {
+  all_principals_iam = [for k in var.principals : "user:${k}"]
+  cloudsql_conf = {
+    database_version = "MYSQL_8_0"
+    tier             = "db-g1-small"
+    db               = "wp-mysql"
+    user             = "admin"
+    pass             = var.cloudsql_password == null ? random_password.cloudsql_password.result : var.cloudsql_password
+  }
+  iam = {
+    # CloudSQL
+    "roles/cloudsql.admin"        = local.all_principals_iam
+    "roles/cloudsql.client"       = local.all_principals_iam
+    "roles/cloudsql.instanceUser" = local.all_principals_iam
+    # common roles
+    "roles/logging.admin"                  = local.all_principals_iam
+    "roles/iam.serviceAccountUser"         = local.all_principals_iam
+    "roles/iam.serviceAccountTokenCreator" = local.all_principals_iam
+  }
+  prefix  = var.prefix == null ? "" : "${var.prefix}-"
+  wp_user = "user"
+  wp_pass = var.wordpress_password == null ? random_password.wp_password.result : var.wordpress_password
+}
+
+
 # either create a project or set up the given one
 module "project" {
   source          = "../../../../modules/project"
@@ -36,10 +61,12 @@ module "project" {
   ]
 }
 
+
 resource "random_password" "wp_password" {
   length = 8
 }
 
+
 # create the Cloud Run service
 module "cloud_run" {
   source     = "../../../../modules/cloud-run"