Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

azurerm_data_factory_dataset_parquet - mark path as optional #19009

Merged
merged 2 commits into from
Oct 27, 2022
Merged

azurerm_data_factory_dataset_parquet - mark path as optional #19009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
03f0262
`azurerm_data_factory_dataset_parquet` - mark `path` as optional
ms-henglu Oct 27, 2022
2182f44
add test
ms-henglu Oct 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions internal/services/datafactory/data_factory_dataset_parquet_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,6 @@ func resourceDataFactoryDatasetParquet() *pluginsdk.Resource {
Optional: true,
Default: false,
},
"path": {
Type: pluginsdk.TypeString,
Required: true,
ValidateFunc: validation.StringIsNotEmpty,
},
"dynamic_path_enabled": {
Type: pluginsdk.TypeBool,
Optional: true,
Expand All @@ -110,6 +105,11 @@ func resourceDataFactoryDatasetParquet() *pluginsdk.Resource {
Optional: true,
Default: false,
},
"path": {
Type: pluginsdk.TypeString,
Optional: true,
ValidateFunc: validation.StringIsNotEmpty,
},
},
},
},
Expand Down Expand Up @@ -163,11 +163,6 @@ func resourceDataFactoryDatasetParquet() *pluginsdk.Resource {
Required: true,
ValidateFunc: validation.StringIsNotEmpty,
},
"path": {
Type: pluginsdk.TypeString,
Required: true,
ValidateFunc: validation.StringIsNotEmpty,
},
"dynamic_path_enabled": {
Type: pluginsdk.TypeBool,
Optional: true,
Expand All @@ -183,6 +178,11 @@ func resourceDataFactoryDatasetParquet() *pluginsdk.Resource {
Optional: true,
Default: false,
},
"path": {
Type: pluginsdk.TypeString,
Optional: true,
ValidateFunc: validation.StringIsNotEmpty,
},
},
},
},
Expand Down
2 changes: 0 additions & 2 deletions internal/services/datafactory/data_factory_dataset_parquet_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,6 @@ resource "azurerm_data_factory_dataset_parquet" "test" {

http_server_location {
relative_url = "/fizz/buzz/"
path = "foo/bar/"
filename = "foo.txt"
}
}
Expand Down Expand Up @@ -335,7 +334,6 @@ resource "azurerm_data_factory_dataset_parquet" "test" {

azure_blob_storage_location {
container = azurerm_storage_container.test.name
path = "@concat('foo/bar/',formatDateTime(convertTimeZone(utcnow(),'UTC','W. Europe Standard Time'),'yyyy-MM-dd'))"
dynamic_path_enabled = true
}
}
Expand Down
7 changes: 3 additions & 4 deletions website/docs/r/data_factory_dataset_parquet.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,22 +92,19 @@ A `http_server_location` block supports the following:

* `relative_url` - (Required) The base URL to the web server hosting the file.

* `path` - (Required) The folder path to the file on the web server.

* `filename` - (Optional) The filename of the file on the web server.

* `dynamic_path_enabled` - (Optional) Is the `path` using dynamic expression, function or system variables? Defaults to `false`.

* `dynamic_filename_enabled` - (Optional) Is the `filename` using dynamic expression, function or system variables? Defaults to `false`.

* `path` - (Optional) The folder path to the file on the web server.
---

A `azure_blob_storage_location` block supports the following:

* `container` - (Required) The container on the Azure Blob Storage Account hosting the file.

* `path` - (Required) The folder path to the file on the web server.

* `filename` - (Required) The filename of the file on the web server.

* `dynamic_container_enabled` - (Optional) Is the `container` using dynamic expression, function or system variables? Defaults to `false`.
Expand All @@ -116,6 +113,8 @@ A `azure_blob_storage_location` block supports the following:

* `dynamic_filename_enabled` - (Optional) Is the `filename` using dynamic expression, function or system variables? Defaults to `false`.

* `path` - (Optional) The folder path to the file on the web server.

## Attributes Reference

The following attributes are exported:
Expand Down