chore(deps): consolidate renovate bot dependency fixes

eeaton commented 1 month ago

Combine the outstanding PR from renovate[bot] into a single PR to reduce toil for release shepherding

eeaton commented 1 month ago

@apeabody Can you approve this when you have a chance please?

eeaton commented 1 month ago

/gcbrun

daniel-cit commented 1 month ago

@apeabody @eeaton integration test need to be updated here

https://github.com/terraform-google-modules/terraform-example-foundation/blob/f22eb6682512468c3da638e1b9a03c5d74f4c2a4/test/integration/networks/networks_test.go#L291C1-L293C6

            "from": map[string]interface{}{
                "identity_type": "ANY_IDENTITY",
            },

to add the sources in the egressPolicies like is is used in the ingressPolicies

            "from": map[string]interface{}{
                "sources": map[string][]string{
                    "access_levels": {"*"},
                },
                "identity_type": "ANY_IDENTITY",
            },

to fix

step #16 - "converge-networks":   on .terraform/modules/base_env.restricted_shared_vpc.regular_service_perimeter/modules/regular_service_perimeter/main.tf line 87, in resource "google_access_context_manager_service_perimeter" "regular_service_perimeter":
Step #16 - "converge-networks":   87:           source_restriction = egress_policies.value["from"]["sources"] != null ? "SOURCE_RESTRICTION_ENABLED" : null
Step #16 - "converge-networks":     ‚ egress_policies.value["from"] is object with 1 attribute "identity_type"

and usage of sources should be fixed in https://github.com/terraform-google-modules/terraform-google-vpc-service-controls/blob/master/modules/regular_service_perimeter/main.tf so that it should not be required.

Maybe from

lookup(egress_policies.value["from"]["sources"], "access_levels", [])

to

lookup(lookup(egress_policies.value["from"],"sources",{}),"access_levels", [])

eeaton commented 1 month ago

Thanks for the guidance Daniel. I've made an additional commit to the tests on this PR and raised the upstream fix as well https://github.com/terraform-google-modules/terraform-google-vpc-service-controls/pull/146

fmichaelobrien commented 1 month ago

thanks team for the update, I'll add this consolidated module update to a scheduled upstream sync for monday. I agree there may be issues with backtracking regressions - however it is also good to have an effective consolidated minor release out at once so a full clean org deploy to 5-app-infra can be done once. The reduce toil option is appreciated.

terraform-google-modules / terraform-example-foundation

chore(deps): consolidate renovate bot dependency fixes #1251