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

…3823) (#6946) Signed-off-by: Modular Magician <magic-modules@google.com>
hashicorp · Aug 5, 2020 · 9e2cd85 · 9e2cd85
1 parent 6eeeaf4
commit 9e2cd85
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 15 deletions.
diff --git a/.changelog/3823.txt b/.changelog/3823.txt
@@ -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.
+```
diff --git a/google/resource_access_context_manager_access_level.go b/google/resource_access_context_manager_access_level.go
@@ -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,
 													},
@@ -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,
 													},

diff --git a/google/resource_dialogflow_intent.go b/google/resource_dialogflow_intent.go
@@ -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,
 				},

diff --git a/google/resource_filestore_instance.go b/google/resource_filestore_instance.go
@@ -86,7 +86,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,
 							},

diff --git a/google/resource_os_config_patch_deployment.go b/google/resource_os_config_patch_deployment.go
@@ -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,
@@ -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,
@@ -553,7 +555,7 @@ This field must not be used with other patch configurations.`,
 										Elem: &schema.Schema{
 											Type: schema.TypeString,
 										},
-										AtLeastOneOf: []string{},
+										ExactlyOneOf: []string{},
 									},
 								},
 							},

diff --git a/google/resource_os_config_patch_deployment_generated_test.go b/google/resource_os_config_patch_deployment_generated_test.go
@@ -229,7 +229,7 @@ resource "google_os_config_patch_deployment" "patch" {
     }
 
     windows_update {
-      exclusive_patches = ["KB4339284"]
+      classifications = ["CRITICAL", "SECURITY", "UPDATE"]
     }
 
     pre_step {

diff --git a/website/docs/r/access_context_manager_access_level.html.markdown b/website/docs/r/access_context_manager_access_level.html.markdown
@@ -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)

diff --git a/website/docs/r/dialogflow_intent.html.markdown b/website/docs/r/dialogflow_intent.html.markdown
@@ -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)

diff --git a/website/docs/r/filestore_instance.html.markdown b/website/docs/r/filestore_instance.html.markdown
@@ -152,6 +152,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)

diff --git a/website/docs/r/os_config_patch_deployment.html.markdown b/website/docs/r/os_config_patch_deployment.html.markdown
@@ -180,7 +180,7 @@ resource "google_os_config_patch_deployment" "patch" {
     }
 
     windows_update {
-      exclusive_patches = ["KB4339284"]
+      classifications = ["CRITICAL", "SECURITY", "UPDATE"]
     }
 
     pre_step {
@@ -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)