Bump GCP provider version to 7.33.0 (#4004)

* Bump provider version

* Fix inventories

* Ignore certificates in inventories

* Add header to cloud run recipe

* Optimize file copy for example-based tests

* Remove local references
This commit is contained in:
Julio Castillo
2026-05-31 23:04:01 +02:00
committed by GitHub
parent 5d1f5a0431
commit d8d66583f8
254 changed files with 2081 additions and 1042 deletions

View File

@@ -45,7 +45,7 @@ def _prepare_root_module(path):
_ignore = shutil.ignore_patterns('*.auto.tfvars', '*.auto.tfvars.json',
'[0-9]-*-providers.tf', 'terraform.tfstate*',
'.terraform.lock.hcl', 'terraform.tfvars',
'.terraform', '.git', 'pytest-*')
'.terraform', '.git', 'pytest-*', 'fabric')
def ignore_patterns(src, names):
ignored = set(_ignore(src, names))
@@ -59,6 +59,10 @@ def _prepare_root_module(path):
# ~20% slower than when run in a copy made with symlinks=False.
shutil.copytree(path, tmp_path, dirs_exist_ok=True, symlinks=False,
ignore=ignore_patterns)
# Recreate the 'fabric' symlink to avoid copying the whole repository
# recursively (which happens if followed via symlinks=False)
if (path / 'fabric').is_symlink():
(tmp_path / 'fabric').symlink_to((path / 'fabric').readlink())
lockfile = _REPO_ROOT / 'tools' / 'lockfile' / '.terraform.lock.hcl'
if lockfile.exists():
shutil.copy(lockfile, tmp_path / '.terraform.lock.hcl')
@@ -148,13 +152,22 @@ def plan_summary(module_path, basedir, tf_var_files=None, extra_files=None,
def filter_plan_values(values, ignored_attributes):
"""Remove ignored attributes from plan values."""
"""Remove ignored attributes from plan values recursively."""
if not ignored_attributes:
return values
for addr, resource_values in values.items():
if isinstance(resource_values, dict):
def _filter(obj):
if isinstance(obj, dict):
for attr in ignored_attributes:
resource_values.pop(attr, None)
obj.pop(attr, None)
for k, v in obj.items():
_filter(v)
elif isinstance(obj, list):
for item in obj:
_filter(item)
for addr, resource_values in values.items():
_filter(resource_values)
return values