fix(static-or-dynamic): don't default to static, but rather force peo…

…ple to chose static over dynamic.
taliesins · Mar 12, 2021 · da10a53 · da10a53
1 parent e27c034
commit da10a53
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/examples/clone-existing-vm/main.tf b/examples/clone-existing-vm/main.tf
@@ -26,6 +26,7 @@ resource "hyperv_vhd" "web_server_g3_vhd" {
 
 resource "hyperv_machine_instance" "web_server_g3" {
   name = "web_server_g3"
+  static_memory = true
 
   network_adaptors {
     name = "wan"

diff --git a/examples/vm-from-scratch/main.tf b/examples/vm-from-scratch/main.tf
@@ -24,6 +24,7 @@ resource "hyperv_machine_instance" "web_server_g1" {
   name = "web_server_g1"
   generation = 1
   processor_count = 2
+  static_memory = true
   memory_startup_bytes = 536870912 #512MB
   wait_for_state_timeout = 10
   wait_for_ips_timeout = 10
@@ -61,6 +62,7 @@ resource "hyperv_machine_instance" "web_server_g2" {
   name = "web_server_g2"
   generation = 2
   processor_count = 2
+  static_memory = true
   memory_startup_bytes = 536870912 #512MB
   wait_for_state_timeout = 10
   wait_for_ips_timeout = 10

diff --git a/hyperv/resource_hyperv_machine_instance.go b/hyperv/resource_hyperv_machine_instance.go
@@ -75,9 +75,10 @@ func resourceHyperVMachineInstance() *schema.Resource {
 			},
 
 			"dynamic_memory": {
-				Type:     schema.TypeBool,
-				Optional: true,
-				Default:  false,
+				Type:         schema.TypeBool,
+				Optional:     true,
+				ExactlyOneOf: []string{"dynamic_memory", "static_memory"},
+				Default:      false,
 			},
 
 			"guest_controlled_cache_types": {
@@ -148,9 +149,10 @@ func resourceHyperVMachineInstance() *schema.Resource {
 			},
 
 			"static_memory": {
-				Type:     schema.TypeBool,
-				Optional: true,
-				Default:  true,
+				Type:         schema.TypeBool,
+				Optional:     true,
+				ExactlyOneOf: []string{"dynamic_memory", "static_memory"},
+				Default:      false,
 			},
 
 			"integration_services": {