Convert to blueprint test skeleton for all stages and do a pipeline refactor

3-networks/envs/development/providers.tf

@@ -24,10 +24,10 @@ locals {
  *****************************************/
 provider "google" {
  impersonate_service_account = local.tf_sa
- request_timeout = "60s"
+ request_timeout = "120s"
 }
 
 provider "google-beta" {
  impersonate_service_account = local.tf_sa
- request_timeout = "60s"
+ request_timeout = "120s"
 }

3-networks/envs/non-production/providers.tf

@@ -24,10 +24,10 @@ locals {
  *****************************************/
 provider "google" {
  impersonate_service_account = local.tf_sa
- request_timeout = "60s"
+ request_timeout = "120s"
 }
 
 provider "google-beta" {
  impersonate_service_account = local.tf_sa
- request_timeout = "60s"
+ request_timeout = "120s"
 }

3-networks/envs/production/providers.tf

@@ -24,10 +24,10 @@ locals {
  *****************************************/
 provider "google" {
  impersonate_service_account = local.tf_sa
- request_timeout = "60s"
+ request_timeout = "120s"
 }
 
 provider "google-beta" {
  impersonate_service_account = local.tf_sa
- request_timeout = "60s"
+ request_timeout = "120s"
 }

3-networks/envs/shared/providers.tf

@@ -24,10 +24,10 @@ locals {
  *****************************************/
 provider "google" {
  impersonate_service_account = local.tf_sa
- request_timeout = "60s"
+ request_timeout = "120s"
 }
 
 provider "google-beta" {
  impersonate_service_account = local.tf_sa
- request_timeout = "60s"
+ request_timeout = "120s"
 }

5-app-infra/business_unit_1/development/outputs.tf

@@ -32,6 +32,7 @@ output "instances_zones" {
 output "instances_details" {
  description = "List of details for compute instances"
  value = module.base_shared_gce_instance.instances_details
+ sensitive = true
 }
 
 output "available_zones" {

test/fixtures/shared/outputs.tf → 5-app-infra/business_unit_1/development/versions.tf

@@ -1,5 +1,5 @@
 /**
- * Copyright 2021 Google LLC
+ * 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.
@@ -14,7 +14,30 @@
  * limitations under the License.
  */
 
-output "dns_hub_project_id" {
- value = module.shared.dns_hub_project_id
- description = "The DNS hub project ID"
+terraform {
+ required_version = ">= 0.13"
+
+ required_providers {
+
+ google = {
+ source = "hashicorp/google"
+ version = "~> 3.77"
+ }
+
+ google-beta = {
+ source = "hashicorp/google-beta"
+ version = "~> 3.77"
+ }
+
+ null = {
+ source = "hashicorp/null"
+ version = "~> 2.1"
+ }
+
+ random = {
+ source = "hashicorp/random"
+ version = "~> 2.3"
+ }
+
+ }
 }

5-app-infra/business_unit_1/non-production/outputs.tf

@@ -32,6 +32,7 @@ output "instances_zones" {
 output "instances_details" {
  description = "List of details for compute instances"
  value = module.base_shared_gce_instance.instances_details
+ sensitive = true
 }
 
 output "available_zones" {

test/fixtures/bootstrap/main.tf → 5-app-infra/business_unit_1/non-production/versions.tf

@@ -1,5 +1,5 @@
 /**
- * Copyright 2021 Google LLC
+ * 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.
@@ -14,14 +14,30 @@
  * limitations under the License.
  */
 
-module "bootstrap" {
- source = "../../../0-bootstrap"
- parent_folder = var.parent_folder
- org_id = var.org_id
- group_org_admins = var.group_email
- group_billing_admins = var.group_email
- billing_account = var.billing_account
- org_project_creators = var.org_project_creators
- project_prefix = var.project_prefix
- bucket_prefix = var.bucket_prefix
+terraform {
+ required_version = ">= 0.13"
+
+ required_providers {
+
+ google = {
+ source = "hashicorp/google"
+ version = "~> 3.77"
+ }
+
+ google-beta = {
+ source = "hashicorp/google-beta"
+ version = "~> 3.77"
+ }
+
+ null = {
+ source = "hashicorp/null"
+ version = "~> 2.1"
+ }
+
+ random = {
+ source = "hashicorp/random"
+ version = "~> 2.3"
+ }
+
+ }
 }

5-app-infra/business_unit_1/production/outputs.tf

@@ -32,6 +32,7 @@ output "instances_zones" {
 output "instances_details" {
  description = "List of details for compute instances"
  value = module.base_shared_gce_instance.instances_details
+ sensitive = true
 }
 
 output "available_zones" {

test/fixtures/app-infra/variables.tf → 5-app-infra/business_unit_1/production/versions.tf

@@ -1,5 +1,5 @@
 /**
- * Copyright 2021 Google LLC
+ * 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.
@@ -14,23 +14,30 @@
  * limitations under the License.
  */
 
-variable "terraform_service_account" {
- description = "The SA that will be used for creating projects."
-}
+terraform {
+ required_version = ">= 0.13"
 
-variable "folder_prefix" {
- description = "Name prefix to use for folders created."
- type = string
- default = "fldr"
-}
+ required_providers {
 
-variable "parent_folder" {
- description = "Optional - if using a folder for testing."
- type = string
- default = ""
-}
+ google = {
+ source = "hashicorp/google"
+ version = "~> 3.77"
+ }
+
+ google-beta = {
+ source = "hashicorp/google-beta"
+ version = "~> 3.77"
+ }
+
+ null = {
+ source = "hashicorp/null"
+ version = "~> 2.1"
+ }
+
+ random = {
+ source = "hashicorp/random"
+ version = "~> 2.3"
+ }
 
-variable "org_id" {
- description = "The organization id for the associated services"
- type = string
+ }
 }