Merge branch 'integration/main' into 22-new-data-source-security_account

.github/workflows/blackduck.yml

@@ -0,0 +1,29 @@
+name: Blackduck Scan
+
+on:
+  push:
+    branches:
+      - integration/main
+
+jobs:
+  build:
+
+    runs-on: self-hosted
+    steps:
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin' # See 'Supported distributions' for available options
+          java-version: '17'
+      - name: Set up Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: '1.19.3'
+      - uses: actions/checkout@v3
+
+      - name: Build
+        env:
+          BLACKDUCK_URL: ${{ secrets.BLACKDUCK_URL }}
+          BLACKDUCK_API_TOKEN: ${{ secrets.BLACKDUCK_API_TOKEN }}
+
+        run: |
+          bash scripts/bd_scan.bash $BLACKDUCK_URL $BLACKDUCK_API_TOKEN

CHANGELOG.md

@@ -1,8 +1,13 @@
 ## 1.1.0 ()
 
 FEATURES:
+* **New Data Source:** `netapp_ontap_protocols_cifs_local_group_data_source` ([#54](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/54))
+* **New Data Source:** `netapp_ontap_protocols_cifs_local_groups_data_source` ([#54](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/54))
 * **New Data Source:** `netapp_ontap_cluster_peer_data_source` ([#50](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/50))
 * **New Data Source:** `netapp_ontap_cluster_peers_data_source` ([#50](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/50))
+* **New Data Source:** `netapp-ontap_protocols_cifs_local_user_data_source` ([#55](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/55))
+* **New Data Source:** `netapp-ontap_protocols_cifs_local_users_data_source` ([#55](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/55))
+
 
 ENHANCEMENTS:
 * **netapp-ontap_protocols_nfs_export_policy_resource**: Add support for import ([#34](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/34))
@@ -13,7 +18,9 @@ ENHANCEMENTS:
 * **netapp-ontap_svm_resource**: Add support for import ([#6](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/6))
 * **netapp-ontap_storage_volume_snapshot_resource**: Add support for import ([#42](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/42))
 * **netapp-ontap_cluster_schedule_resource**: Add support for import ([#31](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/31))
+* **netapp-ontap_snapmiror_policy**: Add support for import ([#38](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/38))
 * **netapp-ontap_networking_ip_interface_resource**: Add support for import ([#32](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/32))
+* **netapp-ontap_protocols_nfs_export_policy_rule_resource**: Add support for import ([#35](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/35))
 
 
 ## 1.0.2 (2023-11-17)

docs/data-sources/cluster_peer_data_source.md

@@ -12,7 +12,7 @@ Retrieves an existing cluster_peer
 
 ## Example Usage
 ```terraform
-data "netapp-ontap_cluster_peer_data_source" "cluster_peers" {
+data "netapp-ontap_cluster_peer_data_source" "cluster_peer" {
   # required to know which system to interface with
   cx_profile_name = "cluster4"
   name = "ontapcluster"

docs/data-sources/netapp-ontap_protocols_cifs_local_group_data_source.md

@@ -0,0 +1,46 @@
+---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "netapp-ontap_protocols_cifs_local_group_data_source Data Source - terraform-provider-netapp-ontap"
+subcategory: "nas"
+description: |-
+  Retrieve CifsLocalGroup data source
+---
+
+# Data Source ontap_protocols_cifs_local_group
+
+Retrieves protocols cifs local group configuration
+
+## Example Usage
+```terraform
+data "netapp-ontap_protocols_cifs_local_group_data_source" "local_group" {
+  # required to know which system to interface with
+  cx_profile_name = "cluster4"
+  svm_name         = "svm3"
+  name             = "Administrators"
+}
+```
+
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Required
+
+- `cx_profile_name` (String) Connection profile name
+- `name` (String) Cifs Local Group name
+- `svm_name` (String) Svm name
+
+### Read-Only
+
+- `description` (String) Cifs Local Group description
+- `id` (String) Cifs Local Group id
+- `members` (Attributes List) Cifs Local Group members (see [below for nested schema](#nestedatt--members))
+
+<a id="nestedatt--members"></a>
+### Nested Schema for `members`
+
+Read-Only:
+
+- `name` (String) Cifs Local Group member
+
+

docs/data-sources/netapp-ontap_protocols_cifs_local_groups_data_source.md

@@ -0,0 +1,72 @@
+---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "netapp-ontap_protocols_cifs_local_groups_data_source Data Source - terraform-provider-netapp-ontap"
+subcategory: "nas"
+description: |-
+  Retrieves list of Cifs Local Groups.
+---
+
+# Data Source protocols_cifs_local_groups
+
+Retrieves list of Cifs Local Groups.
+
+## Example Usage
+```terraform
+data "netapp-ontap_protocols_cifs_local_groups_data_source" "local_groups" {
+  # required to know which system to interface with
+  cx_profile_name = "cluster1"
+  filter = {
+    svm_name = "svm*"
+    name     = "Administrators"
+  }
+}
+```
+
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Required
+
+- `cx_profile_name` (String) Connection profile name
+
+### Optional
+
+- `filter` (Attributes) (see [below for nested schema](#nestedatt--filter))
+
+### Read-Only
+
+- `protocols_cifs_local_groups` (Attributes List) Protocols Cifs Local Groups (see [below for nested schema](#nestedatt--protocols_cifs_local_groups))
+
+<a id="nestedatt--filter"></a>
+### Nested Schema for `filter`
+
+Optional:
+
+- `name` (String) Cifs Local Group name
+- `svm_name` (String) Cifs Local Group svm name
+
+
+<a id="nestedatt--protocols_cifs_local_groups"></a>
+### Nested Schema for `protocols_cifs_local_groups`
+
+Required:
+
+- `cx_profile_name` (String) Connection profile name
+- `name` (String) Cifs Local Group name
+- `svm_name` (String) Cifs Local Group svm name
+
+Read-Only:
+
+- `description` (String) Cifs Local Group description
+- `id` (String) Cifs Local Group identifier
+- `members` (Attributes List) Cifs Local Group members (see [below for nested schema](#nestedatt--protocols_cifs_local_groups--members))
+
+<a id="nestedatt--protocols_cifs_local_groups--members"></a>
+### Nested Schema for `protocols_cifs_local_groups.members`
+
+Read-Only:
+
+- `name` (String) Cifs Local Group member names
+
+

docs/data-sources/netapp-ontap_protocols_cifs_local_user_data_source.md

@@ -0,0 +1,47 @@
+---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "netapp-ontap_protocols_cifs_local_user_data_source Data Source - terraform-provider-netapp-ontap"
+subcategory: "nas"
+description: |-
+  Retrieve CifsLocalUser data source
+---
+
+# Data Source netapp-ontap_protocols_cifs_local_user
+
+Retreives protocols cifs local user configuration
+
+## Example Usage
+```terraform
+data "netapp-ontap_protocols_cifs_local_user_data_source" "local_user" {
+  # required to know which system to interface with
+  cx_profile_name = "cluster4"
+  svm_name         = "svm3"
+  name             = "test"
+}
+```
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Required
+
+- `cx_profile_name` (String) Connection profile name
+- `name` (String) CifsLocalUser name
+- `svm_name` (String) IPInterface svm name
+
+### Read-Only
+
+- `account_disabled` (Boolean) CifsLocalUser account disabled
+- `description` (String) CifsLocalUser description
+- `full_name` (String) CifsLocalUser full name
+- `id` (String) CifsLocalUser id
+- `membership` (Attributes List) CifsLocalUser membership (see [below for nested schema](#nestedatt--membership))
+
+<a id="nestedatt--membership"></a>
+### Nested Schema for `membership`
+
+Read-Only:
+
+- `name` (String) CifsLocalUser membership name
+
+

docs/data-sources/netapp-ontap_protocols_cifs_local_users_data_source.md

@@ -0,0 +1,72 @@
+---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "netapp-ontap_protocols_cifs_local_users_data_source Data Source - terraform-provider-netapp-ontap"
+subcategory: "nas"
+description: |-
+  Retrieves list of Cifs Local Users.
+---
+
+# Data Source protocols_cifs_local_users
+
+Retrieves a list of Cifs Local Users.
+
+## Example Usage
+```terraform
+data "netapp-ontap_protocols_cifs_local_users_data_source" "protocols_cifs_local_users" {
+  # required to know which system to interface with
+  cx_profile_name = "cluster4"
+  filter = {
+    svm_name = "svm*"
+  }
+}
+```
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Required
+
+- `cx_profile_name` (String) Connection profile name
+
+### Optional
+
+- `filter` (Attributes) (see [below for nested schema](#nestedatt--filter))
+
+### Read-Only
+
+- `protocols_cifs_local_users` (Attributes List) Protocols CIFS local users (see [below for nested schema](#nestedatt--protocols_cifs_local_users))
+
+<a id="nestedatt--filter"></a>
+### Nested Schema for `filter`
+
+Optional:
+
+- `name` (String) CifsLocalUser name
+- `svm_name` (String) CifsLocalUser svm name
+
+
+<a id="nestedatt--protocols_cifs_local_users"></a>
+### Nested Schema for `protocols_cifs_local_users`
+
+Required:
+
+- `cx_profile_name` (String) Connection profile name
+- `name` (String) CifsLocalUser name
+
+Read-Only:
+
+- `account_disabled` (Boolean) CifsLocalUser account disabled
+- `description` (String) CifsLocalUser description
+- `full_name` (String) CifsLocalUser full name
+- `id` (String) CifsLocalUser id
+- `membership` (Attributes List) CifsLocalUser membership (see [below for nested schema](#nestedatt--protocols_cifs_local_users--membership))
+- `svm_name` (String) CifsLocalUser svm name
+
+<a id="nestedatt--protocols_cifs_local_users--membership"></a>
+### Nested Schema for `protocols_cifs_local_users.membership`
+
+Read-Only:
+
+- `name` (String) CifsLocalUser membership name
+
+

docs/resources/protocols_nfs_export_policy_rule_resource.md

@@ -59,5 +59,39 @@ resource "netapp-ontap_protocols_nfs_export_policy_rule_resource" "example" {
 - `index` (Number) rule index
 
 ## Import
-Import is currently not support for this Resource.
+This Resource supports import, which allows you to import existing nfs export policy rule into the state of this resoruce.
+Import require a unique ID composed of the rule index, export policy name, svm_name and cx_profile_name, separated by a comma.
+ id = `index`,`export_policy_name`,`svm_name`,`cx_profile_name`
+ ### Terraform Import
+ For example
+ ```shell
+  terraform import netapp-ontap_protocols_nfs_export_policy_rule_resource.rule_import index1,exp1,svm1,cluster4
+ ```
 
+!> The terraform import CLI command can only import resources into the state. Importing via the CLI does not generate configuration. If you want to generate the accompanying configuration for imported resources, use the import block instead.
+
+### Terrafomr Import Block
+This requires Terraform 1.5 or higher, and will auto create the configuration for you
+
+First create the block
+```terraform
+import {
+  to = netapp-ontap_protocols_nfs_export_policy_rule_resource.rule_import
+  id = "index1,exp1,svm1,cluster4"
+}
+```
+Next run, this will auto create the configuration for you
+```shell
+terraform plan -generate-config-out=generated.tf
+```
+This will generate a file called generated.tf, which will contain the configuration for the imported resource
+```terraform
+# __generated__ by Terraform
+# Please review these resources and move them into your main configuration files.
+# __generated__ by Terraform from "index1,exp1,svm1,cluster4"
+resource "netapp-ontap_protocols_nfs_export_policy_rule_resource" "rule_import" {
+  cx_profile_name    = "cluster4"
+  export_policy_name = "exp1"
+  svm_name           = "svm1"
+}
+```