fix: pgsql - add security group (#1414)

* fix: pgsql - add security group

* fix: pg - testcase ref sg_id

* fix: pgsql - network status error

Author: Kagashino

tencentcloud/commom_test.go

@@ -77,6 +77,30 @@ func TestIsContains(t *testing.T) {
 	}
 }
 
+func TestMatchAny(t *testing.T) {
+	assert.False(t, MatchAny(1))
+	assert.True(t, MatchAny(1, 1, 2, 3))
+	assert.False(t, MatchAny(1, 4, 5, 6))
+	assert.True(t, MatchAny("a", "b", "c", "a", "aa"))
+
+	one := 1
+	two := 2
+	var ptrOne *int
+	var nilVal *string
+
+	ptrOne = &one
+	assert.True(t, MatchAny(ptrOne, &one, two))
+
+	assert.False(t, MatchAny(ptrOne, 5, 6, 7))
+	assert.False(t, MatchAny(nilVal, nil))
+
+	var oneI64 int64 = 1
+	var oneUI64 uint64 = 1
+
+	assert.False(t, MatchAny(oneI64, 2, 1, 3))
+	assert.False(t, MatchAny(oneUI64, 1))
+}
+
 func TestGetListIncrement(t *testing.T) {
 	var (
 		old1      = []int{1, 2, 2, 3, 5}

tencentcloud/common.go

@@ -299,6 +299,23 @@ func IsContains(array interface{}, value interface{}) bool {
 	}
 }
 
+func MatchAny(value interface{}, matches ...interface{}) bool {
+	rVal := reflect.ValueOf(value)
+	kind := rVal.Kind()
+	if kind == reflect.Ptr || kind == reflect.Interface {
+		if rVal.IsNil() {
+			return false
+		}
+	}
+	for i := range matches {
+		match := matches[i]
+		if reflect.DeepEqual(value, match) {
+			return true
+		}
+	}
+	return false
+}
+
 func FindIntListIndex(list []int, elem int) int {
 	for i, v := range list {
 		if v == elem {

tencentcloud/resource_tc_postgresql_instance_test.go

@@ -168,7 +168,7 @@ func TestAccTencentCloudPostgresqlInstanceResource(t *testing.T) {
 	})
 }
 
-func TestAccTencentCloudPostgresqlMAZInstanceResource(t *testing.T) {
+func TestAccTencentCloudPostgresqlInstanceResource_MAZ(t *testing.T) {
 	t.Parallel()
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
@@ -255,7 +255,7 @@ func testAccCheckPostgresqlInstanceExists(n string) resource.TestCheckFunc {
 	}
 }
 
-const testAccPostgresqlInstanceBasic = `
+const testAccPostgresqlInstanceBasic = defaultSecurityGroupData + `
 data "tencentcloud_availability_zones_by_product" "zone" {
   product = "postgres"
 }
@@ -270,6 +270,7 @@ resource "tencentcloud_postgresql_instance" "test" {
   subnet_id 		= local.subnet_id
   engine_version	= "10.4"
   root_password	    = "t1qaA2k1wgvfa3?ZZZ"
+  security_groups   = [local.sg_id]
   charset			= "LATIN1"
   project_id 		= 0
   memory 			= 4
@@ -300,6 +301,7 @@ resource "tencentcloud_postgresql_instance" "test" {
   charset 			= "LATIN1"
   project_id 		= 0
   public_access_switch = true
+  security_groups   = [local.sg_id]
   memory 			= 4
   storage 			= 250
   backup_plan {
@@ -327,6 +329,7 @@ resource "tencentcloud_postgresql_instance" "test" {
   charset 			= "LATIN1"
   project_id 		= 0
   public_access_switch = false
+  security_groups   = [local.sg_id]
   memory 			= 4
   storage 			= 250
   backup_plan {

tencentcloud/service_tencentcloud_postgresql.go

@@ -277,21 +277,21 @@ func (me *PostgresqlService) ModifyPublicService(ctx context.Context, openIntern
 				return resource.NonRetryableError(fmt.Errorf("illegal net info of postgresql instance %s", instanceId))
 			}
 			for _, v := range instance.DBInstanceNetInfo {
-				if *v.NetType == "public" {
-					if *v.Status == "opened" || *v.Status == "1" {
-						return nil
-					}
-					if *v.Status == "opening" || *v.Status == "initing" || *v.Status == "3" || *v.Status == "0" {
-						startProgressRetries = 0
-						return resource.RetryableError(fmt.Errorf("status %s, postgresql instance %s waiting", *v.Status, instanceId))
-					}
-					if startProgressRetries > 0 && *v.Status == "closed" {
-						startProgressRetries -= 1
-						return resource.RetryableError(fmt.Errorf("status still closed, retry remaining count: %d", startProgressRetries))
-					}
-					return resource.NonRetryableError(fmt.Errorf("status %s, postgresql instance %s open public service fail", *v.Status, instanceId))
-
+				if *v.NetType != "public" {
+					continue
+				}
+				if MatchAny(*v.Status, "opened", "2") {
+					return nil
+				}
+				if MatchAny(*v.Status, "opening", "4") {
+					startProgressRetries = 0
+					return resource.RetryableError(fmt.Errorf("status %s, postgresql instance %s waiting", *v.Status, instanceId))
+				}
+				if startProgressRetries > 0 && MatchAny(*v.Status, "closed", "initing") {
+					startProgressRetries -= 1
+					return resource.RetryableError(fmt.Errorf("status still closed, retry remaining count: %d", startProgressRetries))
 				}
+				return resource.NonRetryableError(fmt.Errorf("status %s, postgresql instance %s open public service fail", *v.Status, instanceId))
 			}
 			// there is no public service yet
 			return resource.RetryableError(fmt.Errorf("cannot find public status, postgresql instance %s watiting", instanceId))
@@ -335,19 +335,20 @@ func (me *PostgresqlService) ModifyPublicService(ctx context.Context, openIntern
 				return resource.NonRetryableError(fmt.Errorf("illegal net info of postgresql instance %s", instanceId))
 			}
 			for _, v := range instance.DBInstanceNetInfo {
-				if *v.NetType == "public" {
-					if *v.Status == "closed" || *v.Status == "2" {
-						return nil
-					}
-					if *v.Status == "closing" || *v.Status == "4" {
-						return resource.RetryableError(fmt.Errorf("status %s, postgresql instance %s waiting", *v.Status, instanceId))
-					}
-					if startProgressRetries > 0 && *v.Status == "opened" {
-						startProgressRetries -= 1
-						return resource.RetryableError(fmt.Errorf("status still opened, retry remaining count: %d", startProgressRetries))
-					}
-					return resource.NonRetryableError(fmt.Errorf("status %s, postgresql instance %s open public service fail", *v.Status, instanceId))
+				if *v.NetType != "public" {
+					continue
+				}
+				if MatchAny(*v.Status, "closed", "3", "initing", "1") {
+					return nil
+				}
+				if MatchAny(*v.Status, "closing", "4") {
+					return resource.RetryableError(fmt.Errorf("status %s, postgresql instance %s waiting", *v.Status, instanceId))
+				}
+				if startProgressRetries > 0 && *v.Status == "opened" {
+					startProgressRetries -= 1
+					return resource.RetryableError(fmt.Errorf("status still opened, retry remaining count: %d", startProgressRetries))
 				}
+				return resource.NonRetryableError(fmt.Errorf("status %s, postgresql instance %s open public service fail", *v.Status, instanceId))
 			}
 			return nil
 		})