Merge pull request #48 from mulesoft-anypoint/features/rtf

Runtime Fabrics Integration
salesforce · Aug 25, 2024 · c029036 · c029036
2 parents ae92bdb + d2b5807
commit c029036
Show file tree

Hide file tree

Showing 35 changed files with 2,042 additions and 10 deletions.
diff --git a/anypoint/data_source_apim_instance.go b/anypoint/data_source_apim_instance.go
@@ -748,7 +748,7 @@ func flattenApimAudit(audit *apim.Audit) map[string]interface{} {
 		}
 	}
 	if updated, ok := audit.GetUpdatedOk(); ok && updated != nil {
-		if val, ok := updated.GetDateOk(); ok && updated != nil {
+		if val, ok := updated.GetDateOk(); ok {
 			result["updated"] = *val
 		}
 	}

diff --git a/anypoint/data_source_apim_instance_policy.go b/anypoint/data_source_apim_instance_policy.go
@@ -205,7 +205,7 @@ func flattenApimInstancePolicyAudit(audit *apim_policy.Audit) map[string]interfa
 		}
 	}
 	if updated, ok := audit.GetUpdatedOk(); ok && updated != nil {
-		if val, ok := updated.GetDateOk(); ok && updated != nil {
+		if val, ok := updated.GetDateOk(); ok {
 			result["updated"] = val
 		}
 	}

diff --git a/anypoint/data_source_apim_instance_upstreams.go b/anypoint/data_source_apim_instance_upstreams.go
@@ -216,7 +216,7 @@ func flattenApimUpstreamAudit(audit *apim_upstream.Audit) map[string]interface{}
 		}
 	}
 	if updated, ok := audit.GetUpdatedOk(); ok && updated != nil {
-		if val, ok := updated.GetDateOk(); ok && updated != nil {
+		if val, ok := updated.GetDateOk(); ok {
 			result["updated"] = val.String()
 		}
 	}

diff --git a/anypoint/data_source_connected_app.go b/anypoint/data_source_connected_app.go
@@ -163,7 +163,7 @@ func dataSourceConnectedAppRead(ctx context.Context, d *schema.ResourceData, m i
 	// Is it a "on behalf of user" connected apps?
 	if granttypes := connappinstance["grant_types"]; granttypes != nil && StringInSlice(granttypes.([]string), "client_credentials", true) {
 		// Yes, then load the scopes using connapps/{connapp_id}/scopes
-		if scopes, error := readScopesByConnectedAppId(authctx, orgid, connappid, m); error != nil {
+		if scopes, err := readScopesByConnectedAppId(authctx, orgid, connappid, m); err != nil {
 			diags := append(diags, diag.Diagnostic{
 				Severity: diag.Error,
 				Summary:  "Unable to read connected-app " + connappid + " scopes",