Skip to content

Commit f0a4872

Browse files
burythehammerburythehammer
committed
test: fix tests
1 parent c11fe97 commit f0a4872

File tree

2 files changed

+75
-80
lines changed

2 files changed

+75
-80
lines changed

‎provider/privatelink/testdata/testPrivateLink.tf‎

Lines changed: 64 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,67 @@
1-
# locals {
2-
# rediscloud_subscription_name = "%s"
3-
# rediscloud_cloud_account = "%s"
4-
# rediscloud_private_link_share_name = "%s"
5-
# rediscloud_principal_1 = "%s"
6-
# rediscloud_principal_2 = "%s"
7-
# }
8-
#
9-
# data "rediscloud_payment_method" "card" {
10-
# card_type = "Visa"
11-
# last_four_numbers = "5556"
12-
# }
13-
#
14-
# data "rediscloud_cloud_account" "account" {
15-
# exclude_internal_account = true
16-
# provider_type = "AWS"
17-
# name = local.rediscloud_cloud_account
18-
# }
19-
#
20-
# resource "rediscloud_subscription" "subscription" {
21-
# name = local.rediscloud_subscription_name
22-
# payment_method_id = data.rediscloud_payment_method.card.id
23-
#
24-
# cloud_provider {
25-
# provider = data.rediscloud_cloud_account.account.provider_type
26-
# cloud_account_id = data.rediscloud_cloud_account.account.id
27-
# region {
28-
# region = "eu-west-1"
29-
# networking_deployment_cidr = "10.0.0.0/24"
30-
# preferred_availability_zones = ["eu-west-1a"]
31-
# }
32-
# }
33-
#
34-
# creation_plan {
35-
# dataset_size_in_gb = 15
36-
# quantity = 1
37-
# replication = true
38-
# throughput_measurement_by = "operations-per-second"
39-
# throughput_measurement_value = 20000
40-
# }
41-
# }
42-
#
43-
# resource "rediscloud_private_link" "private_link" {
44-
# subscription_id = rediscloud_subscription.subscription.id
45-
# share_name = local.rediscloud_private_link_share_name
46-
#
47-
# principal {
48-
# principal = local.rediscloud_principal_1
49-
# principal_type = "aws_account"
50-
# principal_alias = "terraform test aws account"
51-
# }
52-
#
53-
# principal {
54-
# principal = local.rediscloud_principal_2
55-
# principal_type = "aws_account"
56-
# principal_alias = "terraform test aws account 2"
57-
# }
58-
# }
59-
#
60-
# data "rediscloud_private_link" "private_link" {
61-
# subscription_id = rediscloud_private_link.private_link.subscription_id
62-
# }
63-
#
1+
locals {
2+
rediscloud_subscription_name = "%s"
3+
rediscloud_cloud_account = "%s"
4+
rediscloud_private_link_share_name = "%s"
5+
rediscloud_principal_1 = "%s"
6+
rediscloud_principal_2 = "%s"
7+
}
8+
9+
data "rediscloud_payment_method" "card" {
10+
card_type = "Visa"
11+
last_four_numbers = "5556"
12+
}
13+
14+
data "rediscloud_cloud_account" "account" {
15+
exclude_internal_account = true
16+
provider_type = "AWS"
17+
name = local.rediscloud_cloud_account
18+
}
19+
20+
resource "rediscloud_subscription" "pro_subscription" {
21+
name = local.rediscloud_subscription_name
22+
payment_method_id = data.rediscloud_payment_method.card.id
23+
24+
cloud_provider {
25+
provider = data.rediscloud_cloud_account.account.provider_type
26+
cloud_account_id = data.rediscloud_cloud_account.account.id
27+
region {
28+
region = "eu-west-1"
29+
networking_deployment_cidr = "10.0.0.0/24"
30+
preferred_availability_zones = ["eu-west-1a"]
31+
}
32+
}
33+
34+
creation_plan {
35+
dataset_size_in_gb = 15
36+
quantity = 1
37+
replication = true
38+
throughput_measurement_by = "operations-per-second"
39+
throughput_measurement_value = 20000
40+
}
41+
}
42+
43+
resource "rediscloud_private_link" "pro_private_link" {
44+
subscription_id = rediscloud_subscription.pro_subscription.id
45+
share_name = local.rediscloud_private_link_share_name
46+
47+
principal {
48+
principal = local.rediscloud_principal_1
49+
principal_type = "aws_account"
50+
principal_alias = "terraform test aws account"
51+
}
52+
53+
principal {
54+
principal = local.rediscloud_principal_2
55+
principal_type = "aws_account"
56+
principal_alias = "terraform test aws account 2"
57+
}
58+
}
59+
60+
data "rediscloud_private_link" "pro_private_link" {
61+
subscription_id = rediscloud_private_link.pro_private_link.subscription_id
62+
}
63+
64+
# not working yet
6465
# data "rediscloud_private_link_endpoint_script" "endpoint_script" {
6566
# subscription_id = rediscloud_private_link.private_link.subscription_id
6667
# }
@@ -70,10 +71,3 @@
7071
# }
7172

7273

73-
data "rediscloud_private_link_endpoint_script" "endpoint_script" {
74-
subscription_id = 122536
75-
}
76-
77-
output "endpoint_script" {
78-
value = data.rediscloud_private_link_endpoint_script.endpoint_script
79-
}

‎provider/rediscloud_private_link_test.go‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,20 @@ func TestAccResourceRedisCloudPrivateLink_CRUDI(t *testing.T) {
3232
{
3333
Config: terraformConfig,
3434
Check: resource.ComposeAggregateTestCheckFunc(
35-
//resource.TestCheckResourceAttrSet(resourceName, "id"),
36-
//resource.TestCheckResourceAttrSet(resourceName, "subscription_id"),
37-
//resource.TestCheckResourceAttrSet(resourceName, "share_name"),
38-
//resource.TestCheckResourceAttrSet(resourceName, "principal"),
39-
//resource.TestCheckResourceAttrSet(resourceName, "resource_configuration_id"),
40-
//resource.TestCheckResourceAttrSet(resourceName, "resource_configuration_arn"),
41-
//resource.TestCheckResourceAttrSet(resourceName, "share_arn"),
42-
//resource.TestCheckResourceAttrSet(resourceName, "connections"),
43-
//resource.TestCheckResourceAttrSet(resourceName, "databases"),
35+
resource.TestCheckResourceAttrSet(resourceName, "id"),
36+
resource.TestCheckResourceAttrSet(resourceName, "subscription_id"),
37+
resource.TestCheckResourceAttrSet(resourceName, "share_name"),
38+
resource.TestCheckResourceAttr(resourceName, "principal.#", "2"),
39+
resource.TestCheckResourceAttrSet(resourceName, "resource_configuration_id"),
40+
resource.TestCheckResourceAttrSet(resourceName, "resource_configuration_arn"),
41+
resource.TestCheckResourceAttrSet(resourceName, "share_arn"),
42+
resource.TestCheckResourceAttrSet(resourceName, "connections"),
43+
resource.TestCheckResourceAttrSet(resourceName, "databases"),
4444

4545
resource.TestCheckResourceAttrSet(datasourceName, "id"),
4646
resource.TestCheckResourceAttrSet(datasourceName, "subscription_id"),
47-
resource.TestCheckResourceAttrSet(datasourceName, "principal"),
47+
resource.TestCheckResourceAttr(datasourceName, "principals.#", "2"),
48+
4849
resource.TestCheckResourceAttrSet(datasourceName, "resource_configuration_id"),
4950
resource.TestCheckResourceAttrSet(datasourceName, "resource_configuration_arn"),
5051
resource.TestCheckResourceAttrSet(datasourceName, "share_arn"),

0 commit comments

Comments
 (0)