Added - oprional parameters to import

Author: Emily Shimoda

examples/management_dashboard/main.tf

@@ -10,7 +10,7 @@ provider "oci" {
 }
 
 data "oci_management_dashboard_management_dashboards_export" "test_export" {
-  export_dashboard_id = "{\"dashboardIds\":[\"ocid1.managementdashboard.dev..aaaaaaaazrrxainoaive7adj77uqejld45vch7zkoqrlh5fwv2_dummy_ocids\"]}"
+  export_dashboard_id = "%7B%22dashboardIds%22%3A%5B%22dummy_ocid%22%5D%7D"
 }
 
 // example showing import_details usage
@@ -23,6 +23,21 @@ resource "oci_management_dashboard_management_dashboards_import" "test_import_vi
   import_details_file = "sample.json"
 }
 
+resource "oci_management_dashboard_management_dashboards_import" "test_import_override_name" {
+  override_same_name = true
+  import_details_file = "sample.json"
+}
+
+resource "oci_management_dashboard_management_dashboards_import" "test_import_override_ss_compartment" {
+  override_saved_search_compartment_ocid = "dummy_ocid"
+  import_details_file = "sample.json"
+}
+
+resource "oci_management_dashboard_management_dashboards_import" "test_import_override_db_compartment" {
+  override_dashboard_compartment_ocid = "dummy_ocid"
+  import_details_file = "sample.json"
+}
+
 output "test_export_data_all" {
   value = data.oci_management_dashboard_management_dashboards_export.test_export
 }

internal/service/management_dashboard/management_dashboard_management_dashboards_import_resource.go

@@ -40,6 +40,24 @@ func ManagementDashboardManagementDashboardsImportResource() *schema.Resource {
 				ForceNew:      true,
 				ConflictsWith: []string{"import_details_file"},
 			},
+			"override_dashboard_compartment_ocid": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+				ForceNew: true,
+			},
+			"override_same_name": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+				ForceNew: true,
+			},
+			"override_saved_search_compartment_ocid": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+				ForceNew: true,
+			},
 		},
 	}
 }
@@ -84,6 +102,23 @@ func (s *ManagementDashboardManagementDashboardsImportResourceCrud) Create() err
 		request.ManagementDashboardImportDetails = importDetailsObj
 	}
 
+	if overrideDashboardCompartmentOcid, ok := s.D.GetOkExists("override_dashboard_compartment_ocid"); ok {
+		tmp := overrideDashboardCompartmentOcid.(string)
+		request.OverrideDashboardCompartmentOcid = &tmp
+	}
+
+	if overrideSameName, ok := s.D.GetOkExists("override_same_name"); ok {
+		tmp := overrideSameName.(string)
+		request.OverrideSameName = &tmp
+	}
+
+	if overrideSavedSearchCompartmentOcid, ok := s.D.GetOkExists("override_saved_search_compartment_ocid"); ok {
+		tmp := overrideSavedSearchCompartmentOcid.(string)
+		request.OverrideSavedSearchCompartmentOcid = &tmp
+	}
+
+	request.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(s.DisableNotFoundRetries, "management_dashboard")
+
 	if importDetailsFilePath, ok := s.D.GetOkExists("import_details_file"); ok {
 		flag = true
 		importDetailsFileData, err := ioutil.ReadFile(importDetailsFilePath.(string))
@@ -105,9 +140,10 @@ func (s *ManagementDashboardManagementDashboardsImportResourceCrud) Create() err
 
 	request.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(s.DisableNotFoundRetries, "management_dashboard")
 
-	_, err := s.Client.ImportDashboard(context.Background(), request)
+	response, err := s.Client.ImportDashboard(context.Background(), request)
 	if err != nil {
-		return err
+		return fmt.Errorf("response: %s \n error: %s", response, err)
+
 	}
 
 	return nil

website/docs/r/management_dashboard_management_dashboards_import.html.markdown

@@ -23,17 +23,21 @@ Here's an example of how you can use CLI to import:
 ```hcl
 resource "oci_management_dashboard_management_dashboards_import" "test_management_dashboards_import" {
 	#Optional
-	import_details = var.sample_import_details
-	import_details_file = var.sample_import_details_file_path
+	override_dashboard_compartment_ocid = var.management_dashboards_import_override_dashboard_compartment_ocid
+	override_same_name = var.management_dashboards_import_override_same_name
+	override_saved_search_compartment_ocid = var.management_dashboards_import_override_saved_search_compartment_ocid
 }
 ```
 
 ## Argument Reference
 
 The following arguments are supported:
 
-* `import_details` - (Optional) Array of Dashboards to import. The `import_details` is mandatory if `import_details_path` is not passed. Value should be stringified JSON of [ManagementDashboardImportDetails](https://docs.cloud.oracle.com/en-us/iaas/api/#/en/managementdashboard/20200901/ManagementDashboardImportDetails/)
-* `import_details_path` - (Optional) Array of Dashboards to import. The `import_details_path` is mandatory if `import_details` is not passed. Value should be the path to the JSON file containing [ManagementDashboardImportDetails](https://docs.cloud.oracle.com/en-us/iaas/api/#/en/managementdashboard/20200901/ManagementDashboardImportDetails/)
+
+* `override_dashboard_compartment_ocid` - (Optional) If this attribute is set, the dashboard resources are created or updated in the compartment specified by OCID. If this attribute is not set, the compartment specified in the JSON metadata is used. 
+* `override_same_name` - (Optional) By default, if a resource with the same OCID exists in the target compartment, it is updated during the import process, otherwise, a new resource is created. However, if this attribute is set to true, then during the import process if a resource with the same displayName exists in the compartment, then it is updated even if the OCIDs are different. This is useful when importing the same resource multiple times. If the compartment and displayName remain the same, the resource is only updated and multiple copies of a resource are not created. 
+* `override_saved_search_compartment_ocid` - (Optional) If this attribute is set, the saved search resources are created or updated in the compartment specified by OCID. If this attribute is not set, the compartment specified in the JSON metadata is used. 
+
 
 ** IMPORTANT **
 Any change to a property that does not support update will force the destruction and recreation of the resource with the new property values