Dev

CHANGELOG.md

@@ -1,12 +1,19 @@
 ## 1.6.0 (unreleased)
 
+## 1.3.3 (December 14, 2017)
+
+IMPROVMENTS:
+  * wait for SLB active before return back ([#310](https://github.com/alibaba/terraform-provider/pull/310))
+
 ## 1.3.2 (December 13, 2017)
 
 IMPROVMENTS:
   * deprecated ram_alias and add ram_account_alias ([#305](https://github.com/alibaba/terraform-provider/pull/305))
   * deprecated dns_domain_groups and add dns_groups ([#305](https://github.com/alibaba/terraform-provider/pull/305))
   * deprecated dns_domain_records and add dns_records ([#305](https://github.com/alibaba/terraform-provider/pull/305))
   * add slb listener importing test ([#305](https://github.com/alibaba/terraform-provider/pull/305))
+
+BUG FIXES:
   * fix dns records bug ([#305](https://github.com/alibaba/terraform-provider/pull/305))
   * fix ESS bind SLB failed bug ([#308](https://github.com/alibaba/terraform-provider/pull/308))
   * fix security group not found bug ([#308](https://github.com/alibaba/terraform-provider/pull/308))

README.md

@@ -38,6 +38,7 @@ terraform get
 # set the creds
 export ALICLOUD_ACCESS_KEY="***"
 export ALICLOUD_SECRET_KEY="***"
+export ALICLOUD_REGION="***"
 
 # you're good to start rocking
 # alicloud.tf contains the default example

alicloud/resource_alicloud_security_group_rule.go

@@ -165,7 +165,7 @@ func resourceAliyunSecurityGroupRuleRead(d *schema.ResourceData, meta interface{
 
 	rule, err := client.DescribeSecurityGroupRule(sgId, direction, parts[2], parts[3], parts[4], parts[5], policy, priority)
 	if err != nil {
-		if IsExceptedError(err, InvalidSecurityGroupIdNotFound) {
+		if NotFoundError(err) || IsExceptedError(err, InvalidSecurityGroupIdNotFound) {
 			d.SetId("")
 			return nil
 		}
@@ -240,12 +240,15 @@ func resourceAliyunSecurityGroupRuleDelete(d *schema.ResourceData, meta interfac
 		err := deleteSecurityGroupRule(d, meta)
 
 		if err != nil {
+			if NotFoundError(err) || IsExceptedError(err, InvalidSecurityGroupIdNotFound) {
+				return nil
+			}
 			resource.RetryableError(fmt.Errorf("Security group rule in use - trying again while it is deleted."))
 		}
 
 		_, err = client.DescribeSecurityGroupRule(parts[0], parts[1], parts[2], parts[3], parts[4], parts[5], policy, priority)
 		if err != nil {
-			if IsExceptedError(err, InvalidSecurityGroupIdNotFound) {
+			if NotFoundError(err) || IsExceptedError(err, InvalidSecurityGroupIdNotFound) {
 				return nil
 			}
 			return resource.NonRetryableError(err)

alicloud/resource_alicloud_slb.go

@@ -236,12 +236,16 @@ func resourceAliyunSlbCreate(d *schema.ResourceData, meta interface{}) error {
 	if v, ok := d.GetOk("vswitch_id"); ok {
 		slbArgs.VSwitchId = v.(string)
 	}
-	slb, err := slbconn.CreateLoadBalancer(slbArgs)
+	lb, err := slbconn.CreateLoadBalancer(slbArgs)
 	if err != nil {
 		return err
 	}
 
-	d.SetId(slb.LoadBalancerId)
+	d.SetId(lb.LoadBalancerId)
+
+	if err := slbconn.WaitForLoadBalancerAsyn(lb.LoadBalancerId, slb.ActiveStatus, defaultTimeout); err != nil {
+		return fmt.Errorf("WaitForListener %s got error: %#v", slb.ActiveStatus, err)
+	}
 
 	return resourceAliyunSlbUpdate(d, meta)
 }

alicloud/resource_alicloud_slb_test.go

@@ -130,42 +130,6 @@ func testAccCheckSlbExists(n string, slb *slb.LoadBalancerType) resource.TestChe
 	}
 }
 
-func testAccCheckListenersExists(n string, slb *slb.LoadBalancerType, p string) resource.TestCheckFunc {
-	return func(s *terraform.State) error {
-		rs, ok := s.RootModule().Resources[n]
-		if !ok {
-			return fmt.Errorf("Not found: %s", n)
-		}
-
-		if rs.Primary.ID == "" {
-			return fmt.Errorf("No SLB ID is set")
-		}
-
-		client := testAccProvider.Meta().(*AliyunClient)
-		instance, err := client.DescribeLoadBalancerAttribute(rs.Primary.ID)
-
-		if err != nil {
-			return err
-		}
-		if instance == nil {
-			return fmt.Errorf("SLB not found")
-		}
-
-		exist := false
-		for _, listener := range instance.ListenerPortsAndProtocol.ListenerPortAndProtocol {
-			if listener.ListenerProtocol == p {
-				exist = true
-				break
-			}
-		}
-
-		if !exist {
-			return fmt.Errorf("The %s protocol Listener not found.", p)
-		}
-		return nil
-	}
-}
-
 func testAccCheckSlbDestroy(s *terraform.State) error {
 	client := testAccProvider.Meta().(*AliyunClient)