Update networking bluprints tests

2023-02-10 13:28:26 +01:00
parent 02151af222
commit d71d0c5c22
23 changed files with 82 additions and 364 deletions
--- a/blueprints/networking/filtering-proxy-psc/README.md
+++ b/blueprints/networking/filtering-proxy-psc/README.md
@@ -26,3 +26,19 @@ To simplify the usage of the proxy, a Cloud DNS private zone is created in each
 | [region](variables.tf#L75) | Default region for resources. | <code>string</code> |  | <code>&#34;europe-west1&#34;</code> |
 <!-- END TFDOC -->
 ## Test
 ```hcl
 module "test" {
  source = "./fabric/blueprints/networking/filtering-proxy-psc"
  prefix = "fabric"
  project_create = {
    billing_account = "123456-ABCDEF-123456"
    parent          = "folders/1234567890"
  }
  project_id = "test-project"
 }
 # tftest modules=13 resources=37
 ```
--- a/blueprints/networking/filtering-proxy/README.md
+++ b/blueprints/networking/filtering-proxy/README.md
@@ -36,3 +36,27 @@ You can optionally deploy the Squid server as [Managed Instance Group](https://c
 | [squid-address](outputs.tf#L17) | IP address of the Squid proxy. |  |
 <!-- END TFDOC -->
 ## Test
 ```hcl
 module "test1" {
  source          = "./fabric/blueprints/networking/filtering-proxy"
  billing_account = "123456-123456-123456"
  mig             = true
  prefix          = "fabric"
  root_node       = "folders/123456789"
 }
 # tftest modules=14 resources=36
 ```
 ```hcl
 module "test2" {
  source          = "./fabric/blueprints/networking/filtering-proxy"
  billing_account = "123456-123456-123456"
  mig             = false
  prefix          = "fabric"
  root_node       = "folders/123456789"
 }
 # tftest modules=12 resources=30
 ```
--- a/blueprints/networking/glb-and-armor/README.md
+++ b/blueprints/networking/glb-and-armor/README.md
@@ -137,3 +137,19 @@ The above command will delete the associated resources so there will be no billa
 | [vm_siege_external_ip](outputs.tf#L23) | Siege VM external IP address. |  |
 <!-- END TFDOC -->
 ## Test
 ```hcl
 module "test" {
  source = "./fabric/blueprints/networking/glb-and-armor"
  prefix = "test"
  project_create = {
    billing_account_id = "123456789"
    parent             = "organizations/123456789"
  }
  project_id              = "project-1"
  enforce_security_policy = true
 }
 # tftest modules=12 resources=26
 ```
--- a/blueprints/networking/ilb-next-hop/README.md
+++ b/blueprints/networking/ilb-next-hop/README.md
@@ -86,3 +86,15 @@ A sample testing session using `tmux`:
 | [ssh_vm_right](outputs.tf#L64) | Command-line login to right VMs. |  |
 <!-- END TFDOC -->
 ## Test
 ```hcl
 module "test" {
  source         = "./fabric/blueprints/networking/ilb-next-hop"
  prefix         = "test"
  project_create = true
  project_id     = "project-1"
 }
 # tftest modules=18 resources=42
 ```
--- a/blueprints/networking/private-cloud-function-from-onprem/README.md
+++ b/blueprints/networking/private-cloud-function-from-onprem/README.md
@@ -33,3 +33,17 @@ curl https://YOUR_REGION-YOUR_PROJECT_ID.cloudfunctions.net/YOUR_FUNCTION_NAME
 | [function_url](outputs.tf#L17) | URL of the Cloud Function. |  |
 <!-- END TFDOC -->
 ## Test
 ```hcl
 module "test" {
  source = "./fabric/blueprints/networking/private-cloud-function-from-onprem/"
  project_create = {
    billing_account_id = "123456-ABCDEF-123456"
    parent             = "folders/1234567890"
  }
  project_id = "test-project"
 }
 # tftest modules=11 resources=40
 ```
--- a/tests/blueprints/networking/filtering_proxy/init.py
+++ b/tests/blueprints/networking/filtering_proxy/init.py
@@ -1,13 +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
 #
 #      http://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.
--- a/tests/blueprints/networking/filtering_proxy/fixture/main.tf
+++ b/tests/blueprints/networking/filtering_proxy/fixture/main.tf
@@ -1,23 +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
 *
 *      http://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.
 */
 module "test" {
  source          = "../../../../../blueprints/networking/filtering-proxy"
  billing_account = "123456-123456-123456"
  mig             = var.mig
  prefix          = "fabric"
  root_node       = "folders/123456789"
 }
--- a/tests/blueprints/networking/filtering_proxy/fixture/variables.tf
+++ b/tests/blueprints/networking/filtering_proxy/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 "mig" {
  type    = bool
  default = false
 }
--- a/tests/blueprints/networking/filtering_proxy/test_plan.py
+++ b/tests/blueprints/networking/filtering_proxy/test_plan.py
@@ -1,23 +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
 #
 #      http://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.
 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) == 11
  assert len(resources) == 30
  modules, resources = e2e_plan_runner(mig="true")
  assert len(modules) == 13
  assert len(resources) == 36
--- a/tests/blueprints/networking/filtering_proxy_psc/init.py
+++ b/tests/blueprints/networking/filtering_proxy_psc/init.py
@@ -1,13 +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
 #
 #      http://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.
--- a/tests/blueprints/networking/filtering_proxy_psc/fixture/main.tf
+++ b/tests/blueprints/networking/filtering_proxy_psc/fixture/main.tf
@@ -1,25 +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
 *
 *      http://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.
 */
 module "test" {
  source = "../../../../../blueprints/networking/filtering-proxy-psc"
  prefix = "fabric"
  project_create = {
    billing_account = "123456-ABCDEF-123456"
    parent          = "folders/1234567890"
  }
  project_id = "test-project"
 }
--- a/tests/blueprints/networking/filtering_proxy_psc/test_plan.py
+++ b/tests/blueprints/networking/filtering_proxy_psc/test_plan.py
@@ -1,19 +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
 #
 #      http://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.
 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) == 12
  assert len(resources) == 34
--- a/tests/blueprints/networking/glb_and_armor/init.py
+++ b/tests/blueprints/networking/glb_and_armor/init.py
@@ -1,13 +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
 #
 #      http://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.
--- a/tests/blueprints/networking/glb_and_armor/fixture/main.tf
+++ b/tests/blueprints/networking/glb_and_armor/fixture/main.tf
@@ -1,21 +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.
 module "test" {
  source                  = "../../../../../blueprints/networking/glb-and-armor"
  prefix                  = var.prefix
  project_create          = var.project_create
  project_id              = var.project_id
  enforce_security_policy = var.enforce_security_policy
 }
--- a/tests/blueprints/networking/glb_and_armor/fixture/variables.tf
+++ b/tests/blueprints/networking/glb_and_armor/fixture/variables.tf
@@ -1,39 +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 "prefix" {
  type    = string
  default = "test"
 }
 variable "project_create" {
  type = object({
    billing_account_id = string
    parent             = string
  })
  default = {
    billing_account_id = "123456789"
    parent             = "organizations/123456789"
  }
 }
 variable "project_id" {
  type    = string
  default = "project-1"
 }
 variable "enforce_security_policy" {
  type    = bool
  default = true
 }
--- a/tests/blueprints/networking/glb_and_armor/test_plan.py
+++ b/tests/blueprints/networking/glb_and_armor/test_plan.py
@@ -1,19 +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
 #
 #      http://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.
 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) == 11
  assert len(resources) == 25
--- a/tests/blueprints/networking/ilb_next_hop/init.py
+++ b/tests/blueprints/networking/ilb_next_hop/init.py
@@ -1,13 +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
 #
 #      http://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.
--- a/tests/blueprints/networking/ilb_next_hop/fixture/main.tf
+++ b/tests/blueprints/networking/ilb_next_hop/fixture/main.tf
@@ -1,22 +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
 *
 *      http://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.
 */
 module "test" {
  source         = "../../../../../blueprints/networking/ilb-next-hop"
  prefix         = var.prefix
  project_create = var.project_create
  project_id     = var.project_id
 }
--- a/tests/blueprints/networking/ilb_next_hop/fixture/variables.tf
+++ b/tests/blueprints/networking/ilb_next_hop/fixture/variables.tf
@@ -1,28 +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 "prefix" {
  type    = string
  default = "test"
 }
 variable "project_create" {
  type    = bool
  default = true
 }
 variable "project_id" {
  type    = string
  default = "project-1"
 }
--- a/tests/blueprints/networking/ilb_next_hop/test_plan.py
+++ b/tests/blueprints/networking/ilb_next_hop/test_plan.py
@@ -1,19 +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
 #
 #      http://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.
 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) == 42
--- a/tests/blueprints/networking/private_cloud_function_from_onprem/init.py
+++ b/tests/blueprints/networking/private_cloud_function_from_onprem/init.py
@@ -1,13 +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
 #
 #      http://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.
--- a/tests/blueprints/networking/private_cloud_function_from_onprem/fixture/main.tf
+++ b/tests/blueprints/networking/private_cloud_function_from_onprem/fixture/main.tf
@@ -1,24 +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
 *
 *      http://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.
 */
 module "test" {
  source = "../../../../../blueprints/networking/private-cloud-function-from-onprem"
  project_create = {
    billing_account_id = "123456-ABCDEF-123456"
    parent             = "folders/1234567890"
  }
  project_id = "test-project"
 }
--- a/tests/blueprints/networking/private_cloud_function_from_onprem/test_plan.py
+++ b/tests/blueprints/networking/private_cloud_function_from_onprem/test_plan.py
@@ -1,19 +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
 #
 #      http://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.
 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) == 10
  assert len(resources) == 39