diff --git a/blueprints/gke/binauthz/README.md b/blueprints/gke/binauthz/README.md index 387ceb09b7..09eac687d7 100644 --- a/blueprints/gke/binauthz/README.md +++ b/blueprints/gke/binauthz/README.md @@ -125,3 +125,18 @@ Once done testing, you can clean up resources by running `terraform destroy`. | [image_repo_url](outputs.tf#L22) | Image source repository url. | | + +## Test + +```hcl +module "test" { + source = "./fabric/blueprints/gke/binauthz" + prefix = "test" + project_create = { + billing_account_id = "12345-12345-12345" + parent = "folders/123456789" + } + project_id = "my-project" +} +# tftest modules=14 resources=47 +``` diff --git a/blueprints/gke/multi-cluster-mesh-gke-fleet-api/README.md b/blueprints/gke/multi-cluster-mesh-gke-fleet-api/README.md index 7d43bd4011..f381327a2c 100644 --- a/blueprints/gke/multi-cluster-mesh-gke-fleet-api/README.md +++ b/blueprints/gke/multi-cluster-mesh-gke-fleet-api/README.md @@ -75,3 +75,34 @@ Once done testing, you can clean up resources by running `terraform destroy`. | [region](variables.tf#L99) | Region. | string | | "europe-west1" | + +## Test + +```hcl +module "test" { + source = "./fabric/blueprints/gke/multi-cluster-mesh-gke-fleet-api" + billing_account_id = "123-456-789" + parent = "folders/123456789" + host_project_id = "my-host-project" + fleet_project_id = "my-fleet-project" + mgmt_project_id = "my-mgmt-project" + region = "europe-west1" + clusters_config = { + cluster-a = { + subnet_cidr_block = "10.0.1.0/24" + master_cidr_block = "10.16.0.0/28" + services_cidr_block = "192.168.1.0/24" + pods_cidr_block = "172.16.0.0/20" + } + cluster-b = { + subnet_cidr_block = "10.0.2.0/24" + master_cidr_block = "10.16.0.16/28" + services_cidr_block = "192.168.2.0/24" + pods_cidr_block = "172.16.16.0/20" + } + } + mgmt_subnet_cidr_block = "10.0.0.0/24" + istio_version = "1.14.1-asm.3" +} +# tftest modules=13 resources=57 +``` diff --git a/blueprints/networking/decentralized-firewall/README.md b/blueprints/networking/decentralized-firewall/README.md index cab7da0653..4322c3c1b7 100644 --- a/blueprints/networking/decentralized-firewall/README.md +++ b/blueprints/networking/decentralized-firewall/README.md @@ -51,5 +51,5 @@ module "test" { root_node = "organizations/0123456789" } -# tftest modules=9 resources=50 +# tftest modules=7 resources=50 ``` diff --git a/blueprints/networking/shared-vpc-gke/README.md b/blueprints/networking/shared-vpc-gke/README.md index 858518bd89..f413becfdd 100644 --- a/blueprints/networking/shared-vpc-gke/README.md +++ b/blueprints/networking/shared-vpc-gke/README.md @@ -70,3 +70,15 @@ There's a minor glitch that can surface running `terraform destroy`, where the s | [vpc](outputs.tf#L40) | Shared VPC. | | + +## Test + +```hcl +module "test" { + source = "./fabric/blueprints/gke/shared-vpc-gke" + billing_account_id = "ABCDE-12345-ABCDE" + prefix = "test" + root_node = "organizations/0123456789" +} +# tftest modules=11 resources=43 +``` diff --git a/tests/blueprints/gke/__init__.py b/tests/blueprints/gke/__init__.py deleted file mode 100644 index 6d6d1266c3..0000000000 --- a/tests/blueprints/gke/__init__.py +++ /dev/null @@ -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. diff --git a/tests/blueprints/gke/binauthz/__init__.py b/tests/blueprints/gke/binauthz/__init__.py deleted file mode 100644 index 6d6d1266c3..0000000000 --- a/tests/blueprints/gke/binauthz/__init__.py +++ /dev/null @@ -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. diff --git a/tests/blueprints/gke/binauthz/fixture/main.tf b/tests/blueprints/gke/binauthz/fixture/main.tf deleted file mode 100644 index 23e1504b84..0000000000 --- a/tests/blueprints/gke/binauthz/fixture/main.tf +++ /dev/null @@ -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/gke/binauthz" - prefix = var.prefix - project_create = var.project_create - project_id = var.project_id -} diff --git a/tests/blueprints/gke/binauthz/fixture/variables.tf b/tests/blueprints/gke/binauthz/fixture/variables.tf deleted file mode 100644 index 8a09c75eba..0000000000 --- a/tests/blueprints/gke/binauthz/fixture/variables.tf +++ /dev/null @@ -1,34 +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_create" { - type = object({ - billing_account_id = string - parent = string - }) - default = { - billing_account_id = "12345-12345-12345" - parent = "folders/123456789" - } -} - -variable "project_id" { - type = string - default = "my-project" -} - -variable "prefix" { - type = string - default = "test" -} diff --git a/tests/blueprints/gke/binauthz/test_plan.py b/tests/blueprints/gke/binauthz/test_plan.py deleted file mode 100644 index b4437b6f3d..0000000000 --- a/tests/blueprints/gke/binauthz/test_plan.py +++ /dev/null @@ -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) == 13 - assert len(resources) == 44 diff --git a/tests/blueprints/gke/multi_cluster_mesh_gke_fleet_api/__init__.py b/tests/blueprints/gke/multi_cluster_mesh_gke_fleet_api/__init__.py deleted file mode 100644 index 6d6d1266c3..0000000000 --- a/tests/blueprints/gke/multi_cluster_mesh_gke_fleet_api/__init__.py +++ /dev/null @@ -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. diff --git a/tests/blueprints/gke/multi_cluster_mesh_gke_fleet_api/fixture/main.tf b/tests/blueprints/gke/multi_cluster_mesh_gke_fleet_api/fixture/main.tf deleted file mode 100644 index 47524fa526..0000000000 --- a/tests/blueprints/gke/multi_cluster_mesh_gke_fleet_api/fixture/main.tf +++ /dev/null @@ -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 - * - * 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/gke/multi-cluster-mesh-gke-fleet-api" - billing_account_id = var.billing_account_id - parent = var.parent - host_project_id = var.host_project_id - fleet_project_id = var.fleet_project_id - mgmt_project_id = var.mgmt_project_id - region = var.region - clusters_config = var.clusters_config - mgmt_subnet_cidr_block = var.mgmt_subnet_cidr_block - istio_version = var.istio_version -} diff --git a/tests/blueprints/gke/multi_cluster_mesh_gke_fleet_api/fixture/variables.tf b/tests/blueprints/gke/multi_cluster_mesh_gke_fleet_api/fixture/variables.tf deleted file mode 100644 index 6c6b6c8fba..0000000000 --- a/tests/blueprints/gke/multi_cluster_mesh_gke_fleet_api/fixture/variables.tf +++ /dev/null @@ -1,107 +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. - */ - -variable "billing_account_id" { - description = "Billing account id." - type = string - default = "123-456-789" -} - -variable "parent" { - description = "Parent." - type = string - default = "folders/123456789" -} - -variable "host_project_id" { - description = "Host project ID." - type = string - default = "my-host-project" -} - -variable "fleet_project_id" { - description = "Fleet project ID." - type = string - default = "my-fleet-project" -} - -variable "mgmt_project_id" { - description = "Management Project ID." - type = string - default = "my-mgmt-project" -} - -variable "mgmt_subnet_cidr_block" { - description = "Management subnet CIDR block." - type = string - default = "10.0.0.0/24" -} - -variable "region" { - description = "Region." - type = string - default = "europe-west1" -} - -variable "clusters_config" { - description = "Clusters configuration." - type = map(object({ - subnet_cidr_block = string - master_cidr_block = string - services_cidr_block = string - pods_cidr_block = string - })) - default = { - cluster-a = { - subnet_cidr_block = "10.0.1.0/24" - master_cidr_block = "10.16.0.0/28" - services_cidr_block = "192.168.1.0/24" - pods_cidr_block = "172.16.0.0/20" - } - cluster-b = { - subnet_cidr_block = "10.0.2.0/24" - master_cidr_block = "10.16.0.16/28" - services_cidr_block = "192.168.2.0/24" - pods_cidr_block = "172.16.16.0/20" - } - } -} - -variable "mgmt_server_config" { - description = "Mgmt server configuration" - type = object({ - disk_size = number - disk_type = string - image = string - instance_type = string - region = string - zone = string - }) - default = { - disk_size = 50 - disk_type = "pd-ssd" - image = "projects/ubuntu-os-cloud/global/images/family/ubuntu-2204-lts" - instance_type = "n1-standard-2" - region = "europe-west1" - zone = "europe-west1-c" - } -} - -variable "istio_version" { - description = "ASM version" - type = string - default = "1.14.1-asm.3" -} diff --git a/tests/blueprints/gke/multi_cluster_mesh_gke_fleet_api/test_plan.py b/tests/blueprints/gke/multi_cluster_mesh_gke_fleet_api/test_plan.py deleted file mode 100644 index 2379849dcc..0000000000 --- a/tests/blueprints/gke/multi_cluster_mesh_gke_fleet_api/test_plan.py +++ /dev/null @@ -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) == 55 diff --git a/tests/blueprints/gke/multitenant_fleet/__init__.py b/tests/blueprints/gke/multitenant_fleet/__init__.py deleted file mode 100644 index 6d6d1266c3..0000000000 --- a/tests/blueprints/gke/multitenant_fleet/__init__.py +++ /dev/null @@ -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. diff --git a/tests/blueprints/gke/multitenant_fleet/fixture/main.tf b/tests/blueprints/gke/multitenant_fleet/fixture/main.tf deleted file mode 100644 index 394d555de3..0000000000 --- a/tests/blueprints/gke/multitenant_fleet/fixture/main.tf +++ /dev/null @@ -1,55 +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/gke/multitenant-fleet" - project_id = "test-prj" - billing_account_id = "ABCDEF-0123456-ABCDEF" - folder_id = "folders/1234567890" - prefix = "test" - clusters = { - cluster-0 = { - location = "europe-west1" - private_cluster_config = { - enable_private_endpoint = true - master_global_access = true - } - vpc_config = { - subnetwork = "projects/my-host-project-id/regions/europe-west1/subnetworks/mycluster-subnet" - master_ipv4_cidr_block = "172.16.10.0/28" - secondary_range_names = { - pods = "pods" - services = "services" - } - } - } - } - nodepools = { - cluster-0 = { - nodepool-0 = { - node_config = { - disk_type = "pd-balanced" - machine_type = "n2-standard-4" - spot = true - } - } - } - } - vpc_config = { - host_project_id = "my-host-project-id" - vpc_self_link = "projects/my-host-project-id/global/networks/my-network" - } -} diff --git a/tests/blueprints/gke/multitenant_fleet/test_plan.py b/tests/blueprints/gke/multitenant_fleet/test_plan.py deleted file mode 100644 index c8a8369496..0000000000 --- a/tests/blueprints/gke/multitenant_fleet/test_plan.py +++ /dev/null @@ -1,20 +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) == 4 - assert len(resources) == 23 diff --git a/tests/blueprints/gke/shared_vpc_gke/__init__.py b/tests/blueprints/gke/shared_vpc_gke/__init__.py deleted file mode 100644 index 6d6d1266c3..0000000000 --- a/tests/blueprints/gke/shared_vpc_gke/__init__.py +++ /dev/null @@ -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. diff --git a/tests/blueprints/gke/shared_vpc_gke/fixture/main.tf b/tests/blueprints/gke/shared_vpc_gke/fixture/main.tf deleted file mode 100644 index ac4e647a2e..0000000000 --- a/tests/blueprints/gke/shared_vpc_gke/fixture/main.tf +++ /dev/null @@ -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/gke/shared-vpc-gke" - billing_account_id = var.billing_account_id - prefix = var.prefix - root_node = var.root_node -} diff --git a/tests/blueprints/gke/shared_vpc_gke/fixture/variables.tf b/tests/blueprints/gke/shared_vpc_gke/fixture/variables.tf deleted file mode 100644 index 59933f9aad..0000000000 --- a/tests/blueprints/gke/shared_vpc_gke/fixture/variables.tf +++ /dev/null @@ -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 "billing_account_id" { - type = string - default = "ABCDE-12345-ABCDE" -} - -variable "prefix" { - type = string - default = "test" -} - -variable "root_node" { - type = string - default = "organizations/0123456789" -} diff --git a/tests/blueprints/gke/shared_vpc_gke/test_plan.py b/tests/blueprints/gke/shared_vpc_gke/test_plan.py deleted file mode 100644 index 8d0f6bd617..0000000000 --- a/tests/blueprints/gke/shared_vpc_gke/test_plan.py +++ /dev/null @@ -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) == 43