Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Redis API to v2024-11-01 #28696

Merged
merged 2 commits into from
Feb 26, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions internal/clients/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import (
fluidrelay_2022_05_26 "github.com/hashicorp/go-azure-sdk/resource-manager/fluidrelay/2022-05-26"
hdinsight_v2021_06_01 "github.com/hashicorp/go-azure-sdk/resource-manager/hdinsight/2021-06-01"
nginx_2024_11_01_preview "github.com/hashicorp/go-azure-sdk/resource-manager/nginx/2024-11-01-preview"
redis_2024_03_01 "github.com/hashicorp/go-azure-sdk/resource-manager/redis/2024-03-01"
servicenetworking_2023_11_01 "github.com/hashicorp/go-azure-sdk/resource-manager/servicenetworking/2023-11-01"
storagecache_2023_05_01 "github.com/hashicorp/go-azure-sdk/resource-manager/storagecache/2023-05-01"
systemcentervirtualmachinemanager_2023_10_07 "github.com/hashicorp/go-azure-sdk/resource-manager/systemcentervirtualmachinemanager/2023-10-07"
Expand Down Expand Up @@ -257,7 +256,7 @@ type Client struct {
Purview *purview.Client
RecoveryServices *recoveryServices.Client
RedHatOpenShift *redhatopenshift.Client
Redis *redis_2024_03_01.Client
Redis *redis.Client
RedisEnterprise *redisenterprise.Client
Relay *relay.Client
Resource *resource.Client
Expand Down
37 changes: 30 additions & 7 deletions internal/services/redis/client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,40 @@ package client
import (
"fmt"

redis_2023_08_01 "github.com/hashicorp/go-azure-sdk/resource-manager/redis/2024-03-01"
"github.com/hashicorp/go-azure-sdk/sdk/client/resourcemanager"
"github.com/hashicorp/go-azure-sdk/resource-manager/redis/2024-11-01/firewallrules"
"github.com/hashicorp/go-azure-sdk/resource-manager/redis/2024-11-01/patchschedules"
"github.com/hashicorp/go-azure-sdk/resource-manager/redis/2024-11-01/redis"
"github.com/hashicorp/terraform-provider-azurerm/internal/common"
)

func NewClient(o *common.ClientOptions) (*redis_2023_08_01.Client, error) {
client, err := redis_2023_08_01.NewClientWithBaseURI(o.Environment.ResourceManager, func(c *resourcemanager.Client) {
c.Authorizer = o.Authorizers.ResourceManager
})
type Client struct {
Redis *redis.RedisClient
FirewallRules *firewallrules.FirewallRulesClient
PatchSchedules *patchschedules.PatchSchedulesClient
}

func NewClient(o *common.ClientOptions) (*Client, error) {
redisClient, err := redis.NewRedisClientWithBaseURI(o.Environment.ResourceManager)
if err != nil {
return nil, fmt.Errorf("building clients for Redis: %+v", err)
}
o.Configure(redisClient.Client, o.Authorizers.ResourceManager)

fireWallRulesClient, err := firewallrules.NewFirewallRulesClientWithBaseURI(o.Environment.ResourceManager)
if err != nil {
return nil, fmt.Errorf("building clients for Redis: %+v", err)
}
return client, nil
o.Configure(fireWallRulesClient.Client, o.Authorizers.ResourceManager)

patchSchedulesClient, err := patchschedules.NewPatchSchedulesClientWithBaseURI(o.Environment.ResourceManager)
if err != nil {
return nil, fmt.Errorf("building clients for Redis: %+v", err)
}
o.Configure(patchSchedulesClient.Client, o.Authorizers.ResourceManager)

return &Client{
Redis: redisClient,
FirewallRules: fireWallRulesClient,
PatchSchedules: patchSchedulesClient,
}, nil
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"time"

"github.com/hashicorp/go-azure-helpers/lang/response"
"github.com/hashicorp/go-azure-sdk/resource-manager/redis/2024-03-01/redis"
"github.com/hashicorp/go-azure-sdk/resource-manager/redis/2024-11-01/redis"
"github.com/hashicorp/terraform-provider-azurerm/internal/locks"
"github.com/hashicorp/terraform-provider-azurerm/internal/sdk"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"fmt"
"testing"

"github.com/hashicorp/go-azure-sdk/resource-manager/redis/2024-03-01/redis"
"github.com/hashicorp/go-azure-sdk/resource-manager/redis/2024-11-01/redis"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"time"

"github.com/hashicorp/go-azure-helpers/lang/response"
"github.com/hashicorp/go-azure-sdk/resource-manager/redis/2024-03-01/redis"
"github.com/hashicorp/go-azure-sdk/resource-manager/redis/2024-11-01/redis"
"github.com/hashicorp/terraform-provider-azurerm/internal/locks"
"github.com/hashicorp/terraform-provider-azurerm/internal/sdk"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"fmt"
"testing"

"github.com/hashicorp/go-azure-sdk/resource-manager/redis/2024-03-01/redis"
"github.com/hashicorp/go-azure-sdk/resource-manager/redis/2024-11-01/redis"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
Expand Down
4 changes: 2 additions & 2 deletions internal/services/redis/redis_cache_data_source.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (
"github.com/hashicorp/go-azure-helpers/resourcemanager/location"
"github.com/hashicorp/go-azure-helpers/resourcemanager/tags"
"github.com/hashicorp/go-azure-helpers/resourcemanager/zones"
"github.com/hashicorp/go-azure-sdk/resource-manager/redis/2024-03-01/patchschedules"
"github.com/hashicorp/go-azure-sdk/resource-manager/redis/2024-03-01/redis"
"github.com/hashicorp/go-azure-sdk/resource-manager/redis/2024-11-01/patchschedules"
"github.com/hashicorp/go-azure-sdk/resource-manager/redis/2024-11-01/redis"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
"github.com/hashicorp/terraform-provider-azurerm/internal/timeouts"
Expand Down
4 changes: 2 additions & 2 deletions internal/services/redis/redis_cache_resource.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (
"github.com/hashicorp/go-azure-helpers/resourcemanager/location"
"github.com/hashicorp/go-azure-helpers/resourcemanager/tags"
"github.com/hashicorp/go-azure-helpers/resourcemanager/zones"
"github.com/hashicorp/go-azure-sdk/resource-manager/redis/2024-03-01/patchschedules"
"github.com/hashicorp/go-azure-sdk/resource-manager/redis/2024-03-01/redis"
"github.com/hashicorp/go-azure-sdk/resource-manager/redis/2024-11-01/patchschedules"
"github.com/hashicorp/go-azure-sdk/resource-manager/redis/2024-11-01/redis"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
azValidate "github.com/hashicorp/terraform-provider-azurerm/helpers/validate"
Expand Down
2 changes: 1 addition & 1 deletion internal/services/redis/redis_cache_resource_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"fmt"
"testing"

"github.com/hashicorp/go-azure-sdk/resource-manager/redis/2024-03-01/redis"
"github.com/hashicorp/go-azure-sdk/resource-manager/redis/2024-11-01/redis"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
Expand Down
2 changes: 1 addition & 1 deletion internal/services/redis/redis_firewall_rule_resource.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

"github.com/hashicorp/go-azure-helpers/lang/response"
"github.com/hashicorp/go-azure-helpers/resourcemanager/commonschema"
"github.com/hashicorp/go-azure-sdk/resource-manager/redis/2024-03-01/firewallrules"
"github.com/hashicorp/go-azure-sdk/resource-manager/redis/2024-11-01/firewallrules"
"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
"github.com/hashicorp/terraform-provider-azurerm/internal/services/redis/migration"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"fmt"
"testing"

"github.com/hashicorp/go-azure-sdk/resource-manager/redis/2024-03-01/firewallrules"
"github.com/hashicorp/go-azure-sdk/resource-manager/redis/2024-11-01/firewallrules"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
Expand Down
2 changes: 1 addition & 1 deletion internal/services/redis/redis_linked_server_resource.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/hashicorp/go-azure-helpers/lang/response"
"github.com/hashicorp/go-azure-helpers/resourcemanager/commonschema"
"github.com/hashicorp/go-azure-helpers/resourcemanager/location"
"github.com/hashicorp/go-azure-sdk/resource-manager/redis/2024-03-01/redis"
"github.com/hashicorp/go-azure-sdk/resource-manager/redis/2024-11-01/redis"
"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
"github.com/hashicorp/terraform-provider-azurerm/internal/services/redis/migration"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"fmt"
"testing"

"github.com/hashicorp/go-azure-sdk/resource-manager/redis/2024-03-01/redis"
"github.com/hashicorp/go-azure-sdk/resource-manager/redis/2024-11-01/redis"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
Expand Down

This file was deleted.

Loading
Loading