Skip to content

Commit bbc9d59

Browse files
containers: fix local DNS override hashing
1 parent 57ff5db commit bbc9d59

3 files changed

Lines changed: 42 additions & 23 deletions

File tree

internal/services/containers/kubernetes_cluster_node_pool_resource_test.go

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4288,18 +4288,6 @@ resource "azurerm_kubernetes_cluster_node_pool" "test" {
42884288
cache_duration_in_seconds = 7200
42894289
}
42904290
4291-
vnet_dns_override {
4292-
domain = "mycustom.local"
4293-
serve_stale = "Verify"
4294-
serve_stale_duration = 3600
4295-
query_logging = "Error"
4296-
protocol = "PreferUDP"
4297-
forward_destination = "VnetDNS"
4298-
forward_policy = "RoundRobin"
4299-
max_concurrent = 2000
4300-
cache_duration_in_seconds = 7200
4301-
}
4302-
43034291
vnet_dns_override {
43044292
domain = "cluster.local"
43054293
serve_stale = "Verify"

internal/services/containers/kubernetes_nodepool.go

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -707,7 +707,6 @@ func schemaLocalDNSOverride() *pluginsdk.Schema {
707707
return &pluginsdk.Schema{
708708
Type: pluginsdk.TypeSet,
709709
Optional: true,
710-
Set: localDNSOverrideHash,
711710
Elem: &pluginsdk.Resource{
712711
Schema: map[string]*pluginsdk.Schema{
713712
"domain": {
@@ -776,16 +775,6 @@ func schemaLocalDNSOverride() *pluginsdk.Schema {
776775
}
777776
}
778777

779-
func localDNSOverrideHash(v interface{}) int {
780-
if m, ok := v.(map[string]interface{}); ok {
781-
if domain, ok := m["domain"].(string); ok {
782-
return pluginsdk.HashString(domain)
783-
}
784-
}
785-
786-
return 0
787-
}
788-
789778
func validateDefaultNodePoolLocalDNSProfileRawConfig(d *pluginsdk.ResourceDiff) error {
790779
rawConfig := d.GetRawConfig()
791780
if !localDNSRawValueCanIterate(rawConfig) {
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
// Copyright IBM Corp. 2014, 2025
2+
// SPDX-License-Identifier: MPL-2.0
3+
4+
package containers
5+
6+
import (
7+
"testing"
8+
9+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
10+
)
11+
12+
func TestSchemaLocalDNSOverrideHashIncludesSettings(t *testing.T) {
13+
localDNSOverride := schemaLocalDNSOverride()
14+
15+
localDNSOverrides := localDNSOverride.ZeroValue().(*schema.Set)
16+
localDNSOverrides.Add(map[string]interface{}{
17+
"domain": ".",
18+
"cache_duration_in_seconds": 3600,
19+
"forward_destination": "VnetDNS",
20+
"forward_policy": "Sequential",
21+
"max_concurrent": 1000,
22+
"protocol": "PreferUDP",
23+
"query_logging": "Error",
24+
"serve_stale": "Verify",
25+
"serve_stale_duration": 3600,
26+
})
27+
localDNSOverrides.Add(map[string]interface{}{
28+
"domain": ".",
29+
"cache_duration_in_seconds": 7200,
30+
"forward_destination": "VnetDNS",
31+
"forward_policy": "RoundRobin",
32+
"max_concurrent": 2000,
33+
"protocol": "PreferUDP",
34+
"query_logging": "Error",
35+
"serve_stale": "Verify",
36+
"serve_stale_duration": 3600,
37+
})
38+
39+
if localDNSOverrides.Len() != 2 {
40+
t.Fatalf("expected two local DNS override hashes, got %d", localDNSOverrides.Len())
41+
}
42+
}

0 commit comments

Comments
 (0)