Skip to content

Fixed ServiceAttachment target_service region/location inconsistency when referencing a Secure Web Proxy on creation #13862

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
trodge merged 7 commits into from
Jun 11, 2025
Merged

Fixed ServiceAttachment target_service region/location inconsistency when referencing a Secure Web Proxy on creation #13862

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f9db6e0
- Updated ServiceAttachment target_service custom_expand to hardcode …
matheusaleixo-cit May 6, 2025
ae58f3d
Merge branch 'main' into fix-service-attachment-target-service-swp-re…
matheusaleixo-cit May 6, 2025
c626ee4
- Updated ParseRegionalFieldValue helper function to support "locati…
matheusaleixo-cit May 6, 2025
1dbebe0
Merge branch 'main' into fix-service-attachment-target-service-swp-re…
matheusaleixo-cit May 14, 2025
88c3169
Merge branch 'main' into fix-service-attachment-target-service-swp-re…
matheusaleixo-cit May 15, 2025
a0d03b1
Merge branch 'main' into fix-service-attachment-target-service-swp-re…
matheusaleixo-cit May 27, 2025
07038f8
- Reverted changes to ServiceAttachment target_service custom_expand;
matheusaleixo-cit Jun 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions mmv1/third_party/terraform/tpgresource/field_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ const (
RegionalLinkTemplate = "projects/%s/regions/%s/%s/%s"
RegionalLinkBasePattern = "projects/(.+)/regions/(.+)/%s/(.+)"
RegionalPartialLinkBasePattern = "regions/(.+)/%s/(.+)"
LocalLinkBasePattern = "projects/(.+)/locations/(.+)/%s/(.+)"
LocalPartialLinkBasePattern = "locations/(.+)/%s/(.+)"
ProjectLinkTemplate = "projects/%s/%s/%s"
ProjectBasePattern = "projects/(.+)/%s/(.+)"
OrganizationLinkTemplate = "organizations/%s/%s/%s"
Expand Down Expand Up @@ -414,6 +416,16 @@ func ParseRegionalFieldValue(resourceType, fieldValue, projectSchemaField, regio
}, nil
}

r = regexp.MustCompile(fmt.Sprintf(LocalLinkBasePattern, resourceType))
if parts := r.FindStringSubmatch(fieldValue); parts != nil {
return &RegionalFieldValue{
Project: parts[1],
Region: parts[2],
Name: parts[3],
resourceType: resourceType,
}, nil
}

project, err := GetProjectFromSchema(projectSchemaField, d, config)
if err != nil {
return nil, err
Expand All @@ -429,6 +441,16 @@ func ParseRegionalFieldValue(resourceType, fieldValue, projectSchemaField, regio
}, nil
}

r = regexp.MustCompile(fmt.Sprintf(LocalPartialLinkBasePattern, resourceType))
if parts := r.FindStringSubmatch(fieldValue); parts != nil {
return &RegionalFieldValue{
Project: project,
Region: parts[1],
Name: parts[2],
resourceType: resourceType,
}, nil
}

region, err := GetRegionFromSchema(regionSchemaField, zoneSchemaField, d, config)
if err != nil {
return nil, err
Expand Down
Loading