Simplify new CF from onprem via PSC example (#280)
* add support for PSC addresses to net-address module * simplify PSC CF example * update diagram
This commit is contained in:
committed by
GitHub
parent
6a7e907b65
commit
813ea55d0d
@@ -15,9 +15,10 @@
|
||||
*/
|
||||
|
||||
module "test" {
|
||||
source = "../../../../networking/private-cloud-function-from-onprem"
|
||||
billing_account_id = var.billing_account_id
|
||||
projects_id = var.projects_id
|
||||
root_node = var.root_node
|
||||
cloud_function_gcs_bucket = var.cloud_function_gcs_bucket
|
||||
source = "../../../../networking/private-cloud-function-from-onprem"
|
||||
project_create = {
|
||||
billing_account_id = "123456-ABCDEF-123456"
|
||||
parent = "folders/1234567890"
|
||||
}
|
||||
project_id = "test-project"
|
||||
}
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
# Copyright 2021 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 "billing_account_id" {
|
||||
type = string
|
||||
default = "ABCDE-12345-ABCDE"
|
||||
}
|
||||
|
||||
variable "projects_id" {
|
||||
type = object({
|
||||
onprem = string
|
||||
function = string
|
||||
})
|
||||
default = {
|
||||
onprem = "onprem-project-id"
|
||||
function = "function-project-id"
|
||||
}
|
||||
}
|
||||
|
||||
variable "root_node" {
|
||||
type = string
|
||||
default = "organizations/0123456789"
|
||||
}
|
||||
|
||||
variable cloud_function_gcs_bucket {
|
||||
type = string
|
||||
default = "stanging-gcs-bucket"
|
||||
}
|
||||
@@ -24,4 +24,4 @@ def test_resources(e2e_plan_runner):
|
||||
"Test that plan works and the numbers of resources is as expected."
|
||||
modules, resources = e2e_plan_runner(FIXTURES_DIR)
|
||||
assert len(modules) == 10
|
||||
assert len(resources) == 40
|
||||
assert len(resources) == 38
|
||||
|
||||
Reference in New Issue
Block a user