Fix devops parameter group

docs/resources/devops_parameter_group.md

@@ -54,10 +54,10 @@ resource "nifcloud_devops_parameter_group" "example" {
 
 The following arguments are supported:
 
+* `description` - (Optional) Description of the DevOps parameter group.
 * `name` - (Required) The name of the DevOps parameter group.
-* `description` - (Optional) The description for the DevOps parameter group.
-* `parameter` - (Optional) A list of parameters. see [parameter](#parameter)
-* `sensitive_parameter` - (Optional) A list of parameters whose value should be masked. see [sensitive_parameter](#sensitive_parameter)
+* `parameter` - (Optional) List of the DevOps parameters. see [parameter](#parameter)
+* `sensitive_parameter` - (Optional) List of the DevOps parameters whose value should be masked. see [sensitive_parameter](#sensitive_parameter)
 
 ### parameter
 
@@ -66,9 +66,11 @@ The following arguments are supported:
 
 ### sensitive_parameter
 
-* `name` - (Required) The name of the parameter. The allowed name is "smtp_password".
+* `name` - (Required) The name of the parameter. Valid value is `smtp_password`.
 * `value` - (Required) The value of the parameter.
 
+Note: The calculated difference in the values of this parameter may be inaccurate due to API restrictions.
+
 ## Import
 
 nifcloud_devops_parameter_group can be imported using the `parameter corresponding to id`, e.g.

nifcloud/acc/devops_parameter_group_test.go

@@ -48,7 +48,39 @@ func TestAcc_DevOpsParameterGroup(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "name", randName),
 					resource.TestCheckResourceAttr(resourceName, "description", "tfacc-memo"),
 					resource.TestCheckResourceAttr(resourceName, "parameter.#", "3"),
+					resource.TestCheckTypeSetElemNestedAttrs(
+						resourceName,
+						"parameter.*",
+						map[string]string{
+							"name":  "smtp_user_name",
+							"value": "user1",
+						},
+					),
+					resource.TestCheckTypeSetElemNestedAttrs(
+						resourceName,
+						"parameter.*",
+						map[string]string{
+							"name":  "gitlab_email_from",
+							"value": "[email protected]",
+						},
+					),
+					resource.TestCheckTypeSetElemNestedAttrs(
+						resourceName,
+						"parameter.*",
+						map[string]string{
+							"name":  "gitlab_email_reply_to",
+							"value": "[email protected]",
+						},
+					),
 					resource.TestCheckResourceAttr(resourceName, "sensitive_parameter.#", "1"),
+					resource.TestCheckTypeSetElemNestedAttrs(
+						resourceName,
+						"sensitive_parameter.*",
+						map[string]string{
+							"name":  "smtp_password",
+							"value": "mystrongpassword",
+						},
+					),
 				),
 			},
 			{
@@ -59,7 +91,39 @@ func TestAcc_DevOpsParameterGroup(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "name", randName+"-upd"),
 					resource.TestCheckResourceAttr(resourceName, "description", "tfacc-memo-upd"),
 					resource.TestCheckResourceAttr(resourceName, "parameter.#", "3"),
+					resource.TestCheckTypeSetElemNestedAttrs(
+						resourceName,
+						"parameter.*",
+						map[string]string{
+							"name":  "smtp_user_name",
+							"value": "user101",
+						},
+					),
+					resource.TestCheckTypeSetElemNestedAttrs(
+						resourceName,
+						"parameter.*",
+						map[string]string{
+							"name":  "gitlab_email_from",
+							"value": "[email protected]",
+						},
+					),
+					resource.TestCheckTypeSetElemNestedAttrs(
+						resourceName,
+						"parameter.*",
+						map[string]string{
+							"name":  "gitlab_email_reply_to",
+							"value": "[email protected]",
+						},
+					),
 					resource.TestCheckResourceAttr(resourceName, "sensitive_parameter.#", "1"),
+					resource.TestCheckTypeSetElemNestedAttrs(
+						resourceName,
+						"sensitive_parameter.*",
+						map[string]string{
+							"name":  "smtp_password",
+							"value": "mynewstrongpassword",
+						},
+					),
 				),
 			},
 			{
@@ -140,7 +204,7 @@ func testAccCheckDevOpsParameterGroupValues(group *types.ParameterGroup, rName s
 func testAccCheckDevOpsParameterGroupValuesUpdated(group *types.ParameterGroup, rName string) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		if nifcloud.ToString(group.ParameterGroupName) != rName+"-upd" {
-			return fmt.Errorf("bad parameter group name state, expected \"%s\", got: %#v", rName, nifcloud.ToString(group.ParameterGroupName))
+			return fmt.Errorf("bad parameter group name state, expected \"%s\", got: %#v", rName+"-upd", nifcloud.ToString(group.ParameterGroupName))
 		}
 
 		if nifcloud.ToString(group.Description) != "tfacc-memo-upd" {
@@ -198,7 +262,7 @@ func testAccDevOpsParameterGroupResourceDestroy(s *terraform.State) error {
 
 		if err != nil {
 			var awsErr smithy.APIError
-			if errors.As(err, &awsErr) && awsErr.ErrorCode() == "Client.InvalidParameterNotFound.ParameterGroupName" {
+			if errors.As(err, &awsErr) && awsErr.ErrorCode() == "Client.InvalidParameterNotFound.ParameterGroup" {
 				return nil
 			}
 			return fmt.Errorf("failed GetParameterGroup: %s", err)

nifcloud/resources/devops/devopsparametergroup/create.go

@@ -17,7 +17,7 @@ func createParameterGroup(ctx context.Context, d *schema.ResourceData, meta inte
 
 	res, err := svc.CreateParameterGroup(ctx, input)
 	if err != nil {
-		return diag.FromErr(fmt.Errorf("failed creating ParameterGroup: %s", err))
+		return diag.FromErr(fmt.Errorf("failed to create a DevOps parameter group: %s", err))
 	}
 
 	d.SetId(nifcloud.ToString(res.ParameterGroup.ParameterGroupName))

nifcloud/resources/devops/devopsparametergroup/delete.go

@@ -15,7 +15,7 @@ func deleteParameterGroup(ctx context.Context, d *schema.ResourceData, meta inte
 	input := expandDeleteParameterGroupInput(d)
 
 	if _, err := svc.DeleteParameterGroup(ctx, input); err != nil {
-		return diag.FromErr(fmt.Errorf("failed deleting ParameterGroup: %s", err))
+		return diag.FromErr(fmt.Errorf("failed to delete a DevOps parameter group: %s", err))
 	}
 
 	d.SetId("")

nifcloud/resources/devops/devopsparametergroup/expander.go

@@ -2,7 +2,6 @@ package devopsparametergroup
 
 import (
 	"reflect"
-	"strings"
 
 	"github.com/ettle/strcase"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -47,16 +46,6 @@ func expandUpdateParameterGroupParameters(configured []map[string]string) *types
 		if rawParam["name"] == "" {
 			continue
 		}
-		unsupportedSuffixes := []string{"2", "3", "4", "5"}
-		isUnsuppotedInSDK := false
-		for _, suffix := range unsupportedSuffixes {
-			if strings.HasSuffix(rawParam["name"], suffix) {
-				isUnsuppotedInSDK = true
-			}
-		}
-		if isUnsuppotedInSDK {
-			continue
-		}
 
 		name := strcase.ToPascal(rawParam["name"])
 		value := rawParam["value"]

nifcloud/resources/devops/devopsparametergroup/expander_test.go

@@ -166,10 +166,11 @@ func TestExpandUpdateParameterGroupParameters(t *testing.T) {
 			name: "expands the resource data",
 			args: configured,
 			want: &types.RequestParameters{
-				GitlabEmailFrom:    nifcloud.String("test_value_01"),
-				GitlabEmailReplyTo: nifcloud.String("test_value_02"),
-				SmtpPassword:       nifcloud.String("test_value_03"),
-				SmtpUserName:       nifcloud.String("test_value_04"),
+				GitlabEmailFrom:            nifcloud.String("test_value_01"),
+				GitlabEmailReplyTo:         nifcloud.String("test_value_02"),
+				SmtpPassword:               nifcloud.String("test_value_03"),
+				SmtpUserName:               nifcloud.String("test_value_04"),
+				OmniauthProvidersSamlName2: nifcloud.String("test_value_06"),
 			},
 		},
 	}

nifcloud/resources/devops/devopsparametergroup/flattener.go

@@ -18,7 +18,7 @@ func flatten(d *schema.ResourceData, res *devops.GetParameterGroupOutput) error
 	group := res.ParameterGroup
 
 	if nifcloud.ToString(group.ParameterGroupName) != d.Id() {
-		return fmt.Errorf("unable to find parameter group within: %#v", group)
+		return fmt.Errorf("unable to find the DevOps parameter group within: %#v", group)
 	}
 
 	if err := d.Set("name", group.ParameterGroupName); err != nil {

nifcloud/resources/devops/devopsparametergroup/flattener_test.go

@@ -12,6 +12,17 @@ import (
 
 func TestFlatten(t *testing.T) {
 	rd := schema.TestResourceDataRaw(t, newSchema(), map[string]interface{}{
+		// define a parameter because the flattener only update configured parameters.
+		"parameter": []interface{}{
+			map[string]interface{}{
+				"name":  "test_name_01",
+				"value": "",
+			},
+		},
+	})
+	rd.SetId("test_name")
+
+	wantRd := schema.TestResourceDataRaw(t, newSchema(), map[string]interface{}{
 		"name":        "test_name",
 		"description": "test_description",
 		"parameter": []interface{}{
@@ -21,7 +32,7 @@ func TestFlatten(t *testing.T) {
 			},
 		},
 	})
-	rd.SetId("test_name")
+	wantRd.SetId("test_name")
 
 	wantNotFoundRd := schema.TestResourceDataRaw(t, newSchema(), map[string]interface{}{})
 
@@ -65,7 +76,7 @@ func TestFlatten(t *testing.T) {
 					},
 				},
 			},
-			want: rd,
+			want: wantRd,
 		},
 		{
 			name: "flattens the response even when the resource has been removed externally",
@@ -95,7 +106,6 @@ func TestFlatten(t *testing.T) {
 			}
 
 			assert.Equal(t, wantState.Attributes, gotState.Attributes)
-			assert.True(t, tt.want.Get("parameter").(*schema.Set).Equal(tt.args.d.Get("parameter")))
 		})
 	}
 }

nifcloud/resources/devops/devopsparametergroup/read.go

@@ -14,17 +14,17 @@ import (
 func readParameterGroup(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	svc := meta.(*client.Client).DevOps
 
-	getParameterGroupRes, err := svc.GetParameterGroup(ctx, expandGetParameterGroupInput(d))
+	res, err := svc.GetParameterGroup(ctx, expandGetParameterGroupInput(d))
 	if err != nil {
 		var awsErr smithy.APIError
 		if errors.As(err, &awsErr) && awsErr.ErrorCode() == "Client.InvalidParameterNotFound.ParameterGroup" {
 			d.SetId("")
 			return nil
 		}
-		return diag.FromErr(fmt.Errorf("failed reading ParameterGroup: %s", err))
+		return diag.FromErr(fmt.Errorf("failed to read a DevOps parameter group: %s", err))
 	}
 
-	if err := flatten(d, getParameterGroupRes); err != nil {
+	if err := flatten(d, res); err != nil {
 		return diag.FromErr(err)
 	}
 

nifcloud/resources/devops/devopsparametergroup/schema.go

@@ -41,7 +41,7 @@ func newSchema() map[string]*schema.Schema {
 	return map[string]*schema.Schema{
 		"name": {
 			Type:        schema.TypeString,
-			Description: "The name of the parameter group.",
+			Description: "The name of the DevOps parameter group.",
 			Required:    true,
 			ValidateFunc: validation.All(
 				validation.StringLenBetween(1, 63),
@@ -50,7 +50,7 @@ func newSchema() map[string]*schema.Schema {
 		},
 		"description": {
 			Type:             schema.TypeString,
-			Description:      "The description for the DB parameter group.",
+			Description:      "Description of the DevOps parameter group.",
 			Optional:         true,
 			ValidateDiagFunc: validator.StringRuneCountBetween(0, 255),
 		},
@@ -92,7 +92,7 @@ func newSchema() map[string]*schema.Schema {
 				Schema: map[string]*schema.Schema{
 					"name": {
 						Type:        schema.TypeString,
-						Description: "The name of the parameter.",
+						Description: "The name of the parameter. Valid value is `smtp_password`.",
 						Required:    true,
 						ValidateDiagFunc: func(v any, p cty.Path) diag.Diagnostics {
 							value := v.(string)

nifcloud/resources/devops/devopsparametergroup/update.go

@@ -42,7 +42,7 @@ func updateParameterGroup(ctx context.Context, d *schema.ResourceData, meta inte
 		// since ResourceData contains only configured parameters in tf file.
 		getParameterGroupRes, err := svc.GetParameterGroup(ctx, expandGetParameterGroupInput(d))
 		if err != nil {
-			return diag.FromErr(fmt.Errorf("failed reading ParameterGroup: %s", err))
+			return diag.FromErr(fmt.Errorf("failed to read a DevOps parameter group: %s", err))
 		}
 		currentParams := flattenParameters(getParameterGroupRes.ParameterGroup.Parameters)
 
@@ -51,7 +51,7 @@ func updateParameterGroup(ctx context.Context, d *schema.ResourceData, meta inte
 		input := expandUpdateParameterGroupInput(d, parametersToUpdate)
 
 		if _, err := svc.UpdateParameterGroup(ctx, input); err != nil {
-			return diag.FromErr(fmt.Errorf("failed updating ParameterGroup: %s", err))
+			return diag.FromErr(fmt.Errorf("failed to update a DevOps parameter group: %s", err))
 		}
 	}