Promote field compute_instance.scheduling.min_node_cpus and related f…

…ields to ga (hashicorp#4593) (hashicorp#3059) Signed-off-by: Modular Magician <[email protected]>
jcanseco · Mar 15, 2021 · 3f3907d · 3f3907d
1 parent 1176430
commit 3f3907d
Show file tree

Hide file tree

Showing 23 changed files with 52 additions and 40 deletions.
diff --git a/.changelog/4593.txt b/.changelog/4593.txt
@@ -0,0 +1,5 @@
+```release-note:enhancement
+compute: promoted field `server_binding` and `cpu_overcommit_type` fields on `google_node_template` to ga
+compute: promoted field `scheduling.min_node_cpus` field on `google_compute_instance` to ga
+compute: documented field `scheduling.min_node_cpus` field on `google_compute_instance`
+```
diff --git a/google-beta/resource_compute_backend_bucket.go b/google-beta/resource_compute_backend_bucket.go
@@ -85,7 +85,7 @@ The possible values are: USE_ORIGIN_HEADERS, FORCE_CACHE_ALL and CACHE_ALL_STATI
 						"default_ttl": {
 							Type:     schema.TypeInt,
 							Optional: true,
-							Description: `Specifies the default TTL for cached content served by this origin for responses 
+							Description: `Specifies the default TTL for cached content served by this origin for responses
 that do not have an existing valid TTL (max-age or s-max-age).`,
 						},
 						"max_ttl": {

diff --git a/google-beta/resource_compute_backend_service.go b/google-beta/resource_compute_backend_service.go
@@ -306,7 +306,7 @@ The possible values are: USE_ORIGIN_HEADERS, FORCE_CACHE_ALL and CACHE_ALL_STATI
 						"default_ttl": {
 							Type:     schema.TypeInt,
 							Optional: true,
-							Description: `Specifies the default TTL for cached content served by this origin for responses 
+							Description: `Specifies the default TTL for cached content served by this origin for responses
 that do not have an existing valid TTL (max-age or s-max-age).`,
 						},
 						"max_ttl": {

diff --git a/google-beta/resource_compute_disk.go b/google-beta/resource_compute_disk.go
@@ -495,7 +495,7 @@ See https://cloud.google.com/compute/docs/disks/customer-managed-encryption#encr
 							Type:     schema.TypeString,
 							Optional: true,
 							ForceNew: true,
-							Description: `The service account used for the encryption request for the given KMS key. 
+							Description: `The service account used for the encryption request for the given KMS key.
 If absent, the Compute Engine Service Agent service account is used.`,
 						},
 						"raw_key": {

diff --git a/google-beta/resource_compute_health_check.go b/google-beta/resource_compute_health_check.go
@@ -166,7 +166,7 @@ you create the resource.`,
 						"grpc_service_name": {
 							Type:     schema.TypeString,
 							Optional: true,
-							Description: `The gRPC service name for the health check. 
+							Description: `The gRPC service name for the health check.
 The value of grpcServiceName has the following meanings by convention:
   - Empty serviceName means the overall status of all services at the backend.
   - Non-empty serviceName means the health of that gRPC service, as defined by the owner of the service.
@@ -176,8 +176,8 @@ The grpcServiceName can only be ASCII.`,
 						"port": {
 							Type:     schema.TypeInt,
 							Optional: true,
-							Description: `The port number for the health check request. 
-Must be specified if portName and portSpecification are not set 
+							Description: `The port number for the health check request.
+Must be specified if portName and portSpecification are not set
 or if port_specification is USE_FIXED_PORT. Valid values are 1 through 65535.`,
 							AtLeastOneOf: []string{"grpc_health_check.0.port", "grpc_health_check.0.port_name", "grpc_health_check.0.port_specification", "grpc_health_check.0.grpc_service_name"},
 						},

diff --git a/google-beta/resource_compute_instance.go b/google-beta/resource_compute_instance.go
@@ -1,4 +1,3 @@
-//
 package google
 
 import (

diff --git a/google-beta/resource_compute_instance_test.go b/google-beta/resource_compute_instance_test.go
@@ -1,4 +1,3 @@
-//
 package google
 
 import (

diff --git a/google-beta/resource_compute_machine_image.go b/google-beta/resource_compute_machine_image.go
@@ -81,7 +81,7 @@ instance from the image)`,
 							Type:     schema.TypeString,
 							Optional: true,
 							ForceNew: true,
-							Description: `The service account used for the encryption request for the given KMS key. 
+							Description: `The service account used for the encryption request for the given KMS key.
 If absent, the Compute Engine Service Agent service account is used.`,
 						},
 						"raw_key": {

diff --git a/google-beta/resource_compute_node_template_generated_test.go b/google-beta/resource_compute_node_template_generated_test.go
@@ -70,7 +70,7 @@ func TestAccComputeNodeTemplate_nodeTemplateServerBindingExample(t *testing.T) {
 
 	vcrTest(t, resource.TestCase{
 		PreCheck:  func() { testAccPreCheck(t) },
-		Providers: testAccProvidersOiCS,
+		Providers: testAccProviders,
 		ExternalProviders: map[string]resource.ExternalProvider{
 			"random": {},
 		},
@@ -79,6 +79,12 @@ func TestAccComputeNodeTemplate_nodeTemplateServerBindingExample(t *testing.T) {
 			{
 				Config: testAccComputeNodeTemplate_nodeTemplateServerBindingExample(context),
 			},
+			{
+				ResourceName:            "google_compute_node_template.template",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"region"},
+			},
 		},
 	})
 }

diff --git a/google-beta/resource_compute_region_backend_service.go b/google-beta/resource_compute_region_backend_service.go
@@ -254,7 +254,7 @@ The possible values are: USE_ORIGIN_HEADERS, FORCE_CACHE_ALL and CACHE_ALL_STATI
 						"default_ttl": {
 							Type:     schema.TypeInt,
 							Optional: true,
-							Description: `Specifies the default TTL for cached content served by this origin for responses 
+							Description: `Specifies the default TTL for cached content served by this origin for responses
 that do not have an existing valid TTL (max-age or s-max-age).`,
 						},
 						"max_ttl": {
@@ -549,7 +549,7 @@ This field is only used with l4 load balancing.`,
 				Optional: true,
 				Description: `The set of URLs to HealthCheck resources for health checking
 this RegionBackendService. Currently at most one health
-check can be specified. 
+check can be specified.
 
 A health check must be specified unless the backend service uses an internet
 or serverless NEG as a backend.`,

diff --git a/google-beta/resource_compute_region_health_check.go b/google-beta/resource_compute_region_health_check.go
@@ -81,7 +81,7 @@ you create the resource.`,
 						"grpc_service_name": {
 							Type:     schema.TypeString,
 							Optional: true,
-							Description: `The gRPC service name for the health check. 
+							Description: `The gRPC service name for the health check.
 The value of grpcServiceName has the following meanings by convention:
 
 * Empty serviceName means the overall status of all services at the backend.
@@ -93,8 +93,8 @@ The grpcServiceName can only be ASCII.`,
 						"port": {
 							Type:     schema.TypeInt,
 							Optional: true,
-							Description: `The port number for the health check request. 
-Must be specified if portName and portSpecification are not set 
+							Description: `The port number for the health check request.
+Must be specified if portName and portSpecification are not set
 or if port_specification is USE_FIXED_PORT. Valid values are 1 through 65535.`,
 							AtLeastOneOf: []string{"grpc_health_check.0.port", "grpc_health_check.0.port_name", "grpc_health_check.0.port_specification", "grpc_health_check.0.grpc_service_name"},
 						},

diff --git a/google-beta/resource_compute_region_network_endpoint_group.go b/google-beta/resource_compute_region_network_endpoint_group.go
@@ -168,13 +168,13 @@ Example value: "revision-0010".`,
 							Type:     schema.TypeString,
 							Optional: true,
 							ForceNew: true,
-							Description: `A template to parse service and tag fields from a request URL. 
-URL mask allows for routing to multiple Run services without having 
+							Description: `A template to parse service and tag fields from a request URL.
+URL mask allows for routing to multiple Run services without having
 to create multiple network endpoint groups and backend services.
 
-For example, request URLs "foo1.domain.com/bar1" and "foo1.domain.com/bar2" 
-an be backed by the same Serverless Network Endpoint Group (NEG) with 
-URL mask ".domain.com/". The URL mask will parse them to { service="bar1", tag="foo1" } 
+For example, request URLs "foo1.domain.com/bar1" and "foo1.domain.com/bar2"
+an be backed by the same Serverless Network Endpoint Group (NEG) with
+URL mask ".domain.com/". The URL mask will parse them to { service="bar1", tag="foo1" }
 and { service="bar2", tag="foo2" } respectively.`,
 							AtLeastOneOf: []string{"cloud_run.0.service", "cloud_run.0.url_mask"},
 						},

diff --git a/google-beta/resource_dataproc_cluster_test.go b/google-beta/resource_dataproc_cluster_test.go
@@ -13,8 +13,9 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 
-	dataproc "google.golang.org/api/dataproc/v1beta2"
 	"google.golang.org/api/googleapi"
+
+	dataproc "google.golang.org/api/dataproc/v1beta2"
 )
 
 func TestDataprocExtractInitTimeout(t *testing.T) {

diff --git a/website/docs/r/compute_backend_bucket.html.markdown b/website/docs/r/compute_backend_bucket.html.markdown
@@ -120,7 +120,7 @@ The `cdn_policy` block supports:
 
 * `default_ttl` -
   (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
-  Specifies the default TTL for cached content served by this origin for responses 
+  Specifies the default TTL for cached content served by this origin for responses
   that do not have an existing valid TTL (max-age or s-max-age).
 
 * `max_ttl` -

diff --git a/website/docs/r/compute_backend_service.html.markdown b/website/docs/r/compute_backend_service.html.markdown
@@ -619,7 +619,7 @@ The `cdn_policy` block supports:
 
 * `default_ttl` -
   (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
-  Specifies the default TTL for cached content served by this origin for responses 
+  Specifies the default TTL for cached content served by this origin for responses
   that do not have an existing valid TTL (max-age or s-max-age).
 
 * `max_ttl` -

diff --git a/website/docs/r/compute_disk.html.markdown b/website/docs/r/compute_disk.html.markdown
@@ -271,7 +271,7 @@ The `source_snapshot_encryption_key` block supports:
 
 * `kms_key_service_account` -
   (Optional)
-  The service account used for the encryption request for the given KMS key. 
+  The service account used for the encryption request for the given KMS key.
   If absent, the Compute Engine Service Agent service account is used.
 
 ## Attributes Reference

diff --git a/website/docs/r/compute_health_check.html.markdown b/website/docs/r/compute_health_check.html.markdown
@@ -682,8 +682,8 @@ The `grpc_health_check` block supports:
 
 * `port` -
   (Optional)
-  The port number for the health check request. 
-  Must be specified if portName and portSpecification are not set 
+  The port number for the health check request.
+  Must be specified if portName and portSpecification are not set
   or if port_specification is USE_FIXED_PORT. Valid values are 1 through 65535.
 
 * `port_name` -
@@ -707,7 +707,7 @@ The `grpc_health_check` block supports:
 
 * `grpc_service_name` -
   (Optional)
-  The gRPC service name for the health check. 
+  The gRPC service name for the health check.
   The value of grpcServiceName has the following meanings by convention:
     - Empty serviceName means the overall status of all services at the backend.
     - Non-empty serviceName means the health of that gRPC service, as defined by the owner of the service.

diff --git a/website/docs/r/compute_instance.html.markdown b/website/docs/r/compute_instance.html.markdown
@@ -334,6 +334,8 @@ The `scheduling` block supports:
    [here](https://cloud.google.com/compute/docs/nodes/create-nodes).
    Structure documented below.
 
+* `minNodeCpus` - (Optional) The minimum number of virtual CPUs this instance will consume when running on a sole-tenant node.
+
 The `guest_accelerator` block supports:
 
 * `type` (Required) - The accelerator type resource to expose to this instance. E.g. `nvidia-tesla-k80`.

diff --git a/website/docs/r/compute_machine_image.html.markdown b/website/docs/r/compute_machine_image.html.markdown
@@ -121,7 +121,7 @@ The `machine_image_encryption_key` block supports:
 
 * `kms_key_service_account` -
   (Optional)
-  The service account used for the encryption request for the given KMS key. 
+  The service account used for the encryption request for the given KMS key.
   If absent, the Compute Engine Service Agent service account is used.
 
 ## Attributes Reference

diff --git a/website/docs/r/compute_node_template.html.markdown b/website/docs/r/compute_node_template.html.markdown
@@ -120,13 +120,13 @@ The following arguments are supported:
   Structure is documented below.
 
 * `server_binding` -
-  (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
+  (Optional)
   The server binding policy for nodes using this template. Determines
   where the nodes should restart following a maintenance event.
   Structure is documented below.
 
 * `cpu_overcommit_type` -
-  (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
+  (Optional)
   CPU overcommit.
   Default value is `NONE`.
   Possible values are `ENABLED` and `NONE`.

diff --git a/website/docs/r/compute_region_backend_service.html.markdown b/website/docs/r/compute_region_backend_service.html.markdown
@@ -355,7 +355,7 @@ The following arguments are supported:
   (Optional)
   The set of URLs to HealthCheck resources for health checking
   this RegionBackendService. Currently at most one health
-  check can be specified. 
+  check can be specified.
   A health check must be specified unless the backend service uses an internet
   or serverless NEG as a backend.
 
@@ -681,7 +681,7 @@ The `cdn_policy` block supports:
 
 * `default_ttl` -
   (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
-  Specifies the default TTL for cached content served by this origin for responses 
+  Specifies the default TTL for cached content served by this origin for responses
   that do not have an existing valid TTL (max-age or s-max-age).
 
 * `max_ttl` -

diff --git a/website/docs/r/compute_region_health_check.html.markdown b/website/docs/r/compute_region_health_check.html.markdown
@@ -683,8 +683,8 @@ The `grpc_health_check` block supports:
 
 * `port` -
   (Optional)
-  The port number for the health check request. 
-  Must be specified if portName and portSpecification are not set 
+  The port number for the health check request.
+  Must be specified if portName and portSpecification are not set
   or if port_specification is USE_FIXED_PORT. Valid values are 1 through 65535.
 
 * `port_name` -
@@ -708,7 +708,7 @@ The `grpc_health_check` block supports:
 
 * `grpc_service_name` -
   (Optional)
-  The gRPC service name for the health check. 
+  The gRPC service name for the health check.
   The value of grpcServiceName has the following meanings by convention:
   * Empty serviceName means the overall status of all services at the backend.
   * Non-empty serviceName means the health of that gRPC service, as defined by the owner of the service.

diff --git a/website/docs/r/compute_region_network_endpoint_group.html.markdown b/website/docs/r/compute_region_network_endpoint_group.html.markdown
@@ -267,12 +267,12 @@ The `cloud_run` block supports:
 
 * `url_mask` -
   (Optional)
-  A template to parse service and tag fields from a request URL. 
-  URL mask allows for routing to multiple Run services without having 
+  A template to parse service and tag fields from a request URL.
+  URL mask allows for routing to multiple Run services without having
   to create multiple network endpoint groups and backend services.
-  For example, request URLs "foo1.domain.com/bar1" and "foo1.domain.com/bar2" 
-  an be backed by the same Serverless Network Endpoint Group (NEG) with 
-  URL mask ".domain.com/". The URL mask will parse them to { service="bar1", tag="foo1" } 
+  For example, request URLs "foo1.domain.com/bar1" and "foo1.domain.com/bar2"
+  an be backed by the same Serverless Network Endpoint Group (NEG) with
+  URL mask ".domain.com/". The URL mask will parse them to { service="bar1", tag="foo1" }
   and { service="bar2", tag="foo2" } respectively.
 
 The `app_engine` block supports: