Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions mmv1/api/type.go
Original file line number Diff line number Diff line change
Expand Up @@ -546,6 +546,11 @@ func (t *Type) Validate(rName string) (es []error) {
default:
}

// UpdateMask isn't supported on nested fields: https://github.com/hashicorp/terraform-provider-google/issues/26382
if t.ParentMetadata != nil && !t.ParentMetadata.FlattenObject && len(t.UpdateMaskFields) > 0 {
es = append(es, fmt.Errorf("property %s cannot set update_mask_fields because it is nested in resource %s", fullFieldPath, rName))
}

return es
}

Expand Down
18 changes: 0 additions & 18 deletions mmv1/products/compute/RegionSecurityPolicy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -467,15 +467,6 @@ properties:
type: NestedObject
description: |
Must be specified if the action is "rate_based_ban" or "throttle". Cannot be specified for any other actions.
update_mask_fields:
- 'rateLimitOptions.rateLimitThreshold'
- 'rateLimitOptions.conformAction'
- 'rateLimitOptions.exceedAction'
- 'rateLimitOptions.enforceOnKey'
- 'rateLimitOptions.enforceOnKeyName'
- 'rateLimitOptions.enforceOnKeyConfigs'
- 'rateLimitOptions.banThreshold'
- 'rateLimitOptions.banDurationSec'
properties:
- name: 'rateLimitThreshold'
type: NestedObject
Expand Down Expand Up @@ -609,15 +600,6 @@ properties:
Example:
networkMatch: srcIpRanges: - "192.0.2.0/24" - "198.51.100.0/24" userDefinedFields: - name: "ipv4_fragment_offset" values: - "1-0x1fff"
The above match condition matches packets with a source IP in 192.0.2.0/24 or 198.51.100.0/24 and a user-defined field named "ipv4_fragment_offset" with a value between 1 and 0x1fff inclusive
update_mask_fields:
- 'network_match.userDefinedFields'
- 'network_match.srcIpRanges'
- 'network_match.destIpRanges'
- 'network_match.ipProtocols'
- 'network_match.srcPorts'
- 'network_match.destPorts'
- 'network_match.srcRegionCodes'
- 'network_match.srcAsns'
properties:
- name: 'userDefinedFields'
type: Array
Expand Down
7 changes: 0 additions & 7 deletions mmv1/products/discoveryengine/Control.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -292,13 +292,6 @@ properties:
description: |
The search link promotion to apply to the search results.
required: true
update_mask_fields:
- 'promote_action.search_link_promotion.title'
- 'promote_action.search_link_promotion.uri'
- 'promote_action.search_link_promotion.document'
- 'promote_action.search_link_promotion.description'
- 'promote_action.search_link_promotion.image_uri'
- 'promote_action.search_link_promotion.enabled'
properties:
- name: 'title'
type: String
Expand Down
3 changes: 0 additions & 3 deletions mmv1/products/netapp/VolumeReplication.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -264,9 +264,6 @@ properties:
type: NestedObject
description: |-
Tiering policy for the volume.
update_mask_fields:
- 'tiering_policy.cooling_threshold_days'
- 'tiering_policy.tier_action'
properties:
- name: 'coolingThresholdDays'
type: Integer
Expand Down
Loading