Skip to content

Commit 19b3b68

Browse files
kavya498kavya498
authored
fix dashboard panic (IBM-Cloud#6374)
1 parent d542a4a commit 19b3b68

File tree

1 file changed

+128
-94
lines changed

1 file changed

+128
-94
lines changed

‎ibm/service/logs/resource_ibm_logs_dashboard.go‎

Lines changed: 128 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -8105,11 +8105,15 @@ func ResourceIbmLogsDashboardMapToApisDashboardsV1AstWidgetsDataTableLogsQueryAg
81058105
model.ID = core.UUIDPtr(strfmt.UUID(modelMap["id"].(string)))
81068106
model.Name = core.StringPtr(modelMap["name"].(string))
81078107
model.IsVisible = core.BoolPtr(modelMap["is_visible"].(bool))
8108-
AggregationModel, err := ResourceIbmLogsDashboardMapToApisDashboardsV1CommonLogsAggregation(modelMap["aggregation"].([]interface{})[0].(map[string]interface{}))
8109-
if err != nil {
8110-
return model, err
8108+
modelMapAggregation := modelMap["aggregation"].([]interface{})
8109+
if modelMapAggregation != nil && len(modelMapAggregation) > 0 {
8110+
AggregationModel, err := ResourceIbmLogsDashboardMapToApisDashboardsV1CommonLogsAggregation(modelMapAggregation[0].(map[string]interface{}))
8111+
if err != nil {
8112+
return model, err
8113+
}
8114+
model.Aggregation = AggregationModel
81118115
}
8112-
model.Aggregation = AggregationModel
8116+
81138117
return model, nil
81148118
}
81158119

@@ -8324,11 +8328,15 @@ func ResourceIbmLogsDashboardMapToApisDashboardsV1AstWidgetsGaugeLogsQuery(model
83248328
model.LuceneQuery = LuceneQueryModel
83258329
}
83268330
if modelMapElement["logs_aggregation"] != nil && len(modelMapElement["logs_aggregation"].([]interface{})) > 0 {
8327-
LogsAggregationModel, err := ResourceIbmLogsDashboardMapToApisDashboardsV1CommonLogsAggregation(modelMapElement["logs_aggregation"].([]interface{})[0].(map[string]interface{}))
8328-
if err != nil {
8329-
return model, err
8331+
modelMapAggregation := modelMapElement["aggregation"].([]interface{})
8332+
if modelMapAggregation != nil && len(modelMapAggregation) > 0 {
8333+
LogsAggregationModel, err := ResourceIbmLogsDashboardMapToApisDashboardsV1CommonLogsAggregation(modelMapAggregation[0].(map[string]interface{}))
8334+
if err != nil {
8335+
return model, err
8336+
}
8337+
model.LogsAggregation = LogsAggregationModel
83308338
}
8331-
model.LogsAggregation = LogsAggregationModel
8339+
83328340
}
83338341
if modelMapElement["filters"] != nil {
83348342
filters := []logsv0.ApisDashboardsV1AstFilterLogsFilter{}
@@ -8488,11 +8496,15 @@ func ResourceIbmLogsDashboardMapToApisDashboardsV1AstWidgetsPieChartLogsQuery(mo
84888496
}
84898497
model.LuceneQuery = LuceneQueryModel
84908498
}
8491-
AggregationModel, err := ResourceIbmLogsDashboardMapToApisDashboardsV1CommonLogsAggregation(modelMapElement["aggregation"].([]interface{})[0].(map[string]interface{}))
8492-
if err != nil {
8493-
return model, err
8499+
modelMapAggregation := modelMapElement["aggregation"].([]interface{})
8500+
if modelMapAggregation != nil && len(modelMapAggregation) > 0 {
8501+
AggregationModel, err := ResourceIbmLogsDashboardMapToApisDashboardsV1CommonLogsAggregation(modelMapAggregation[0].(map[string]interface{}))
8502+
if err != nil {
8503+
return model, err
8504+
}
8505+
model.Aggregation = AggregationModel
84948506
}
8495-
model.Aggregation = AggregationModel
8507+
84968508
if modelMapElement["filters"] != nil {
84978509
filters := []logsv0.ApisDashboardsV1AstFilterLogsFilter{}
84988510
for _, filtersItem := range modelMapElement["filters"].([]interface{}) {
@@ -8719,14 +8731,14 @@ func ResourceIbmLogsDashboardMapToApisDashboardsV1AstWidgetsBarChartQuery(modelM
87198731
if modelMap != nil && len(modelMap) > 0 && modelMap[0] != nil {
87208732
modelMapElement := modelMap[0].(map[string]interface{})
87218733
if modelMapElement["logs"] != nil && len(modelMapElement["logs"].([]interface{})) > 0 {
8722-
LogsModel, err := ResourceIbmLogsDashboardMapToApisDashboardsV1AstWidgetsBarChartLogsQuery(modelMapElement["logs"].([]interface{})[0].(map[string]interface{}))
8734+
LogsModel, err := ResourceIbmLogsDashboardMapToApisDashboardsV1AstWidgetsBarChartLogsQuery(modelMapElement["logs"].([]interface{}))
87238735
if err != nil {
87248736
return model, err
87258737
}
87268738
model.Logs = LogsModel
87278739
}
87288740
if modelMapElement["metrics"] != nil && len(modelMapElement["metrics"].([]interface{})) > 0 {
8729-
MetricsModel, err := ResourceIbmLogsDashboardMapToApisDashboardsV1AstWidgetsBarChartMetricsQuery(modelMapElement["metrics"].([]interface{})[0].(map[string]interface{}))
8741+
MetricsModel, err := ResourceIbmLogsDashboardMapToApisDashboardsV1AstWidgetsBarChartMetricsQuery(modelMapElement["metrics"].([]interface{}))
87308742
if err != nil {
87318743
return model, err
87328744
}
@@ -8744,85 +8756,95 @@ func ResourceIbmLogsDashboardMapToApisDashboardsV1AstWidgetsBarChartQuery(modelM
87448756
return model, nil
87458757
}
87468758

8747-
func ResourceIbmLogsDashboardMapToApisDashboardsV1AstWidgetsBarChartLogsQuery(modelMap map[string]interface{}) (*logsv0.ApisDashboardsV1AstWidgetsBarChartLogsQuery, error) {
8759+
func ResourceIbmLogsDashboardMapToApisDashboardsV1AstWidgetsBarChartLogsQuery(modelMap []interface{}) (*logsv0.ApisDashboardsV1AstWidgetsBarChartLogsQuery, error) {
87488760
model := &logsv0.ApisDashboardsV1AstWidgetsBarChartLogsQuery{}
8749-
if modelMap["lucene_query"] != nil && len(modelMap["lucene_query"].([]interface{})) > 0 {
8750-
LuceneQueryModel, err := ResourceIbmLogsDashboardMapToApisDashboardsV1AstWidgetsCommonLuceneQuery(modelMap["lucene_query"].([]interface{}))
8751-
if err != nil {
8752-
return model, err
8761+
if len(modelMap) > 0 && modelMap[0] != nil {
8762+
modelMapElement := modelMap[0].(map[string]interface{})
8763+
if modelMapElement["lucene_query"] != nil && len(modelMapElement["lucene_query"].([]interface{})) > 0 {
8764+
LuceneQueryModel, err := ResourceIbmLogsDashboardMapToApisDashboardsV1AstWidgetsCommonLuceneQuery(modelMapElement["lucene_query"].([]interface{}))
8765+
if err != nil {
8766+
return model, err
8767+
}
8768+
model.LuceneQuery = LuceneQueryModel
87538769
}
8754-
model.LuceneQuery = LuceneQueryModel
8755-
}
8756-
AggregationModel, err := ResourceIbmLogsDashboardMapToApisDashboardsV1CommonLogsAggregation(modelMap["aggregation"].([]interface{})[0].(map[string]interface{}))
8757-
if err != nil {
8758-
return model, err
8759-
}
8760-
model.Aggregation = AggregationModel
8761-
if modelMap["filters"] != nil {
8762-
filters := []logsv0.ApisDashboardsV1AstFilterLogsFilter{}
8763-
for _, filtersItem := range modelMap["filters"].([]interface{}) {
8764-
filtersItemModel, err := ResourceIbmLogsDashboardMapToApisDashboardsV1AstFilterLogsFilter(filtersItem.(map[string]interface{}))
8770+
modelMapAggregation := modelMapElement["aggregation"].([]interface{})
8771+
if modelMapAggregation != nil && len(modelMapAggregation) > 0 {
8772+
AggregationModel, err := ResourceIbmLogsDashboardMapToApisDashboardsV1CommonLogsAggregation(modelMapAggregation[0].(map[string]interface{}))
87658773
if err != nil {
87668774
return model, err
87678775
}
8768-
filters = append(filters, *filtersItemModel)
8776+
model.Aggregation = AggregationModel
87698777
}
8770-
model.Filters = filters
8771-
}
8772-
if modelMap["group_names_fields"] != nil {
8773-
// groupNamesFields := []logsv0.ApisDashboardsV1CommonObservationField{}
8774-
// for _, groupNamesFieldsItem := range modelMap["group_names_fields"].([]interface{}) {
8775-
// groupNamesFieldsItemModel, err := ResourceIbmLogsDashboardMapToApisDashboardsV1CommonObservationField(groupNamesFieldsItem.(map[string]interface{}))
8776-
// if err != nil {
8777-
// return model, err
8778-
// }
8779-
// groupNamesFields = append(groupNamesFields, *groupNamesFieldsItemModel)
8780-
// }
8781-
groupNamesFields, err := ResourceIbmLogsDashboardMapToApisDashboardsV1CommonObservationField(modelMap["group_names_fields"].([]interface{}))
8782-
if err != nil {
8783-
return model, err
8778+
if modelMapElement["filters"] != nil {
8779+
filters := []logsv0.ApisDashboardsV1AstFilterLogsFilter{}
8780+
for _, filtersItem := range modelMapElement["filters"].([]interface{}) {
8781+
filtersItemModel, err := ResourceIbmLogsDashboardMapToApisDashboardsV1AstFilterLogsFilter(filtersItem.(map[string]interface{}))
8782+
if err != nil {
8783+
return model, err
8784+
}
8785+
filters = append(filters, *filtersItemModel)
8786+
}
8787+
model.Filters = filters
87848788
}
8785-
model.GroupNamesFields = groupNamesFields
8786-
}
8787-
if modelMap["stacked_group_name_field"] != nil && len(modelMap["stacked_group_name_field"].([]interface{})) > 0 && modelMap["stacked_group_name_field"].([]interface{})[0] != nil {
8788-
StackedGroupNameFieldModel, err := ResourceIbmLogsDashboardMapToApisDashboardsV1CommonObservationField(modelMap["stacked_group_name_field"].([]interface{}))
8789-
if err != nil {
8790-
return model, err
8789+
if modelMapElement["group_names_fields"] != nil {
8790+
// groupNamesFields := []logsv0.ApisDashboardsV1CommonObservationField{}
8791+
// for _, groupNamesFieldsItem := range modelMapElement["group_names_fields"].([]interface{}) {
8792+
// groupNamesFieldsItemModel, err := ResourceIbmLogsDashboardMapToApisDashboardsV1CommonObservationField(groupNamesFieldsItem.(map[string]interface{}))
8793+
// if err != nil {
8794+
// return model, err
8795+
// }
8796+
// groupNamesFields = append(groupNamesFields, *groupNamesFieldsItemModel)
8797+
// }
8798+
groupNamesFields, err := ResourceIbmLogsDashboardMapToApisDashboardsV1CommonObservationField(modelMapElement["group_names_fields"].([]interface{}))
8799+
if err != nil {
8800+
return model, err
8801+
}
8802+
model.GroupNamesFields = groupNamesFields
8803+
}
8804+
if modelMapElement["stacked_group_name_field"] != nil && len(modelMapElement["stacked_group_name_field"].([]interface{})) > 0 && modelMapElement["stacked_group_name_field"].([]interface{})[0] != nil {
8805+
StackedGroupNameFieldModel, err := ResourceIbmLogsDashboardMapToApisDashboardsV1CommonObservationField(modelMapElement["stacked_group_name_field"].([]interface{}))
8806+
if err != nil {
8807+
return model, err
8808+
}
8809+
model.StackedGroupNameField = &StackedGroupNameFieldModel[0]
87918810
}
8792-
model.StackedGroupNameField = &StackedGroupNameFieldModel[0]
87938811
}
8812+
87948813
return model, nil
87958814
}
87968815

8797-
func ResourceIbmLogsDashboardMapToApisDashboardsV1AstWidgetsBarChartMetricsQuery(modelMap map[string]interface{}) (*logsv0.ApisDashboardsV1AstWidgetsBarChartMetricsQuery, error) {
8816+
func ResourceIbmLogsDashboardMapToApisDashboardsV1AstWidgetsBarChartMetricsQuery(modelMap []interface{}) (*logsv0.ApisDashboardsV1AstWidgetsBarChartMetricsQuery, error) {
87988817
model := &logsv0.ApisDashboardsV1AstWidgetsBarChartMetricsQuery{}
8799-
if modelMap["promql_query"] != nil && len(modelMap["promql_query"].([]interface{})) > 0 {
8800-
PromqlQueryModel, err := ResourceIbmLogsDashboardMapToApisDashboardsV1AstWidgetsCommonPromQlQuery(modelMap["promql_query"].([]interface{}))
8801-
if err != nil {
8802-
return model, err
8803-
}
8804-
model.PromqlQuery = PromqlQueryModel
8805-
}
8806-
if modelMap["filters"] != nil {
8807-
filters := []logsv0.ApisDashboardsV1AstFilterMetricsFilter{}
8808-
for _, filtersItem := range modelMap["filters"].([]interface{}) {
8809-
filtersItemModel, err := ResourceIbmLogsDashboardMapToApisDashboardsV1AstFilterMetricsFilter(filtersItem.(map[string]interface{}))
8818+
if len(modelMap) > 0 && modelMap[0] != nil {
8819+
modelMapElement := modelMap[0].(map[string]interface{})
8820+
if modelMapElement["promql_query"] != nil && len(modelMapElement["promql_query"].([]interface{})) > 0 {
8821+
PromqlQueryModel, err := ResourceIbmLogsDashboardMapToApisDashboardsV1AstWidgetsCommonPromQlQuery(modelMapElement["promql_query"].([]interface{}))
88108822
if err != nil {
88118823
return model, err
88128824
}
8813-
filters = append(filters, *filtersItemModel)
8825+
model.PromqlQuery = PromqlQueryModel
88148826
}
8815-
model.Filters = filters
8816-
}
8817-
if modelMap["group_names"] != nil {
8818-
groupNames := []string{}
8819-
for _, groupNamesItem := range modelMap["group_names"].([]interface{}) {
8820-
groupNames = append(groupNames, groupNamesItem.(string))
8827+
if modelMapElement["filters"] != nil {
8828+
filters := []logsv0.ApisDashboardsV1AstFilterMetricsFilter{}
8829+
for _, filtersItem := range modelMapElement["filters"].([]interface{}) {
8830+
filtersItemModel, err := ResourceIbmLogsDashboardMapToApisDashboardsV1AstFilterMetricsFilter(filtersItem.(map[string]interface{}))
8831+
if err != nil {
8832+
return model, err
8833+
}
8834+
filters = append(filters, *filtersItemModel)
8835+
}
8836+
model.Filters = filters
8837+
}
8838+
if modelMapElement["group_names"] != nil {
8839+
groupNames := []string{}
8840+
for _, groupNamesItem := range modelMapElement["group_names"].([]interface{}) {
8841+
groupNames = append(groupNames, groupNamesItem.(string))
8842+
}
8843+
model.GroupNames = groupNames
8844+
}
8845+
if modelMapElement["stacked_group_name"] != nil && modelMapElement["stacked_group_name"].(string) != "" {
8846+
model.StackedGroupName = core.StringPtr(modelMapElement["stacked_group_name"].(string))
88218847
}
8822-
model.GroupNames = groupNames
8823-
}
8824-
if modelMap["stacked_group_name"] != nil && modelMap["stacked_group_name"].(string) != "" {
8825-
model.StackedGroupName = core.StringPtr(modelMap["stacked_group_name"].(string))
88268848
}
88278849
return model, nil
88288850
}
@@ -8861,7 +8883,7 @@ func ResourceIbmLogsDashboardMapToApisDashboardsV1AstWidgetsBarChartDataprimeQue
88618883
func ResourceIbmLogsDashboardMapToApisDashboardsV1AstWidgetsBarChartQueryValueLogs(modelMap map[string]interface{}) (*logsv0.ApisDashboardsV1AstWidgetsBarChartQueryValueLogs, error) {
88628884
model := &logsv0.ApisDashboardsV1AstWidgetsBarChartQueryValueLogs{}
88638885
if modelMap["logs"] != nil && len(modelMap["logs"].([]interface{})) > 0 {
8864-
LogsModel, err := ResourceIbmLogsDashboardMapToApisDashboardsV1AstWidgetsBarChartLogsQuery(modelMap["logs"].([]interface{})[0].(map[string]interface{}))
8886+
LogsModel, err := ResourceIbmLogsDashboardMapToApisDashboardsV1AstWidgetsBarChartLogsQuery(modelMap["logs"].([]interface{}))
88658887
if err != nil {
88668888
return model, err
88678889
}
@@ -8873,7 +8895,7 @@ func ResourceIbmLogsDashboardMapToApisDashboardsV1AstWidgetsBarChartQueryValueLo
88738895
func ResourceIbmLogsDashboardMapToApisDashboardsV1AstWidgetsBarChartQueryValueMetrics(modelMap map[string]interface{}) (*logsv0.ApisDashboardsV1AstWidgetsBarChartQueryValueMetrics, error) {
88748896
model := &logsv0.ApisDashboardsV1AstWidgetsBarChartQueryValueMetrics{}
88758897
if modelMap["metrics"] != nil && len(modelMap["metrics"].([]interface{})) > 0 {
8876-
MetricsModel, err := ResourceIbmLogsDashboardMapToApisDashboardsV1AstWidgetsBarChartMetricsQuery(modelMap["metrics"].([]interface{})[0].(map[string]interface{}))
8898+
MetricsModel, err := ResourceIbmLogsDashboardMapToApisDashboardsV1AstWidgetsBarChartMetricsQuery(modelMap["metrics"].([]interface{}))
88778899
if err != nil {
88788900
return model, err
88798901
}
@@ -8995,14 +9017,14 @@ func ResourceIbmLogsDashboardMapToApisDashboardsV1AstWidgetsBarChartXAxis(modelM
89959017
if modelMap != nil && len(modelMap) > 0 && modelMap[0] != nil {
89969018
modelMapElement := modelMap[0].(map[string]interface{})
89979019
if modelMapElement["value"] != nil && len(modelMapElement["value"].([]interface{})) > 0 {
8998-
ValueModel, err := ResourceIbmLogsDashboardMapToApisDashboardsV1AstWidgetsBarChartXAxisXAxisByValueEmpty(modelMapElement["value"].([]interface{})[0].(map[string]interface{}))
9020+
ValueModel, err := ResourceIbmLogsDashboardMapToApisDashboardsV1AstWidgetsBarChartXAxisXAxisByValueEmpty(modelMapElement["value"].([]interface{}))
89999021
if err != nil {
90009022
return model, err
90019023
}
90029024
model.Value = ValueModel
90039025
}
90049026
if modelMapElement["time"] != nil && len(modelMapElement["time"].([]interface{})) > 0 {
9005-
TimeModel, err := ResourceIbmLogsDashboardMapToApisDashboardsV1AstWidgetsBarChartXAxisXAxisByTime(modelMapElement["time"].([]interface{})[0].(map[string]interface{}))
9027+
TimeModel, err := ResourceIbmLogsDashboardMapToApisDashboardsV1AstWidgetsBarChartXAxisXAxisByTime(modelMapElement["time"].([]interface{}))
90069028
if err != nil {
90079029
return model, err
90089030
}
@@ -9013,26 +9035,30 @@ func ResourceIbmLogsDashboardMapToApisDashboardsV1AstWidgetsBarChartXAxis(modelM
90139035
return model, nil
90149036
}
90159037

9016-
func ResourceIbmLogsDashboardMapToApisDashboardsV1AstWidgetsBarChartXAxisXAxisByValueEmpty(modelMap map[string]interface{}) (*logsv0.ApisDashboardsV1AstWidgetsBarChartXAxisXAxisByValueEmpty, error) {
9038+
func ResourceIbmLogsDashboardMapToApisDashboardsV1AstWidgetsBarChartXAxisXAxisByValueEmpty(modelMap interface{}) (*logsv0.ApisDashboardsV1AstWidgetsBarChartXAxisXAxisByValueEmpty, error) {
90179039
model := &logsv0.ApisDashboardsV1AstWidgetsBarChartXAxisXAxisByValueEmpty{}
90189040
return model, nil
90199041
}
90209042

9021-
func ResourceIbmLogsDashboardMapToApisDashboardsV1AstWidgetsBarChartXAxisXAxisByTime(modelMap map[string]interface{}) (*logsv0.ApisDashboardsV1AstWidgetsBarChartXAxisXAxisByTime, error) {
9043+
func ResourceIbmLogsDashboardMapToApisDashboardsV1AstWidgetsBarChartXAxisXAxisByTime(modelMap []interface{}) (*logsv0.ApisDashboardsV1AstWidgetsBarChartXAxisXAxisByTime, error) {
90229044
model := &logsv0.ApisDashboardsV1AstWidgetsBarChartXAxisXAxisByTime{}
9023-
if modelMap["interval"] != nil && modelMap["interval"].(string) != "" {
9024-
model.Interval = core.StringPtr(modelMap["interval"].(string))
9025-
}
9026-
if modelMap["buckets_presented"] != nil {
9027-
model.BucketsPresented = core.Int64Ptr(int64(modelMap["buckets_presented"].(int)))
9045+
if len(modelMap) > 0 && modelMap[0] != nil {
9046+
modelMapElement := modelMap[0].(map[string]interface{})
9047+
if modelMapElement["interval"] != nil && modelMapElement["interval"].(string) != "" {
9048+
model.Interval = core.StringPtr(modelMapElement["interval"].(string))
9049+
}
9050+
if modelMapElement["buckets_presented"] != nil {
9051+
model.BucketsPresented = core.Int64Ptr(int64(modelMapElement["buckets_presented"].(int)))
9052+
}
90289053
}
9054+
90299055
return model, nil
90309056
}
90319057

90329058
func ResourceIbmLogsDashboardMapToApisDashboardsV1AstWidgetsBarChartXAxisTypeValue(modelMap map[string]interface{}) (*logsv0.ApisDashboardsV1AstWidgetsBarChartXAxisTypeValue, error) {
90339059
model := &logsv0.ApisDashboardsV1AstWidgetsBarChartXAxisTypeValue{}
90349060
if modelMap["value"] != nil && len(modelMap["value"].([]interface{})) > 0 {
9035-
ValueModel, err := ResourceIbmLogsDashboardMapToApisDashboardsV1AstWidgetsBarChartXAxisXAxisByValueEmpty(modelMap["value"].([]interface{})[0].(map[string]interface{}))
9061+
ValueModel, err := ResourceIbmLogsDashboardMapToApisDashboardsV1AstWidgetsBarChartXAxisXAxisByValueEmpty(modelMap["value"].([]interface{}))
90369062
if err != nil {
90379063
return model, err
90389064
}
@@ -9044,7 +9070,7 @@ func ResourceIbmLogsDashboardMapToApisDashboardsV1AstWidgetsBarChartXAxisTypeVal
90449070
func ResourceIbmLogsDashboardMapToApisDashboardsV1AstWidgetsBarChartXAxisTypeTime(modelMap map[string]interface{}) (*logsv0.ApisDashboardsV1AstWidgetsBarChartXAxisTypeTime, error) {
90459071
model := &logsv0.ApisDashboardsV1AstWidgetsBarChartXAxisTypeTime{}
90469072
if modelMap["time"] != nil && len(modelMap["time"].([]interface{})) > 0 {
9047-
TimeModel, err := ResourceIbmLogsDashboardMapToApisDashboardsV1AstWidgetsBarChartXAxisXAxisByTime(modelMap["time"].([]interface{})[0].(map[string]interface{}))
9073+
TimeModel, err := ResourceIbmLogsDashboardMapToApisDashboardsV1AstWidgetsBarChartXAxisXAxisByTime(modelMap["time"].([]interface{}))
90489074
if err != nil {
90499075
return model, err
90509076
}
@@ -9151,11 +9177,15 @@ func ResourceIbmLogsDashboardMapToApisDashboardsV1AstWidgetsHorizontalBarChartLo
91519177
model.LuceneQuery = LuceneQueryModel
91529178
}
91539179
if modelMap["aggregation"] != nil && len(modelMap["aggregation"].([]interface{})) > 0 {
9154-
AggregationModel, err := ResourceIbmLogsDashboardMapToApisDashboardsV1CommonLogsAggregation(modelMap["aggregation"].([]interface{})[0].(map[string]interface{}))
9155-
if err != nil {
9156-
return model, err
9180+
modelMapAggregation := modelMap["aggregation"].([]interface{})
9181+
if modelMapAggregation != nil && len(modelMapAggregation) > 0 {
9182+
AggregationModel, err := ResourceIbmLogsDashboardMapToApisDashboardsV1CommonLogsAggregation(modelMapAggregation[0].(map[string]interface{}))
9183+
if err != nil {
9184+
return model, err
9185+
}
9186+
model.Aggregation = AggregationModel
91579187
}
9158-
model.Aggregation = AggregationModel
9188+
91599189
}
91609190
if modelMap["filters"] != nil {
91619191
filters := []logsv0.ApisDashboardsV1AstFilterLogsFilter{}
@@ -12175,13 +12205,17 @@ func ResourceIbmLogsDashboardApisDashboardsV1AstWidgetsBarChartToMap(model *logs
1217512205
}
1217612206
modelMap["query"] = []map[string]interface{}{queryMap}
1217712207
modelMap["max_bars_per_chart"] = flex.IntValue(model.MaxBarsPerChart)
12178-
modelMap["group_name_template"] = *model.GroupNameTemplate
12208+
if model.GroupNameTemplate != nil {
12209+
modelMap["group_name_template"] = *model.GroupNameTemplate
12210+
}
1217912211
stackDefinitionMap, err := ResourceIbmLogsDashboardApisDashboardsV1AstWidgetsBarChartStackDefinitionToMap(model.StackDefinition)
1218012212
if err != nil {
1218112213
return modelMap, err
1218212214
}
1218312215
modelMap["stack_definition"] = []map[string]interface{}{stackDefinitionMap}
12184-
modelMap["scale_type"] = *model.ScaleType
12216+
if model.ScaleType != nil {
12217+
modelMap["scale_type"] = *model.ScaleType
12218+
}
1218512219
colorsByMap, err := ResourceIbmLogsDashboardApisDashboardsV1AstWidgetsCommonColorsByToMap(model.ColorsBy)
1218612220
if err != nil {
1218712221
return modelMap, err

0 commit comments

Comments
 (0)