Skip to content
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.

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

Update ospatch's windows update classification field to be an array. #2340

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
6 changes: 6 additions & 0 deletions .changelog/3823.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
```release-note:bug
osconfig: `google_os_config_patch_deployment`'s `windows_update.classifications` field now works correctly, accepting multiple values.
```
```release-note:note
all: Lists of enums now display the enum options in the documentation pages.
```
4 changes: 2 additions & 2 deletions google-beta/resource_access_context_manager_access_level.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ allowed.`,
Type: schema.TypeList,
Optional: true,
Description: `A list of allowed device management levels.
An empty list allows all management levels.`,
An empty list allows all management levels. Possible values: ["MANAGEMENT_UNSPECIFIED", "NONE", "BASIC", "COMPLETE"]`,
Elem: &schema.Schema{
Type: schema.TypeString,
},
Expand All @@ -99,7 +99,7 @@ An empty list allows all management levels.`,
Type: schema.TypeList,
Optional: true,
Description: `A list of allowed encryptions statuses.
An empty list allows all statuses.`,
An empty list allows all statuses. Possible values: ["ENCRYPTION_UNSPECIFIED", "ENCRYPTION_UNSUPPORTED", "UNENCRYPTED", "ENCRYPTED"]`,
Elem: &schema.Schema{
Type: schema.TypeString,
},
Expand Down
2 changes: 1 addition & 1 deletion google-beta/resource_compute_packet_mirroring.go
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ destination (egress) IP in the IP header. Only IPv4 is supported.`,
"ip_protocols": {
Type: schema.TypeList,
Optional: true,
Description: `Protocols that apply as a filter on mirrored traffic.`,
Description: `Protocols that apply as a filter on mirrored traffic. Possible values: ["tcp", "udp", "icmp"]`,
Elem: &schema.Schema{
Type: schema.TypeString,
},
Expand Down
2 changes: 1 addition & 1 deletion google-beta/resource_dialogflow_intent.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ Note: The action name must not contain whitespaces.`,
Type: schema.TypeList,
Optional: true,
Description: `The list of platforms for which the first responses will be copied from the messages in PLATFORM_UNSPECIFIED
(i.e. default platform).`,
(i.e. default platform). Possible values: ["FACEBOOK", "SLACK", "TELEGRAM", "KIK", "SKYPE", "LINE", "VIBER", "ACTIONS_ON_GOOGLE", "GOOGLE_HANGOUTS"]`,
Elem: &schema.Schema{
Type: schema.TypeString,
},
Expand Down
2 changes: 1 addition & 1 deletion google-beta/resource_filestore_instance.go
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ only a single network is supported.`,
Required: true,
ForceNew: true,
Description: `IP versions for which the instance has
IP addresses assigned.`,
IP addresses assigned. Possible values: ["ADDRESS_MODE_UNSPECIFIED", "MODE_IPV4", "MODE_IPV6"]`,
Elem: &schema.Schema{
Type: schema.TypeString,
},
Expand Down
18 changes: 10 additions & 8 deletions google-beta/resource_os_config_patch_deployment.go
Original file line number Diff line number Diff line change
Expand Up @@ -527,12 +527,14 @@ be executed directly, which will likely only succeed for scripts with shebang li
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"classifications": {
Type: schema.TypeString,
Optional: true,
ForceNew: true,
ValidateFunc: validation.StringInSlice([]string{"CRITICAL", "SECURITY", "DEFINITION", "DRIVER", "FEATURE_PACK", "SERVICE_PACK", "TOOL", "UPDATE_ROLLUP", "UPDATE", ""}, false),
Description: `Only apply updates of these windows update classifications. If empty, all updates are applied. Possible values: ["CRITICAL", "SECURITY", "DEFINITION", "DRIVER", "FEATURE_PACK", "SERVICE_PACK", "TOOL", "UPDATE_ROLLUP", "UPDATE"]`,
AtLeastOneOf: []string{},
Type: schema.TypeList,
Optional: true,
ForceNew: true,
Description: `Only apply updates of these windows update classifications. If empty, all updates are applied. Possible values: ["CRITICAL", "SECURITY", "DEFINITION", "DRIVER", "FEATURE_PACK", "SERVICE_PACK", "TOOL", "UPDATE_ROLLUP", "UPDATE"]`,
Elem: &schema.Schema{
Type: schema.TypeString,
},
ExactlyOneOf: []string{},
},
"excludes": {
Type: schema.TypeList,
Expand All @@ -542,7 +544,7 @@ be executed directly, which will likely only succeed for scripts with shebang li
Elem: &schema.Schema{
Type: schema.TypeString,
},
AtLeastOneOf: []string{},
ExactlyOneOf: []string{},
},
"exclusive_patches": {
Type: schema.TypeList,
Expand All @@ -553,7 +555,7 @@ This field must not be used with other patch configurations.`,
Elem: &schema.Schema{
Type: schema.TypeString,
},
AtLeastOneOf: []string{},
ExactlyOneOf: []string{},
},
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ resource "google_os_config_patch_deployment" "patch" {
}

windows_update {
exclusive_patches = ["KB4339284"]
classifications = ["CRITICAL", "SECURITY", "UPDATE"]
}

pre_step {
Expand Down
2 changes: 1 addition & 1 deletion google-beta/resource_security_scanner_scan_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ which means the scan will be scheduled to start immediately.`,
"target_platforms": {
Type: schema.TypeList,
Optional: true,
Description: `Set of Cloud Platforms targeted by the scan. If empty, APP_ENGINE will be used as a default.`,
Description: `Set of Cloud Platforms targeted by the scan. If empty, APP_ENGINE will be used as a default. Possible values: ["APP_ENGINE", "COMPUTE"]`,
Elem: &schema.Schema{
Type: schema.TypeString,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -186,11 +186,13 @@ The `device_policy` block supports:
(Optional)
A list of allowed encryptions statuses.
An empty list allows all statuses.
Each value may be one of `ENCRYPTION_UNSPECIFIED`, `ENCRYPTION_UNSUPPORTED`, `UNENCRYPTED`, and `ENCRYPTED`.

* `allowed_device_management_levels` -
(Optional)
A list of allowed device management levels.
An empty list allows all management levels.
Each value may be one of `MANAGEMENT_UNSPECIFIED`, `NONE`, `BASIC`, and `COMPLETE`.

* `os_constraints` -
(Optional)
Expand Down
1 change: 1 addition & 0 deletions website/docs/r/compute_packet_mirroring.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,7 @@ The `filter` block supports:
* `ip_protocols` -
(Optional)
Protocols that apply as a filter on mirrored traffic.
Each value may be one of `tcp`, `udp`, and `icmp`.

* `cidr_ranges` -
(Optional)
Expand Down
1 change: 1 addition & 0 deletions website/docs/r/dialogflow_intent.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ The following arguments are supported:
(Optional)
The list of platforms for which the first responses will be copied from the messages in PLATFORM_UNSPECIFIED
(i.e. default platform).
Each value may be one of `FACEBOOK`, `SLACK`, `TELEGRAM`, `KIK`, `SKYPE`, `LINE`, `VIBER`, `ACTIONS_ON_GOOGLE`, and `GOOGLE_HANGOUTS`.

* `parent_followup_intent_name` -
(Optional)
Expand Down
1 change: 1 addition & 0 deletions website/docs/r/filestore_instance.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ The `networks` block supports:
(Required)
IP versions for which the instance has
IP addresses assigned.
Each value may be one of `ADDRESS_MODE_UNSPECIFIED`, `MODE_IPV4`, and `MODE_IPV6`.

* `reserved_ip_range` -
(Optional)
Expand Down
4 changes: 2 additions & 2 deletions website/docs/r/os_config_patch_deployment.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ resource "google_os_config_patch_deployment" "patch" {
}

windows_update {
exclusive_patches = ["KB4339284"]
classifications = ["CRITICAL", "SECURITY", "UPDATE"]
}

pre_step {
Expand Down Expand Up @@ -442,7 +442,7 @@ The `windows_update` block supports:
* `classifications` -
(Optional)
Only apply updates of these windows update classifications. If empty, all updates are applied.
Possible values are `CRITICAL`, `SECURITY`, `DEFINITION`, `DRIVER`, `FEATURE_PACK`, `SERVICE_PACK`, `TOOL`, `UPDATE_ROLLUP`, and `UPDATE`.
Each value may be one of `CRITICAL`, `SECURITY`, `DEFINITION`, `DRIVER`, `FEATURE_PACK`, `SERVICE_PACK`, `TOOL`, `UPDATE_ROLLUP`, and `UPDATE`.

* `excludes` -
(Optional)
Expand Down
1 change: 1 addition & 0 deletions website/docs/r/security_scanner_scan_config.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ The following arguments are supported:
* `target_platforms` -
(Optional)
Set of Cloud Platforms targeted by the scan. If empty, APP_ENGINE will be used as a default.
Each value may be one of `APP_ENGINE` and `COMPUTE`.

* `export_to_security_command_center` -
(Optional)
Expand Down