Skip to content

Commit 2619620

Browse files
burythehammerburythehammer
authored
Merge pull request #685 from RedisLabs/feat/OPCR-44-disable-modules
Redis 8 Compatibility and Support
2 parents 34e49b1 + adf29ab commit 2619620

File tree

84 files changed

+2122
-1291
lines changed

Some content is hidden

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

84 files changed

+2122
-1291
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,4 @@ CLAUDE.md
3939

4040
# Keep windows files with windows line endings
4141
*.winfile eol=crlf
42+
.claude

‎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.AccRequiresEnvVar(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: 4 additions & 3 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"
@@ -167,7 +168,7 @@ func dataSourceRedisCloudActiveActiveSubscriptionRead(ctx context.Context, d *sc
167168
})
168169
}
169170

170-
subs = filterSubscriptions(subs, filters)
171+
subs = pro.FilterSubscriptions(subs, filters)
171172

172173
if len(subs) == 0 {
173174
return diag.Errorf("Your query returned no results. Please change your search criteria and try again.")
@@ -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_subscription_regions.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"github.com/RedisLabs/rediscloud-go-api/redis"
77
"github.com/RedisLabs/rediscloud-go-api/service/subscriptions"
88
"github.com/RedisLabs/terraform-provider-rediscloud/provider/client"
9+
"github.com/RedisLabs/terraform-provider-rediscloud/provider/pro"
910
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
1011
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1112
)
@@ -107,7 +108,7 @@ func dataSourceRedisCloudActiveActiveRegionsRead(ctx context.Context, d *schema.
107108
})
108109
}
109110

110-
subs = filterSubscriptions(subs, filters)
111+
subs = pro.FilterSubscriptions(subs, filters)
111112

112113
if len(subs) == 0 {
113114
return diag.Errorf("Your query returned no results. Please change your search criteria and try again.")

‎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.AccRequiresEnvVar(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.AccRequiresEnvVar(t, "EXECUTE_TESTS")
1213

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

‎provider/datasource_rediscloud_database_modules.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010

1111
func dataSourceRedisCloudDatabaseModules() *schema.Resource {
1212
return &schema.Resource{
13-
Description: "The Database data source allows access to the details of an existing database within your Redis Enterprise Cloud account.",
13+
Description: "The Database modules data source allows access to the details of existing database modules within your Redis Enterprise Cloud account.",
1414
ReadContext: dataSourceRedisCloudDatabaseModulesRead,
1515

1616
Schema: map[string]*schema.Schema{

‎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.AccRequiresEnvVar(t, "EXECUTE_TESTS")
1213

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

0 commit comments

Comments
 (0)