change NOT to NOT_IN for node_affinities operator (#3225) (#5841)

Signed-off-by: Modular Magician <[email protected]>
hashicorp · Mar 5, 2020 · 1af6072 · 1af6072
1 parent 43c46a8
commit 1af6072
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 3 deletions.
diff --git a/.changelog/3225.txt b/.changelog/3225.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+compute: fixed bug where `google_compute_instance.scheduling.node_affinities.operator` would incorrectly accept `NOT` rather than `NOT_IN`.
+```
diff --git a/google/compute_instance_helpers.go b/google/compute_instance_helpers.go
@@ -22,7 +22,7 @@ func instanceSchedulingNodeAffinitiesElemSchema() *schema.Resource {
 				Type:         schema.TypeString,
 				Required:     true,
 				ForceNew:     true,
-				ValidateFunc: validation.StringInSlice([]string{"IN", "NOT"}, false),
+				ValidateFunc: validation.StringInSlice([]string{"IN", "NOT_IN"}, false),
 			},
 			"values": {
 				Type:     schema.TypeSet,

diff --git a/google/resource_compute_instance_test.go b/google/resource_compute_instance_test.go
@@ -4240,6 +4240,12 @@ resource "google_compute_instance" "foobar" {
       values   = ["test"]
     }
 
+    node_affinities {
+      key      = "tfacc"
+      operator = "NOT_IN"
+      values   = ["not_here"]
+    }
+
     node_affinities {
       key      = "compute.googleapis.com/node-group-name"
       operator = "IN"
@@ -4302,6 +4308,12 @@ resource "google_compute_instance" "foobar" {
       values   = ["test", "updatedlabel"]
     }
 
+    node_affinities {
+      key      = "tfacc"
+      operator = "NOT_IN"
+      values   = ["not_here"]
+    }
+
     node_affinities {
       key      = "compute.googleapis.com/node-group-name"
       operator = "IN"

diff --git a/website/docs/r/compute_instance.html.markdown b/website/docs/r/compute_instance.html.markdown
@@ -333,7 +333,7 @@ The `node_affinities` block supports:
 * `key` (Required) - The key for the node affinity label.
 
 * `operator` (Required) - The operator. Can be `IN` for node-affinities
-    or `NOT` for anti-affinities.
+    or `NOT_IN` for anti-affinities.
 
 * `value` (Required) - The values for the node affinity label.
 

diff --git a/website/docs/r/compute_instance_template.html.markdown b/website/docs/r/compute_instance_template.html.markdown
@@ -394,7 +394,7 @@ The `node_affinities` block supports:
 * `key` (Required) - The key for the node affinity label.
 
 * `operator` (Required) - The operator. Can be `IN` for node-affinities
-    or `NOT` for anti-affinities.
+    or `NOT_IN` for anti-affinities.
 
 * `value` (Required) - The values for the node affinity label.