Skip to content

Commit bc422ef

Browse files
varmax2511varmax2511
committed
nil instantiation of typeset and typelist
1 parent 63fd5c3 commit bc422ef

File tree

51 files changed

+468
-288
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+468
-288
lines changed

‎oci/autoscaling_auto_scaling_configuration_resource.go‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,6 @@ func (s *AutoScalingAutoScalingConfigurationResourceCrud) Create() error {
353353
request.IsEnabled = &tmp
354354
}
355355

356-
request.Policies = []oci_auto_scaling.CreateAutoScalingPolicyDetails{}
357356
if policies, ok := s.D.GetOkExists("policies"); ok {
358357
interfaces := policies.([]interface{})
359358
tmp := make([]oci_auto_scaling.CreateAutoScalingPolicyDetails, len(interfaces))
@@ -366,7 +365,9 @@ func (s *AutoScalingAutoScalingConfigurationResourceCrud) Create() error {
366365
}
367366
tmp[i] = converted
368367
}
369-
request.Policies = tmp
368+
if len(tmp) != 0 || s.D.HasChange("policies") {
369+
request.Policies = tmp
370+
}
370371
}
371372

372373
request.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "auto_scaling")
@@ -587,7 +588,6 @@ func (s *AutoScalingAutoScalingConfigurationResourceCrud) mapToCreateAutoScaling
587588
switch strings.ToLower(policyType) {
588589
case strings.ToLower("threshold"):
589590
details := oci_auto_scaling.CreateThresholdPolicyDetails{}
590-
details.Rules = []oci_auto_scaling.CreateConditionDetails{}
591591
if rules, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "rules")); ok {
592592
set := rules.(*schema.Set)
593593
interfaces := set.List()
@@ -601,7 +601,9 @@ func (s *AutoScalingAutoScalingConfigurationResourceCrud) mapToCreateAutoScaling
601601
}
602602
tmp[i] = converted
603603
}
604-
details.Rules = tmp
604+
if len(tmp) != 0 || s.D.HasChange(fmt.Sprintf(fieldKeyFormat, "rules")) {
605+
details.Rules = tmp
606+
}
605607
}
606608
if capacity, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "capacity")); ok {
607609
if tmpList := capacity.([]interface{}); len(tmpList) > 0 {

‎oci/budget_budget_resource.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,6 @@ func (s *BudgetBudgetResourceCrud) Create() error {
232232
request.TargetType = oci_budget.CreateBudgetDetailsTargetTypeEnum(targetType.(string))
233233
}
234234

235-
request.Targets = []string{}
236235
if targets, ok := s.D.GetOkExists("targets"); ok {
237236
interfaces := targets.([]interface{})
238237
tmp := make([]string, len(interfaces))
@@ -241,7 +240,9 @@ func (s *BudgetBudgetResourceCrud) Create() error {
241240
tmp[i] = interfaces[i].(string)
242241
}
243242
}
244-
request.Targets = tmp
243+
if len(tmp) != 0 || s.D.HasChange("targets") {
244+
request.Targets = tmp
245+
}
245246
}
246247

247248
request.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "budget")

‎oci/containerengine_cluster_resource.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,9 @@ func (s *ContainerengineClusterResourceCrud) mapToClusterCreateOptions(fieldKeyF
673673
tmp[i] = interfaces[i].(string)
674674
}
675675
}
676-
result.ServiceLbSubnetIds = tmp
676+
if len(tmp) != 0 || s.D.HasChange(fmt.Sprintf(fieldKeyFormat, "service_lb_subnet_ids")) {
677+
result.ServiceLbSubnetIds = tmp
678+
}
677679
}
678680

679681
return result, nil

‎oci/containerengine_node_pool_resource.go‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,6 @@ func (s *ContainerengineNodePoolResourceCrud) Create() error {
298298
request.CompartmentId = &tmp
299299
}
300300

301-
request.InitialNodeLabels = []oci_containerengine.KeyValue{}
302301
if initialNodeLabels, ok := s.D.GetOkExists("initial_node_labels"); ok {
303302
interfaces := initialNodeLabels.([]interface{})
304303
tmp := make([]oci_containerengine.KeyValue, len(interfaces))
@@ -311,7 +310,9 @@ func (s *ContainerengineNodePoolResourceCrud) Create() error {
311310
}
312311
tmp[i] = converted
313312
}
314-
request.InitialNodeLabels = tmp
313+
if len(tmp) != 0 || s.D.HasChange("initial_node_labels") {
314+
request.InitialNodeLabels = tmp
315+
}
315316
}
316317

317318
if kubernetesVersion, ok := s.D.GetOkExists("kubernetes_version"); ok {
@@ -373,7 +374,9 @@ func (s *ContainerengineNodePoolResourceCrud) Create() error {
373374
tmp[i] = interfaces[i].(string)
374375
}
375376
}
376-
request.SubnetIds = tmp
377+
if len(tmp) != 0 || s.D.HasChange("subnet_ids") {
378+
request.SubnetIds = tmp
379+
}
377380
}
378381

379382
request.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "containerengine")
@@ -449,7 +452,6 @@ func (s *ContainerengineNodePoolResourceCrud) Get() error {
449452
func (s *ContainerengineNodePoolResourceCrud) Update() error {
450453
request := oci_containerengine.UpdateNodePoolRequest{}
451454

452-
request.InitialNodeLabels = []oci_containerengine.KeyValue{}
453455
if initialNodeLabels, ok := s.D.GetOkExists("initial_node_labels"); ok {
454456
interfaces := initialNodeLabels.([]interface{})
455457
tmp := make([]oci_containerengine.KeyValue, len(interfaces))
@@ -462,7 +464,9 @@ func (s *ContainerengineNodePoolResourceCrud) Update() error {
462464
}
463465
tmp[i] = converted
464466
}
465-
request.InitialNodeLabels = tmp
467+
if len(tmp) != 0 || s.D.HasChange("initial_node_labels") {
468+
request.InitialNodeLabels = tmp
469+
}
466470
}
467471

468472
if kubernetesVersion, ok := s.D.GetOkExists("kubernetes_version"); ok {
@@ -638,7 +642,6 @@ func (s *ContainerengineNodePoolResourceCrud) SetData() error {
638642
func (s *ContainerengineNodePoolResourceCrud) mapToCreateNodePoolNodeConfigDetails(fieldKeyFormat string) (oci_containerengine.CreateNodePoolNodeConfigDetails, error) {
639643
result := oci_containerengine.CreateNodePoolNodeConfigDetails{}
640644

641-
result.PlacementConfigs = []oci_containerengine.NodePoolPlacementConfigDetails{}
642645
if placementConfigs, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "placement_configs")); ok {
643646
interfaces := placementConfigs.([]interface{})
644647
tmp := make([]oci_containerengine.NodePoolPlacementConfigDetails, len(interfaces))
@@ -651,7 +654,9 @@ func (s *ContainerengineNodePoolResourceCrud) mapToCreateNodePoolNodeConfigDetai
651654
}
652655
tmp[i] = converted
653656
}
654-
result.PlacementConfigs = tmp
657+
if len(tmp) != 0 || s.D.HasChange(fmt.Sprintf(fieldKeyFormat, "placement_configs")) {
658+
result.PlacementConfigs = tmp
659+
}
655660
}
656661

657662
if size, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "size")); ok {

‎oci/core_cluster_network_resource.go‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,6 @@ func (s *CoreClusterNetworkResourceCrud) Create() error {
360360
request.FreeformTags = objectMapToStringMap(freeformTags.(map[string]interface{}))
361361
}
362362

363-
request.InstancePools = []oci_core.CreateClusterNetworkInstancePoolDetails{}
364363
if instancePools, ok := s.D.GetOkExists("instance_pools"); ok {
365364
interfaces := instancePools.([]interface{})
366365
tmp := make([]oci_core.CreateClusterNetworkInstancePoolDetails, len(interfaces))
@@ -373,7 +372,9 @@ func (s *CoreClusterNetworkResourceCrud) Create() error {
373372
}
374373
tmp[i] = converted
375374
}
376-
request.InstancePools = tmp
375+
if len(tmp) != 0 || s.D.HasChange("instance_pools") {
376+
request.InstancePools = tmp
377+
}
377378
}
378379

379380
if placementConfiguration, ok := s.D.GetOkExists("placement_configuration"); ok {
@@ -523,7 +524,6 @@ func (s *CoreClusterNetworkResourceCrud) mapToClusterNetworkPlacementConfigurati
523524
result.PrimarySubnetId = &tmp
524525
}
525526

526-
result.SecondaryVnicSubnets = []oci_core.InstancePoolPlacementSecondaryVnicSubnet{}
527527
if secondaryVnicSubnets, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "secondary_vnic_subnets")); ok {
528528
set := secondaryVnicSubnets.(*schema.Set)
529529
interfaces := set.List()
@@ -537,7 +537,9 @@ func (s *CoreClusterNetworkResourceCrud) mapToClusterNetworkPlacementConfigurati
537537
}
538538
tmp[i] = converted
539539
}
540-
result.SecondaryVnicSubnets = tmp
540+
if len(tmp) != 0 || s.D.HasChange(fmt.Sprintf(fieldKeyFormat, "secondary_vnic_subnets")) {
541+
result.SecondaryVnicSubnets = tmp
542+
}
541543
}
542544

543545
return result, nil

‎oci/core_dhcp_options_resource.go‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,6 @@ func (s *CoreDhcpOptionsResourceCrud) Create() error {
215215
request.FreeformTags = objectMapToStringMap(freeformTags.(map[string]interface{}))
216216
}
217217

218-
request.Options = []oci_core.DhcpOption{}
219218
if options, ok := s.D.GetOkExists("options"); ok {
220219
set := options.(*schema.Set)
221220
interfaces := set.List()
@@ -229,7 +228,9 @@ func (s *CoreDhcpOptionsResourceCrud) Create() error {
229228
}
230229
tmp[i] = converted
231230
}
232-
request.Options = tmp
231+
if len(tmp) != 0 || s.D.HasChange("options") {
232+
request.Options = tmp
233+
}
233234
}
234235

235236
if vcnId, ok := s.D.GetOkExists("vcn_id"); ok {
@@ -309,7 +310,6 @@ func (s *CoreDhcpOptionsResourceCrud) Update() error {
309310
request.FreeformTags = objectMapToStringMap(freeformTags.(map[string]interface{}))
310311
}
311312

312-
request.Options = []oci_core.DhcpOption{}
313313
if options, ok := s.D.GetOkExists("options"); ok {
314314
set := options.(*schema.Set)
315315
interfaces := set.List()
@@ -323,7 +323,9 @@ func (s *CoreDhcpOptionsResourceCrud) Update() error {
323323
}
324324
tmp[i] = converted
325325
}
326-
request.Options = tmp
326+
if len(tmp) != 0 || s.D.HasChange("options") {
327+
request.Options = tmp
328+
}
327329
}
328330

329331
request.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "core")
@@ -406,6 +408,7 @@ func (s *CoreDhcpOptionsResourceCrud) mapToDhcpOption(fieldKeyFormat string) (oc
406408
}
407409
}
408410
details.CustomDnsServers = tmp
411+
409412
}
410413
if serverType, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "server_type")); ok {
411414
details.ServerType = oci_core.DhcpDnsOptionServerTypeEnum(serverType.(string))

‎oci/core_instance_configuration_resource.go‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -920,7 +920,6 @@ func (s *CoreInstanceConfigurationResourceCrud) mapToInstanceConfigurationCreate
920920
result.HostnameLabel = &tmp
921921
}
922922

923-
result.NsgIds = []string{}
924923
if nsgIds, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "nsg_ids")); ok {
925924
set := nsgIds.(*schema.Set)
926925
interfaces := set.List()
@@ -930,7 +929,9 @@ func (s *CoreInstanceConfigurationResourceCrud) mapToInstanceConfigurationCreate
930929
tmp[i] = interfaces[i].(string)
931930
}
932931
}
933-
result.NsgIds = tmp
932+
if len(tmp) != 0 || s.D.HasChange(fmt.Sprintf(fieldKeyFormat, "nsg_ids")) {
933+
result.NsgIds = tmp
934+
}
934935
}
935936

936937
if privateIp, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "private_ip")); ok {
@@ -1102,7 +1103,6 @@ func (s *CoreInstanceConfigurationResourceCrud) mapToInstanceConfigurationInstan
11021103
switch strings.ToLower(instanceType) {
11031104
case strings.ToLower("compute"):
11041105
details := oci_core.ComputeInstanceDetails{}
1105-
details.BlockVolumes = []oci_core.InstanceConfigurationBlockVolumeDetails{}
11061106
if blockVolumes, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "block_volumes")); ok {
11071107
interfaces := blockVolumes.([]interface{})
11081108
tmp := make([]oci_core.InstanceConfigurationBlockVolumeDetails, len(interfaces))
@@ -1115,7 +1115,9 @@ func (s *CoreInstanceConfigurationResourceCrud) mapToInstanceConfigurationInstan
11151115
}
11161116
tmp[i] = converted
11171117
}
1118-
details.BlockVolumes = tmp
1118+
if len(tmp) != 0 || s.D.HasChange(fmt.Sprintf(fieldKeyFormat, "block_volumes")) {
1119+
details.BlockVolumes = tmp
1120+
}
11191121
}
11201122
if launchDetails, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "launch_details")); ok {
11211123
if tmpList := launchDetails.([]interface{}); len(tmpList) > 0 {
@@ -1127,7 +1129,6 @@ func (s *CoreInstanceConfigurationResourceCrud) mapToInstanceConfigurationInstan
11271129
details.LaunchDetails = &tmp
11281130
}
11291131
}
1130-
details.SecondaryVnics = []oci_core.InstanceConfigurationAttachVnicDetails{}
11311132
if secondaryVnics, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "secondary_vnics")); ok {
11321133
interfaces := secondaryVnics.([]interface{})
11331134
tmp := make([]oci_core.InstanceConfigurationAttachVnicDetails, len(interfaces))
@@ -1140,7 +1141,9 @@ func (s *CoreInstanceConfigurationResourceCrud) mapToInstanceConfigurationInstan
11401141
}
11411142
tmp[i] = converted
11421143
}
1143-
details.SecondaryVnics = tmp
1144+
if len(tmp) != 0 || s.D.HasChange(fmt.Sprintf(fieldKeyFormat, "secondary_vnics")) {
1145+
details.SecondaryVnics = tmp
1146+
}
11441147
}
11451148
baseObject = details
11461149
default:

‎oci/core_instance_pool_resource.go‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,6 @@ func (s *CoreInstancePoolResourceCrud) Create() error {
297297
request.InstanceConfigurationId = &tmp
298298
}
299299

300-
request.LoadBalancers = []oci_core.AttachLoadBalancerDetails{}
301300
if loadBalancers, ok := s.D.GetOkExists("load_balancers"); ok {
302301
interfaces := loadBalancers.([]interface{})
303302
tmp := make([]oci_core.AttachLoadBalancerDetails, len(interfaces))
@@ -310,10 +309,11 @@ func (s *CoreInstancePoolResourceCrud) Create() error {
310309
}
311310
tmp[i] = converted
312311
}
313-
request.LoadBalancers = tmp
312+
if len(tmp) != 0 || s.D.HasChange("load_balancers") {
313+
request.LoadBalancers = tmp
314+
}
314315
}
315316

316-
request.PlacementConfigurations = []oci_core.CreateInstancePoolPlacementConfigurationDetails{}
317317
if placementConfigurations, ok := s.D.GetOkExists("placement_configurations"); ok {
318318
interfaces := placementConfigurations.([]interface{})
319319
tmp := make([]oci_core.CreateInstancePoolPlacementConfigurationDetails, len(interfaces))
@@ -326,7 +326,9 @@ func (s *CoreInstancePoolResourceCrud) Create() error {
326326
}
327327
tmp[i] = converted
328328
}
329-
request.PlacementConfigurations = tmp
329+
if len(tmp) != 0 || s.D.HasChange("placement_configurations") {
330+
request.PlacementConfigurations = tmp
331+
}
330332
}
331333

332334
if size, ok := s.D.GetOkExists("size"); ok {
@@ -434,7 +436,6 @@ func (s *CoreInstancePoolResourceCrud) Update() error {
434436
tmp := s.D.Id()
435437
request.InstancePoolId = &tmp
436438

437-
request.PlacementConfigurations = []oci_core.UpdateInstancePoolPlacementConfigurationDetails{}
438439
if placementConfigurations, ok := s.D.GetOkExists("placement_configurations"); ok {
439440
interfaces := placementConfigurations.([]interface{})
440441
tmp := make([]oci_core.UpdateInstancePoolPlacementConfigurationDetails, len(interfaces))
@@ -447,7 +448,9 @@ func (s *CoreInstancePoolResourceCrud) Update() error {
447448
}
448449
tmp[i] = converted
449450
}
450-
request.PlacementConfigurations = tmp
451+
if len(tmp) != 0 || s.D.HasChange("placement_configurations") {
452+
request.PlacementConfigurations = tmp
453+
}
451454
}
452455

453456
if size, ok := s.D.GetOkExists("size"); ok {
@@ -618,7 +621,6 @@ func (s *CoreInstancePoolResourceCrud) mapToCreateInstancePoolPlacementConfigura
618621
result.PrimarySubnetId = &tmp
619622
}
620623

621-
result.SecondaryVnicSubnets = []oci_core.InstancePoolPlacementSecondaryVnicSubnet{}
622624
if secondaryVnicSubnets, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "secondary_vnic_subnets")); ok {
623625
interfaces := secondaryVnicSubnets.([]interface{})
624626
tmp := make([]oci_core.InstancePoolPlacementSecondaryVnicSubnet, len(interfaces))
@@ -631,7 +633,9 @@ func (s *CoreInstancePoolResourceCrud) mapToCreateInstancePoolPlacementConfigura
631633
}
632634
tmp[i] = converted
633635
}
634-
result.SecondaryVnicSubnets = tmp
636+
if len(tmp) != 0 || s.D.HasChange(fmt.Sprintf(fieldKeyFormat, "secondary_vnic_subnets")) {
637+
result.SecondaryVnicSubnets = tmp
638+
}
635639
}
636640

637641
return result, nil

‎oci/core_instance_resource.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -999,7 +999,6 @@ func (s *CoreInstanceResourceCrud) mapToCreateVnicDetailsInstance(fieldKeyFormat
999999
result.HostnameLabel = &tmp
10001000
}
10011001

1002-
result.NsgIds = []string{}
10031002
if nsgIds, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "nsg_ids")); ok {
10041003
set := nsgIds.(*schema.Set)
10051004
interfaces := set.List()
@@ -1009,7 +1008,9 @@ func (s *CoreInstanceResourceCrud) mapToCreateVnicDetailsInstance(fieldKeyFormat
10091008
tmp[i] = interfaces[i].(string)
10101009
}
10111010
}
1012-
result.NsgIds = tmp
1011+
if len(tmp) != 0 || s.D.HasChange(fmt.Sprintf(fieldKeyFormat, "nsg_ids")) {
1012+
result.NsgIds = tmp
1013+
}
10131014
}
10141015

10151016
if privateIp, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "private_ip")); ok {

0 commit comments

Comments
 (0)