attempt fixing quota issues (#3652) (#2181)

Signed-off-by: Modular Magician <[email protected]>
hashicorp · Jun 16, 2020 · 4574b29 · 4574b29
1 parent 1a1ea02
commit 4574b29
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 43 deletions.
diff --git a/.changelog/3652.txt b/.changelog/3652.txt
@@ -0,0 +1,3 @@
+```release-note:none
+
+```
diff --git a/google-beta/resource_compute_node_group_generated_test.go b/google-beta/resource_compute_node_group_generated_test.go
@@ -49,14 +49,10 @@ func TestAccComputeNodeGroup_nodeGroupBasicExample(t *testing.T) {
 
 func testAccComputeNodeGroup_nodeGroupBasicExample(context map[string]interface{}) string {
 	return Nprintf(`
-data "google_compute_node_types" "central1a" {
-  zone = "us-central1-a"
-}
-
 resource "google_compute_node_template" "soletenant-tmpl" {
   name      = "tf-test-soletenant-tmpl%{random_suffix}"
   region    = "us-central1"
-  node_type = data.google_compute_node_types.central1a.names[0]
+  node_type = "n1-node-96-624"
 }
 
 resource "google_compute_node_group" "nodes" {
@@ -91,16 +87,11 @@ func TestAccComputeNodeGroup_nodeGroupAutoscalingPolicyExample(t *testing.T) {
 
 func testAccComputeNodeGroup_nodeGroupAutoscalingPolicyExample(context map[string]interface{}) string {
 	return Nprintf(`
-data "google_compute_node_types" "central1a" {
-  provider = google-beta
-  zone = "us-central1-a"
-}
-
 resource "google_compute_node_template" "soletenant-tmpl" {
   provider = google-beta
   name      = "tf-test-soletenant-tmpl%{random_suffix}"
   region    = "us-central1"
-  node_type = data.google_compute_node_types.central1a.names[0]
+  node_type = "n1-node-96-624"
 }
 
 resource "google_compute_node_group" "nodes" {

diff --git a/google-beta/resource_compute_node_group_test.go b/google-beta/resource_compute_node_group_test.go
@@ -86,20 +86,16 @@ func testAccCheckComputeNodeGroupCreationTimeBefore(prevTimeCreated *time.Time)
 
 func testAccComputeNodeGroup_updateNodeTemplate(groupName, tmplPrefix, tmplToUse string) string {
 	return fmt.Sprintf(`
-data "google_compute_node_types" "central1a" {
-  zone = "us-central1-a"
-}
-
 resource "google_compute_node_template" "tmpl1" {
   name      = "%s-first"
   region    = "us-central1"
-  node_type = data.google_compute_node_types.central1a.names[0]
+  node_type = "n1-node-96-624"
 }
 
 resource "google_compute_node_template" "tmpl2" {
   name      = "%s-second"
   region    = "us-central1"
-  node_type = data.google_compute_node_types.central1a.names[0]
+  node_type = "n1-node-96-624"
 }
 
 resource "google_compute_node_group" "nodes" {

diff --git a/google-beta/resource_compute_node_template.go b/google-beta/resource_compute_node_template.go
@@ -44,8 +44,9 @@ func resourceComputeNodeTemplate() *schema.Resource {
 				Type:         schema.TypeString,
 				Optional:     true,
 				ForceNew:     true,
-				ValidateFunc: validation.StringInSlice([]string{"ENABLED", "DISABLED", ""}, false),
-				Description:  `CPU overcommit. Possible values: ["ENABLED", "DISABLED"]`,
+				ValidateFunc: validation.StringInSlice([]string{"ENABLED", "NONE", ""}, false),
+				Description:  `CPU overcommit. Default value: "NONE" Possible values: ["ENABLED", "NONE"]`,
+				Default:      "NONE",
 			},
 			"description": {
 				Type:        schema.TypeString,

diff --git a/google-beta/resource_compute_node_template_generated_test.go b/google-beta/resource_compute_node_template_generated_test.go
@@ -49,14 +49,10 @@ func TestAccComputeNodeTemplate_nodeTemplateBasicExample(t *testing.T) {
 
 func testAccComputeNodeTemplate_nodeTemplateBasicExample(context map[string]interface{}) string {
 	return Nprintf(`
-data "google_compute_node_types" "central1a" {
-  zone = "us-central1-a"
-}
-
 resource "google_compute_node_template" "template" {
   name      = "tf-test-soletenant-tmpl%{random_suffix}"
   region    = "us-central1"
-  node_type = data.google_compute_node_types.central1a.names[0]
+  node_type = "n1-node-96-624"
 }
 `, context)
 }
@@ -97,7 +93,7 @@ resource "google_compute_node_template" "template" {
 
   name      = "tf-test-soletenant-with-licenses%{random_suffix}"
   region    = "us-central1"
-  node_type = data.google_compute_node_types.central1a.names[0]
+  node_type = "n1-node-96-624"
 
   node_affinity_labels = {
     foo = "baz"

diff --git a/website/docs/r/compute_node_group.html.markdown b/website/docs/r/compute_node_group.html.markdown
@@ -45,14 +45,10 @@ Terraform to delete and recreate the node group.
 
 
 ```hcl
-data "google_compute_node_types" "central1a" {
-  zone = "us-central1-a"
-}
-
 resource "google_compute_node_template" "soletenant-tmpl" {
   name      = "soletenant-tmpl"
   region    = "us-central1"
-  node_type = data.google_compute_node_types.central1a.names[0]
+  node_type = "n1-node-96-624"
 }
 
 resource "google_compute_node_group" "nodes" {
@@ -73,16 +69,11 @@ resource "google_compute_node_group" "nodes" {
 
 
 ```hcl
-data "google_compute_node_types" "central1a" {
-  provider = google-beta
-  zone = "us-central1-a"
-}
-
 resource "google_compute_node_template" "soletenant-tmpl" {
   provider = google-beta
   name      = "soletenant-tmpl"
   region    = "us-central1"
-  node_type = data.google_compute_node_types.central1a.names[0]
+  node_type = "n1-node-96-624"
 }
 
 resource "google_compute_node_group" "nodes" {

diff --git a/website/docs/r/compute_node_template.html.markdown b/website/docs/r/compute_node_template.html.markdown
@@ -42,14 +42,10 @@ To get more information about NodeTemplate, see:
 
 
 ```hcl
-data "google_compute_node_types" "central1a" {
-  zone = "us-central1-a"
-}
-
 resource "google_compute_node_template" "template" {
   name      = "soletenant-tmpl"
   region    = "us-central1"
-  node_type = data.google_compute_node_types.central1a.names[0]
+  node_type = "n1-node-96-624"
 }
 ```
 <div class = "oics-button" style="float: right; margin: 0 0 -15px">
@@ -76,7 +72,7 @@ resource "google_compute_node_template" "template" {
 
   name      = "soletenant-with-licenses"
   region    = "us-central1"
-  node_type = data.google_compute_node_types.central1a.names[0]
+  node_type = "n1-node-96-624"
 
   node_affinity_labels = {
     foo = "baz"
@@ -131,9 +127,10 @@ The following arguments are supported:
   (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
   CPU overcommit.
 
+  Default value: `NONE`
   Possible values are:
   * `ENABLED`
-  * `DISABLED`
+  * `NONE`
 
 * `region` -
   (Optional)