Skip to content

azurerm_redis_cache - tighten validation for sku_name, family, capacity #29079

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.

Sign up for GitHub

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

Merged
wyattfry merged 11 commits into from
Mar 20, 2025
Merged

azurerm_redis_cache - tighten validation for sku_name, family, capacity #29079

Changes from 6 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8461e3c
extend SKU, family and capacity validation
wyattfry Mar 14, 2025
2555302
remove cruft and refine error msg
wyattfry Mar 14, 2025
dfd3d06
add newline
wyattfry Mar 14, 2025
f3593c2
Merge branch 'main' of https://github.com/hashicorp/terraform-provide…
wyattfry Mar 14, 2025
7eb5b42
go mod vendor
wyattfry Mar 14, 2025
2eec6cf
Merge branch 'main' of https://github.com/hashicorp/terraform-provide…
wyattfry Mar 17, 2025
389fbf3
Update internal/services/redis/redis_cache_resource.go
wyattfry Mar 17, 2025
978df2a
remove trailing whitespace
wyattfry Mar 17, 2025
b3b64f7
remove deprecated fns
wyattfry Mar 20, 2025
606a27b
cleanup
wyattfry Mar 20, 2025
10a71c1
shortern error message
wyattfry Mar 20, 2025
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
19 changes: 19 additions & 0 deletions internal/services/redis/redis_cache_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"context"
"fmt"
"log"
"slices"
"strconv"
"strings"
"time"
Expand Down Expand Up @@ -392,6 +393,24 @@ func resourceRedisCache() *pluginsdk.Resource {
return fmt.Errorf("`active_directory_authentication_enabled` must be enabled in order to disable `access_keys_authentication_enabled`")
}

return nil
}),
pluginsdk.CustomizeDiffShim(func(ctx context.Context, diff *pluginsdk.ResourceDiff, v interface{}) error {
// Replicates validation rules from Azure CLI
// https://github.com/Azure/azure-cli/blob/131634d374fe704920862a2e5b0745e61af9bc89/src/azure-cli/azure/cli/command_modules/redis/custom.py#L13
skuName := diff.Get("sku_name").(string)
family := diff.Get("family").(string)
capacity := diff.Get("capacity").(int)
validCombinations := map[string][]string{
string(redis.SkuNameBasic): {"C0", "C1", "C2", "C3", "C4", "C5", "C6"},
string(redis.SkuNameStandard): {"C0", "C1", "C2", "C3", "C4", "C5", "C6"},
string(redis.SkuNamePremium): {"P1", "P2", "P3", "P4", "P5"},
}
familyCapacity := fmt.Sprintf("%s%d", strings.ToUpper(family), capacity)
if !slices.Contains(validCombinations[skuName], familyCapacity) {
Comment on lines +403 to +410
Copy link
Collaborator

@katbyte katbyte Mar 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

whitespace is desirable here

Suggested change
capacity := diff.Get("capacity").(int)
validCombinations := map[string][]string{
string(redis.SkuNameBasic): {"C0", "C1", "C2", "C3", "C4", "C5", "C6"},
string(redis.SkuNameStandard): {"C0", "C1", "C2", "C3", "C4", "C5", "C6"},
string(redis.SkuNamePremium): {"P1", "P2", "P3", "P4", "P5"},
}
familyCapacity := fmt.Sprintf("%s%d", strings.ToUpper(family), capacity)
if !slices.Contains(validCombinations[skuName], familyCapacity) {
capacity := diff.Get("capacity").(int)
validCombinations := map[string][]string{
string(redis.SkuNameBasic): {"C0", "C1", "C2", "C3", "C4", "C5", "C6"},
string(redis.SkuNameStandard): {"C0", "C1", "C2", "C3", "C4", "C5", "C6"},
string(redis.SkuNamePremium): {"P1", "P2", "P3", "P4", "P5"},
}
familyCapacity := fmt.Sprintf("%s%d", strings.ToUpper(family), capacity)
if !slices.Contains(validCombinations[skuName], familyCapacity) {

return fmt.Errorf("invalid combination of `sku_name`, `family`, and `capacity`: '%s: %s'. Valid combinations are: %v", skuName, familyCapacity, validCombinations)
}

return nil
}),
),
Expand Down
Loading