Add support for project-level log sinks to FAST stage 0 (#2893)
* Fix ipv6 and align loadbalancer address types * Release v37.3.0 * add support for project-level log sinks to stage 0 --------- Co-authored-by: Wiktor Niesiobędzki <wiktorn@google.com>
This commit is contained in:
committed by
GitHub
parent
a15f97db67
commit
9148e76087
@@ -50,7 +50,6 @@ values:
|
||||
module.f5-lb.module.lb-addresses.google_compute_address.internal["l4"]:
|
||||
address_type: INTERNAL
|
||||
description: Terraform managed.
|
||||
ip_version: null
|
||||
ipv6_endpoint_type: null
|
||||
name: test-ilb-l4
|
||||
project: my-project
|
||||
@@ -103,7 +102,7 @@ values:
|
||||
allow_global_access: true
|
||||
allow_psc_global_access: null
|
||||
ip_protocol: L3_DEFAULT
|
||||
ip_version: IPV4
|
||||
ip_version: __missing__
|
||||
load_balancing_scheme: INTERNAL
|
||||
name: test-ilb-l4
|
||||
network: projects/my-project/global/networks/dataplane
|
||||
|
||||
@@ -234,7 +234,7 @@ values:
|
||||
description: Terraform managed.
|
||||
effective_labels:
|
||||
goog-terraform-provisioned: 'true'
|
||||
ip_version: IPV6
|
||||
ip_version: null
|
||||
ipv6_endpoint_type: null
|
||||
labels: null
|
||||
name: test-ilb-int-ipv6
|
||||
@@ -251,7 +251,7 @@ values:
|
||||
allow_psc_global_access: null
|
||||
description: null
|
||||
ip_protocol: L3_DEFAULT
|
||||
ip_version: IPV4
|
||||
ip_version: __missing__
|
||||
is_mirroring_collector: null
|
||||
labels: null
|
||||
load_balancing_scheme: INTERNAL
|
||||
@@ -273,7 +273,7 @@ values:
|
||||
allow_psc_global_access: null
|
||||
description: null
|
||||
ip_protocol: L3_DEFAULT
|
||||
ip_version: IPV6
|
||||
ip_version: __missing__
|
||||
is_mirroring_collector: null
|
||||
labels: null
|
||||
load_balancing_scheme: INTERNAL
|
||||
@@ -339,7 +339,7 @@ values:
|
||||
allow_psc_global_access: null
|
||||
description: null
|
||||
ip_protocol: L3_DEFAULT
|
||||
ip_version: IPV4
|
||||
ip_version: __missing__
|
||||
is_mirroring_collector: null
|
||||
labels: null
|
||||
load_balancing_scheme: EXTERNAL
|
||||
@@ -359,7 +359,7 @@ values:
|
||||
allow_psc_global_access: null
|
||||
description: null
|
||||
ip_protocol: L3_DEFAULT
|
||||
ip_version: IPV6
|
||||
ip_version: __missing__
|
||||
is_mirroring_collector: null
|
||||
labels: null
|
||||
load_balancing_scheme: EXTERNAL
|
||||
|
||||
@@ -103,7 +103,7 @@ values:
|
||||
allow_psc_global_access: null
|
||||
description: null
|
||||
ip_protocol: L3_DEFAULT
|
||||
ip_version: IPV4
|
||||
ip_version: __missing__
|
||||
load_balancing_scheme: EXTERNAL
|
||||
name: test-nlb-ext-ipv4
|
||||
ports: null
|
||||
|
||||
@@ -61,7 +61,7 @@ values:
|
||||
allow_global_access: true
|
||||
allow_psc_global_access: null
|
||||
ip_protocol: L3_DEFAULT
|
||||
ip_version: IPV4
|
||||
ip_version: __missing__
|
||||
load_balancing_scheme: INTERNAL
|
||||
name: test-ilb-l4
|
||||
network: projects/my-project/global/networks/dataplane
|
||||
|
||||
@@ -105,7 +105,7 @@ values:
|
||||
allow_global_access: true
|
||||
allow_psc_global_access: null
|
||||
ip_protocol: L3_DEFAULT
|
||||
ip_version: IPV4
|
||||
ip_version: __missing__
|
||||
load_balancing_scheme: INTERNAL
|
||||
name: test-ilb-l4
|
||||
network: projects/my-project/global/networks/dataplane
|
||||
|
||||
@@ -61,7 +61,7 @@ values:
|
||||
allow_global_access: true
|
||||
allow_psc_global_access: null
|
||||
ip_protocol: L3_DEFAULT
|
||||
ip_version: IPV4
|
||||
ip_version: __missing__
|
||||
load_balancing_scheme: INTERNAL
|
||||
name: test-ilb-l4
|
||||
network: projects/my-project/global/networks/dataplane
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
# Fabric release: v37.2.0
|
||||
# Fabric release: v37.3.0
|
||||
|
||||
terraform {
|
||||
required_version = ">= 1.10.2"
|
||||
@@ -27,9 +27,9 @@ terraform {
|
||||
}
|
||||
}
|
||||
provider_meta "google" {
|
||||
module_name = "google-pso-tool/cloud-foundation-fabric/tests/examples_e2e/setup_module:v37.2.0-tf"
|
||||
module_name = "google-pso-tool/cloud-foundation-fabric/tests/examples_e2e/setup_module:v37.3.0-tf"
|
||||
}
|
||||
provider_meta "google-beta" {
|
||||
module_name = "google-pso-tool/cloud-foundation-fabric/tests/examples_e2e/setup_module:v37.2.0-tf"
|
||||
module_name = "google-pso-tool/cloud-foundation-fabric/tests/examples_e2e/setup_module:v37.3.0-tf"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
# Fabric release: v37.2.0
|
||||
# Fabric release: v37.3.0
|
||||
|
||||
terraform {
|
||||
required_version = ">= 1.9.0"
|
||||
@@ -27,9 +27,9 @@ terraform {
|
||||
}
|
||||
}
|
||||
provider_meta "google" {
|
||||
module_name = "google-pso-tool/cloud-foundation-fabric/tests/examples_e2e/setup_module:v37.2.0-tofu"
|
||||
module_name = "google-pso-tool/cloud-foundation-fabric/tests/examples_e2e/setup_module:v37.3.0-tofu"
|
||||
}
|
||||
provider_meta "google-beta" {
|
||||
module_name = "google-pso-tool/cloud-foundation-fabric/tests/examples_e2e/setup_module:v37.2.0-tofu"
|
||||
module_name = "google-pso-tool/cloud-foundation-fabric/tests/examples_e2e/setup_module:v37.3.0-tofu"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -254,10 +254,14 @@ def validate_plan_object(expected_value, plan_value, relative_path,
|
||||
# dictionaries / objects
|
||||
if isinstance(expected_value, dict) and isinstance(plan_value, dict):
|
||||
for k, v in expected_value.items():
|
||||
assert k in plan_value, \
|
||||
f'{relative_path}: {relative_address}.{k} is not a valid address in the plan'
|
||||
validate_plan_object(v, plan_value[k], relative_path,
|
||||
f'{relative_address}.{k}')
|
||||
if v == "__missing__":
|
||||
assert k not in plan_value, \
|
||||
f'{relative_path}: {relative_address}.{k} was expected to be missing, but exists with value: {plan_value[k]}'
|
||||
else:
|
||||
assert k in plan_value, \
|
||||
f'{relative_path}: {relative_address}.{k} is not a valid address in the plan'
|
||||
validate_plan_object(v, plan_value[k], relative_path,
|
||||
f'{relative_address}.{k}')
|
||||
|
||||
# lists
|
||||
elif isinstance(expected_value, list) and isinstance(plan_value, list):
|
||||
|
||||
@@ -26,7 +26,7 @@ values:
|
||||
allow_psc_global_access: null
|
||||
description: Terraform managed.
|
||||
ip_protocol: TCP
|
||||
ip_version: IPV4
|
||||
ip_version: __missing__
|
||||
labels: null
|
||||
load_balancing_scheme: EXTERNAL
|
||||
metadata_filters: []
|
||||
@@ -86,7 +86,7 @@ values:
|
||||
allow_psc_global_access: null
|
||||
description: Terraform managed.
|
||||
ip_protocol: TCP
|
||||
ip_version: IPV4
|
||||
ip_version: __missing__
|
||||
labels: null
|
||||
load_balancing_scheme: EXTERNAL_MANAGED
|
||||
metadata_filters: []
|
||||
@@ -165,4 +165,3 @@ counts:
|
||||
resources: 14
|
||||
|
||||
outputs: {}
|
||||
|
||||
|
||||
@@ -7,9 +7,9 @@ backends = [{
|
||||
}]
|
||||
forwarding_rules_config = {
|
||||
ipv4 = {
|
||||
ip_version = "IPV4"
|
||||
ipv6 = false
|
||||
}
|
||||
ipv6 = {
|
||||
ip_version = "IPV6"
|
||||
ipv6 = true
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user