Update tests

outscale-toa · Dec 11, 2023 · e4751de · e4751de
1 parent 13691c7
commit e4751de
Show file tree

Hide file tree

Showing 12 changed files with 56 additions and 4 deletions.
diff --git a/outscale/resource_outscale_security_group_rule_test.go b/outscale/resource_outscale_security_group_rule_test.go
@@ -50,6 +50,22 @@ func TestAccOthers_SecurityGroupRule_basic(t *testing.T) {
 	}
 }
 
+func TestAccNet_AddSecurityGroupRuleMembersWithSgName(t *testing.T) {
+
+	rInt := acctest.RandInt()
+	accountID := os.Getenv("OUTSCALE_ACCOUNT")
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:  func() { testAccPreCheck(t) },
+		Providers: testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccAddSecurityGroupRuleMembersWithSgName(rInt, accountID),
+			},
+		},
+	})
+}
+
 func TestAccOthers_SecurityGroupRule_withSecurityGroupMember(t *testing.T) {
 	t.Parallel()
 	rInt := acctest.RandInt()
@@ -296,3 +312,31 @@ func testAccOutscaleOAPISecurityGroupRuleWithGroupMembers(rInt int, accountID st
 		}
 	`, accountID, rInt)
 }
+
+func testAccAddSecurityGroupRuleMembersWithSgName(rInt int, accountID string) string {
+	return fmt.Sprintf(`
+
+resource "outscale_net" "netSgtest" {
+    ip_range = "10.0.0.0/16"
+}
+
+resource "outscale_security_group" "security_group" {
+    description         = "testing security group"
+    security_group_name = "terraform-test_%[2]d"
+    net_id              = outscale_net.netSgtest.net_id
+}
+resource "outscale_security_group_rule" "rule_group" {
+    security_group_id = outscale_security_group.security_group.security_group_id
+    flow              = "Inbound"
+    rules {
+        from_port_range   = 22
+        to_port_range     = 22
+        ip_protocol       = "tcp"
+        security_groups_members {
+            account_id          = "%[1]s"
+            security_group_name = outscale_security_group.security_group.security_group_name
+        }
+    }
+}
+	`, accountID, rInt)
+}
diff --git a/...oapi/data/nets/TF-110_nic_resource_attributes_ok/step2.nic_resource_attributes_update.ref b/...oapi/data/nets/TF-110_nic_resource_attributes_ok/step2.nic_resource_attributes_update.ref
@@ -95,6 +95,7 @@
                     "sensitive_attributes": [],
                     "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6NjAwMDAwMDAwMDAwfX0=",
                     "dependencies": [
+                        "outscale_net.outscale_net",
                         "outscale_security_group.outscale_sg",
                         "outscale_subnet.outscale_subnet"
                     ]

diff --git a/...ets/TF-125_security_group_datasource_attributes_ok/step2.security_group_datasource_ok.ref b/...ets/TF-125_security_group_datasource_attributes_ok/step2.security_group_datasource_ok.ref
@@ -212,6 +212,7 @@
                     "sensitive_attributes": [],
                     "private": "bnVsbA==",
                     "dependencies": [
+                        "outscale_net.outscale_net",
                         "outscale_security_group.outscale_security_group"
                     ]
                 }

diff --git a/...ets/TF-125_security_group_datasource_attributes_ok/step3.security_group_datasource_ok.ref b/...ets/TF-125_security_group_datasource_attributes_ok/step3.security_group_datasource_ok.ref
@@ -224,6 +224,7 @@
                     "sensitive_attributes": [],
                     "private": "bnVsbA==",
                     "dependencies": [
+                        "outscale_net.outscale_net",
                         "outscale_security_group.outscale_security_group",
                         "outscale_security_group.outscale_security_group2"
                     ]

diff --git a/...ets/TF-125_security_group_datasource_attributes_ok/step4.security_group_datasource_ok.ref b/...ets/TF-125_security_group_datasource_attributes_ok/step4.security_group_datasource_ok.ref
@@ -230,6 +230,7 @@
                     "sensitive_attributes": [],
                     "private": "bnVsbA==",
                     "dependencies": [
+                        "outscale_net.outscale_net",
                         "outscale_security_group.outscale_security_group",
                         "outscale_security_group.outscale_security_group2"
                     ]

diff --git a/..._security_group_rule_resource_attributes_2_ok/step1.security_group_rule_resource_2_ok.ref b/..._security_group_rule_resource_attributes_2_ok/step1.security_group_rule_resource_2_ok.ref
@@ -191,8 +191,8 @@
                                 "security_groups_members": [
                                     {
                                         "account_id": "##id-2##",
-                                        "security_group_id": "##id-4##",
-                                        "security_group_name": ""
+                                        "security_group_id": "",
+                                        "security_group_name": "sg2-terraform-test"
                                     }
                                 ],
                                 "service_ids": null,

diff --git a/...8_security_group_rule_resource_attributes_2_ok/step1.security_group_rule_resource_2_ok.tf b/...8_security_group_rule_resource_attributes_2_ok/step1.security_group_rule_resource_2_ok.tf
@@ -50,7 +50,7 @@ resource "outscale_security_group_rule" "outscale_security_group_rule-3_2" {
      ip_protocol       = "tcp"
       security_groups_members {
            account_id         = outscale_security_group.outscale_security_group2.account_id
-           security_group_id  = outscale_security_group.outscale_security_group2.id
+           security_group_name  = outscale_security_group.outscale_security_group2.security_group_name
        }
      }
 depends_on = [outscale_security_group.outscale_security_group2, outscale_security_group_rule.outscale_security_group_rule-3]

diff --git a/..._security_group_rule_resource_attributes_2_ok/step2.security_group_rule_resource_2_ok.ref b/..._security_group_rule_resource_attributes_2_ok/step2.security_group_rule_resource_2_ok.ref
@@ -222,7 +222,7 @@
                                         "security_group_name": ""
                                     }
                                 ],
-                                "service_ids": [],
+                                "service_ids": null,
                                 "to_port_range": 22
                             }
                         ],

diff --git a/...s/TF-129_security_groups_datasource_attributes_ok/step2.security_groups_datasource_ok.ref b/...s/TF-129_security_groups_datasource_attributes_ok/step2.security_groups_datasource_ok.ref
@@ -212,6 +212,7 @@
                     "sensitive_attributes": [],
                     "private": "bnVsbA==",
                     "dependencies": [
+                        "outscale_net.outscale_net",
                         "outscale_security_group.outscale_security_group"
                     ]
                 }

diff --git a/...s/TF-129_security_groups_datasource_attributes_ok/step3.security_groups_datasource_ok.ref b/...s/TF-129_security_groups_datasource_attributes_ok/step3.security_groups_datasource_ok.ref
@@ -224,6 +224,7 @@
                     "sensitive_attributes": [],
                     "private": "bnVsbA==",
                     "dependencies": [
+                        "outscale_net.outscale_net",
                         "outscale_security_group.outscale_security_group",
                         "outscale_security_group.outscale_security_group2"
                     ]

diff --git a/...s/TF-129_security_groups_datasource_attributes_ok/step4.security_groups_datasource_ok.ref b/...s/TF-129_security_groups_datasource_attributes_ok/step4.security_groups_datasource_ok.ref
@@ -230,6 +230,7 @@
                     "sensitive_attributes": [],
                     "private": "bnVsbA==",
                     "dependencies": [
+                        "outscale_net.outscale_net",
                         "outscale_security_group.outscale_security_group",
                         "outscale_security_group.outscale_security_group2"
                     ]

diff --git a/..._load_balancer_update_security_groups/step2.private_load_balancer_Add_security_groups.ref b/..._load_balancer_update_security_groups/step2.private_load_balancer_Add_security_groups.ref
@@ -74,6 +74,7 @@
                     "sensitive_attributes": [],
                     "private": "bnVsbA==",
                     "dependencies": [
+                        "outscale_net.outscale_net",
                         "outscale_security_group.outscale_security_group",
                         "outscale_security_group.outscale_security_group-2",
                         "outscale_subnet.subnet-1"