Skip to content

Commit 047dc6d

Browse files
committed
Merge branch 'integration/main' of https://github.com/NetApp/terraform-provider-netapp-ontap into 341-docs-aws-fsx-guide-page-syntax
2 parents 2473e99 + f2efcc4 commit 047dc6d

File tree

173 files changed

+3248
-1752
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

173 files changed

+3248
-1752
lines changed

CHANGELOG.md

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
BREAKING CHANGES:
44

55
Cluster
6+
67
* **Rename Resource:** `netapp-ontap_cluster_licensing_license_resource` is now renamed to `netapp-ontap_cluster_licensing_license`
78
* **Rename Resource:** `netapp-ontap_cluster_peers_resource` is now renamed to `netapp-ontap_cluster_peer`
89
* **Rename Resource:** `netapp-ontap_cluster_schedule_resource` is now renamed to `netapp-ontap_cluster_schedule`
@@ -14,6 +15,7 @@ Cluster
1415
* **Rename Data Source:** `netapp-ontap_cluster_schedules_data_source` is now renamed to `netapp-ontap_cluster_schedules`
1516

1617
Name Services
18+
1719
* **Rename Resource:** `netapp-ontap_name_services_dns_resource` is now renamed to `netapp-ontap_dns`
1820
* **Rename Resource:** `netapp-ontap_name_services_ldap_resource` is now renamed to `netapp-ontap_name_services_ldap`
1921
* **Rename Data Source:** `netapp-ontap_name_services_dns_data_source` is now renamed to `netapp-ontap_dns`
@@ -22,6 +24,7 @@ Name Services
2224
* **Rename Data Source:** `netapp-ontap_name_services_ldaps_data_source` is now renamed to `netapp-ontap_name_services_ldaps`
2325

2426
Networking
27+
2528
* **Rename Resource:** `netapp-ontap_networking_ip_interface_resource` is now renamed to `netapp-ontap_network_ip_interface`
2629
* **Rename Resource:** `netapp-ontap_networking_ip_route_resource` is now renamed to `netapp-ontap_network_ip_route`
2730
* **Rename Data Source:** `netapp-ontap_networking_ip_interface_data_source` is now renamed to `netapp-ontap_network_ip_interface`
@@ -30,6 +33,7 @@ Networking
3033
* **Rename Data Source:** `netapp-ontap_networking_ip_routes_data_source` is now renamed to `netapp-ontap_network_ip_routes`
3134

3235
Protocols
36+
3337
* **Rename Resource:** `netapp-ontap_cifs_local_group_member_resource` is now renamed to `netapp-ontap_cifs_local_group_members`
3438
* **Rename Resource:** `netapp-ontap_cifs_local_group_resource` is now renamed to `netapp-ontap_cifs_local_group`
3539
* **Rename Resource:** `netapp-ontap_cifs_local_user_resource` is now renamed to `netapp-ontap_cifs_local_user`
@@ -66,11 +70,13 @@ Protocols
6670
* **Rename Data Source:** `netapp-ontap_san_lun-maps_data_source` is now renamed to `netapp-ontap_san_lun-maps`
6771

6872
Security
73+
6974
* **Rename Resource:** `netapp-ontap_security_accounts_resource` is now renamed to `netapp-ontap_security_account`
7075
* **Rename Data Source:** `netapp-ontap_security_account_data_source` is now renamed to `netapp-ontap_security_account`
7176
* **Rename Data Source:** `netapp-ontap_security_accounts_data_source` is now renamed to `netapp-ontap_security_accounts`
7277

7378
Snapmirror
79+
7480
* **Rename Resource:** `netapp-ontap_snapmirror_resource` is now renamed to `netapp-ontap_snapmirror`
7581
* **Rename Resource:** `netapp-ontap_snapmirror_policy_resource` is now renamed to `netapp-ontap_snapmirror_policy`
7682
* **Rename Data Source:** `netapp-ontap_snapmirror_data_source` is now renamed to `netapp-ontap_snapmirror`
@@ -79,6 +85,7 @@ Snapmirror
7985
* **Rename Data Source:** `netapp-ontap_snapmirror_policies_data_source` is now renamed to `netapp-ontap_snapmirror_policies`
8086

8187
Storage
88+
8289
* **Rename Resource:** `netapp-ontap_aggregate_resource` is now renamed to `netapp-ontap_aggregate`
8390
* **Rename Resource:** `netapp-ontap_flexcache_resource` is now renamed to `netapp-ontap_flexcache`
8491
* **Rename Resource:** `netapp-ontap_lun_resource` is now renamed to `netapp-ontap_lun`
@@ -100,6 +107,7 @@ Storage
100107
* **Rename Data Source:** `netapp-ontap_volume_snapshots_data_source` is now renamed to `netapp-ontap_volume_snapshots`
101108

102109
Svm
110+
103111
* **Rename Resource:** `netapp-ontap_svm_peers_resource` is now renamed to `netapp-ontap_svm_peer`
104112
* **Rename Resource:** `netapp-ontap_svm_resource` is now renamed to `netapp-ontap_svm`
105113
* **Rename Data Source:** `netapp-ontap_svm_peer_data_source` is now renamed to `netapp-ontap_svm_peer`
@@ -108,6 +116,7 @@ Svm
108116
* **Rename Data Source:** `netapp-ontap_svms_data_source` is now renamed to `netapp-ontap_svms`
109117

110118
FEATURES:
119+
111120
* **provider**: add `aws_lambda` option. ([#262](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/262))
112121
* **New Data Source:** `netapp-ontap_volume_file` ([#8](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/8))
113122
* **New Data Source:** `netapp-ontap_qos_policy` ([#77](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/77))
@@ -131,41 +140,49 @@ FEATURES:
131140
* **New Resource:** `netapp-ontap_qtree` ([#82](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/82))
132141
* **New Resource:** `netapp-ontap_qos_policy` ([#76](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/76))
133142
* **New Resource:** `netapp-security_login_message` ([#18](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/18))
143+
* **New Resource:** `netapp-ontap_security_certificate` ([#138](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/138))
134144

135145
ENHANCEMENTS:
146+
136147
* **netapp-ontap_lun**: added `size_unit` option. ([#227](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/227))
137148
* **netapp-ontap_security_account**: Add support for import and update ([#243](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/243))
138149
* **netapp-ontap_name_services_dns**: Add `skip_config_validation`([#316](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/316))
139150

140151
## 1.1.4 (2024-09-05)
141152

142153
DOC FIXES:
154+
143155
* **netapp-ontap_storage_flexcache_resource**: Fixed Page display issue ([[#271](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/271)])
144156
* **netapp-ontap_networking_ip_interface_resource**: Include min version for metrics ([[#265](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/265)])
145157
* Fix the documentation: snapmirror and the description of other data source and resource ([[#330](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/330)])
146158

147159
BUG FIXES:
160+
148161
* **netapp-ontap_cluster_data_source**: fix on nodes to show multiple elements ([#264](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/264))
149162
* **netapp-ontap_protocols_nfs_export_policy_resource**: fix id error during the creation ([[#290](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/290)])
150163

151164
## 1.1.3 (2024-08-08)
152165

153166
BUG FIXES:
167+
154168
* **netapp-ontap_protocols_cifs_service_resource**: fixed on attribute checking ([#250](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/250))
155169
* **netapp-ontap_protocols_cifs_share_resource** :`acls` unable to update acls ([#236](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/236))
156170
* **netapp-ontap_protocols_san_igroups_resource**: fixed bug nil pointer dereference ([#247](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/247))
157171

158172
## 1.1.2 (2024-06-03)
159173

160174
ENHANCEMENTS:
175+
161176
* **netapp-ontap_storage_lun_resource**, **netapp-ontap_storage_lun_data_source**, **netapp-ontap_storage_luns_data_source**: added `serial_number` option to get info in state file ([#207](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/207))
162177

163178
BUG FIXES:
179+
164180
* **netapp-ontap_storage_lun_resource**, **netapp-ontap_storage_lun_data_source**, **netapp-ontap_storage_luns_data_source**: fixed `name` and `logical_unit` options as separate inputs for resource and info in state file gets added separately as well ([#215](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/215))
165181
* added guide for changing NetApp Ontap Provider from one minor version to another.
166182
* corrected typos in the CHANGELOG.
167183

168184
BUG FIXES:
185+
169186
* **netapp-ontap_storage_flexcache_resource**: Fixed junction_path bug ([#223](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/223))
170187

171188
## 1.1.1 (2024-05-15)
@@ -176,6 +193,7 @@ BUG FIXES:
176193
## 1.1.0 (2024-05-08)
177194

178195
FEATURES:
196+
179197
* **New Data Source:** `netapp-ontap_protocols_cifs_local_group_data_source` ([#54](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/54))
180198
* **New Data Source:** `netapp-ontap_protocols_cifs_local_groups_data_source` ([#54](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/54))
181199
* **New Data Source:** `netapp-ontap_cluster_peer_data_source` ([#50](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/50))
@@ -218,8 +236,8 @@ FEATURES:
218236
* **New Resource:** `netapp-ontap_storage_lun_resource` ([#11](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/11))
219237
* **New Resource:** `netapp-ontap_security_account_resource` ([#21](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/21))
220238

221-
222239
ENHANCEMENTS:
240+
223241
* **netapp-ontap_protocols_nfs_export_policy_resource**: Add support for import ([#34](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/34))
224242
* **netapp-ontap_cluster_licensing_license_resource**: Add support for import ([#30](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/30))
225243
* **netapp-ontap_storage_aggregate_resource**: Add support for import ([#39](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/39))
@@ -238,28 +256,30 @@ ENHANCEMENTS:
238256
* **netapp-ontap_cluster** Add contact, locaton, dns_domains, name_servers, timezone, certificate, ntp_servers, management_interfaces options ([#16](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/16))
239257

240258
BUG FIXES:
259+
241260
* **netapp-ontap_protocols_nfs_service**: Fixed issue with version check failing for minor versions
242261
* netapp-ontap resource and data source documentation update ([#169](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/169))
243262

244-
245263
## 1.0.3 (2023-12-05)
264+
246265
* netapp-ontap_name_services_dns_resource: Fixed missing ID on create ([#99](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/63))
247266

248267
## 1.0.2 (2023-11-17)
249-
* 1.0.1 did not deploy correctly 1.0.2 fixes that.
250268

269+
* 1.0.1 did not deploy correctly 1.0.2 fixes that.
251270

252271
## 1.0.1 (2023-11-17)
253272

254273
BUG FIXES:
274+
255275
* **netapp-ontap_name_services_dns_resource**: Fixed and Documented Import ([#63](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/63))
256276
* **netapp-ontap_cluster_data_source**, **netapp-ontap_snapmirrors_data_source**, **netapp-ontap_networking_ip_route_resource** and **netapp-ontap_sotrage_volume_resource**: Fix documentation ([#70](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/70))
257277
* **netapp-ontap_name_services_ldap_resource**: Fixed and Document with the version check and workflow ([#163](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/163))
258278

259-
260279
## 1.0.0 (2023-11-06)
261280

262281
FEATURES:
282+
263283
* **New Data Source:** `netapp-ontap_cluster_data_source`
264284
* **New Data Source:** `netapp-ontap_cluster_licensing_license_data_source`
265285
* **New Data Source:** `netapp-ontap_cluster_licensing_licenses_data_source`

CONTRIBUTING.md

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,39 @@
11
# Contributing
2-
Thank you for your interest in contributing to the Terraform Provider for ONTAP! 🎉
2+
3+
Thank you for your interest in contributing to the Terraform Provider for ONTAP! 🎉
34

45
We appreciate that you want to take the time to contribute! Please follow these steps before submitting your PR.
56

67
# Creating a Pull Request
8+
79
1. Please search [existing issues](https://github.com/NetApp/terraform-provider-netapp-ontap/issues) to determine if an issue already exists for what you intend to contribute.
810
2. If the issue does not exist, [create a new one](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/new/choose) that explains the bug or feature request.
911
3. Let us know in the issue that you plan on creating a pull request for it, by selecting the option when creating an issue. This helps us to keep track of the pull request and make sure there isn't duplicate effort.
1012
4. It's better to wait for feedback from someone on Netapp's Terraform Team development team before writing code. We don't have an SLA for our feedback, but we will do our best to respond in a timely manner (at a minimum, to give you an idea if you're on the right track and that you should proceed, or not).
1113
5. Sign and submit [NetApp's Contributor License Agreement (CCLA)](https://netapp.tap.thinksmart.com/prod/Portal/ShowWorkFlow/AnonymousEmbed/3d2f3aa5-9161-4970-997d-e482b0b033fa). You must sign and submit the Corporate Contributor License Agreement (CCLA) in order to contribute.
12-
* For Project name, select "Terraform Provider for ONTAP"
13-
* For Project Website, enter "https://github.com/NetApp/terraform-provider-netapp-ontap"
14+
15+
* For Project name, select "Terraform Provider for ONTAP"
16+
* For Project Website, enter "https://github.com/NetApp/terraform-provider-netapp-ontap"
1417
6. If you've made it this far, have written the code that solves your issue, and addressed the review comments, then feel free to create your pull request.
1518

1619
Important: NetApp will NOT look at the PR or any of the code submitted in the PR if the CCLA is not on file with NetApp Legal.
1720

1821
## Requirement for new Resources/Data Sources
19-
If your building a new Resouces or Data Source for the ONTAP we have a few requirements that need to be met before we can accept the PR.
22+
23+
If your building a new Resources or Data Source for the ONTAP we have a few requirements that need to be met before we can accept the PR.
24+
2025
* documentation in the /docs directory
2126
* example in the /examples directory
2227
* ACCtest in the /internal/provider directory
2328
* we have a GitHub Self Hosted Action that will run the ACCtest on an internal ONTAP VSIM, if there is anything that need to be set up for the ACCtest to run please let us know in the PR.
2429
* Pass all existing GitHub actions test
2530

26-
2731
# Netapp's Terraform Team's Commitment
32+
2833
While we truly appreciate your efforts on pull requests, we cannot make any commitment for when, or if, your PR will be included in the Trident project. Here are a few reasons why:
29-
* There are many factors involved in integrating new code into this project, including things like: support for a wide variety of NetApp backends, proper adherence to our existing and/or upcoming architecture, sufficient functional and/or scenario tests across all backends, etc. In other words, while your bug fix or feature may be perfect as a standalone patch, we must ensure that your code works and can be accomodated for in all of our use cases, configurations, backends, installer, support matrix, etc.
34+
35+
* There are many factors involved in integrating new code into this project, including things like: support for a wide variety of NetApp backends, proper adherence to our existing and/or upcoming architecture, sufficient functional and/or scenario tests across all backends, etc. In other words, while your bug fix or feature may be perfect as a standalone patch, we must ensure that your code works and can be accommodated for in all of our use cases, configurations, backends, installer, support matrix, etc.
3036
* The Terraform Team must plan our resources to integrate your code into our code base and CI platform, and depending on the complexity of your PR, we may or may not have the resources available to make it happen in a timely fashion. As much as we would like to, and as much as we like to be "agile", we still have a roadmap of features that comes from Product Management. We will do our best, but it doesn't always happen quickly.
3137
* Sometimes the PR just doesn't fit into our future plans. As stated above, we have a roadmap of things, and you don't necessarily know what's coming down the pike. It's possible that a PR you submit doesn't align with our upcoming plans, thus we won't be able to use it. It's not personal.
3238

3339
Thank you for considering to contribute to the Terraform Provider for ONTAP!
34-

README.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,16 @@ go install
3333
```
3434

3535
## Bug Reports & Feature Requests
36+
3637
Click on Issues, we have 6 categories for issues:
38+
3739
1. Report a Bug -- for unexpected error, a crash, or otherwise incorrect behavior.
3840
2. Report a Documentation Error -- for error in our documentation, including typos, mistakes, or outdated information.
39-
3. Request an Enhancement -- For new fields to existing Resources or data sources
40-
4. Request a New Resource, Data Source, or Service
41+
3. Request an Enhancement -- For new fields to existing Resources or data sources.
42+
4. Request a New Resource, Data Source, or Service.
4143
5. Other -- Any other issue that is not covered by the above categories.
4244
6. General Questions -- If you have any general question we have a Discord channel for that.
4345

4446
## Contributing
47+
4548
Please read the [Contributing Guide](CONTRIBUTING.md) for details on the process for submitting pull requests to us.

docs/data-sources/cluster.md

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,23 @@ description: |-
66
Cluster data source
77
---
88

9-
# Data Source cluster
9+
# Data Source cluster
10+
1011
Retrieve the details of a cluster data source
1112

12-
### Related ONTAP commands
13-
cluster show
13+
## Related ONTAP commands
14+
15+
```commandline
16+
* cluster show
17+
```
1418

1519
## Supported Platforms
16-
* On-perm ONTAP system 9.6 or higher
20+
21+
* On-prem ONTAP system 9.6 or higher
1722
* Amazon FSx for NetApp ONTAP
1823

1924
## Example Usage
25+
2026
```terraform
2127
data "netapp-ontap_cluster" "cluster" {
2228
# required to know which system to interface with
@@ -46,14 +52,15 @@ data "netapp-ontap_cluster" "cluster" {
4652
- `version` (Attributes) ONTAP software version (see [below for nested schema](#nestedatt--version))
4753

4854
<a id="nestedatt--certificate"></a>
55+
4956
### Nested Schema for `certificate`
5057

5158
Read-Only:
5259

5360
- `id` (String)
5461

55-
5662
<a id="nestedatt--management_interfaces"></a>
63+
5764
### Nested Schema for `management_interfaces`
5865

5966
Read-Only:
@@ -63,6 +70,7 @@ Read-Only:
6370
- `name` (String) Name
6471

6572
<a id="nestedatt--management_interfaces--ip"></a>
73+
6674
### Nested Schema for `management_interfaces.ip`
6775

6876
Read-Only:
@@ -72,6 +80,7 @@ Read-Only:
7280

7381

7482
<a id="nestedatt--nodes"></a>
83+
7584
### Nested Schema for `nodes`
7685

7786
Read-Only:
@@ -81,6 +90,7 @@ Read-Only:
8190

8291

8392
<a id="nestedatt--time_zone"></a>
93+
8494
### Nested Schema for `time_zone`
8595

8696
Read-Only:
@@ -89,9 +99,9 @@ Read-Only:
8999

90100

91101
<a id="nestedatt--version"></a>
102+
92103
### Nested Schema for `version`
93104

94105
Read-Only:
95106

96107
- `full` (String) ONTAP software version
97-

docs/data-sources/cluster_licensing_license_data_source.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,16 @@ description: |-
66
---
77

88
# Data Source cluster licensing license
9+
910
Retrieves Cluster Licensing License
1011

1112
## Supported Platforms
12-
* On-perm ONTAP system 9.6 or higher
13-
* Amazon FSx for NetApp ONTAP
1413

14+
* On-prem ONTAP system 9.6 or higher
15+
* Amazon FSx for NetApp ONTAP
1516

1617
## Example Usage
18+
1719
```terraform
1820
data "netapp-ontap_cluster_licensing_license" "cluster_licensing_license" {
1921
# required to know which system to interface with
@@ -37,6 +39,7 @@ data "netapp-ontap_cluster_licensing_license" "cluster_licensing_license" {
3739
- `state` (String) State of the license
3840

3941
<a id="nestedatt--licenses"></a>
42+
4043
### Nested Schema for `licenses`
4144

4245
Read-Only:
@@ -49,10 +52,9 @@ Read-Only:
4952
- `serial_number` (String) Serial Number of the license
5053

5154
<a id="nestedatt--licenses--compliance"></a>
55+
5256
### Nested Schema for `licenses.compliance`
5357

5458
Read-Only:
5559

5660
- `state` (String) state of the license
57-
58-

0 commit comments

Comments
 (0)