Merge branch 'master' into sql-multi-region

tests/examples/networking/hub_and_spoke_vpn/fixture/main.tf

@@ -15,6 +15,10 @@
  */
 
 module "test" {
-  source     = "../../../../../examples/networking/hub-and-spoke-vpn"
-  project_id = var.project_id
+  source = "../../../../../examples/networking/hub-and-spoke-vpn"
+  project_create_config = {
+    billing_account_id = "ABCDE-123456-ABCDE"
+    parent_id          = null
+  }
+  project_id = "test-1"
 }

tests/examples/networking/hub_and_spoke_vpn/fixture/variables.tf

@@ -1,18 +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
-#
-#     https://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.
-
-variable "project_id" {
-  type    = string
-  default = "project-1"
-}

tests/examples/networking/hub_and_spoke_vpn/test_plan.py

@@ -12,8 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+
 def test_resources(e2e_plan_runner):
   "Test that plan works and the numbers of resources is as expected."
   modules, resources = e2e_plan_runner()
-  assert len(modules) == 17
-  assert len(resources) == 71
+  assert len(modules) == 19
+  assert len(resources) == 73