fix: Avoids runtime error: invalid memory address or nil pointer dereference when type!=DatabaseTrigger (#1218)

Author: EspenAlbert

.gitignore

@@ -27,6 +27,7 @@ update.json
 **/functions/packages
 **/taskcat_outputs/
 **/inputs/**
+**/samples/**
 pytestdebug.log
 !/cdk/**/.*
 *.DS_Store

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

@@ -230,28 +230,26 @@ func newEventTrigger(model *Model) (*appservices.EventTriggerRequest, error) {
 		conf.Database = *model.DatabaseTrigger.Database
 	}
 	dTrigger := model.DatabaseTrigger
-
-	if dTrigger.Match != nil {
-		jsonData := []byte(*dTrigger.Match)
-		// convert the JSON string to a map
-		var m interface{}
-		if err := json.Unmarshal(jsonData, &m); err != nil {
-			return nil, errors.New("error unmarshalling Match field - " + err.Error())
+	if dTrigger != nil {
+		if dTrigger.Match != nil {
+			jsonData := []byte(*dTrigger.Match)
+			// convert the JSON string to a map
+			var m interface{}
+			if err := json.Unmarshal(jsonData, &m); err != nil {
+				return nil, errors.New("error unmarshalling Match field - " + err.Error())
+			}
+			conf.Match = m
 		}
-		conf.Match = m
-	}
 
-	if dTrigger.Project != nil {
-		jsonData := []byte(*dTrigger.Project)
-		// convert the JSON string to a map
-		var m interface{}
-		if err := json.Unmarshal(jsonData, &m); err != nil {
-			return nil, errors.New("error unmarshalling Project field - " + err.Error())
+		if dTrigger.Project != nil {
+			jsonData := []byte(*dTrigger.Project)
+			// convert the JSON string to a map
+			var m interface{}
+			if err := json.Unmarshal(jsonData, &m); err != nil {
+				return nil, errors.New("error unmarshalling Project field - " + err.Error())
+			}
+			conf.Project = m
 		}
-		conf.Project = m
-	}
-
-	if dTrigger != nil {
 		conf.Collection = aws.StringValue(dTrigger.Collection)
 		conf.ServiceID = aws.StringValue(dTrigger.ServiceId)
 		conf.OperationTypes = dTrigger.OperationTypes

cfn-resources/trigger/index.html

@@ -1,14 +1,14 @@
 {
-  "Name": "materializeMonthlyProductSales46",
+  "Name": "cfn-test-trigger-${RANDOM_INT_100K}",
   "Type": "DATABASE",
-  "Profile": "default",
+  "Profile": "${MONGODB_ATLAS_PROFILE}",
   "DatabaseTrigger": {
     "OperationTypes": [
       "INSERT"
     ],
     "Database": "store",
     "Collection": "sales",
-    "ServiceId": "6387aee08659af5254b0a51e",
+    "ServiceId": "${MONGODB_REALM_SERVICE_ID}",
     "FullDocument": "true",
     "FullDocumentBeforeChange": "false",
     "Unordered": "false",
@@ -20,14 +20,14 @@
   "EventProcessors": {
     "FUNCTION": {
       "FuncConfig": {
-        "FunctionName": "cfn_func",
-        "FunctionId": "63862553ac0702272aa701ba"
+        "FunctionName": "${MONGODB_REALM_FUNCTION_NAME}",
+        "FunctionId": "${MONGODB_REALM_FUNCTION_ID}"
       }
     },
     "AWSEVENTBRIDGE": {
       "AWSConfig": {}
     }
   },
-  "AppId": "638624a5167f5659feb75971",
-  "ProjectId": "625454459c4e6108393d650d"
+  "AppId": "${MONGODB_REALM_APP_ID}",
+  "ProjectId": "${MONGODB_ATLAS_PROJECT_ID}"
 }

cfn-resources/trigger/test/inputs_1_create.template.json

@@ -1,14 +1,14 @@
 {
-  "Name": "materializeMonthlyProductSales46",
+  "Name": "cfn-test-trigger-${RANDOM_INT_100K}",
   "Type": "DATABASE",
-  "Profile": "default",
+  "Profile": "${MONGODB_ATLAS_PROFILE}",
   "DatabaseTrigger": {
     "OperationTypes": [
       "INSERT"
     ],
     "Database": "store",
     "Collection": "sales",
-    "ServiceId": "6387aee08659af5254b0a51e",
+    "ServiceId": "${MONGODB_REALM_SERVICE_ID}",
     "FullDocument": "true",
     "FullDocumentBeforeChange": "false",
     "Unordered": "false",
@@ -20,14 +20,14 @@
   "EventProcessors": {
     "FUNCTION": {
       "FuncConfig": {
-        "FunctionName": "cfn_func",
-        "FunctionId": "63862553ac0702272aa701ba"
+        "FunctionName": "${MONGODB_REALM_FUNCTION_NAME}",
+        "FunctionId": "${MONGODB_REALM_FUNCTION_ID}"
       }
     },
     "AWSEVENTBRIDGE": {
       "AWSConfig": {}
     }
   },
-  "AppId": "638624a5167f5659feb75971",
-  "ProjectId": "625454459c4e6108393d650d"
+  "AppId": "${MONGODB_REALM_APP_ID}",
+  "ProjectId": "${MONGODB_ATLAS_PROJECT_ID}"
 }