Skip to content

Commit 3cdf8b9

Browse files
modular-magicianmodular-magician
authored
fix nil entry crash (#5817) (#4124)
Signed-off-by: Modular Magician <[email protected]>
1 parent 428794d commit 3cdf8b9

19 files changed

+188
-185
lines changed

‎.changelog/5817.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
dataproc: fixed a crash when `logging_config` only contains `nil` entry in `google_dataproc_workflow_template`
3+
```

‎google-beta/resource_apikeys_key.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ func expandApikeysKeyRestrictions(o interface{}) *apikeys.KeyRestrictions {
432432
return apikeys.EmptyKeyRestrictions
433433
}
434434
objArr := o.([]interface{})
435-
if len(objArr) == 0 {
435+
if len(objArr) == 0 || objArr[0] == nil {
436436
return apikeys.EmptyKeyRestrictions
437437
}
438438
obj := objArr[0].(map[string]interface{})
@@ -466,7 +466,7 @@ func expandApikeysKeyRestrictionsAndroidKeyRestrictions(o interface{}) *apikeys.
466466
return apikeys.EmptyKeyRestrictionsAndroidKeyRestrictions
467467
}
468468
objArr := o.([]interface{})
469-
if len(objArr) == 0 {
469+
if len(objArr) == 0 || objArr[0] == nil {
470470
return apikeys.EmptyKeyRestrictionsAndroidKeyRestrictions
471471
}
472472
obj := objArr[0].(map[string]interface{})
@@ -492,7 +492,7 @@ func expandApikeysKeyRestrictionsAndroidKeyRestrictionsAllowedApplicationsArray(
492492
}
493493

494494
objs := o.([]interface{})
495-
if len(objs) == 0 {
495+
if len(objs) == 0 || objs[0] == nil {
496496
return make([]apikeys.KeyRestrictionsAndroidKeyRestrictionsAllowedApplications, 0)
497497
}
498498

@@ -549,7 +549,7 @@ func expandApikeysKeyRestrictionsApiTargetsArray(o interface{}) []apikeys.KeyRes
549549
}
550550

551551
objs := o.([]interface{})
552-
if len(objs) == 0 {
552+
if len(objs) == 0 || objs[0] == nil {
553553
return make([]apikeys.KeyRestrictionsApiTargets, 0)
554554
}
555555

@@ -606,7 +606,7 @@ func expandApikeysKeyRestrictionsBrowserKeyRestrictions(o interface{}) *apikeys.
606606
return apikeys.EmptyKeyRestrictionsBrowserKeyRestrictions
607607
}
608608
objArr := o.([]interface{})
609-
if len(objArr) == 0 {
609+
if len(objArr) == 0 || objArr[0] == nil {
610610
return apikeys.EmptyKeyRestrictionsBrowserKeyRestrictions
611611
}
612612
obj := objArr[0].(map[string]interface{})
@@ -632,7 +632,7 @@ func expandApikeysKeyRestrictionsIosKeyRestrictions(o interface{}) *apikeys.KeyR
632632
return apikeys.EmptyKeyRestrictionsIosKeyRestrictions
633633
}
634634
objArr := o.([]interface{})
635-
if len(objArr) == 0 {
635+
if len(objArr) == 0 || objArr[0] == nil {
636636
return apikeys.EmptyKeyRestrictionsIosKeyRestrictions
637637
}
638638
obj := objArr[0].(map[string]interface{})
@@ -658,7 +658,7 @@ func expandApikeysKeyRestrictionsServerKeyRestrictions(o interface{}) *apikeys.K
658658
return apikeys.EmptyKeyRestrictionsServerKeyRestrictions
659659
}
660660
objArr := o.([]interface{})
661-
if len(objArr) == 0 {
661+
if len(objArr) == 0 || objArr[0] == nil {
662662
return apikeys.EmptyKeyRestrictionsServerKeyRestrictions
663663
}
664664
obj := objArr[0].(map[string]interface{})

‎google-beta/resource_assured_workloads_workload.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ func expandAssuredWorkloadsWorkloadKmsSettings(o interface{}) *assuredworkloads.
459459
return assuredworkloads.EmptyWorkloadKmsSettings
460460
}
461461
objArr := o.([]interface{})
462-
if len(objArr) == 0 {
462+
if len(objArr) == 0 || objArr[0] == nil {
463463
return assuredworkloads.EmptyWorkloadKmsSettings
464464
}
465465
obj := objArr[0].(map[string]interface{})
@@ -487,7 +487,7 @@ func expandAssuredWorkloadsWorkloadResourceSettingsArray(o interface{}) []assure
487487
}
488488

489489
objs := o.([]interface{})
490-
if len(objs) == 0 {
490+
if len(objs) == 0 || objs[0] == nil {
491491
return make([]assuredworkloads.WorkloadResourceSettings, 0)
492492
}
493493

‎google-beta/resource_cloudbuild_worker_pool.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ func expandCloudbuildWorkerPoolNetworkConfig(o interface{}) *cloudbuild.WorkerPo
420420
return cloudbuild.EmptyWorkerPoolNetworkConfig
421421
}
422422
objArr := o.([]interface{})
423-
if len(objArr) == 0 {
423+
if len(objArr) == 0 || objArr[0] == nil {
424424
return cloudbuild.EmptyWorkerPoolNetworkConfig
425425
}
426426
obj := objArr[0].(map[string]interface{})
@@ -446,7 +446,7 @@ func expandCloudbuildWorkerPoolWorkerConfig(o interface{}) *cloudbuild.WorkerPoo
446446
return nil
447447
}
448448
objArr := o.([]interface{})
449-
if len(objArr) == 0 {
449+
if len(objArr) == 0 || objArr[0] == nil {
450450
return nil
451451
}
452452
obj := objArr[0].(map[string]interface{})

‎google-beta/resource_compute_firewall_policy_rule.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ func expandComputeFirewallPolicyRuleMatch(o interface{}) *compute.FirewallPolicy
418418
return compute.EmptyFirewallPolicyRuleMatch
419419
}
420420
objArr := o.([]interface{})
421-
if len(objArr) == 0 {
421+
if len(objArr) == 0 || objArr[0] == nil {
422422
return compute.EmptyFirewallPolicyRuleMatch
423423
}
424424
obj := objArr[0].(map[string]interface{})
@@ -448,7 +448,7 @@ func expandComputeFirewallPolicyRuleMatchLayer4ConfigsArray(o interface{}) []com
448448
}
449449

450450
objs := o.([]interface{})
451-
if len(objs) == 0 {
451+
if len(objs) == 0 || objs[0] == nil {
452452
return make([]compute.FirewallPolicyRuleMatchLayer4Configs, 0)
453453
}
454454

‎google-beta/resource_compute_global_forwarding_rule.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@ func expandComputeGlobalForwardingRuleMetadataFilterArray(o interface{}) []compu
474474
}
475475

476476
objs := o.([]interface{})
477-
if len(objs) == 0 {
477+
if len(objs) == 0 || objs[0] == nil {
478478
return make([]compute.ForwardingRuleMetadataFilter, 0)
479479
}
480480

@@ -531,7 +531,7 @@ func expandComputeGlobalForwardingRuleMetadataFilterFilterLabelArray(o interface
531531
}
532532

533533
objs := o.([]interface{})
534-
if len(objs) == 0 {
534+
if len(objs) == 0 || objs[0] == nil {
535535
return make([]compute.ForwardingRuleMetadataFilterFilterLabel, 0)
536536
}
537537

‎google-beta/resource_container_aws_cluster.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -807,7 +807,7 @@ func expandContainerAwsClusterAuthorization(o interface{}) *containeraws.Cluster
807807
return containeraws.EmptyClusterAuthorization
808808
}
809809
objArr := o.([]interface{})
810-
if len(objArr) == 0 {
810+
if len(objArr) == 0 || objArr[0] == nil {
811811
return containeraws.EmptyClusterAuthorization
812812
}
813813
obj := objArr[0].(map[string]interface{})
@@ -833,7 +833,7 @@ func expandContainerAwsClusterAuthorizationAdminUsersArray(o interface{}) []cont
833833
}
834834

835835
objs := o.([]interface{})
836-
if len(objs) == 0 {
836+
if len(objs) == 0 || objs[0] == nil {
837837
return make([]containeraws.ClusterAuthorizationAdminUsers, 0)
838838
}
839839

@@ -888,7 +888,7 @@ func expandContainerAwsClusterControlPlane(o interface{}) *containeraws.ClusterC
888888
return containeraws.EmptyClusterControlPlane
889889
}
890890
objArr := o.([]interface{})
891-
if len(objArr) == 0 {
891+
if len(objArr) == 0 || objArr[0] == nil {
892892
return containeraws.EmptyClusterControlPlane
893893
}
894894
obj := objArr[0].(map[string]interface{})
@@ -938,7 +938,7 @@ func expandContainerAwsClusterControlPlaneAwsServicesAuthentication(o interface{
938938
return containeraws.EmptyClusterControlPlaneAwsServicesAuthentication
939939
}
940940
objArr := o.([]interface{})
941-
if len(objArr) == 0 {
941+
if len(objArr) == 0 || objArr[0] == nil {
942942
return containeraws.EmptyClusterControlPlaneAwsServicesAuthentication
943943
}
944944
obj := objArr[0].(map[string]interface{})
@@ -966,7 +966,7 @@ func expandContainerAwsClusterControlPlaneConfigEncryption(o interface{}) *conta
966966
return containeraws.EmptyClusterControlPlaneConfigEncryption
967967
}
968968
objArr := o.([]interface{})
969-
if len(objArr) == 0 {
969+
if len(objArr) == 0 || objArr[0] == nil {
970970
return containeraws.EmptyClusterControlPlaneConfigEncryption
971971
}
972972
obj := objArr[0].(map[string]interface{})
@@ -992,7 +992,7 @@ func expandContainerAwsClusterControlPlaneDatabaseEncryption(o interface{}) *con
992992
return containeraws.EmptyClusterControlPlaneDatabaseEncryption
993993
}
994994
objArr := o.([]interface{})
995-
if len(objArr) == 0 {
995+
if len(objArr) == 0 || objArr[0] == nil {
996996
return containeraws.EmptyClusterControlPlaneDatabaseEncryption
997997
}
998998
obj := objArr[0].(map[string]interface{})
@@ -1018,7 +1018,7 @@ func expandContainerAwsClusterControlPlaneMainVolume(o interface{}) *containeraw
10181018
return nil
10191019
}
10201020
objArr := o.([]interface{})
1021-
if len(objArr) == 0 {
1021+
if len(objArr) == 0 || objArr[0] == nil {
10221022
return nil
10231023
}
10241024
obj := objArr[0].(map[string]interface{})
@@ -1050,7 +1050,7 @@ func expandContainerAwsClusterControlPlaneProxyConfig(o interface{}) *containera
10501050
return containeraws.EmptyClusterControlPlaneProxyConfig
10511051
}
10521052
objArr := o.([]interface{})
1053-
if len(objArr) == 0 {
1053+
if len(objArr) == 0 || objArr[0] == nil {
10541054
return containeraws.EmptyClusterControlPlaneProxyConfig
10551055
}
10561056
obj := objArr[0].(map[string]interface{})
@@ -1078,7 +1078,7 @@ func expandContainerAwsClusterControlPlaneRootVolume(o interface{}) *containeraw
10781078
return nil
10791079
}
10801080
objArr := o.([]interface{})
1081-
if len(objArr) == 0 {
1081+
if len(objArr) == 0 || objArr[0] == nil {
10821082
return nil
10831083
}
10841084
obj := objArr[0].(map[string]interface{})
@@ -1110,7 +1110,7 @@ func expandContainerAwsClusterControlPlaneSshConfig(o interface{}) *containeraws
11101110
return containeraws.EmptyClusterControlPlaneSshConfig
11111111
}
11121112
objArr := o.([]interface{})
1113-
if len(objArr) == 0 {
1113+
if len(objArr) == 0 || objArr[0] == nil {
11141114
return containeraws.EmptyClusterControlPlaneSshConfig
11151115
}
11161116
obj := objArr[0].(map[string]interface{})
@@ -1136,7 +1136,7 @@ func expandContainerAwsClusterFleet(o interface{}) *containeraws.ClusterFleet {
11361136
return containeraws.EmptyClusterFleet
11371137
}
11381138
objArr := o.([]interface{})
1139-
if len(objArr) == 0 {
1139+
if len(objArr) == 0 || objArr[0] == nil {
11401140
return containeraws.EmptyClusterFleet
11411141
}
11421142
obj := objArr[0].(map[string]interface{})
@@ -1163,7 +1163,7 @@ func expandContainerAwsClusterNetworking(o interface{}) *containeraws.ClusterNet
11631163
return containeraws.EmptyClusterNetworking
11641164
}
11651165
objArr := o.([]interface{})
1166-
if len(objArr) == 0 {
1166+
if len(objArr) == 0 || objArr[0] == nil {
11671167
return containeraws.EmptyClusterNetworking
11681168
}
11691169
obj := objArr[0].(map[string]interface{})

‎google-beta/resource_container_aws_node_pool.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,7 @@ func expandContainerAwsNodePoolAutoscaling(o interface{}) *containeraws.NodePool
640640
return containeraws.EmptyNodePoolAutoscaling
641641
}
642642
objArr := o.([]interface{})
643-
if len(objArr) == 0 {
643+
if len(objArr) == 0 || objArr[0] == nil {
644644
return containeraws.EmptyNodePoolAutoscaling
645645
}
646646
obj := objArr[0].(map[string]interface{})
@@ -668,7 +668,7 @@ func expandContainerAwsNodePoolConfig(o interface{}) *containeraws.NodePoolConfi
668668
return containeraws.EmptyNodePoolConfig
669669
}
670670
objArr := o.([]interface{})
671-
if len(objArr) == 0 {
671+
if len(objArr) == 0 || objArr[0] == nil {
672672
return containeraws.EmptyNodePoolConfig
673673
}
674674
obj := objArr[0].(map[string]interface{})
@@ -710,7 +710,7 @@ func expandContainerAwsNodePoolConfigConfigEncryption(o interface{}) *containera
710710
return containeraws.EmptyNodePoolConfigConfigEncryption
711711
}
712712
objArr := o.([]interface{})
713-
if len(objArr) == 0 {
713+
if len(objArr) == 0 || objArr[0] == nil {
714714
return containeraws.EmptyNodePoolConfigConfigEncryption
715715
}
716716
obj := objArr[0].(map[string]interface{})
@@ -736,7 +736,7 @@ func expandContainerAwsNodePoolConfigRootVolume(o interface{}) *containeraws.Nod
736736
return nil
737737
}
738738
objArr := o.([]interface{})
739-
if len(objArr) == 0 {
739+
if len(objArr) == 0 || objArr[0] == nil {
740740
return nil
741741
}
742742
obj := objArr[0].(map[string]interface{})
@@ -768,7 +768,7 @@ func expandContainerAwsNodePoolConfigSshConfig(o interface{}) *containeraws.Node
768768
return containeraws.EmptyNodePoolConfigSshConfig
769769
}
770770
objArr := o.([]interface{})
771-
if len(objArr) == 0 {
771+
if len(objArr) == 0 || objArr[0] == nil {
772772
return containeraws.EmptyNodePoolConfigSshConfig
773773
}
774774
obj := objArr[0].(map[string]interface{})
@@ -794,7 +794,7 @@ func expandContainerAwsNodePoolConfigTaintsArray(o interface{}) []containeraws.N
794794
}
795795

796796
objs := o.([]interface{})
797-
if len(objs) == 0 {
797+
if len(objs) == 0 || objs[0] == nil {
798798
return make([]containeraws.NodePoolConfigTaints, 0)
799799
}
800800

@@ -853,7 +853,7 @@ func expandContainerAwsNodePoolMaxPodsConstraint(o interface{}) *containeraws.No
853853
return containeraws.EmptyNodePoolMaxPodsConstraint
854854
}
855855
objArr := o.([]interface{})
856-
if len(objArr) == 0 {
856+
if len(objArr) == 0 || objArr[0] == nil {
857857
return containeraws.EmptyNodePoolMaxPodsConstraint
858858
}
859859
obj := objArr[0].(map[string]interface{})

0 commit comments

Comments
 (0)