Skip to content

Commit d8d4052

Browse files
arjunchauhanibmarjunchauhanibm
authored
feat(PDNS): update custom resolver profile and views. (IBM-Cloud#5625)
* feat(PDNS): update custom resolver profile and views * fix minor warnigns * add example * add documentation * change variable names * fix styling * add validator for profile * modify example * improve error message * modified docs * fix error message * incorporate review comments for documentation * add order in views and fix minor bugs * change the variable instance * changing update logic for views * modified test for linked zone * add test for custom resolver profile * add test for forwarding rule views * fix acceptance test FR * change message format * change fields to computed in data source file * incorporated doc review changes * fix go mod issues
1 parent a3d1506 commit d8d4052

23 files changed

+564
-292
lines changed

‎examples/ibm-private-dns/main.tf‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,8 @@ resource "ibm_dns_custom_resolver" "test" {
192192
name = "testCR-TF"
193193
instance_id = ibm_resource_instance.test-pdns-instance.guid
194194
description = "testdescription-CR"
195+
profile = "essential"
196+
allow_disruptive_updates = false
195197
locations {
196198
subnet_crn = "crn:v1:staging:public:is:us-south-1:a/01652b251c3ae2787110a995d8db0135::subnet:0716-6c3a997d-72b2-47f6-8788-6bd95e1bdb03"
197199
enabled = false
@@ -203,6 +205,8 @@ resource "ibm_dns_custom_resolver" "test" {
203205
description = "new test CR TF-1"
204206
high_availability = true
205207
enabled = true
208+
profile = "essential"
209+
allow_disruptive_updates = false
206210
locations {
207211
subnet_crn = "crn:v1:staging:public:is:us-south-1:a/01652b251c3ae2787110a995d8db0135::subnet:0716-a094c4e8-02cd-4b04-858d-3432"
208212
enabled = false
@@ -236,6 +240,12 @@ resource "ibm_dns_custom_resolver_forwarding_rule" "test" {
236240
type = "zone"
237241
match = "test.example.com"
238242
forward_to = ["168.20.22.122"]
243+
views {
244+
name = "view-example-name"
245+
description = "view description"
246+
expression = "ipInRange(source.ip, '10.240.0.0/24') || ipInRange(source.ip, '10.240.1.0/24')"
247+
forward_to = ["10.240.2.6","10.240.2.7"]
248+
}
239249
}
240250

241251
data "ibm_dns_custom_resolver_forwarding_rules" "test-fr" {

‎go.mod‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module github.com/IBM-Cloud/terraform-provider-ibm
22

3-
go 1.22.5
3+
go 1.23.3
44

5-
toolchain go1.23.2
5+
toolchain go1.23.4
66

77
require (
88
github.com/IBM-Cloud/bluemix-go v0.0.0-20241117121028-a3be206688b3
@@ -22,7 +22,7 @@ require (
2222
github.com/IBM/eventstreams-go-sdk v1.4.0
2323
github.com/IBM/go-sdk-core v1.1.0
2424
github.com/IBM/go-sdk-core/v3 v3.2.4
25-
github.com/IBM/go-sdk-core/v5 v5.18.3
25+
github.com/IBM/go-sdk-core/v5 v5.18.5
2626
github.com/IBM/ibm-backup-recovery-sdk-go v1.0.1
2727
github.com/IBM/ibm-cos-sdk-go v1.12.0
2828
github.com/IBM/ibm-cos-sdk-go-config/v2 v2.2.0
@@ -32,7 +32,7 @@ require (
3232
github.com/IBM/logs-go-sdk v0.4.0
3333
github.com/IBM/logs-router-go-sdk v1.0.5
3434
github.com/IBM/mqcloud-go-sdk v0.2.0
35-
github.com/IBM/networking-go-sdk v0.49.0
35+
github.com/IBM/networking-go-sdk v0.50.0
3636
github.com/IBM/platform-services-go-sdk v0.72.0
3737
github.com/IBM/project-go-sdk v0.3.5
3838
github.com/IBM/push-notifications-go-sdk v0.0.0-20210310100607-5790b96c47f5
@@ -66,7 +66,7 @@ require (
6666
github.com/rook/rook/pkg/apis v0.0.0-20231204200402-5287527732f7
6767
github.com/softlayer/softlayer-go v1.0.3
6868
github.com/stretchr/testify v1.10.0
69-
golang.org/x/crypto v0.31.0
69+
golang.org/x/crypto v0.32.0
7070
gopkg.in/yaml.v3 v3.0.1
7171
gotest.tools v2.2.0+incompatible
7272
k8s.io/api v0.31.1
@@ -102,7 +102,7 @@ require (
102102
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
103103
github.com/fatih/color v1.16.0 // indirect
104104
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
105-
github.com/gabriel-vasile/mimetype v1.4.6 // indirect
105+
github.com/gabriel-vasile/mimetype v1.4.8 // indirect
106106
github.com/go-jose/go-jose/v4 v4.0.1 // indirect
107107
github.com/go-logr/logr v1.4.2 // indirect
108108
github.com/go-logr/stdr v1.2.2 // indirect
@@ -118,7 +118,7 @@ require (
118118
github.com/go-ozzo/ozzo-validation/v4 v4.3.0 // indirect
119119
github.com/go-playground/locales v0.14.1 // indirect
120120
github.com/go-playground/universal-translator v0.18.1 // indirect
121-
github.com/go-playground/validator/v10 v10.22.1 // indirect
121+
github.com/go-playground/validator/v10 v10.23.0 // indirect
122122
github.com/go-test/deep v1.1.0 // indirect
123123
github.com/gogo/protobuf v1.3.2 // indirect
124124
github.com/golang/protobuf v1.5.4 // indirect
@@ -201,19 +201,19 @@ require (
201201
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
202202
github.com/x448/float16 v0.8.4 // indirect
203203
github.com/zclconf/go-cty v1.15.0 // indirect
204-
go.mongodb.org/mongo-driver v1.17.1 // indirect
204+
go.mongodb.org/mongo-driver v1.17.2 // indirect
205205
go.opentelemetry.io/otel v1.28.0 // indirect
206206
go.opentelemetry.io/otel/metric v1.28.0 // indirect
207207
go.opentelemetry.io/otel/trace v1.28.0 // indirect
208208
go.uber.org/atomic v1.9.0 // indirect
209209
go.uber.org/ratelimit v0.2.0 // indirect
210210
go.uber.org/zap v1.27.0 // indirect
211211
golang.org/x/mod v0.21.0 // indirect
212-
golang.org/x/net v0.32.0 // indirect
212+
golang.org/x/net v0.34.0 // indirect
213213
golang.org/x/oauth2 v0.22.0 // indirect
214214
golang.org/x/sync v0.10.0 // indirect
215-
golang.org/x/sys v0.28.0 // indirect
216-
golang.org/x/term v0.27.0 // indirect
215+
golang.org/x/sys v0.29.0 // indirect
216+
golang.org/x/term v0.28.0 // indirect
217217
golang.org/x/text v0.21.0 // indirect
218218
golang.org/x/time v0.3.0 // indirect
219219
golang.org/x/tools v0.26.0 // indirect

‎go.sum‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ github.com/IBM/go-sdk-core/v5 v5.6.3/go.mod h1:tt/B9rxLkRtglE7pvqLuYikgCXaZFL3bt
133133
github.com/IBM/go-sdk-core/v5 v5.9.5/go.mod h1:YlOwV9LeuclmT/qi/LAK2AsobbAP42veV0j68/rlZsE=
134134
github.com/IBM/go-sdk-core/v5 v5.10.2/go.mod h1:WZPFasUzsKab/2mzt29xPcfruSk5js2ywAPwW4VJjdI=
135135
github.com/IBM/go-sdk-core/v5 v5.17.4/go.mod h1:KsAAI7eStAWwQa4F96MLy+whYSh39JzNjklZRbN/8ns=
136-
github.com/IBM/go-sdk-core/v5 v5.18.3 h1:q6IDU3N2bHGwijK9pMnzKC5gqdaRII56NzB4ZNdSFvY=
137-
github.com/IBM/go-sdk-core/v5 v5.18.3/go.mod h1:5kILxqEWOrwMhoD2b7J6Xv9Z2M6YIdT/6Oy+XRSsCGQ=
136+
github.com/IBM/go-sdk-core/v5 v5.18.5 h1:g0JRl3sYXJczB/yuDlrN6x22LJ6jIxhp0Sa4ARNW60c=
137+
github.com/IBM/go-sdk-core/v5 v5.18.5/go.mod h1:KonTFRR+8ZSgw5cxBSYo6E4WZoY1+7n1kfHM82VcjFU=
138138
github.com/IBM/ibm-backup-recovery-sdk-go v1.0.1 h1:JSdt2WuiRCSKok+Jvv+x0eQP6duR1dUg6utKH0bI734=
139139
github.com/IBM/ibm-backup-recovery-sdk-go v1.0.1/go.mod h1:ezUFoHQn8MvZI5vNd3H/ds4BCDYOXDodGFrTUgsU33k=
140140
github.com/IBM/ibm-cos-sdk-go v1.12.0 h1:Wrk3ve4JS3euhl7XjNFd3RlvPT56199G2/rKaPWpRKU=
@@ -154,8 +154,8 @@ github.com/IBM/logs-router-go-sdk v1.0.5 h1:r0kC1+HfmSeQCD6zQTUp4PDI/zp4Ueo1Zo19
154154
github.com/IBM/logs-router-go-sdk v1.0.5/go.mod h1:tCN2vFgu5xG0ob9iJcxi5M4bJ6mWmu3nhmRPnvlwev0=
155155
github.com/IBM/mqcloud-go-sdk v0.2.0 h1:QOWk8ZGk0QfIL0MOGTKzNdM3Qe0Hk+ifAFtNSFQo5HU=
156156
github.com/IBM/mqcloud-go-sdk v0.2.0/go.mod h1:VZQKMtqmcdXKhmLhLiPuS/UHMs/5yo2tA/nD83cQt9E=
157-
github.com/IBM/networking-go-sdk v0.49.0 h1:lPS34u3C0JVrbxH+Ulua76Nwl6Frv8BEfq6LRkyvOv0=
158-
github.com/IBM/networking-go-sdk v0.49.0/go.mod h1:G9CKbmPE8gSLjN+ABh4hIZ1bMx076enl5Eekvj6zQnA=
157+
github.com/IBM/networking-go-sdk v0.50.0 h1:3BHO1GrFnkkZ4mYyn2nQc+Djw48/g3znJe3k4a4p1Yk=
158+
github.com/IBM/networking-go-sdk v0.50.0/go.mod h1:aDKmbdfJG+JnoV9RvxOPg7nmgTKReyBgX8aAZHolcm8=
159159
github.com/IBM/platform-services-go-sdk v0.72.0 h1:AfJe6bgqmTQU4ff/2URu3wkRLZD0XIzojn7SLf2yIns=
160160
github.com/IBM/platform-services-go-sdk v0.72.0/go.mod h1:ApFkvqw7NaluWJ5Uq+afdM/2jQqo5ILc0SzKSVobYNw=
161161
github.com/IBM/project-go-sdk v0.3.5 h1:L+YClFUa14foS0B/hOOY9n7sIdsT5/XQicnXOyJSpyM=
@@ -370,8 +370,8 @@ github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8
370370
github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E=
371371
github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ=
372372
github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk=
373-
github.com/gabriel-vasile/mimetype v1.4.6 h1:3+PzJTKLkvgjeTbts6msPJt4DixhT4YtFNf1gtGe3zc=
374-
github.com/gabriel-vasile/mimetype v1.4.6/go.mod h1:JX1qVKqZd40hUPpAfiNTe0Sne7hdfKSbOqqmkq8GCXc=
373+
github.com/gabriel-vasile/mimetype v1.4.8 h1:FfZ3gj38NjllZIeJAmMhr+qKL8Wu+nOoI3GqacKw1NM=
374+
github.com/gabriel-vasile/mimetype v1.4.8/go.mod h1:ByKUIKGjh1ODkGM1asKUbQZOLGrPjydw3hYPU2YU9t8=
375375
github.com/getkin/kin-openapi v0.76.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSyhcnluiMv+Xg=
376376
github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
377377
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
@@ -502,8 +502,8 @@ github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl
502502
github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
503503
github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
504504
github.com/go-playground/validator/v10 v10.19.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
505-
github.com/go-playground/validator/v10 v10.22.1 h1:40JcKH+bBNGFczGuoBYgX4I6m/i27HYW8P9FDk5PbgA=
506-
github.com/go-playground/validator/v10 v10.22.1/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
505+
github.com/go-playground/validator/v10 v10.23.0 h1:/PwmTwZhS0dPkav3cdK9kV1FsAmrL8sThn8IHr/sO+o=
506+
github.com/go-playground/validator/v10 v10.23.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
507507
github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
508508
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
509509
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
@@ -1270,8 +1270,8 @@ go.mongodb.org/mongo-driver v1.7.5/go.mod h1:VXEWRZ6URJIkUq2SCAyapmhH0ZLRBP+FT4x
12701270
go.mongodb.org/mongo-driver v1.10.0/go.mod h1:wsihk0Kdgv8Kqu1Anit4sfK+22vSFbUrAVEYRhCXrA8=
12711271
go.mongodb.org/mongo-driver v1.11.3/go.mod h1:PTSz5yu21bkT/wXpkS7WR5f0ddqw5quethTUn9WM+2g=
12721272
go.mongodb.org/mongo-driver v1.14.0/go.mod h1:Vzb0Mk/pa7e6cWw85R4F/endUC3u0U9jGcNU603k65c=
1273-
go.mongodb.org/mongo-driver v1.17.1 h1:Wic5cJIwJgSpBhe3lx3+/RybR5PiYRMpVFgO7cOHyIM=
1274-
go.mongodb.org/mongo-driver v1.17.1/go.mod h1:wwWm/+BuOddhcq3n68LKRmgk2wXzmF6s0SFOa0GINL4=
1273+
go.mongodb.org/mongo-driver v1.17.2 h1:gvZyk8352qSfzyZ2UMWcpDpMSGEr1eqE4T793SqyhzM=
1274+
go.mongodb.org/mongo-driver v1.17.2/go.mod h1:Hy04i7O2kC4RS06ZrhPRqj/u4DTYkFDAAccj+rVKqgQ=
12751275
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
12761276
go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
12771277
go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
@@ -1343,8 +1343,8 @@ golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDf
13431343
golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
13441344
golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
13451345
golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
1346-
golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
1347-
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
1346+
golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
1347+
golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
13481348
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
13491349
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
13501350
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -1474,8 +1474,8 @@ golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
14741474
golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
14751475
golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
14761476
golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
1477-
golang.org/x/net v0.32.0 h1:ZqPmj8Kzc+Y6e0+skZsuACbx+wzMgo5MQsJh9Qd6aYI=
1478-
golang.org/x/net v0.32.0/go.mod h1:CwU0IoeOlnQQWJ6ioyFrfRuomB8GKF6KbYXZVyeXNfs=
1477+
golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
1478+
golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
14791479
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
14801480
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
14811481
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -1638,8 +1638,8 @@ golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
16381638
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
16391639
golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
16401640
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
1641-
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
1642-
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
1641+
golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
1642+
golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
16431643
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
16441644
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
16451645
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -1660,8 +1660,8 @@ golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
16601660
golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
16611661
golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk=
16621662
golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
1663-
golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
1664-
golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
1663+
golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
1664+
golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
16651665
golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
16661666
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
16671667
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

‎ibm/provider/provider.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2034,6 +2034,7 @@ func Validator() validate.ValidatorDict {
20342034
"ibm_is_reservation": vpc.ResourceIBMISReservationValidator(),
20352035
"ibm_kms_key_rings": kms.ResourceIBMKeyRingValidator(),
20362036
"ibm_dns_glb_monitor": dnsservices.ResourceIBMPrivateDNSGLBMonitorValidator(),
2037+
"ibm_dns_custom_resolver": dnsservices.ResourceIBMPrivateDNSCustomResolverValidator(),
20372038
"ibm_dns_custom_resolver_forwarding_rule": dnsservices.ResourceIBMPrivateDNSForwardingRuleValidator(),
20382039
"ibm_schematics_action": schematics.ResourceIBMSchematicsActionValidator(),
20392040
"ibm_schematics_job": schematics.ResourceIBMSchematicsJobValidator(),

‎ibm/service/dnsservices/data_source_ibm_private_dns_custom_resolver.go‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,16 @@ func DataSourceIBMPrivateDNSCustomResolver() *schema.Resource {
5151
Type: schema.TypeString,
5252
Computed: true,
5353
},
54+
pdnsCRProfile: {
55+
Type: schema.TypeString,
56+
Computed: true,
57+
Description: "The profile name of the custom resolver.",
58+
},
59+
pdnsCRAllowDisruptiveUpdates: {
60+
Type: schema.TypeBool,
61+
Computed: true,
62+
Description: "Whether a disruptive update is allowed for the custom resolver",
63+
},
5464
pdnsCustomResolverLocations: {
5565
Type: schema.TypeList,
5666
Description: "Locations on which the custom resolver will be running",
@@ -109,17 +119,19 @@ func dataSourceIBMDNSCustomResolverRead(context context.Context, d *schema.Resou
109119
customResolver[pdnsCRDescription] = *instance.Description
110120
customResolver[pdnsCRHealth] = *instance.Health
111121
customResolver[pdnsCREnabled] = *instance.Enabled
122+
customResolver[pdnsCRProfile] = *instance.Profile
123+
customResolver[pdnsCRAllowDisruptiveUpdates] = *instance.AllowDisruptiveUpdates
112124
customResolver[pdnsCustomResolverLocations] = flattenPdnsCRLocations(instance.Locations)
113125

114126
customResolvers = append(customResolvers, customResolver)
115127
}
116-
d.SetId(dataSourceIBMPrivateDNSCustomResolverID(d))
128+
d.SetId(dataSourceIBMPrivateDNSCustomResolverID())
117129
d.Set(pdnsInstanceID, instanceID)
118130
d.Set(pdnsCustomResolvers, customResolvers)
119131
return nil
120132
}
121133

122134
// dataSourceIBMPrivateDNSCustomResolverID returns a reasonable ID for dns custom resolver list.
123-
func dataSourceIBMPrivateDNSCustomResolverID(d *schema.ResourceData) string {
135+
func dataSourceIBMPrivateDNSCustomResolverID() string {
124136
return time.Now().UTC().String()
125137
}

‎ibm/service/dnsservices/data_source_ibm_private_dns_custom_resolver_forwarding_rules.go‎

Lines changed: 39 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,36 @@ func DataSourceIBMPrivateDNSForwardingRules() *schema.Resource {
6161
Type: schema.TypeString,
6262
},
6363
},
64+
pdnsCRFRViews: {
65+
Type: schema.TypeList,
66+
Description: "An array of views used by forwarding rules.",
67+
Computed: true,
68+
Elem: &schema.Resource{
69+
Schema: map[string]*schema.Schema{
70+
pdnsCRFRVName: {
71+
Type: schema.TypeString,
72+
Computed: true,
73+
Description: "Unique name of the view.",
74+
},
75+
pdnsCRFRVDescription: {
76+
Type: schema.TypeString,
77+
Computed: true,
78+
Description: "Description of the view.",
79+
},
80+
pdnsCRFRVExpression: {
81+
Type: schema.TypeString,
82+
Computed: true,
83+
Description: "Expression of the view.",
84+
},
85+
pdnsCRFRVForwardTo: {
86+
Type: schema.TypeList,
87+
Computed: true,
88+
Description: "The upstream DNS servers that the matching DNS queries will be forwarded to.",
89+
Elem: &schema.Schema{Type: schema.TypeString},
90+
},
91+
},
92+
},
93+
},
6494
},
6595
},
6696
},
@@ -84,23 +114,24 @@ func dataSourceIbmDnsCrForwardingRulesRead(context context.Context, d *schema.Re
84114
}
85115

86116
forwardRules := make([]interface{}, 0)
87-
for _, instance := range result.ForwardingRules {
117+
for _, rule := range result.ForwardingRules {
88118
forwardRule := map[string]interface{}{}
89-
forwardRule[pdnsCRFRRuleID] = *instance.ID
90-
forwardRule[pdnsCRFRDesctiption] = *instance.Description
91-
forwardRule[pdnsCRFRType] = *instance.Type
92-
forwardRule[pdnsCRFRMatch] = *instance.Match
93-
forwardRule[pdnsCRFRForwardTo] = instance.ForwardTo
119+
forwardRule[pdnsCRFRRuleID] = *rule.ID
120+
forwardRule[pdnsCRFRDesctiption] = *rule.Description
121+
forwardRule[pdnsCRFRType] = *rule.Type
122+
forwardRule[pdnsCRFRMatch] = *rule.Match
123+
forwardRule[pdnsCRFRForwardTo] = rule.ForwardTo
124+
forwardRule[pdnsCRFRViews] = flattenPDNSFRViews(rule.Views)
94125

95126
forwardRules = append(forwardRules, forwardRule)
96127
}
97-
d.SetId(dataSourceIBMPrivateDNSForwardrulesID(d))
128+
d.SetId(dataSourceIBMPrivateDNSForwardrulesID())
98129
d.Set(pdnsInstanceID, instanceID)
99130
d.Set(pdnsCRFRResolverID, resolverID)
100131
d.Set(pdnsCRForwardRules, forwardRules)
101132
return nil
102133
}
103134

104-
func dataSourceIBMPrivateDNSForwardrulesID(d *schema.ResourceData) string {
135+
func dataSourceIBMPrivateDNSForwardrulesID() string {
105136
return time.Now().UTC().String()
106137
}

‎ibm/service/dnsservices/resource_ibm_dns_linked_zone.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,12 +120,10 @@ func resourceIBMDNSLinkedZoneCreate(ctx context.Context, d *schema.ResourceData,
120120
}
121121
ownerInstanceID := d.Get(DnsLinkedZoneOwnerInstanceID).(string)
122122
ownerZoneID := d.Get(DnsLinkedZoneOwnerZoneID).(string)
123-
createLinkedZoneOptions := sess.NewCreateLinkedZoneOptions(instanceID)
123+
createLinkedZoneOptions := sess.NewCreateLinkedZoneOptions(instanceID, ownerInstanceID, ownerZoneID)
124124

125125
createLinkedZoneOptions.SetDescription(description)
126126
createLinkedZoneOptions.SetLabel(label)
127-
createLinkedZoneOptions.SetOwnerInstanceID(ownerInstanceID)
128-
createLinkedZoneOptions.SetOwnerZoneID(ownerZoneID)
129127
mk := "dns_linked_zone_" + instanceID
130128
conns.IbmMutexKV.Lock(mk)
131129
defer conns.IbmMutexKV.Unlock(mk)

0 commit comments

Comments
 (0)