Support for publisher maps for service connector

Author: varmax2511

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ### Added
 - Support for SMS notifications for ONS
+- Support for publisher maps for service connector
 
 ## 4.16.0 (March 03, 2021)
 

examples/service_connector_hub/main.tf

@@ -13,6 +13,9 @@ variable "compartment_ocid" {}
 // If using the log analytics target
 //variable "log_analytics_log_group_id" {}
 
+// If using the notification target
+//variable "notification_topic_id" {}
+
 provider "oci" {
   tenancy_ocid     = var.tenancy_ocid
   user_ocid        = var.user_ocid
@@ -147,6 +150,13 @@ resource "oci_sch_service_connector" "test_service_connector" {
     log_group_id    = var.log_analytics_log_group_id
   }*/
 
+  // If using the notification target
+  /*target {
+    kind            		= "notifications"
+    topic_id  			= var.notification_topic_id
+    enable_formatted_messaging	= "true"
+  }*/
+
   tasks {
     condition = "logContent='20'"
     kind      = "logRule"

oci/sch_service_connector_resource.go

@@ -135,6 +135,11 @@ func SchServiceConnectorResource() *schema.Resource {
 							Optional: true,
 							Computed: true,
 						},
+						"enable_formatted_messaging": {
+							Type:     schema.TypeBool,
+							Optional: true,
+							Computed: true,
+						},
 						"function_id": {
 							Type:     schema.TypeString,
 							Optional: true,
@@ -944,6 +949,10 @@ func (s *SchServiceConnectorResourceCrud) mapToTargetDetails(fieldKeyFormat stri
 		baseObject = details
 	case strings.ToLower("notifications"):
 		details := oci_sch.NotificationsTargetDetails{}
+		if enableFormattedMessaging, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "enable_formatted_messaging")); ok {
+			tmp := enableFormattedMessaging.(bool)
+			details.EnableFormattedMessaging = &tmp
+		}
 		if topicId, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "topic_id")); ok {
 			tmp := topicId.(string)
 			details.TopicId = &tmp
@@ -1017,6 +1026,10 @@ func TargetDetailsToMap(obj *oci_sch.TargetDetails) map[string]interface{} {
 	case oci_sch.NotificationsTargetDetails:
 		result["kind"] = "notifications"
 
+		if v.EnableFormattedMessaging != nil {
+			result["enable_formatted_messaging"] = bool(*v.EnableFormattedMessaging)
+		}
+
 		if v.TopicId != nil {
 			result["topic_id"] = string(*v.TopicId)
 		}

oci/sch_service_connector_test.go

@@ -76,8 +76,9 @@ var (
 	}
 
 	onsTargetRepresentation = map[string]interface{}{
-		"kind":     Representation{repType: Required, create: `notifications`},
-		"topic_id": Representation{repType: Required, create: `${oci_ons_notification_topic.test_notification_topic.id}`},
+		"kind":                       Representation{repType: Required, create: `notifications`},
+		"topic_id":                   Representation{repType: Required, create: `${oci_ons_notification_topic.test_notification_topic.id}`},
+		"enable_formatted_messaging": Representation{repType: Optional, create: `true`},
 	}
 
 	// create serviceConnector definitions
@@ -252,6 +253,7 @@ func TestSchServiceConnectorResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "target.#", "1"),
 					resource.TestCheckResourceAttr(resourceName, "target.0.kind", "notifications"),
 					resource.TestCheckResourceAttrSet(resourceName, "target.0.topic_id"),
+					resource.TestCheckResourceAttr(resourceName, "target.0.enable_formatted_messaging", "true"),
 
 					func(s *terraform.State) (err error) {
 						resId, err = fromInstanceState(s, resourceName, "id")

website/docs/d/sch_service_connector.html.markdown

@@ -53,6 +53,7 @@ The following attributes are exported:
 	* `batch_rollover_time_in_ms` - The batch rollover time in milliseconds. 
 	* `bucket` - The name of the bucket. Avoid entering confidential information. 
 	* `compartment_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the compartment containing the metric. 
+	* `enable_formatted_messaging` - Whether to apply a simplified, user-friendly format to the message. Applies only when friendly formatting is supported by the service connector source and the subscription protocol.  Example: `true` 
 	* `function_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the function. 
 	* `kind` - The type descriminator. 
 	* `log_group_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the Logging Analytics log group. 

website/docs/d/sch_service_connectors.html.markdown

@@ -65,6 +65,7 @@ The following attributes are exported:
 	* `batch_rollover_time_in_ms` - The batch rollover time in milliseconds. 
 	* `bucket` - The name of the bucket. Avoid entering confidential information. 
 	* `compartment_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the compartment containing the metric. 
+	* `enable_formatted_messaging` - Whether to apply a simplified, user-friendly format to the message. Applies only when friendly formatting is supported by the service connector source and the subscription protocol.  Example: `true` 
 	* `function_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the function. 
 	* `kind` - The type descriminator. 
 	* `log_group_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the Logging Analytics log group. 

website/docs/r/sch_service_connector.html.markdown

@@ -58,6 +58,7 @@ resource "oci_sch_service_connector" "test_service_connector" {
 		batch_rollover_time_in_ms = var.service_connector_target_batch_rollover_time_in_ms
 		bucket = var.service_connector_target_bucket
 		compartment_id = var.compartment_id
+		enable_formatted_messaging = var.service_connector_target_enable_formatted_messaging
 		function_id = oci_functions_function.test_function.id
 		log_group_id = oci_logging_log_group.test_log_group.id
 		metric = var.service_connector_target_metric
@@ -100,6 +101,7 @@ The following arguments are supported:
 	* `batch_rollover_time_in_ms` - (Applicable when kind=objectStorage) (Updatable) The batch rollover time in milliseconds. 
 	* `bucket` - (Required when kind=objectStorage) (Updatable) The name of the bucket. Avoid entering confidential information. 
 	* `compartment_id` - (Required when kind=monitoring) (Updatable) The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the compartment containing the metric. 
+	* `enable_formatted_messaging` - (Applicable when kind=notifications) (Updatable) Whether to apply a simplified, user-friendly format to the message. Applies only when friendly formatting is supported by the service connector source and the subscription protocol.  Example: `true` 
 	* `function_id` - (Required when kind=functions) (Updatable) The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the function. 
 	* `kind` - (Required) (Updatable) The type descriminator. 
 	* `log_group_id` - (Required when kind=loggingAnalytics) (Updatable) The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the Logging Analytics log group. 
@@ -142,6 +144,7 @@ The following attributes are exported:
 	* `batch_rollover_time_in_ms` - The batch rollover time in milliseconds. 
 	* `bucket` - The name of the bucket. Avoid entering confidential information. 
 	* `compartment_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the compartment containing the metric. 
+	* `enable_formatted_messaging` - Whether to apply a simplified, user-friendly format to the message. Applies only when friendly formatting is supported by the service connector source and the subscription protocol.  Example: `true` 
 	* `function_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the function. 
 	* `kind` - The type descriminator. 
 	* `log_group_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the Logging Analytics log group.