Fix start action in Instance Pool

Author: ndordevi

oci/core_instance_pool_resource.go

@@ -9,6 +9,8 @@ import (
 	"log"
 	"strings"
 
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
 
@@ -357,17 +359,7 @@ func (s *CoreInstancePoolResourceCrud) Create() error {
 		return err
 	}
 
-	desiredStateStr := instancePoolRunningState
-	if desiredState, ok := s.D.GetOkExists("state"); ok {
-		desiredStateStr = desiredState.(string)
-	}
-
-	instancePool, err := s.setInstancePoolDesiredState(response.InstancePool.Id, desiredStateStr)
-	if err != nil {
-		return err
-	}
-
-	s.Res = instancePool
+	s.Res = &response.InstancePool
 
 	return nil
 }
@@ -487,17 +479,23 @@ func (s *CoreInstancePoolResourceCrud) Update() error {
 		return err
 	}
 
-	desiredStateStr := instancePoolRunningState
-	if desiredState, ok := s.D.GetOkExists("state"); ok {
-		desiredStateStr = desiredState.(string)
-	}
+	s.Res = &response.InstancePool
 
-	instancePool, err := s.setInstancePoolDesiredState(response.InstancePool.Id, desiredStateStr)
-	if err != nil {
-		return err
-	}
+	if _, ok := s.D.GetOkExists("state"); ok && s.D.HasChange("state") {
+		oldRaw, newRaw := s.D.GetChange("state")
+		oldState := strings.ToLower(oldRaw.(string))
+		newState := strings.ToLower(newRaw.(string))
 
-	s.Res = instancePool
+		if oldState == instancePoolRunningState && newState == instancePoolStoppedState ||
+			oldState == instancePoolStoppedState && newState == instancePoolRunningState {
+			instancePool, err := s.setInstancePoolDesiredState(response.InstancePool.Id, newState)
+			if err != nil {
+				return err
+			}
+
+			s.Res = instancePool
+		}
+	}
 
 	return nil
 }
@@ -843,6 +841,13 @@ func (s *CoreInstancePoolResourceCrud) updateLoadBalancers(oldRaw interface{}, n
 		attachLoadBalancerRequest.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "core")
 		attachLoadBalancerRequest.AttachLoadBalancerDetails = newLoadBalancer
 		_, err := s.Client.AttachLoadBalancer(context.Background(), attachLoadBalancerRequest)
+
+		if err != nil {
+			return err
+		}
+
+		_, err = s.pollForLbOperationCompletion(&id, &attachLoadBalancerRequest.AttachLoadBalancerDetails)
+
 		if err != nil {
 			return err
 		}
@@ -855,6 +860,13 @@ func (s *CoreInstancePoolResourceCrud) updateLoadBalancers(oldRaw interface{}, n
 		detachLoadBalancerRequest.InstancePoolId = &id
 		detachLoadBalancerRequest.BackendSetName = oldLoadbalancer.BackendSetName
 		_, err := s.Client.DetachLoadBalancer(context.Background(), detachLoadBalancerRequest)
+
+		if err != nil {
+			return err
+		}
+
+		_, err = s.pollForLbOperationCompletion(&id, &oldLoadbalancer)
+
 		if err != nil {
 			return err
 		}
@@ -876,3 +888,45 @@ func mapToAttachLoadBalancerDetails(item map[string]interface{}) oci_core.Attach
 
 	return result
 }
+
+func (s *CoreInstancePoolResourceCrud) pollForLbOperationCompletion(poolId *string, lbToTrack *oci_core.AttachLoadBalancerDetails) (*oci_core.InstancePool, error) {
+	response := oci_core.GetInstancePoolResponse{}
+	stateConf := &resource.StateChangeConf{
+		Pending: []string{
+			string(oci_core.InstancePoolLoadBalancerAttachmentLifecycleStateAttaching),
+			string(oci_core.InstancePoolLoadBalancerAttachmentLifecycleStateDetaching),
+		},
+		Target: []string{
+			string(oci_core.InstancePoolLoadBalancerAttachmentLifecycleStateAttached),
+			string(oci_core.InstancePoolLoadBalancerAttachmentLifecycleStateDetached),
+		},
+		Refresh: func() (interface{}, string, error) {
+			var err error
+
+			response, err = s.Client.GetInstancePool(context.Background(),
+				oci_core.GetInstancePoolRequest{
+					InstancePoolId: poolId,
+				})
+
+			ip := response.InstancePool
+			loadBalancers := ip.LoadBalancers
+
+			for i := 0; i < len(loadBalancers); i++ {
+				if *loadBalancers[i].LoadBalancerId == *lbToTrack.LoadBalancerId &&
+					*loadBalancers[i].BackendSetName == *lbToTrack.BackendSetName {
+					return ip, string(loadBalancers[i].LifecycleState), err
+				}
+			}
+
+			// if there is no match than fail
+			return ip, "Not found", fmt.Errorf("load balancer attachment not found")
+		},
+		Timeout: s.D.Timeout(schema.TimeoutUpdate),
+	}
+
+	if _, e := stateConf.WaitForState(); e != nil {
+		return &response.InstancePool, e
+	}
+
+	return &response.InstancePool, nil
+}

oci/core_instance_pool_test.go

@@ -370,8 +370,8 @@ func TestCoreInstancePoolResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet(resourceName, "load_balancers.0.id"),
 					resource.TestCheckResourceAttrSet(resourceName, "load_balancers.0.instance_pool_id"),
 					resource.TestCheckResourceAttrSet(resourceName, "load_balancers.0.load_balancer_id"),
-					resource.TestCheckResourceAttr(resourceName, "load_balancers.0.port", "10"),
 					resource.TestCheckResourceAttrSet(resourceName, "load_balancers.0.state"),
+					resource.TestCheckResourceAttr(resourceName, "load_balancers.0.port", "10"),
 					resource.TestCheckResourceAttr(resourceName, "load_balancers.0.vnic_selection", "PrimaryVnic"),
 					resource.TestCheckResourceAttr(resourceName, "placement_configurations.#", "1"),
 					resource.TestCheckResourceAttrSet(resourceName, "placement_configurations.0.availability_domain"),

website/docs/r/core_instance_pool.html.markdown

@@ -82,7 +82,7 @@ The following arguments are supported:
 		* `display_name` - (Optional) (Updatable) The display name of the VNIC. This is also use to match against the instance configuration defined secondary VNIC. 
 		* `subnet_id` - (Required) (Updatable) The subnet [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) for the secondary VNIC.
 * `size` - (Required) (Updatable) The number of instances that should be in the instance pool. Modifying this value will override the size of the instance pool. If the instance pool is linked with autoscaling configuration, autoscaling configuration could resize the instance pool at a later point. The instance pool's actual size may differ from the configured size if it is associated with an autoscaling configuration. For the actual size of the instance pool, refer to the `actual_size` attribute.
-* `state` - (Optional) (Updatable) The target state for the instance pool. Could be set to RUNNING or STOPPED.
+* `state` - (Optional) (Updatable) The target state for the instance pool update operation (ignored at create time and should not be set). Could be set to RUNNING or STOPPED.
 
 
 ** IMPORTANT **