From f4c1fa6c20f28e0f071d81d8c1e6762fc7c64f8d Mon Sep 17 00:00:00 2001
From: lcaggio <lorenzo.caggioni@gmail.com>
Date: Mon, 20 Feb 2023 00:56:32 +0100
Subject: [PATCH] Fix tests.

---
 .../data-platform-foundations/README.md              |  4 ++--
 fast/stages/3-data-platform/dev/main.tf              | 10 ++++++----
 .../data_platform_foundations/fixture/main.tf        |  8 +++++---
 .../data_platform_foundations/test_plan.py           |  2 +-
 tests/fast/stages/s3_data_platform/common.tfvars     | 12 +++++++-----
 5 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/blueprints/data-solutions/data-platform-foundations/README.md b/blueprints/data-solutions/data-platform-foundations/README.md
index e1bb5f5e..d004cf94 100644
--- a/blueprints/data-solutions/data-platform-foundations/README.md
+++ b/blueprints/data-solutions/data-platform-foundations/README.md
@@ -215,13 +215,13 @@ module "data-platform" {
   source              = "./fabric/blueprints/data-solutions/data-platform-foundations"
   organization_domain = "example.com"
   project_config = {
-    billing_account_id  = var.billing_account_id
+    billing_account_id  = "123456-123456-123456"
     parent              = "folders/12345678"
   }  
   prefix              = "myprefix"
 }
 
-# tftest modules=43 resources=297
+# tftest modules=43 resources=264
 ```
 
 ## Customizations
diff --git a/fast/stages/3-data-platform/dev/main.tf b/fast/stages/3-data-platform/dev/main.tf
index 53d901d1..c600a758 100644
--- a/fast/stages/3-data-platform/dev/main.tf
+++ b/fast/stages/3-data-platform/dev/main.tf
@@ -18,13 +18,15 @@
 
 module "data-platform" {
   source             = "../../../../blueprints/data-solutions/data-platform-foundations"
-  billing_account_id = var.billing_account.id
   composer_config    = var.composer_config
   data_force_destroy = var.data_force_destroy
   data_catalog_tags  = var.data_catalog_tags
-  folder_id          = var.folder_ids.data-platform-dev
-  groups             = var.groups
-  location           = var.location
+  project_config = {
+    billing_account_id = var.billing_account.id
+    parent             = var.folder_ids.data-platform-dev
+  }
+  groups   = var.groups
+  location = var.location
   network_config = {
     host_project      = var.host_project_ids.dev-spoke-0
     network_self_link = var.vpc_self_links.dev-spoke-0
diff --git a/tests/blueprints/data_solutions/data_platform_foundations/fixture/main.tf b/tests/blueprints/data_solutions/data_platform_foundations/fixture/main.tf
index 52317d6f..5acb29e8 100644
--- a/tests/blueprints/data_solutions/data_platform_foundations/fixture/main.tf
+++ b/tests/blueprints/data_solutions/data_platform_foundations/fixture/main.tf
@@ -17,7 +17,9 @@
 module "test" {
   source              = "../../../../../blueprints/data-solutions/data-platform-foundations/"
   organization_domain = "example.com"
-  billing_account_id  = "123456-123456-123456"
-  folder_id           = "folders/12345678"
-  prefix              = "prefix"
+  project_config = {
+    billing_account_id = "123456-123456-123456"
+    parent             = "folders/12345678"
+  }
+  prefix = "prefix"
 }
diff --git a/tests/blueprints/data_solutions/data_platform_foundations/test_plan.py b/tests/blueprints/data_solutions/data_platform_foundations/test_plan.py
index 785f4705..f3ed2ba0 100644
--- a/tests/blueprints/data_solutions/data_platform_foundations/test_plan.py
+++ b/tests/blueprints/data_solutions/data_platform_foundations/test_plan.py
@@ -23,4 +23,4 @@ def test_resources(e2e_plan_runner):
   modules, resources = e2e_plan_runner(FIXTURES_DIR)
 
   assert len(modules) == 42
-  assert len(resources) == 296
+  assert len(resources) == 264
diff --git a/tests/fast/stages/s3_data_platform/common.tfvars b/tests/fast/stages/s3_data_platform/common.tfvars
index 2ec41d37..97d8bebc 100644
--- a/tests/fast/stages/s3_data_platform/common.tfvars
+++ b/tests/fast/stages/s3_data_platform/common.tfvars
@@ -1,11 +1,13 @@
 automation = {
   outputs_bucket = "test"
 }
-billing_account = {
-  id = "012345-67890A-BCDEF0",
-}
-folder_ids = {
-  data-platform-dev = "folders/12345678"
+project_config = {
+  billing_account = {
+    id = "012345-67890A-BCDEF0",
+  },
+  parent = {
+    data-platform-dev = "folders/12345678"
+  }
 }
 host_project_ids = {
   dev-spoke-0 = "fast-dev-net-spoke-0"