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_netapp_volume - support mount_ip_addresses #5526

Merged
merged 18 commits into from
May 20, 2020
Merged

azurerm_netapp_volume - support mount_ip_addresses #5526

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
f810b05
Add more support for mountTargets
Jan 26, 2020
f607b5f
Update code
Jan 26, 2020
b79415e
Update code
Jan 28, 2020
eaaf155
Merge remote-tracking branch 'upstream/master' into fix_netapp_volume
Feb 4, 2020
c27bf6c
Update code
Feb 4, 2020
3e43f53
Update code
Feb 5, 2020
566602b
Update code
Mar 5, 2020
0a28add
Update code
Mar 5, 2020
372438f
Merge remote-tracking branch 'upstream/master' into fix_netapp_volume
Apr 13, 2020
ff0e09a
Update code
Apr 13, 2020
d076ce3
Update code
Apr 13, 2020
367f3ce
Update code
Apr 13, 2020
84e02a9
Update code
May 18, 2020
70f7012
go mod vendor
May 18, 2020
81f1171
Update code
May 18, 2020
1ca3640
Update code
May 18, 2020
10c4129
Update code
May 18, 2020
db409de
Update code
May 20, 2020
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
11 changes: 11 additions & 0 deletions azurerm/internal/services/netapp/data_source_netapp_volume.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,14 @@ func dataSourceArmNetAppVolume() *schema.Resource {
ValidateFunc: ValidateNetAppPoolName,
},

"mount_ip_addresses": {
Type: schema.TypeList,
Computed: true,
Elem: &schema.Schema{
Type: schema.TypeString,
},
},

"volume_path": {
Type: schema.TypeString,
Computed: true,
Expand Down Expand Up @@ -116,6 +124,9 @@ func dataSourceArmNetAppVolumeRead(d *schema.ResourceData, meta interface{}) err
if props.UsageThreshold != nil {
d.Set("storage_quota_in_gb", *props.UsageThreshold/1073741824)
}
if err := d.Set("mount_ip_addresses", flattenArmNetAppVolumeMountIPAddresses(props.MountTargets)); err != nil {
return fmt.Errorf("Error setting `mount_ip_addresses`: %+v", err)
}
}

return nil
Expand Down
17 changes: 17 additions & 0 deletions azurerm/internal/services/netapp/resource_arm_netapp_volume.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,3 +470,20 @@ func flattenArmNetAppVolumeExportPolicyRule(input *netapp.VolumePropertiesExport

return results
}

func flattenArmNetAppVolumeMountIPAddresses(input interface{}) []interface{} {
// Improve code for parsing MountTargets once the issue https://github.com/Azure/azure-rest-api-specs/issues/8604 is fixed.
results := make([]interface{}, 0)
if input == nil {
return results
}

for _, item := range input.([]interface{}) {
if item != nil {
v := item.(map[string]interface{})
results = append(results, v["ipAddress"].(string))
}
}

return results
}
1 change: 1 addition & 0 deletions azurerm/internal/services/netapp/tests/data_source_netapp_volume_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ func TestAccDataSourceAzureRMNetAppVolume_basic(t *testing.T) {
resource.TestCheckResourceAttrSet(data.ResourceName, "subnet_id"),
resource.TestCheckResourceAttrSet(data.ResourceName, "storage_quota_in_gb"),
resource.TestCheckResourceAttrSet(data.ResourceName, "protocols.0"),
resource.TestCheckResourceAttr(data.ResourceName, "mount_ip_addresses.#", "1"),
),
},
},
Expand Down
4 changes: 2 additions & 2 deletions azurerm/internal/services/netapp/tests/resource_arm_netapp_volume_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,14 +456,14 @@ resource "azurerm_virtual_network" "test" {
name = "acctest-VirtualNetwork-%d"
location = azurerm_resource_group.test.location
resource_group_name = azurerm_resource_group.test.name
address_space = ["10.0.0.0/16"]
address_space = ["10.6.0.0/16"]
}

resource "azurerm_subnet" "test" {
name = "acctest-Subnet-%d"
resource_group_name = azurerm_resource_group.test.name
virtual_network_name = azurerm_virtual_network.test.name
address_prefix = "10.0.2.0/24"
address_prefix = "10.6.2.0/24"

delegation {
name = "testdelegation"
Expand Down
2 changes: 2 additions & 0 deletions website/docs/d/netapp_volume.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ The following attributes are exported:

* `location` - The Azure Region where the NetApp Volume exists.

* `mount_ip_addresses` - A list of IPv4 Addresses which should be used to mount the volume.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this has also been added to the Resource - so can we document this field there too?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't add this field "mount_ip_addresses" to the resource file. I just added this to data source file. So I think we don't need to document this field to resource md file.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason we are only adding it to the datasource and not the resource too? @neil-yechenwei

Copy link
Contributor Author

@neil-yechenwei neil-yechenwei Mar 6, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can find user's usage preference from (#5416), seems they want to use data source to retrieve this property value.


* `volume_path` - The unique file path of the volume.

* `service_level` - The service level of the file system.
Expand Down