Skip to content

Commit e0a1c8a

Browse files
committed
fix: runtime error: invalid memory address or nil pointer dereference when type=DatabaseTrigger
1 parent ab1f3c7 commit e0a1c8a

File tree

1 file changed

+17
-19
lines changed

1 file changed

+17
-19
lines changed

cfn-resources/trigger/cmd/resource/resource.go

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -229,28 +229,26 @@ func newEventTrigger(model *Model) (*realm.EventTriggerRequest, error) {
229229
conf.Database = *model.DatabaseTrigger.Database
230230
}
231231
dTrigger := model.DatabaseTrigger
232-
233-
if dTrigger.Match != nil {
234-
jsonData := []byte(*dTrigger.Match)
235-
// convert the JSON string to a map
236-
var m interface{}
237-
if err := json.Unmarshal(jsonData, &m); err != nil {
238-
return nil, errors.New("error unmarshalling Match field - " + err.Error())
232+
if dTrigger != nil {
233+
if dTrigger.Match != nil {
234+
jsonData := []byte(*dTrigger.Match)
235+
// convert the JSON string to a map
236+
var m interface{}
237+
if err := json.Unmarshal(jsonData, &m); err != nil {
238+
return nil, errors.New("error unmarshalling Match field - " + err.Error())
239+
}
240+
conf.Match = m
239241
}
240-
conf.Match = m
241-
}
242242

243-
if dTrigger.Project != nil {
244-
jsonData := []byte(*dTrigger.Project)
245-
// convert the JSON string to a map
246-
var m interface{}
247-
if err := json.Unmarshal(jsonData, &m); err != nil {
248-
return nil, errors.New("error unmarshalling Project field - " + err.Error())
243+
if dTrigger.Project != nil {
244+
jsonData := []byte(*dTrigger.Project)
245+
// convert the JSON string to a map
246+
var m interface{}
247+
if err := json.Unmarshal(jsonData, &m); err != nil {
248+
return nil, errors.New("error unmarshalling Project field - " + err.Error())
249+
}
250+
conf.Project = m
249251
}
250-
conf.Project = m
251-
}
252-
253-
if dTrigger != nil {
254252
conf.Collection = aws.StringValue(dTrigger.Collection)
255253
conf.ServiceID = aws.StringValue(dTrigger.ServiceId)
256254
conf.OperationTypes = dTrigger.OperationTypes

0 commit comments

Comments
 (0)