schema and test fix for instance group manager action

IBM-Cloud · Jan 24, 2022 · ccd5135 · ccd5135
1 parent e588feb
commit ccd5135
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/ibm/service/vpc/resource_ibm_is_instance_group_manager_action.go b/ibm/service/vpc/resource_ibm_is_instance_group_manager_action.go
@@ -77,6 +77,7 @@ func ResourceIBMISInstanceGroupManagerAction() *schema.Resource {
 				ValidateFunc:  validate.InvokeValidator("ibm_is_instance_group_manager_action", "membership_count"),
 				Description:   "The number of members the instance group should have at the scheduled time.",
 				ConflictsWith: []string{"target_manager", "max_membership_count", "min_membership_count"},
+				AtLeastOneOf:  []string{"target_manager", "membership_count"},
 			},
 
 			"max_membership_count": {
@@ -103,6 +104,7 @@ func ResourceIBMISInstanceGroupManagerAction() *schema.Resource {
 				Description:   "The unique identifier for this instance group manager of type autoscale.",
 				ConflictsWith: []string{"membership_count"},
 				RequiredWith:  []string{"min_membership_count", "max_membership_count"},
+				AtLeastOneOf:  []string{"target_manager", "membership_count"},
 			},
 
 			"target_manager_name": {

diff --git a/ibm/service/vpc/resource_ibm_is_instance_group_manager_action_test.go b/ibm/service/vpc/resource_ibm_is_instance_group_manager_action_test.go
@@ -62,14 +62,15 @@ func TestAccIBMISInstanceGroupManagerAction_basic_autoscale(t *testing.T) {
 	instanceGroupManager := fmt.Sprintf("testinstancegroupmanager%d", randInt)
 	instanceGroupManagerAutoscale := fmt.Sprintf("testinstancegroupmanagerautoscale%d", randInt)
 	instanceGroupManagerAction := fmt.Sprintf("testinstancegroupmanageraction%d", randInt)
+	instanceGroupManagerPolicyAction := fmt.Sprintf("testinstancegroupmanagerpolicy%d", randInt)
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { acc.TestAccPreCheck(t) },
 		Providers:    acc.TestAccProviders,
 		CheckDestroy: testAccCheckIBMISInstanceGroupManagerActionDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccCheckIBMISInstanceGroupManagerActionAutoscaleConfig(vpcName, subnetName, sshKeyName, publicKey, templateName, instanceGroupName, instanceGroupManager, instanceGroupManagerAutoscale, instanceGroupManagerAction),
+				Config: testAccCheckIBMISInstanceGroupManagerActionAutoscaleConfig(vpcName, subnetName, sshKeyName, publicKey, templateName, instanceGroupName, instanceGroupManager, instanceGroupManagerAutoscale, instanceGroupManagerPolicyAction, instanceGroupManagerAction),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr(
 						"ibm_is_instance_group_manager.instance_group_manager", "name", instanceGroupManager),
@@ -136,7 +137,7 @@ func testAccCheckIBMISInstanceGroupManagerActionConfig(vpcName, subnetName, sshK
 
 	resource "ibm_is_instance_template" "instancetemplate1" {
 	   name    = "%s"
-	   image   = "r006-14140f94-fcc4-11e9-96e7-a72723715315"
+	   image   = "%s"
 	   profile = "bx2-8x32"
 
 	   primary_network_interface {
@@ -170,11 +171,11 @@ func testAccCheckIBMISInstanceGroupManagerActionConfig(vpcName, subnetName, sshK
 		membership_count = 1
 	}
 
-	`, vpcName, subnetName, sshKeyName, publicKey, templateName, instanceGroupName, instanceGroupManager, instanceGroupManagerAction)
+	`, vpcName, subnetName, sshKeyName, publicKey, templateName, acc.IsImage, instanceGroupName, instanceGroupManager, instanceGroupManagerAction)
 
 }
 
-func testAccCheckIBMISInstanceGroupManagerActionAutoscaleConfig(vpcName, subnetName, sshKeyName, publicKey, templateName, instanceGroupName, instanceGroupManager, instanceGroupManagerAutoscale, instanceGroupManagerAction string) string {
+func testAccCheckIBMISInstanceGroupManagerActionAutoscaleConfig(vpcName, subnetName, sshKeyName, publicKey, templateName, instanceGroupName, instanceGroupManager, instanceGroupManagerAutoscale, instanceGroupManagerPolicyAction, instanceGroupManagerAction string) string {
 	return fmt.Sprintf(`
 	provider "ibm" {
 		generation = 2
@@ -198,7 +199,7 @@ func testAccCheckIBMISInstanceGroupManagerActionAutoscaleConfig(vpcName, subnetN
 
 	resource "ibm_is_instance_template" "instancetemplate1" {
 	   name    = "%s"
-	   image   = "r006-14140f94-fcc4-11e9-96e7-a72723715315"
+	   image   = "%s"
 	   profile = "bx2-8x32"
 
 	   primary_network_interface {
@@ -241,7 +242,7 @@ func testAccCheckIBMISInstanceGroupManagerActionAutoscaleConfig(vpcName, subnetN
 		metric_type = "cpu"
 		metric_value = 70
 		policy_type = "target"
-		name = "instancegrouppolicysunitha"
+		name = "%s"
 	}
 
 	resource "ibm_is_instance_group_manager_action" "instance_group_manager_action" {
@@ -254,6 +255,6 @@ func testAccCheckIBMISInstanceGroupManagerActionAutoscaleConfig(vpcName, subnetN
 		max_membership_count   = 2
 	  }
 
-	`, vpcName, subnetName, sshKeyName, publicKey, templateName, instanceGroupName, instanceGroupManager, instanceGroupManagerAutoscale, instanceGroupManagerAction)
+	`, vpcName, subnetName, sshKeyName, publicKey, templateName, acc.IsImage, instanceGroupName, instanceGroupManager, instanceGroupManagerAutoscale, instanceGroupManagerPolicyAction, instanceGroupManagerAction)
 
 }
diff --git a/website/docs/r/is_instance_group_manager_action.html.markdown b/website/docs/r/is_instance_group_manager_action.html.markdown
@@ -90,7 +90,7 @@ Review the argument references that you can specify for your resource.
 - `max_membership_count` - (Optional, Integer) The maximum number of members the instance group should have at the scheduled time.
 - `min_membership_count` - (Optional, Integer) The minimum number of members the instance group should have at the scheduled time. Default value is set to 1.
 - `name` - (Optional, String) The user-defined name for this instance group manager action. Names must be unique within the instance group manager.
-- `run_at` - (Optional, String) The date and time that is specified for the scheduled action. The format is in ISO 8601 format. Example: 2024-03-05T15:31:50.701Z or 2024-03-05T15:31:50.701+8:00.
+- `run_at` - (Optional, String) The date and time that is specified for the scheduled action. The format is in ISO 8601 format. Example: 2024-03-05T15:31:50.701Z or 2024-03-06T15:31:50.701+8:00.
 - `target_manager` - (Optional, String) The unique identifier for this instance group manager of type autoscale.