From 5b7f6ab91a69e4bd4280bf4f5173ac280dcf2310 Mon Sep 17 00:00:00 2001
From: Stefan Tomm <32126381+sttomm@users.noreply.github.com>
Date: Tue, 16 Aug 2022 09:36:24 +0200
Subject: [PATCH] fix data-platform-dev folder in stage 03-data-platform (#774)
---
fast/stages/03-data-platform/dev/README.md | 2 +-
fast/stages/03-data-platform/dev/main.tf | 2 +-
fast/stages/03-data-platform/dev/variables.tf | 2 +-
tests/fast/stages/s03_data_platform/fixture/main.tf | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/fast/stages/03-data-platform/dev/README.md b/fast/stages/03-data-platform/dev/README.md
index d62a1c0063..7238b44a1c 100644
--- a/fast/stages/03-data-platform/dev/README.md
+++ b/fast/stages/03-data-platform/dev/README.md
@@ -168,7 +168,7 @@ You can find examples in the `[demo](../../../../examples/data-solutions/data-pl
|---|---|:---:|:---:|:---:|:---:|
| [automation](variables.tf#L17) | Automation resources created by the bootstrap stage. | object({…})
| ✓ | | 00-bootstrap
|
| [billing_account](variables.tf#L25) | Billing account id and organization id ('nnnnnnnn' or null). | object({…})
| ✓ | | 00-globals
|
-| [folder_ids](variables.tf#L64) | Folder to be used for the networking resources in folders/nnnn format. | object({…})
| ✓ | | 01-resman
|
+| [folder_ids](variables.tf#L64) | Folder to be used for the networking resources in folders/nnnn format. | object({…})
| ✓ | | 01-resman
|
| [host_project_ids](variables.tf#L82) | Shared VPC project ids. | object({…})
| ✓ | | 02-networking
|
| [organization](variables.tf#L114) | Organization details. | object({…})
| ✓ | | 00-globals
|
| [prefix](variables.tf#L130) | Unique prefix used for resource names. Not used for projects if 'project_create' is null. | string
| ✓ | | 00-globals
|
diff --git a/fast/stages/03-data-platform/dev/main.tf b/fast/stages/03-data-platform/dev/main.tf
index f26a528856..b65f367a7e 100644
--- a/fast/stages/03-data-platform/dev/main.tf
+++ b/fast/stages/03-data-platform/dev/main.tf
@@ -22,7 +22,7 @@ module "data-platform" {
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
+ folder_id = var.folder_ids.data-platform-dev
groups = var.groups
location = var.location
network_config = {
diff --git a/fast/stages/03-data-platform/dev/variables.tf b/fast/stages/03-data-platform/dev/variables.tf
index 5553037ef6..19c998fe6d 100644
--- a/fast/stages/03-data-platform/dev/variables.tf
+++ b/fast/stages/03-data-platform/dev/variables.tf
@@ -65,7 +65,7 @@ variable "folder_ids" {
# tfdoc:variable:source 01-resman
description = "Folder to be used for the networking resources in folders/nnnn format."
type = object({
- data-platform = string
+ data-platform-dev = string
})
}
diff --git a/tests/fast/stages/s03_data_platform/fixture/main.tf b/tests/fast/stages/s03_data_platform/fixture/main.tf
index bf9be2fd20..0e356d2221 100644
--- a/tests/fast/stages/s03_data_platform/fixture/main.tf
+++ b/tests/fast/stages/s03_data_platform/fixture/main.tf
@@ -26,7 +26,7 @@ module "stage" {
organization_id = 123456
}
folder_ids = {
- data-platform = "folders/12345678"
+ data-platform-dev = "folders/12345678"
}
host_project_ids = {
dev-spoke-0 = "fast-dev-net-spoke-0"