From db44b98e51ca4290548ffeee8c4b8195d891a13a Mon Sep 17 00:00:00 2001
From: Mark Hobson <mark.hobson@activetravelengland.gov.uk>
Date: Tue, 18 Jun 2024 12:06:46 +0100
Subject: [PATCH] Pull up secret manager service to root module

---
 cloud/schemes/main.tf                     | 8 ++++----
 cloud/schemes/secret-manager/main.tf      | 4 ----
 cloud/schemes/secret-manager/variables.tf | 4 ----
 3 files changed, 4 insertions(+), 12 deletions(-)
 delete mode 100644 cloud/schemes/secret-manager/main.tf
 delete mode 100644 cloud/schemes/secret-manager/variables.tf

diff --git a/cloud/schemes/main.tf b/cloud/schemes/main.tf
index 8a1b575c..cc82ba2f 100644
--- a/cloud/schemes/main.tf
+++ b/cloud/schemes/main.tf
@@ -49,9 +49,9 @@ data "terraform_remote_state" "schemes_database" {
   workspace = local.config[local.env].schemes_database
 }
 
-module "secret_manager" {
-  source  = "./secret-manager"
+resource "google_project_service" "secret_manager" {
   project = local.project
+  service = "secretmanager.googleapis.com"
 }
 
 module "cloud_sql" {
@@ -61,7 +61,7 @@ module "cloud_sql" {
   database_backups = local.config[local.env].database_backups
 
   depends_on = [
-    module.secret_manager
+    google_project_service.secret_manager
   ]
 }
 
@@ -83,7 +83,7 @@ module "cloud_run" {
   basic_auth                               = local.config[local.env].basic_auth
 
   depends_on = [
-    module.secret_manager
+    google_project_service.secret_manager
   ]
 }
 
diff --git a/cloud/schemes/secret-manager/main.tf b/cloud/schemes/secret-manager/main.tf
deleted file mode 100644
index 34c6424b..00000000
--- a/cloud/schemes/secret-manager/main.tf
+++ /dev/null
@@ -1,4 +0,0 @@
-resource "google_project_service" "secret_manager" {
-  project = var.project
-  service = "secretmanager.googleapis.com"
-}
diff --git a/cloud/schemes/secret-manager/variables.tf b/cloud/schemes/secret-manager/variables.tf
deleted file mode 100644
index a90c35ee..00000000
--- a/cloud/schemes/secret-manager/variables.tf
+++ /dev/null
@@ -1,4 +0,0 @@
-variable "project" {
-  description = "GCP project"
-  type        = string
-}