kovagoadi/hunfabric
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix tests

Browse Source
This commit is contained in:
Wiktor Niesiobędzki
2025-12-18 10:04:12 +00:00
parent f4b8992ea5
commit 85ebc4bc6f
12 changed files with 102 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tests/collectors.py
View File

@@ -97,8 +97,8 @@ class FabricTestItem(pytest.Item):
self.module = module
self.inventory = inventory
self.tf_var_files = tf_var_files
self.extra_dirs = extra_dirs
self.extra_files = extra_files
self.extra_dirs = extra_dirs if extra_dirs else []
self.extra_files = extra_files if extra_files else []
def runtest(self):
try:
@@ -107,13 +107,22 @@ class FabricTestItem(pytest.Item):
self.extra_files, self.extra_dirs)
except AssertionError:
def full_paths(x):
return [str(self.parent.path.parent / x) for x in x]
def full_paths(paths):
return [str(self.parent.path.parent / x) for x in paths]
extra_dirs = [f"--extra-dirs={x}" for x in full_paths(self.extra_dirs)]
extra_files = [
f"--extra-files={x}" for x in full_paths(
f"../{f}" for f in self.
extra_files # FIXME: for some reason, extra files needs one extra ../
)
]
print(f'Error in inventory file: {" ".join(full_paths(self.inventory))}')
print(
f'To regenerate inventory run: python tools/plan_summary.py {self.module} {" ".join(full_paths(self.tf_var_files))}'
)
print(f'To regenerate inventory run: python tools/plan_summary.py '
f'{" ".join(extra_dirs)} '
f'{" ".join(extra_files)} '
f'{self.module} '
f'{" ".join(full_paths(self.tf_var_files))}')
raise
def reportinfo(self):

28
tests/fast/stages/s0_org_setup/hardened.yaml
View File

@@ -36,14 +36,13 @@ values:
content_language: null
customer_encryption: []
deletion_policy: null
detect_md5hash: different hash
detect_md5hash: null
event_based_hold: null
force_empty_content_type: null
metadata: null
name: providers/0-org-setup-providers.tf
retention: []
source: null
source_md5hash: null
temporary_hold: null
timeouts: null
google_storage_bucket_object.providers["0-org-setup-ro"]:
@@ -68,14 +67,13 @@ values:
content_language: null
customer_encryption: []
deletion_policy: null
detect_md5hash: different hash
detect_md5hash: null
event_based_hold: null
force_empty_content_type: null
metadata: null
name: providers/0-org-setup-ro-providers.tf
retention: []
source: null
source_md5hash: null
temporary_hold: null
timeouts: null
google_storage_bucket_object.providers["1-vpcsc"]:
@@ -101,14 +99,13 @@ values:
content_language: null
customer_encryption: []
deletion_policy: null
detect_md5hash: different hash
detect_md5hash: null
event_based_hold: null
force_empty_content_type: null
metadata: null
name: providers/1-vpcsc-providers.tf
retention: []
source: null
source_md5hash: null
temporary_hold: null
timeouts: null
google_storage_bucket_object.providers["2-networking"]:
@@ -134,14 +131,13 @@ values:
content_language: null
customer_encryption: []
deletion_policy: null
detect_md5hash: different hash
detect_md5hash: null
event_based_hold: null
force_empty_content_type: null
metadata: null
name: providers/2-networking-providers.tf
retention: []
source: null
source_md5hash: null
temporary_hold: null
timeouts: null
google_storage_bucket_object.providers["2-project-factory"]:
@@ -167,14 +163,13 @@ values:
content_language: null
customer_encryption: []
deletion_policy: null
detect_md5hash: different hash
detect_md5hash: null
event_based_hold: null
force_empty_content_type: null
metadata: null
name: providers/2-project-factory-providers.tf
retention: []
source: null
source_md5hash: null
temporary_hold: null
timeouts: null
google_storage_bucket_object.providers["2-security"]:
@@ -200,14 +195,13 @@ values:
content_language: null
customer_encryption: []
deletion_policy: null
detect_md5hash: different hash
detect_md5hash: null
event_based_hold: null
force_empty_content_type: null
metadata: null
name: providers/2-security-providers.tf
retention: []
source: null
source_md5hash: null
temporary_hold: null
timeouts: null
google_storage_bucket_object.tfvars["globals"]:
@@ -219,14 +213,13 @@ values:
content_language: null
customer_encryption: []
deletion_policy: null
detect_md5hash: different hash
detect_md5hash: null
event_based_hold: null
force_empty_content_type: null
metadata: null
name: tfvars/0-globals.auto.tfvars.json
retention: []
source: null
source_md5hash: null
temporary_hold: null
timeouts: null
google_storage_bucket_object.tfvars["org-setup"]:
@@ -237,14 +230,13 @@ values:
content_language: null
customer_encryption: []
deletion_policy: null
detect_md5hash: different hash
detect_md5hash: null
event_based_hold: null
force_empty_content_type: null
metadata: null
name: tfvars/0-org-setup.auto.tfvars.json
retention: []
source: null
source_md5hash: null
temporary_hold: null
timeouts: null
local_file.providers["0-org-setup"]:
@@ -7300,7 +7292,7 @@ counts:
google_service_account_iam_member: 4
google_storage_bucket: 3
google_storage_bucket_iam_binding: 4
google_storage_bucket_object: 9
google_storage_bucket_object: 10
google_storage_managed_folder: 5
google_storage_managed_folder_iam_binding: 10
google_storage_project_service_account: 3
@@ -7310,5 +7302,5 @@ counts:
google_tags_tag_value_iam_binding: 4
local_file: 9
modules: 54
resources: 570
resources: 571
terraform_data: 4

28
tests/fast/stages/s0_org_setup/simple.yaml
View File

@@ -36,14 +36,13 @@ values:
content_language: null
customer_encryption: []
deletion_policy: null
detect_md5hash: different hash
detect_md5hash: null
event_based_hold: null
force_empty_content_type: null
metadata: null
name: providers/0-org-setup-providers.tf
retention: []
source: null
source_md5hash: null
temporary_hold: null
timeouts: null
google_storage_bucket_object.providers["0-org-setup-ro"]:
@@ -68,14 +67,13 @@ values:
content_language: null
customer_encryption: []
deletion_policy: null
detect_md5hash: different hash
detect_md5hash: null
event_based_hold: null
force_empty_content_type: null
metadata: null
name: providers/0-org-setup-ro-providers.tf
retention: []
source: null
source_md5hash: null
temporary_hold: null
timeouts: null
google_storage_bucket_object.providers["1-vpcsc"]:
@@ -101,14 +99,13 @@ values:
content_language: null
customer_encryption: []
deletion_policy: null
detect_md5hash: different hash
detect_md5hash: null
event_based_hold: null
force_empty_content_type: null
metadata: null
name: providers/1-vpcsc-providers.tf
retention: []
source: null
source_md5hash: null
temporary_hold: null
timeouts: null
google_storage_bucket_object.providers["2-networking"]:
@@ -134,14 +131,13 @@ values:
content_language: null
customer_encryption: []
deletion_policy: null
detect_md5hash: different hash
detect_md5hash: null
event_based_hold: null
force_empty_content_type: null
metadata: null
name: providers/2-networking-providers.tf
retention: []
source: null
source_md5hash: null
temporary_hold: null
timeouts: null
google_storage_bucket_object.providers["2-project-factory"]:
@@ -167,14 +163,13 @@ values:
content_language: null
customer_encryption: []
deletion_policy: null
detect_md5hash: different hash
detect_md5hash: null
event_based_hold: null
force_empty_content_type: null
metadata: null
name: providers/2-project-factory-providers.tf
retention: []
source: null
source_md5hash: null
temporary_hold: null
timeouts: null
google_storage_bucket_object.providers["2-security"]:
@@ -200,14 +195,13 @@ values:
content_language: null
customer_encryption: []
deletion_policy: null
detect_md5hash: different hash
detect_md5hash: null
event_based_hold: null
force_empty_content_type: null
metadata: null
name: providers/2-security-providers.tf
retention: []
source: null
source_md5hash: null
temporary_hold: null
timeouts: null
google_storage_bucket_object.tfvars["globals"]:
@@ -219,14 +213,13 @@ values:
content_language: null
customer_encryption: []
deletion_policy: null
detect_md5hash: different hash
detect_md5hash: null
event_based_hold: null
force_empty_content_type: null
metadata: null
name: tfvars/0-globals.auto.tfvars.json
retention: []
source: null
source_md5hash: null
temporary_hold: null
timeouts: null
google_storage_bucket_object.tfvars["org-setup"]:
@@ -237,14 +230,13 @@ values:
content_language: null
customer_encryption: []
deletion_policy: null
detect_md5hash: different hash
detect_md5hash: null
event_based_hold: null
force_empty_content_type: null
metadata: null
name: tfvars/0-org-setup.auto.tfvars.json
retention: []
source: null
source_md5hash: null
temporary_hold: null
timeouts: null
local_file.providers["0-org-setup"]:
@@ -2879,7 +2871,7 @@ counts:
google_service_account_iam_member: 4
google_storage_bucket: 3
google_storage_bucket_iam_binding: 4
google_storage_bucket_object: 9
google_storage_bucket_object: 10
google_storage_managed_folder: 5
google_storage_managed_folder_iam_binding: 10
google_storage_project_service_account: 3
@@ -2889,5 +2881,5 @@ counts:
google_tags_tag_value_iam_binding: 4
local_file: 9
modules: 50
resources: 323
resources: 324
terraform_data: 4

2
tests/fast/stages/s1_vpcsc/simple.yaml
View File

@@ -20,7 +20,7 @@ values:
content_encoding: null
content_language: null
customer_encryption: []
detect_md5hash: different hash
detect_md5hash: null
event_based_hold: null
metadata: null
name: tfvars/1-vpcsc.auto.tfvars.json

92
tests/fast/stages/s2_networking/ncc.yaml
View File

@@ -16,7 +16,7 @@ values:
google_compute_ha_vpn_gateway.default["hub/to-onprem"]:
description: null
effective_labels:
goog-terraform-provisioned: "true"
goog-terraform-provisioned: 'true'
gateway_ip_version: IPV4
labels: null
name: hub-to-onprem
@@ -25,7 +25,7 @@ values:
region: europe-west1
stack_type: IPV4_ONLY
terraform_labels:
goog-terraform-provisioned: "true"
goog-terraform-provisioned: 'true'
timeouts: null
google_compute_router.default["hub/vpn-router"]:
bgp:
@@ -49,29 +49,29 @@ values:
- fast-dev-net-spoke-0
description: Terraform-managed
effective_labels:
goog-terraform-provisioned: "true"
goog-terraform-provisioned: 'true'
labels: null
name: default
project: fast-prod-net-core-0
terraform_labels:
goog-terraform-provisioned: "true"
goog-terraform-provisioned: 'true'
timeouts: null
google_network_connectivity_hub.default["hub"]:
description: Terraform-managed
effective_labels:
goog-terraform-provisioned: "true"
goog-terraform-provisioned: 'true'
export_psc: true
labels: null
name: hub
preset_topology: MESH
project: fast-prod-net-core-0
terraform_labels:
goog-terraform-provisioned: "true"
goog-terraform-provisioned: 'true'
timeouts: null
google_network_connectivity_spoke.tunnels["hub/to-onprem/hub"]:
description: Terraform-managed.
effective_labels:
goog-terraform-provisioned: "true"
goog-terraform-provisioned: 'true'
labels: null
linked_interconnect_attachments: []
linked_producer_vpc_network: []
@@ -85,12 +85,12 @@ values:
name: hub-to-onprem-hub
project: fast-prod-net-core-0
terraform_labels:
goog-terraform-provisioned: "true"
goog-terraform-provisioned: 'true'
timeouts: null
google_network_connectivity_spoke.vpcs["dev/hub"]:
description: Terraform-managed
effective_labels:
goog-terraform-provisioned: "true"
goog-terraform-provisioned: 'true'
labels: null
linked_interconnect_attachments: []
linked_producer_vpc_network: []
@@ -103,12 +103,12 @@ values:
name: dev-hub
project: fast-dev-net-spoke-0
terraform_labels:
goog-terraform-provisioned: "true"
goog-terraform-provisioned: 'true'
timeouts: null
google_network_connectivity_spoke.vpcs["prod/hub"]:
description: Terraform-managed
effective_labels:
goog-terraform-provisioned: "true"
goog-terraform-provisioned: 'true'
labels: null
linked_interconnect_attachments: []
linked_producer_vpc_network: []
@@ -121,7 +121,7 @@ values:
name: prod-hub
project: fast-prod-net-spoke-0
terraform_labels:
goog-terraform-provisioned: "true"
goog-terraform-provisioned: 'true'
timeouts: null
google_storage_bucket_object.tfvars[0]:
bucket: test
@@ -131,14 +131,13 @@ values:
content_language: null
customer_encryption: []
deletion_policy: null
detect_md5hash: different hash
detect_md5hash: null
event_based_hold: null
force_empty_content_type: null
metadata: null
name: tfvars/2-networking.auto.tfvars.json
retention: []
source: null
source_md5hash: null
temporary_hold: null
timeouts: null
google_storage_bucket_object.version[0]:
@@ -149,14 +148,13 @@ values:
content_language: null
customer_encryption: []
deletion_policy: null
detect_md5hash: different hash
detect_md5hash: null
event_based_hold: null
force_empty_content_type: null
metadata: null
name: versions/2-networking-version.txt
retention: []
source: fast_version.txt
source_md5hash: null
temporary_hold: null
timeouts: null
module.dns-response-policies["net-core-0"].google_dns_response_policy.default[0]:
@@ -773,7 +771,7 @@ values:
description: Terraform-managed.
dns_name: onprem.
effective_labels:
goog-terraform-provisioned: "true"
goog-terraform-provisioned: 'true'
force_destroy: false
forwarding_config:
- target_name_servers:
@@ -794,7 +792,7 @@ values:
reverse_lookup: false
service_directory_config: []
terraform_labels:
goog-terraform-provisioned: "true"
goog-terraform-provisioned: 'true'
timeouts: null
visibility: private
module.dns-zones["net-core-0/peer-root"].google_dns_managed_zone.dns_managed_zone[0]:
@@ -803,7 +801,7 @@ values:
description: Terraform-managed.
dns_name: .
effective_labels:
goog-terraform-provisioned: "true"
goog-terraform-provisioned: 'true'
force_destroy: false
forwarding_config: []
labels: null
@@ -820,7 +818,7 @@ values:
reverse_lookup: false
service_directory_config: []
terraform_labels:
goog-terraform-provisioned: "true"
goog-terraform-provisioned: 'true'
timeouts: null
visibility: private
module.dns-zones["net-core-0/pvt-test"].google_dns_managed_zone.dns_managed_zone[0]:
@@ -829,7 +827,7 @@ values:
description: Terraform-managed.
dns_name: test.
effective_labels:
goog-terraform-provisioned: "true"
goog-terraform-provisioned: 'true'
force_destroy: false
forwarding_config: []
labels: null
@@ -843,7 +841,7 @@ values:
reverse_lookup: false
service_directory_config: []
terraform_labels:
goog-terraform-provisioned: "true"
goog-terraform-provisioned: 'true'
timeouts: null
visibility: private
module.dns-zones["net-core-0/pvt-test"].google_dns_record_set.dns_record_set["A localhost"]:
@@ -861,7 +859,7 @@ values:
description: Terraform-managed.
dns_name: dev.test.
effective_labels:
goog-terraform-provisioned: "true"
goog-terraform-provisioned: 'true'
force_destroy: false
forwarding_config: []
labels: null
@@ -876,7 +874,7 @@ values:
reverse_lookup: false
service_directory_config: []
terraform_labels:
goog-terraform-provisioned: "true"
goog-terraform-provisioned: 'true'
timeouts: null
visibility: private
module.dns-zones["net-dev-0/pvt-dev-test"].google_dns_record_set.dns_record_set["A localhost"]:
@@ -894,7 +892,7 @@ values:
description: Terraform-managed.
dns_name: prod.test.
effective_labels:
goog-terraform-provisioned: "true"
goog-terraform-provisioned: 'true'
force_destroy: false
forwarding_config: []
labels: null
@@ -909,7 +907,7 @@ values:
reverse_lookup: false
service_directory_config: []
terraform_labels:
goog-terraform-provisioned: "true"
goog-terraform-provisioned: 'true'
timeouts: null
visibility: private
module.dns-zones["net-prod-0/pvt-prod-test"].google_dns_record_set.dns_record_set["A localhost"]:
@@ -1207,7 +1205,7 @@ values:
billing_account: 000000-111111-222222
deletion_policy: DELETE
effective_labels:
goog-terraform-provisioned: "true"
goog-terraform-provisioned: 'true'
folder_id: '12345678'
labels: null
name: fast-prod-net-core-0
@@ -1215,7 +1213,7 @@ values:
project_id: fast-prod-net-core-0
tags: null
terraform_labels:
goog-terraform-provisioned: "true"
goog-terraform-provisioned: 'true'
timeouts: null
module.projects.module.projects["net-core-0"].google_project_iam_member.service_agents["compute-system"]:
condition: []
@@ -1332,7 +1330,7 @@ values:
billing_account: 000000-111111-222222
deletion_policy: DELETE
effective_labels:
goog-terraform-provisioned: "true"
goog-terraform-provisioned: 'true'
folder_id: '34567890'
labels: null
name: fast-dev-net-spoke-0
@@ -1340,7 +1338,7 @@ values:
project_id: fast-dev-net-spoke-0
tags: null
terraform_labels:
goog-terraform-provisioned: "true"
goog-terraform-provisioned: 'true'
timeouts: null
module.projects.module.projects["net-dev-0"].google_project_iam_member.service_agents["compute-system"]:
condition: []
@@ -1457,7 +1455,7 @@ values:
billing_account: 000000-111111-222222
deletion_policy: DELETE
effective_labels:
goog-terraform-provisioned: "true"
goog-terraform-provisioned: 'true'
folder_id: '23456789'
labels: null
name: fast-prod-net-spoke-0
@@ -1465,7 +1463,7 @@ values:
project_id: fast-prod-net-spoke-0
tags: null
terraform_labels:
goog-terraform-provisioned: "true"
goog-terraform-provisioned: 'true'
timeouts: null
module.projects.module.projects["net-prod-0"].google_project_iam_member.service_agents["compute-system"]:
condition: []
@@ -1761,7 +1759,7 @@ values:
address_type: INTERNAL
description: null
effective_labels:
goog-terraform-provisioned: "true"
goog-terraform-provisioned: 'true'
ip_version: null
labels: null
name: servicenetworking-googleapis-com-psa
@@ -1769,7 +1767,7 @@ values:
project: fast-prod-net-spoke-0
purpose: VPC_PEERING
terraform_labels:
goog-terraform-provisioned: "true"
goog-terraform-provisioned: 'true'
timeouts: null
module.vpcs["prod"].google_compute_network.network[0]:
auto_create_subnetworks: false
@@ -1876,7 +1874,7 @@ values:
module.vpn-ha["hub/to-onprem"].google_compute_external_vpn_gateway.external_gateway["default"]:
description: Terraform managed external VPN gateway
effective_labels:
goog-terraform-provisioned: "true"
goog-terraform-provisioned: 'true'
interface:
- id: 0
ip_address: 8.8.8.8
@@ -1886,7 +1884,7 @@ values:
project: fast-prod-net-core-0
redundancy_type: SINGLE_IP_INTERNALLY_REDUNDANT
terraform_labels:
goog-terraform-provisioned: "true"
goog-terraform-provisioned: 'true'
timeouts: null
module.vpn-ha["hub/to-onprem"].google_compute_router_interface.router_interface["remote-0"]:
interconnect_attachment: null
@@ -1960,7 +1958,7 @@ values:
cipher_suite: []
description: null
effective_labels:
goog-terraform-provisioned: "true"
goog-terraform-provisioned: 'true'
ike_version: 2
labels: null
name: hub-to-onprem-remote-0
@@ -1974,14 +1972,14 @@ values:
shared_secret_wo_version: null
target_vpn_gateway: null
terraform_labels:
goog-terraform-provisioned: "true"
goog-terraform-provisioned: 'true'
timeouts: null
vpn_gateway_interface: 0
module.vpn-ha["hub/to-onprem"].google_compute_vpn_tunnel.tunnels["remote-1"]:
cipher_suite: []
description: null
effective_labels:
goog-terraform-provisioned: "true"
goog-terraform-provisioned: 'true'
ike_version: 2
labels: null
name: hub-to-onprem-remote-1
@@ -1995,7 +1993,7 @@ values:
shared_secret_wo_version: null
target_vpn_gateway: null
terraform_labels:
goog-terraform-provisioned: "true"
goog-terraform-provisioned: 'true'
timeouts: null
vpn_gateway_interface: 1
module.vpn-ha["hub/to-onprem"].random_id.md5_keys["remote-0"]:
@@ -2047,3 +2045,17 @@ counts:
random_id: 3
resources: 183
terraform_data: 2
outputs:
host_project_ids:
net-core-0: fast-prod-net-core-0
net-dev-0: fast-dev-net-spoke-0
net-prod-0: fast-prod-net-spoke-0
host_project_numbers: __missing__
subnet_proxy_only_self_links: __missing__
subnet_psc_self_links:
dev: {}
hub: {}
prod: {}
subnet_self_links: __missing__
vpc_self_links: __missing__

6
tests/fast/stages/s2_networking/simple.yaml
View File

@@ -85,14 +85,13 @@ values:
content_language: null
customer_encryption: []
deletion_policy: null
detect_md5hash: different hash
detect_md5hash: null
event_based_hold: null
force_empty_content_type: null
metadata: null
name: tfvars/2-networking.auto.tfvars.json
retention: []
source: null
source_md5hash: null
temporary_hold: null
timeouts: null
google_storage_bucket_object.version[0]:
@@ -103,14 +102,13 @@ values:
content_language: null
customer_encryption: []
deletion_policy: null
detect_md5hash: different hash
detect_md5hash: null
event_based_hold: null
force_empty_content_type: null
metadata: null
name: versions/2-networking-version.txt
retention: []
source: fast_version.txt
source_md5hash: null
temporary_hold: null
timeouts: null
module.dns-response-policies["net-core-0"].google_dns_response_policy.default[0]:

6
tests/fast/stages/s2_networking/vpns.yaml
View File

@@ -139,14 +139,13 @@ values:
content_language: null
customer_encryption: []
deletion_policy: null
detect_md5hash: different hash
detect_md5hash: null
event_based_hold: null
force_empty_content_type: null
metadata: null
name: tfvars/2-networking.auto.tfvars.json
retention: []
source: null
source_md5hash: null
temporary_hold: null
timeouts: null
google_storage_bucket_object.version[0]:
@@ -157,14 +156,13 @@ values:
content_language: null
customer_encryption: []
deletion_policy: null
detect_md5hash: different hash
detect_md5hash: null
event_based_hold: null
force_empty_content_type: null
metadata: null
name: versions/2-networking-version.txt
retention: []
source: fast_version.txt
source_md5hash: null
temporary_hold: null
timeouts: null
module.dns-response-policies["net-core-0"].google_dns_response_policy.default[0]:

3
tests/fast/stages/s2_security/simple.yaml
View File

@@ -22,14 +22,13 @@ values:
content_language: null
customer_encryption: []
deletion_policy: null
detect_md5hash: different hash
detect_md5hash: null
event_based_hold: null
force_empty_content_type: null
metadata: null
name: versions/2-security-version.txt
retention: []
source: fast_version.txt
source_md5hash: null
temporary_hold: null
timeouts: null
module.cas["prod-ca-0"].google_privateca_ca_pool.default[0]:

3
tests/fast/stages/s3_gke_dev/hardened.yaml
View File

@@ -23,14 +23,13 @@ values:
content_language: null
customer_encryption: []
deletion_policy: null
detect_md5hash: different hash
detect_md5hash: null
event_based_hold: null
force_empty_content_type: null
metadata: null
name: versions/3-gke-dev-version.txt
retention: []
source: fast_version.txt
source_md5hash: null
temporary_hold: null
timeouts: null
module.gke-cluster["mycluster"].google_container_cluster.cluster:

3
tests/fast/stages/s3_gke_dev/simple.yaml
View File

@@ -23,14 +23,13 @@ values:
content_language: null
customer_encryption: []
deletion_policy: null
detect_md5hash: different hash
detect_md5hash: null
event_based_hold: null
force_empty_content_type: null
metadata: null
name: versions/3-gke-dev-version.txt
retention: []
source: fast_version.txt
source_md5hash: null
temporary_hold: null
timeouts: null
module.gke-cluster["mycluster"].google_container_cluster.cluster: