Skip to content

Commit 6fa4051

Browse files
Updates to address test lint errors
1 parent 2a65337 commit 6fa4051

File tree

3 files changed

+43
-29
lines changed

3 files changed

+43
-29
lines changed
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
package provider
2+
3+
import (
4+
"fmt"
5+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
6+
"regexp"
7+
"testing"
8+
)
9+
10+
func TestAccDataSourceRedisCloudAclRule_ForDefaultRule(t *testing.T) {
11+
12+
testAccRequiresEnvVar(t, "EXECUTE_TESTS")
13+
14+
// This rule already exists
15+
const testName = "Read-Write"
16+
const testRule = "+@all -@dangerous ~*"
17+
getRuleTerraform := fmt.Sprintf(getDefaultDatasourceAclRuleDataSource, testName)
18+
19+
const AclRuleTest = "data.rediscloud_acl_rule.test"
20+
resource.ParallelTest(t, resource.TestCase{
21+
PreCheck: func() { testAccPreCheck(t) },
22+
ProviderFactories: providerFactories,
23+
CheckDestroy: nil, // test doesn't create a resource, so don't need to check anything
24+
Steps: []resource.TestStep{
25+
{
26+
Config: getRuleTerraform,
27+
Check: resource.ComposeAggregateTestCheckFunc(
28+
resource.TestMatchResourceAttr(
29+
AclRuleTest, "id", regexp.MustCompile("^\\d*$")),
30+
resource.TestCheckResourceAttr(AclRuleTest, "name", testName),
31+
resource.TestCheckResourceAttr(AclRuleTest, "rule", testRule),
32+
),
33+
},
34+
},
35+
})
36+
}
37+
38+
const getDefaultDatasourceAclRuleDataSource = `
39+
data "rediscloud_acl_rule" "test" {
40+
name = "%s"
41+
}
42+
`

provider/rediscloud_acl_rule_test.go renamed to provider/resource_rediscloud_acl_rule_test.go

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -12,34 +12,6 @@ import (
1212
"testing"
1313
)
1414

15-
func TestAccDataSourceRedisCloudAclRule_ForDefaultRule(t *testing.T) {
16-
17-
testAccRequiresEnvVar(t, "EXECUTE_TESTS")
18-
19-
// This rule already exists
20-
const testName = "Read-Write"
21-
const testRule = "+@all -@dangerous ~*"
22-
getRuleTerraform := fmt.Sprintf(getDefaultAclRuleDataSource, testName)
23-
24-
const AclRuleTest = "data.rediscloud_acl_rule.test"
25-
resource.ParallelTest(t, resource.TestCase{
26-
PreCheck: func() { testAccPreCheck(t) },
27-
ProviderFactories: providerFactories,
28-
CheckDestroy: nil, // test doesn't create a resource, so don't need to check anything
29-
Steps: []resource.TestStep{
30-
{
31-
Config: getRuleTerraform,
32-
Check: resource.ComposeAggregateTestCheckFunc(
33-
resource.TestMatchResourceAttr(
34-
AclRuleTest, "id", regexp.MustCompile("^\\d*$")),
35-
resource.TestCheckResourceAttr(AclRuleTest, "name", testName),
36-
resource.TestCheckResourceAttr(AclRuleTest, "rule", testRule),
37-
),
38-
},
39-
},
40-
})
41-
}
42-
4315
func TestAccResourceRedisCloudAclRule_CRUDI(t *testing.T) {
4416

4517
testAccRequiresEnvVar(t, "EXECUTE_TESTS")

provider/resource_rediscloud_pro_tls_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ func TestAccResourceRedisCloudSubscriptionTls_createWithDatabaseWithEnabledTlsAn
229229
}
230230

231231
// enable_tls=false, client_ssl_certificate=<invalid>
232-
func TestAccResourceRedisCloudSubscription_createWithDatabaseAndDisabledTlsAndInvalidCert(t *testing.T) {
232+
func TestAccResourceRedisCloudSubscriptionTls_createWithDatabaseAndDisabledTlsAndInvalidCert(t *testing.T) {
233233

234234
testAccRequiresEnvVar(t, "EXECUTE_TEST_SUBSCRIPTION")
235235

0 commit comments

Comments
 (0)