Skip to content

Commit 213e561

Browse files
burythehammerburythehammer
committed
refactor: moving pro subscription and database into their own package
1 parent 5e94a52 commit 213e561

File tree

63 files changed

+806
-724
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+806
-724
lines changed

‎provider/datasource_rediscloud_acl_rule_test.go‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,16 @@ package provider
22

33
import (
44
"fmt"
5-
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
65
"regexp"
76
"testing"
7+
8+
"github.com/RedisLabs/terraform-provider-rediscloud/provider/utils"
9+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
810
)
911

1012
func TestAccDataSourceRedisCloudAclRule_ForDefaultRule(t *testing.T) {
1113

12-
testAccRequiresEnvVar(t, "EXECUTE_TESTS")
14+
utils.TestAccRequiresEnvVar(t, "EXECUTE_TESTS")
1315

1416
// This rule already exists
1517
const testName = "Read-Write"

‎provider/datasource_rediscloud_active_active_database.go‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@ package provider
33
import (
44
"context"
55
"fmt"
6-
"github.com/RedisLabs/terraform-provider-rediscloud/provider/client"
76

87
"github.com/RedisLabs/rediscloud-go-api/redis"
98
"github.com/RedisLabs/rediscloud-go-api/service/databases"
9+
"github.com/RedisLabs/terraform-provider-rediscloud/provider/client"
10+
"github.com/RedisLabs/terraform-provider-rediscloud/provider/pro"
11+
"github.com/RedisLabs/terraform-provider-rediscloud/provider/utils"
1012
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
1113
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1214
)
@@ -347,7 +349,7 @@ func dataSourceRedisCloudActiveActiveDatabaseRead(ctx context.Context, d *schema
347349
if err != nil {
348350
// Forgive errors here, sometimes we just can't get a latest status
349351
} else {
350-
parsedLatestBackupStatus, err := parseLatestBackupStatus(latestBackupStatus)
352+
parsedLatestBackupStatus, err := utils.ParseLatestBackupStatus(latestBackupStatus)
351353
if err != nil {
352354
return diag.FromErr(err)
353355
}
@@ -365,7 +367,7 @@ func dataSourceRedisCloudActiveActiveDatabaseRead(ctx context.Context, d *schema
365367
if err != nil {
366368
// Forgive errors here, sometimes we just can't get a latest status
367369
} else {
368-
parsedLatestImportStatus, err = parseLatestImportStatus(latestImportStatus)
370+
parsedLatestImportStatus, err = utils.ParseLatestImportStatus(latestImportStatus)
369371
if err != nil {
370372
return diag.FromErr(err)
371373
}
@@ -374,7 +376,7 @@ func dataSourceRedisCloudActiveActiveDatabaseRead(ctx context.Context, d *schema
374376
return diag.FromErr(err)
375377
}
376378

377-
if err := readTags(ctx, api, subId, dbId, d); err != nil {
379+
if err := pro.ReadTags(ctx, api, subId, dbId, d); err != nil {
378380
return diag.FromErr(err)
379381
}
380382

‎provider/datasource_rediscloud_active_active_subscription.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"github.com/RedisLabs/rediscloud-go-api/redis"
66
"github.com/RedisLabs/rediscloud-go-api/service/subscriptions"
77
"github.com/RedisLabs/terraform-provider-rediscloud/provider/client"
8+
"github.com/RedisLabs/terraform-provider-rediscloud/provider/pro"
89
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
910
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1011
"strconv"
@@ -219,15 +220,15 @@ func dataSourceRedisCloudActiveActiveSubscriptionRead(ctx context.Context, d *sc
219220
if err != nil {
220221
return diag.FromErr(err)
221222
}
222-
if err := d.Set("maintenance_windows", flattenMaintenance(m)); err != nil {
223+
if err := d.Set("maintenance_windows", pro.FlattenMaintenance(m)); err != nil {
223224
return diag.FromErr(err)
224225
}
225226

226227
pricingList, err := api.Client.Pricing.List(ctx, subId)
227228
if err != nil {
228229
return diag.FromErr(err)
229230
}
230-
if err := d.Set("pricing", flattenPricing(pricingList)); err != nil {
231+
if err := d.Set("pricing", pro.FlattenPricing(pricingList)); err != nil {
231232
return diag.FromErr(err)
232233
}
233234

‎provider/datasource_rediscloud_active_active_transit_gateway.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"github.com/RedisLabs/rediscloud-go-api/redis"
66
"github.com/RedisLabs/rediscloud-go-api/service/transit_gateway/attachments"
77
"github.com/RedisLabs/terraform-provider-rediscloud/provider/client"
8+
"github.com/RedisLabs/terraform-provider-rediscloud/provider/utils"
89
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
910
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1011
"strconv"
@@ -110,7 +111,7 @@ func dataSourceActiveActiveTransitGatewayRead(ctx context.Context, d *schema.Res
110111

111112
tgw := tgws[0]
112113
tgwId := redis.IntValue(tgw.Id)
113-
d.SetId(buildResourceId(subId, tgwId))
114+
d.SetId(utils.BuildResourceId(subId, tgwId))
114115
if err := d.Set("tgw_id", tgwId); err != nil {
115116
return diag.FromErr(err)
116117
}

‎provider/datasource_rediscloud_cloud_account_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package provider
22

33
import (
44
"fmt"
5+
"github.com/RedisLabs/terraform-provider-rediscloud/provider/utils"
56
"os"
67
"regexp"
78
"testing"
@@ -11,7 +12,7 @@ import (
1112

1213
func TestAccDataSourceRedisCloudCloudAccount_basic(t *testing.T) {
1314

14-
testAccRequiresEnvVar(t, "EXECUTE_TESTS")
15+
utils.TestAccRequiresEnvVar(t, "EXECUTE_TESTS")
1516

1617
name := os.Getenv("AWS_TEST_CLOUD_ACCOUNT_NAME")
1718

‎provider/datasource_rediscloud_data_persistence_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
package provider
22

33
import (
4+
"github.com/RedisLabs/terraform-provider-rediscloud/provider/utils"
45
"testing"
56

67
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
78
)
89

910
func TestAccDataSourceRedisCloudDataPersistence_basic(t *testing.T) {
1011

11-
testAccRequiresEnvVar(t, "EXECUTE_TESTS")
12+
utils.TestAccRequiresEnvVar(t, "EXECUTE_TESTS")
1213

1314
const dataPersistenceFoo = "data.rediscloud_data_persistence.foo"
1415
resource.ParallelTest(t, resource.TestCase{

‎provider/datasource_rediscloud_database_modules_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
package provider
22

33
import (
4+
"github.com/RedisLabs/terraform-provider-rediscloud/provider/utils"
45
"testing"
56

67
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
78
)
89

910
func TestAccDataSourceRedisCloudDatabaseModules_basic(t *testing.T) {
1011

11-
testAccRequiresEnvVar(t, "EXECUTE_TESTS")
12+
utils.TestAccRequiresEnvVar(t, "EXECUTE_TESTS")
1213

1314
resource.ParallelTest(t, resource.TestCase{
1415
PreCheck: func() { testAccPreCheck(t) },

‎provider/datasource_rediscloud_essentials_database.go‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import (
55
"github.com/RedisLabs/rediscloud-go-api/redis"
66
fixedDatabases "github.com/RedisLabs/rediscloud-go-api/service/fixed/databases"
77
"github.com/RedisLabs/terraform-provider-rediscloud/provider/client"
8+
"github.com/RedisLabs/terraform-provider-rediscloud/provider/pro"
9+
"github.com/RedisLabs/terraform-provider-rediscloud/provider/utils"
810
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
911
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1012
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
@@ -408,7 +410,7 @@ func dataSourceRedisCloudEssentialsDatabaseRead(ctx context.Context, d *schema.R
408410

409411
databaseId := redis.IntValue(db.DatabaseId)
410412

411-
d.SetId(buildResourceId(subId, databaseId))
413+
d.SetId(utils.BuildResourceId(subId, databaseId))
412414

413415
if err := d.Set("db_id", redis.IntValue(db.DatabaseId)); err != nil {
414416
return diag.FromErr(err)
@@ -483,10 +485,10 @@ func dataSourceRedisCloudEssentialsDatabaseRead(ctx context.Context, d *schema.R
483485
if err := d.Set("enable_default_user", redis.Bool(*db.Security.EnableDefaultUser)); err != nil {
484486
return diag.FromErr(err)
485487
}
486-
if err := d.Set("alert", flattenAlerts(*db.Alerts)); err != nil {
488+
if err := d.Set("alert", pro.FlattenAlerts(*db.Alerts)); err != nil {
487489
return diag.FromErr(err)
488490
}
489-
if err := d.Set("modules", flattenModules(*db.Modules)); err != nil {
491+
if err := d.Set("modules", pro.FlattenModules(*db.Modules)); err != nil {
490492
return diag.FromErr(err)
491493
}
492494

@@ -495,7 +497,7 @@ func dataSourceRedisCloudEssentialsDatabaseRead(ctx context.Context, d *schema.R
495497
if err != nil {
496498
// Forgive errors here, sometimes we just can't get a latest status
497499
} else {
498-
parsedLatestBackupStatus, err = parseLatestBackupStatus(latestBackupStatus)
500+
parsedLatestBackupStatus, err = utils.ParseLatestBackupStatus(latestBackupStatus)
499501
if err != nil {
500502
return diag.FromErr(err)
501503
}
@@ -509,7 +511,7 @@ func dataSourceRedisCloudEssentialsDatabaseRead(ctx context.Context, d *schema.R
509511
if err != nil {
510512
// Forgive errors here, sometimes we just can't get a latest status
511513
} else {
512-
parsedLatestImportStatus, err = parseLatestImportStatus(latestImportStatus)
514+
parsedLatestImportStatus, err = utils.ParseLatestImportStatus(latestImportStatus)
513515
if err != nil {
514516
return diag.FromErr(err)
515517
}
@@ -540,7 +542,7 @@ func dataSourceRedisCloudEssentialsDatabaseRead(ctx context.Context, d *schema.R
540542
if err := d.Set("enable_database_clustering", redis.BoolValue(db.Clustering.Enabled)); err != nil {
541543
return diag.FromErr(err)
542544
}
543-
if err := d.Set("regex_rules", flattenRegexRules(db.Clustering.RegexRules)); err != nil {
545+
if err := d.Set("regex_rules", pro.FlattenRegexRules(db.Clustering.RegexRules)); err != nil {
544546
return diag.FromErr(err)
545547
}
546548
}

‎provider/datasource_rediscloud_essentials_plan_test.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
package provider
22

33
import (
4+
"github.com/RedisLabs/terraform-provider-rediscloud/provider/utils"
45
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
56
"regexp"
67
"testing"
78
)
89

910
func TestAccDataSourceRedisCloudEssentialsPlan_basic(t *testing.T) {
1011

11-
testAccRequiresEnvVar(t, "EXECUTE_TESTS")
12+
utils.TestAccRequiresEnvVar(t, "EXECUTE_TESTS")
1213

1314
const basicPlan = "data.rediscloud_essentials_plan.basic"
1415

@@ -50,7 +51,7 @@ func TestAccDataSourceRedisCloudEssentialsPlan_basic(t *testing.T) {
5051

5152
func TestAccDataSourceRedisCloudEssentialsPlan_azure(t *testing.T) {
5253

53-
testAccRequiresEnvVar(t, "EXECUTE_TESTS")
54+
utils.TestAccRequiresEnvVar(t, "EXECUTE_TESTS")
5455

5556
const azurePlan = "data.rediscloud_essentials_plan.azure"
5657

@@ -92,7 +93,7 @@ func TestAccDataSourceRedisCloudEssentialsPlan_azure(t *testing.T) {
9293

9394
func TestAccDataSourceRedisCloudEssentialsPlan_subscriptionId(t *testing.T) {
9495

95-
testAccRequiresEnvVar(t, "EXECUTE_TESTS")
96+
utils.TestAccRequiresEnvVar(t, "EXECUTE_TESTS")
9697

9798
const examplePlan = "data.rediscloud_essentials_plan.example"
9899

@@ -136,7 +137,7 @@ func TestAccDataSourceRedisCloudEssentialsPlan_subscriptionId(t *testing.T) {
136137

137138
func TestAccDataSourceRedisCloudEssentialsPlan_ambiguous(t *testing.T) {
138139

139-
testAccRequiresEnvVar(t, "EXECUTE_TESTS")
140+
utils.TestAccRequiresEnvVar(t, "EXECUTE_TESTS")
140141

141142
resource.ParallelTest(t, resource.TestCase{
142143
PreCheck: func() { testAccPreCheck(t) },
@@ -153,7 +154,7 @@ func TestAccDataSourceRedisCloudEssentialsPlan_ambiguous(t *testing.T) {
153154

154155
func TestAccDataSourceRedisCloudEssentialsPlan_impossible(t *testing.T) {
155156

156-
testAccRequiresEnvVar(t, "EXECUTE_TESTS")
157+
utils.TestAccRequiresEnvVar(t, "EXECUTE_TESTS")
157158

158159
resource.ParallelTest(t, resource.TestCase{
159160
PreCheck: func() { testAccPreCheck(t) },

‎provider/datasource_rediscloud_payment_method_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
package provider
22

33
import (
4+
"github.com/RedisLabs/terraform-provider-rediscloud/provider/utils"
45
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
56
"regexp"
67
"testing"
78
)
89

910
func TestAccDataSourceRedisCloudPaymentMethod_basic(t *testing.T) {
1011

11-
testAccRequiresEnvVar(t, "EXECUTE_TESTS")
12+
utils.TestAccRequiresEnvVar(t, "EXECUTE_TESTS")
1213

1314
resource.ParallelTest(t, resource.TestCase{
1415
PreCheck: func() { testAccPreCheck(t) },

0 commit comments

Comments
 (0)