Add a new network_tier value FIXED_STANDARD to google_compute_instance_template & google_compute_instance resource (#5696) (#4233)

* update instance template validatefunc values

Co-authored-by: upodroid <[email protected]>

* add the change to instances as well

* fix docs again

* remove ValidateFunc

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/5696.txt

@@ -0,0 +1,12 @@
+```release-note:enhancement
+compute: added `FIXED_STANDARD` as a valid value to the field `network_interface.0.access_configs.0.network_tier` of  `google_compute_instance_template` resource
+```
+```release-note:enhancement
+compute: added `STANDARD` as a valid value to the field `network_interface.0.ipv6_access_configs.0.network_tier` of  `google_compute_instance_template` resource
+```
+```release-note:enhancement
+compute: added `FIXED_STANDARD` as a valid value to the field `network_interface.0.access_configs.0.network_tier` of  `google_compute_instance` resource
+```
+```release-note:enhancement
+compute: added `STANDARD` as a valid value to the field `network_interface.0.ipv6_access_configs.0.network_tier` of  `google_compute_instance` resource
+```

google-beta/resource_compute_instance.go

@@ -315,11 +315,10 @@ func resourceComputeInstance() *schema.Resource {
 									},
 
 									"network_tier": {
-										Type:         schema.TypeString,
-										Optional:     true,
-										Computed:     true,
-										ValidateFunc: validation.StringInSlice([]string{"PREMIUM", "STANDARD"}, false),
-										Description:  `The networking tier used for configuring this instance. One of PREMIUM or STANDARD.`,
+										Type:        schema.TypeString,
+										Optional:    true,
+										Computed:    true,
+										Description: `The networking tier used for configuring this instance. One of PREMIUM or STANDARD.`,
 									},
 
 									"public_ptr_domain_name": {
@@ -373,10 +372,9 @@ func resourceComputeInstance() *schema.Resource {
 							Elem: &schema.Resource{
 								Schema: map[string]*schema.Schema{
 									"network_tier": {
-										Type:         schema.TypeString,
-										Required:     true,
-										ValidateFunc: validation.StringInSlice([]string{"PREMIUM"}, false),
-										Description:  `The service-level to be provided for IPv6 traffic when the subnet has an external subnet. Only PREMIUM tier is valid for IPv6`,
+										Type:        schema.TypeString,
+										Required:    true,
+										Description: `The service-level to be provided for IPv6 traffic when the subnet has an external subnet. Only PREMIUM tier is valid for IPv6`,
 									},
 									"public_ptr_domain_name": {
 										Type:        schema.TypeString,

google-beta/resource_compute_instance_template.go

@@ -365,12 +365,11 @@ func resourceComputeInstanceTemplate() *schema.Resource {
 										Description: `The IP address that will be 1:1 mapped to the instance's network ip. If not given, one will be generated.`,
 									},
 									"network_tier": {
-										Type:         schema.TypeString,
-										Optional:     true,
-										Computed:     true,
-										ForceNew:     true,
-										Description:  `The networking tier used for configuring this instance template. This field can take the following values: PREMIUM or STANDARD. If this field is not specified, it is assumed to be PREMIUM.`,
-										ValidateFunc: validation.StringInSlice([]string{"PREMIUM", "STANDARD"}, false),
+										Type:        schema.TypeString,
+										Optional:    true,
+										Computed:    true,
+										ForceNew:    true,
+										Description: `The networking tier used for configuring this instance template. This field can take the following values: PREMIUM, STANDARD, FIXED_STANDARD. If this field is not specified, it is assumed to be PREMIUM.`,
 									},
 									// Possibly configurable- this was added so we don't break if it's inadvertently set
 									"public_ptr_domain_name": {
@@ -427,10 +426,9 @@ func resourceComputeInstanceTemplate() *schema.Resource {
 							Elem: &schema.Resource{
 								Schema: map[string]*schema.Schema{
 									"network_tier": {
-										Type:         schema.TypeString,
-										Required:     true,
-										ValidateFunc: validation.StringInSlice([]string{"PREMIUM"}, false),
-										Description:  `The service-level to be provided for IPv6 traffic when the subnet has an external subnet. Only PREMIUM tier is valid for IPv6`,
+										Type:        schema.TypeString,
+										Required:    true,
+										Description: `The service-level to be provided for IPv6 traffic when the subnet has an external subnet. Only PREMIUM tier is valid for IPv6`,
 									},
 									// Possibly configurable- this was added so we don't break if it's inadvertently set
 									// (assuming the same ass access config)

website/docs/r/compute_instance.html.markdown

@@ -318,7 +318,7 @@ specified, then this instance will have no external IPv6 Internet access. Struct
     to become verified as a domain owner.
 
 * `network_tier` - (Optional) The [networking tier][network-tier] used for configuring this instance.
-    This field can take the following values: PREMIUM or STANDARD. If this field is
+    This field can take the following values: PREMIUM, FIXED_STANDARD or STANDARD. If this field is
     not specified, it is assumed to be PREMIUM.
 
 <a name="nested_ipv6_access_config"></a>The `ipv6_access_config` block supports:
@@ -327,7 +327,7 @@ specified, then this instance will have no external IPv6 Internet access. Struct
     records for the external IPv6 ranges..
 
 * `network_tier` - (Optional) The service-level to be provided for IPv6 traffic when the
-    subnet has an external subnet. Only PREMIUM tier is valid for IPv6.
+    subnet has an external subnet. Only PREMIUM or STANDARD tier is valid for IPv6.
 
 <a name="nested_alias_ip_range"></a>The `alias_ip_range` block supports:
 

website/docs/r/compute_instance_template.html.markdown

@@ -391,13 +391,13 @@ specified, then this instance will have no external IPv6 Internet access. Struct
     network ip. If not given, one will be generated.
 
 * `network_tier` - (Optional) The [networking tier][network-tier] used for configuring
-    this instance template. This field can take the following values: PREMIUM or
-    STANDARD. If this field is not specified, it is assumed to be PREMIUM.
+    this instance template. This field can take the following values: PREMIUM,
+    STANDARD or FIXED_STANDARD. If this field is not specified, it is assumed to be PREMIUM.
 
 <a name="nested_ipv6_access_config"></a>The `ipv6_access_config` block supports:
 
 * `network_tier` - (Optional) The service-level to be provided for IPv6 traffic when the
-    subnet has an external subnet. Only PREMIUM tier is valid for IPv6.
+    subnet has an external subnet. Only PREMIUM and STANDARD tier is valid for IPv6.
 
 <a name="nested_alias_ip_range"></a>The `alias_ip_range` block supports: