azurerm_data_factory_dataset_parquet - mark path as optional (#19009

) * `azurerm_data_factory_dataset_parquet` - mark `path` as optional * add test
hashicorp · Oct 27, 2022 · df78c9e · df78c9e
1 parent 4fe3db3
commit df78c9e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 16 deletions.
diff --git a/internal/services/datafactory/data_factory_dataset_parquet_resource.go b/internal/services/datafactory/data_factory_dataset_parquet_resource.go
@@ -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,
@@ -110,6 +105,11 @@ func resourceDataFactoryDatasetParquet() *pluginsdk.Resource {
 							Optional: true,
 							Default:  false,
 						},
+						"path": {
+							Type:         pluginsdk.TypeString,
+							Optional:     true,
+							ValidateFunc: validation.StringIsNotEmpty,
+						},
 					},
 				},
 			},
@@ -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,
@@ -183,6 +178,11 @@ func resourceDataFactoryDatasetParquet() *pluginsdk.Resource {
 							Optional: true,
 							Default:  false,
 						},
+						"path": {
+							Type:         pluginsdk.TypeString,
+							Optional:     true,
+							ValidateFunc: validation.StringIsNotEmpty,
+						},
 					},
 				},
 			},

diff --git a/internal/services/datafactory/data_factory_dataset_parquet_resource_test.go b/internal/services/datafactory/data_factory_dataset_parquet_resource_test.go
@@ -153,7 +153,6 @@ resource "azurerm_data_factory_dataset_parquet" "test" {
 
   http_server_location {
     relative_url = "/fizz/buzz/"
-    path         = "foo/bar/"
     filename     = "foo.txt"
   }
 }
@@ -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
   }
 }

diff --git a/website/docs/r/data_factory_dataset_parquet.html.markdown b/website/docs/r/data_factory_dataset_parquet.html.markdown
@@ -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`.
@@ -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: