Skip to content

Commit 5f483f6

Browse files
committed
Update whitelisted_ips to use TypeSet required to suppress diff in ordering
1 parent 2537e13 commit 5f483f6

File tree

2 files changed

+18
-8
lines changed

2 files changed

+18
-8
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
### Fixed
99
- Add missing attributes for `oci_file_storage_mount_target` import [Github issue #1037](https://github.com/terraform-providers/terraform-provider-oci/issues/1037)
10+
- Fixed the diff for `whitelisted_ips` arguments order in `oci_database_autonomous_database` resource [Issue #1050](https://github.com/terraform-providers/terraform-provider-oci/issues/1050)
1011

1112
## 3.74.0 (May 06, 2020)
1213

oci/database_autonomous_database_resource.go

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,9 @@ func DatabaseAutonomousDatabaseResource() *schema.Resource {
199199
DiffSuppressFunc: timeDiffSuppressFunction,
200200
},
201201
"whitelisted_ips": {
202-
Type: schema.TypeList,
202+
Type: schema.TypeSet,
203203
Optional: true,
204+
Set: literalTypeHashCodeForSets,
204205
Elem: &schema.Schema{
205206
Type: schema.TypeString,
206207
},
@@ -581,8 +582,8 @@ func (s *DatabaseAutonomousDatabaseResourceCrud) Update() error {
581582
}
582583

583584
if whitelistedIps, ok := s.D.GetOkExists("whitelisted_ips"); ok && s.D.HasChange("whitelisted_ips") {
584-
request.WhitelistedIps = []string{}
585-
interfaces := whitelistedIps.([]interface{})
585+
set := whitelistedIps.(*schema.Set)
586+
interfaces := set.List()
586587
tmp := make([]string, len(interfaces))
587588
for i := range interfaces {
588589
if interfaces[i] != nil {
@@ -746,7 +747,11 @@ func (s *DatabaseAutonomousDatabaseResourceCrud) SetData() error {
746747
s.D.Set("used_data_storage_size_in_tbs", *s.Res.UsedDataStorageSizeInTBs)
747748
}
748749

749-
s.D.Set("whitelisted_ips", s.Res.WhitelistedIps)
750+
whitelistedIps := []interface{}{}
751+
for _, item := range s.Res.WhitelistedIps {
752+
whitelistedIps = append(whitelistedIps, item)
753+
}
754+
s.D.Set("whitelisted_ips", schema.NewSet(literalTypeHashCodeForSets, whitelistedIps))
750755

751756
return nil
752757
}
@@ -898,7 +903,8 @@ func (s *DatabaseAutonomousDatabaseResourceCrud) populateTopLevelPolymorphicCrea
898903
details.SubnetId = &tmp
899904
}
900905
if whitelistedIps, ok := s.D.GetOkExists("whitelisted_ips"); ok {
901-
interfaces := whitelistedIps.([]interface{})
906+
set := whitelistedIps.(*schema.Set)
907+
interfaces := set.List()
902908
tmp := make([]string, len(interfaces))
903909
for i := range interfaces {
904910
if interfaces[i] != nil {
@@ -1012,7 +1018,8 @@ func (s *DatabaseAutonomousDatabaseResourceCrud) populateTopLevelPolymorphicCrea
10121018
details.SubnetId = &tmp
10131019
}
10141020
if whitelistedIps, ok := s.D.GetOkExists("whitelisted_ips"); ok {
1015-
interfaces := whitelistedIps.([]interface{})
1021+
set := whitelistedIps.(*schema.Set)
1022+
interfaces := set.List()
10161023
tmp := make([]string, len(interfaces))
10171024
for i := range interfaces {
10181025
if interfaces[i] != nil {
@@ -1119,7 +1126,8 @@ func (s *DatabaseAutonomousDatabaseResourceCrud) populateTopLevelPolymorphicCrea
11191126
details.SubnetId = &tmp
11201127
}
11211128
if whitelistedIps, ok := s.D.GetOkExists("whitelisted_ips"); ok {
1122-
interfaces := whitelistedIps.([]interface{})
1129+
set := whitelistedIps.(*schema.Set)
1130+
interfaces := set.List()
11231131
tmp := make([]string, len(interfaces))
11241132
for i := range interfaces {
11251133
if interfaces[i] != nil {
@@ -1217,7 +1225,8 @@ func (s *DatabaseAutonomousDatabaseResourceCrud) populateTopLevelPolymorphicCrea
12171225
details.SubnetId = &tmp
12181226
}
12191227
if whitelistedIps, ok := s.D.GetOkExists("whitelisted_ips"); ok {
1220-
interfaces := whitelistedIps.([]interface{})
1228+
set := whitelistedIps.(*schema.Set)
1229+
interfaces := set.List()
12211230
tmp := make([]string, len(interfaces))
12221231
for i := range interfaces {
12231232
if interfaces[i] != nil {

0 commit comments

Comments
 (0)