Skip to content

Commit 2d167d2

Browse files
Terraform Team AutomationNagaRajuPasunuri
authored andcommitted
Added - New attribute are_data_asset_references_included in dataintegration import api
1 parent b3f0408 commit 2d167d2

7 files changed

+43
-7
lines changed

examples/dataintegration/workspace_import_requests/workspace_import_request.tf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
// Licensed under the Mozilla Public License v2.0
33

44

5+
variable "workspace_import_request_are_data_asset_references_included" {
6+
default = false
7+
}
8+
59
variable "workspace_import_request_bucket" {
610
default = "bucket"
711
}
@@ -61,6 +65,7 @@ resource "oci_dataintegration_workspace_import_request" "test_workspace_import_r
6165
workspace_id = var.workspace_id
6266

6367
#Optional
68+
are_data_asset_references_included = var.workspace_import_request_are_data_asset_references_included
6469
import_conflict_resolution {
6570
#Required
6671
import_conflict_resolution_type = var.workspace_import_request_import_conflict_resolution_import_conflict_resolution_type

internal/integrationtest/dataintegration_workspace_import_request_test.go

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,14 @@ var (
4848
}
4949

5050
DataintegrationWorkspaceImportRequestRepresentation = map[string]interface{}{
51-
"bucket": acctest.Representation{RepType: acctest.Required, Create: `${var.bucket_name}`},
52-
"file_name": acctest.Representation{RepType: acctest.Required, Create: `MyExportObjects.zip`},
53-
"workspace_id": acctest.Representation{RepType: acctest.Required, Create: `${var.workspace_id}`},
54-
"import_conflict_resolution": acctest.RepresentationGroup{RepType: acctest.Optional, Group: DataintegrationWorkspaceImportRequestImportConflictResolutionRepresentation},
55-
"object_key_for_import": acctest.Representation{RepType: acctest.Optional, Create: nil},
56-
"object_storage_region": acctest.Representation{RepType: acctest.Optional, Create: `${var.region_name}`},
57-
"object_storage_tenancy_id": acctest.Representation{RepType: acctest.Optional, Create: `${var.tenancy_id}`},
51+
"bucket": acctest.Representation{RepType: acctest.Required, Create: `${var.bucket_name}`},
52+
"file_name": acctest.Representation{RepType: acctest.Required, Create: `MyExportObjects.zip`},
53+
"workspace_id": acctest.Representation{RepType: acctest.Required, Create: `${var.workspace_id}`},
54+
"are_data_asset_references_included": acctest.Representation{RepType: acctest.Optional, Create: `false`},
55+
"import_conflict_resolution": acctest.RepresentationGroup{RepType: acctest.Optional, Group: DataintegrationWorkspaceImportRequestImportConflictResolutionRepresentation},
56+
"object_key_for_import": acctest.Representation{RepType: acctest.Optional, Create: nil},
57+
"object_storage_region": acctest.Representation{RepType: acctest.Optional, Create: `${var.region_name}`},
58+
"object_storage_tenancy_id": acctest.Representation{RepType: acctest.Required, Create: `${var.tenancy_id}`},
5859
}
5960
DataintegrationWorkspaceImportRequestImportConflictResolutionRepresentation = map[string]interface{}{
6061
"import_conflict_resolution_type": acctest.Representation{RepType: acctest.Required, Create: `REPLACE`},
@@ -125,6 +126,7 @@ func TestDataintegrationWorkspaceImportRequestResource_basic(t *testing.T) {
125126
Config: config + compartmentIdVariableStr + workspaceIdVariableStr + tenancyIdVariableStr + regionVariableStr + bucketVariableStr + DataintegrationWorkspaceImportRequestResourceDependencies +
126127
acctest.GenerateResourceFromRepresentationMap("oci_dataintegration_workspace_import_request", "test_workspace_import_request", acctest.Optional, acctest.Create, DataintegrationWorkspaceImportRequestRepresentation),
127128
Check: acctest.ComposeAggregateTestCheckFuncWrapper(
129+
resource.TestCheckResourceAttr(resourceName, "are_data_asset_references_included", "false"),
128130
resource.TestCheckResourceAttrSet(resourceName, "bucket"),
129131
resource.TestCheckResourceAttr(resourceName, "file_name", "MyExportObjects.zip"),
130132
resource.TestCheckResourceAttr(resourceName, "import_conflict_resolution.#", "1"),
@@ -172,6 +174,7 @@ func TestDataintegrationWorkspaceImportRequestResource_basic(t *testing.T) {
172174
resource.TestCheckResourceAttrSet(singularDatasourceName, "import_request_key"),
173175
resource.TestCheckResourceAttrSet(singularDatasourceName, "workspace_id"),
174176

177+
resource.TestCheckResourceAttr(singularDatasourceName, "are_data_asset_references_included", "false"),
175178
resource.TestCheckResourceAttrSet(singularDatasourceName, "bucket"),
176179
resource.TestCheckResourceAttrSet(singularDatasourceName, "created_by"),
177180
resource.TestCheckResourceAttr(singularDatasourceName, "file_name", "MyExportObjects.zip"),

internal/service/dataintegration/dataintegration_workspace_import_request_data_source.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,10 @@ func (s *DataintegrationWorkspaceImportRequestDataSourceCrud) SetData() error {
7676

7777
s.D.SetId(tfresource.GenerateDataSourceHashID("DataintegrationWorkspaceImportRequestDataSource-", DataintegrationWorkspaceImportRequestDataSource(), s.D))
7878

79+
if s.Res.AreDataAssetReferencesIncluded != nil {
80+
s.D.Set("are_data_asset_references_included", *s.Res.AreDataAssetReferencesIncluded)
81+
}
82+
7983
if s.Res.BucketName != nil {
8084
s.D.Set("bucket", *s.Res.BucketName)
8185
}

internal/service/dataintegration/dataintegration_workspace_import_request_resource.go

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,12 @@ func DataintegrationWorkspaceImportRequestResource() *schema.Resource {
4848
},
4949

5050
// Optional
51+
"are_data_asset_references_included": {
52+
Type: schema.TypeBool,
53+
Optional: true,
54+
Computed: true,
55+
ForceNew: true,
56+
},
5157
"import_conflict_resolution": {
5258
Type: schema.TypeList,
5359
Optional: true,
@@ -231,6 +237,11 @@ func (s *DataintegrationWorkspaceImportRequestResourceCrud) ID() string {
231237
func (s *DataintegrationWorkspaceImportRequestResourceCrud) Create() error {
232238
request := oci_dataintegration.CreateImportRequestRequest{}
233239

240+
if areDataAssetReferencesIncluded, ok := s.D.GetOkExists("are_data_asset_references_included"); ok {
241+
tmp := areDataAssetReferencesIncluded.(bool)
242+
request.AreDataAssetReferencesIncluded = &tmp
243+
}
244+
234245
if bucket, ok := s.D.GetOkExists("bucket"); ok {
235246
tmp := bucket.(string)
236247
request.BucketName = &tmp
@@ -364,6 +375,10 @@ func (s *DataintegrationWorkspaceImportRequestResourceCrud) SetData() error {
364375
log.Printf("[WARN] SetData() unable to parse current ID: %s", s.D.Id())
365376
}
366377

378+
if s.Res.AreDataAssetReferencesIncluded != nil {
379+
s.D.Set("are_data_asset_references_included", *s.Res.AreDataAssetReferencesIncluded)
380+
}
381+
367382
if s.Res.BucketName != nil {
368383
s.D.Set("bucket", *s.Res.BucketName)
369384
}
@@ -510,6 +525,10 @@ func ImportObjectMetadataSummaryToMap(obj oci_dataintegration.ImportObjectMetada
510525
func ImportRequestSummaryToMap(obj oci_dataintegration.ImportRequestSummary) map[string]interface{} {
511526
result := map[string]interface{}{}
512527

528+
if obj.AreDataAssetReferencesIncluded != nil {
529+
result["are_data_asset_references_included"] = bool(*obj.AreDataAssetReferencesIncluded)
530+
}
531+
513532
if obj.BucketName != nil {
514533
result["bucket"] = string(*obj.BucketName)
515534
}

website/docs/d/dataintegration_workspace_import_request.html.markdown

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ The following arguments are supported:
3535

3636
The following attributes are exported:
3737

38+
* `are_data_asset_references_included` - This field controls if the data asset references will be included during import.
3839
* `bucket` - The name of the Object Storage Bucket where the objects will be imported from
3940
* `created_by` - Name of the user who initiated import request.
4041
* `error_messages` - Contains key of the error

website/docs/d/dataintegration_workspace_import_requests.html.markdown

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ The following attributes are exported:
5151

5252
The following attributes are exported:
5353

54+
* `are_data_asset_references_included` - This field controls if the data asset references will be included during import.
5455
* `bucket` - The name of the Object Storage Bucket where the objects will be imported from
5556
* `created_by` - Name of the user who initiated import request.
5657
* `error_messages` - Contains key of the error

website/docs/r/dataintegration_workspace_import_request.html.markdown

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ resource "oci_dataintegration_workspace_import_request" "test_workspace_import_r
2222
workspace_id = oci_dataintegration_workspace.test_workspace.id
2323
2424
#Optional
25+
are_data_asset_references_included = var.workspace_import_request_are_data_asset_references_included
2526
import_conflict_resolution {
2627
#Required
2728
import_conflict_resolution_type = var.workspace_import_request_import_conflict_resolution_import_conflict_resolution_type
@@ -40,6 +41,7 @@ resource "oci_dataintegration_workspace_import_request" "test_workspace_import_r
4041

4142
The following arguments are supported:
4243

44+
* `are_data_asset_references_included` - (Optional) This field controls if the data asset references will be included during import.
4345
* `bucket` - (Required) Name of the Object Storage bucket where the object will be imported from.
4446
* `file_name` - (Required) Name of the zip file to be imported.
4547
* `import_conflict_resolution` - (Optional) Import Objects Conflict resolution.
@@ -59,6 +61,7 @@ Any change to a property that does not support update will force the destruction
5961

6062
The following attributes are exported:
6163

64+
* `are_data_asset_references_included` - This field controls if the data asset references will be included during import.
6265
* `bucket` - The name of the Object Storage Bucket where the objects will be imported from
6366
* `created_by` - Name of the user who initiated import request.
6467
* `error_messages` - Contains key of the error

0 commit comments

Comments
 (0)