diff --git a/CHANGELOG.md b/CHANGELOG.md index ca8a47f6..ec09d376 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ BREAKING CHANGES: * **Rename Resource:** `netapp-ontap_cluster_peers` is now renamed to `netapp-ontap_cluster_peer` +* **Rename Resource:** `netapp-ontap_cifs_local_group_member` is now renamed to `netapp-ontap_cifs_local_group_members` + FEATURES: * **provider**: add `aws_lambda` option. ([#262](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/262)) diff --git a/docs/resources/protocols_cifs_local_group_member_resource.md b/docs/resources/protocols_cifs_local_group_members_resource.md similarity index 79% rename from docs/resources/protocols_cifs_local_group_member_resource.md rename to docs/resources/protocols_cifs_local_group_members_resource.md index 2a1682f0..7f8e24c6 100644 --- a/docs/resources/protocols_cifs_local_group_member_resource.md +++ b/docs/resources/protocols_cifs_local_group_members_resource.md @@ -1,14 +1,14 @@ --- # generated by https://github.com/hashicorp/terraform-plugin-docs -page_title: "netapp-ontap_cifs_local_group_member Resource - terraform-provider-netapp-ontap" +page_title: "netapp-ontap_cifs_local_group_members Resource - terraform-provider-netapp-ontap" subcategory: "NAS" description: |- - CifsLocalGroupMember resource + CifsLocalGroupMembers resource --- # Resource Protocols Cifs Local Group Mmember -Create/Read/Delete a member in a local group resource +Create/Read/Delete one or more members in a local group resource ~> **NOTE:** This module does not support member modification @@ -23,7 +23,7 @@ Create/Read/Delete a member in a local group resource ## Example Usage ```terraform -resource "netapp-ontap_cifs_local_group_member" "protocols_cifs_local_group_member" { +resource "netapp-ontap_cifs_local_group_members" "protocols_cifs_local_group_member" { # required to know which system to interface with cx_profile_name = "cluster4" group_name = "SVM_SERVER\\testme" diff --git a/examples/resources/netapp-ontap_cifs_local_group_member/provider.tf b/examples/resources/netapp-ontap_cifs_local_group_members/provider.tf similarity index 100% rename from examples/resources/netapp-ontap_cifs_local_group_member/provider.tf rename to examples/resources/netapp-ontap_cifs_local_group_members/provider.tf diff --git a/examples/resources/netapp-ontap_cifs_local_group_member/resource.tf b/examples/resources/netapp-ontap_cifs_local_group_members/resource.tf similarity index 66% rename from examples/resources/netapp-ontap_cifs_local_group_member/resource.tf rename to examples/resources/netapp-ontap_cifs_local_group_members/resource.tf index 5280ce96..905e09e5 100644 --- a/examples/resources/netapp-ontap_cifs_local_group_member/resource.tf +++ b/examples/resources/netapp-ontap_cifs_local_group_members/resource.tf @@ -1,4 +1,4 @@ -resource "netapp-ontap_cifs_local_group_member" "protocols_cifs_local_group_member" { +resource "netapp-ontap_cifs_local_group_members" "protocols_cifs_local_group_member" { # required to know which system to interface with cx_profile_name = "cluster4" group_name = "SVM_SERVER\\testme" diff --git a/examples/resources/netapp-ontap_cifs_local_group_member/terraform.tfvars b/examples/resources/netapp-ontap_cifs_local_group_members/terraform.tfvars similarity index 100% rename from examples/resources/netapp-ontap_cifs_local_group_member/terraform.tfvars rename to examples/resources/netapp-ontap_cifs_local_group_members/terraform.tfvars diff --git a/examples/resources/netapp-ontap_cifs_local_group_member/variables.tf b/examples/resources/netapp-ontap_cifs_local_group_members/variables.tf similarity index 100% rename from examples/resources/netapp-ontap_cifs_local_group_member/variables.tf rename to examples/resources/netapp-ontap_cifs_local_group_members/variables.tf diff --git a/internal/provider/protocols/protocols_cifs_local_group_member_resource.go b/internal/provider/protocols/protocols_cifs_local_group_members_resource.go similarity index 99% rename from internal/provider/protocols/protocols_cifs_local_group_member_resource.go rename to internal/provider/protocols/protocols_cifs_local_group_members_resource.go index 3df05e10..c832c6f4 100644 --- a/internal/provider/protocols/protocols_cifs_local_group_member_resource.go +++ b/internal/provider/protocols/protocols_cifs_local_group_members_resource.go @@ -3,10 +3,11 @@ package protocols import ( "context" "fmt" - "github.com/netapp/terraform-provider-netapp-ontap/internal/provider/connection" "regexp" "strings" + "github.com/netapp/terraform-provider-netapp-ontap/internal/provider/connection" + "github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator" "github.com/hashicorp/terraform-plugin-framework/path" "github.com/hashicorp/terraform-plugin-framework/resource" @@ -28,7 +29,7 @@ var _ resource.ResourceWithImportState = &CifsLocalGroupMemberResource{} func NewCifsLocalGroupMemberResource() resource.Resource { return &CifsLocalGroupMemberResource{ config: connection.ResourceOrDataSourceConfig{ - Name: "cifs_local_group_member", + Name: "cifs_local_group_members", }, } } diff --git a/internal/provider/protocols/protocols_cifs_local_group_member_resource_test.go b/internal/provider/protocols/protocols_cifs_local_group_members_resource_test.go similarity index 69% rename from internal/provider/protocols/protocols_cifs_local_group_member_resource_test.go rename to internal/provider/protocols/protocols_cifs_local_group_members_resource_test.go index 63f47937..9694ba7c 100644 --- a/internal/provider/protocols/protocols_cifs_local_group_member_resource_test.go +++ b/internal/provider/protocols/protocols_cifs_local_group_members_resource_test.go @@ -2,58 +2,59 @@ package protocols_test import ( "fmt" - ntest "github.com/netapp/terraform-provider-netapp-ontap/internal/provider" "os" "regexp" "testing" + ntest "github.com/netapp/terraform-provider-netapp-ontap/internal/provider" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) -func TestAccCifsLocalGroupMemberResource(t *testing.T) { +func TestAccCifsLocalGroupMembersResource(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { ntest.TestAccPreCheck(t) }, ProtoV6ProviderFactories: ntest.TestAccProtoV6ProviderFactories, Steps: []resource.TestStep{ { - Config: testAccCifsLocalGroupMemberResourceConfigMissingVars("non-existant"), + Config: testAccCifsLocalGroupMembersResourceConfigMissingVars("non-existant"), ExpectError: regexp.MustCompile("Missing required argument"), }, // create with basic argument on a local group member { // configuration of group name and memmber name have to be double \ otherwise it will be treated as escape character - Config: testAccCifsLocalGroupMemberResourceConfig("svm3", "SVM3_SERVER\\\\accgroup1", "SVM3_SERVER\\\\accuser3"), + Config: testAccCifsLocalGroupMembersResourceConfig("svm3", "SVM3_SERVER\\\\accgroup1", "SVM3_SERVER\\\\accuser3"), Check: resource.ComposeTestCheckFunc( // check member - resource.TestCheckResourceAttr("netapp-ontap_cifs_local_group_member.example1", "member", "SVM3_SERVER\\accuser3"), + resource.TestCheckResourceAttr("netapp-ontap_cifs_local_group_members.example1", "member", "SVM3_SERVER\\accuser3"), // check group_name - resource.TestCheckResourceAttr("netapp-ontap_cifs_local_group_member.example1", "group_name", "SVM3_SERVER\\accgroup1"), + resource.TestCheckResourceAttr("netapp-ontap_cifs_local_group_members.example1", "group_name", "SVM3_SERVER\\accgroup1"), // check svm_name - resource.TestCheckResourceAttr("netapp-ontap_cifs_local_group_member.example1", "svm_name", "svm3"), + resource.TestCheckResourceAttr("netapp-ontap_cifs_local_group_members.example1", "svm_name", "svm3"), // check ID - resource.TestCheckResourceAttrSet("netapp-ontap_cifs_local_group_member.example1", "id"), + resource.TestCheckResourceAttrSet("netapp-ontap_cifs_local_group_members.example1", "id"), ), }, // Test importing a resource { - ResourceName: "netapp-ontap_cifs_local_group_member.example1", + ResourceName: "netapp-ontap_cifs_local_group_members.example1", ImportState: true, ImportStateId: fmt.Sprintf("%s,%s,%s,%s", "SVM3_SERVER\\accuser3", "SVM3_SERVER\\accgroup1", "svm3", "cluster4"), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr("netapp-ontap_cifs_local_group_member.example1", "svm_name", "svm3"), - resource.TestCheckResourceAttr("netapp-ontap_cifs_local_group_member.example1", "group_name", "SVM3_SERVER\\accgroup1"), - resource.TestCheckResourceAttr("netapp-ontap_cifs_local_group_member.example1", "member", "SVM3_SERVER\\accuser3"), + resource.TestCheckResourceAttr("netapp-ontap_cifs_local_group_members.example1", "svm_name", "svm3"), + resource.TestCheckResourceAttr("netapp-ontap_cifs_local_group_members.example1", "group_name", "SVM3_SERVER\\accgroup1"), + resource.TestCheckResourceAttr("netapp-ontap_cifs_local_group_members.example1", "member", "SVM3_SERVER\\accuser3"), // check id - resource.TestCheckResourceAttrSet("netapp-ontap_cifs_local_group_member.example1", "id"), + resource.TestCheckResourceAttrSet("netapp-ontap_cifs_local_group_members.example1", "id"), ), }, }, }) } -func testAccCifsLocalGroupMemberResourceConfigMissingVars(svmName string) string { +func testAccCifsLocalGroupMembersResourceConfigMissingVars(svmName string) string { return fmt.Sprintf(` -resource "netapp-ontap_cifs_local_group_member" "example1" { +resource "netapp-ontap_cifs_local_group_members" "example1" { svm_name = "%s" group_name = "SVM3_SERVER\\accgroup1" member = "SVM3_SERVER\\accuser3" @@ -61,7 +62,7 @@ resource "netapp-ontap_cifs_local_group_member" "example1" { `, svmName) } -func testAccCifsLocalGroupMemberResourceConfig(svmName, groupName, member string) string { +func testAccCifsLocalGroupMembersResourceConfig(svmName, groupName, member string) string { host := os.Getenv("TF_ACC_NETAPP_HOST") admin := os.Getenv("TF_ACC_NETAPP_USER") password := os.Getenv("TF_ACC_NETAPP_PASS") @@ -81,7 +82,7 @@ provider "netapp-ontap" { }, ] } -resource "netapp-ontap_cifs_local_group_member" "example1" { +resource "netapp-ontap_cifs_local_group_members" "example1" { cx_profile_name = "cluster4" svm_name = "%s" group_name = "%s"