add validator for body and identity fields

Azure · Apr 23, 2024 · 9019fc3 · 9019fc3
1 parent 07e1387
commit 9019fc3
Show file tree

Hide file tree

Showing 11 changed files with 100 additions and 4 deletions.
diff --git a/internal/services/azapi_data_plane_resource.go b/internal/services/azapi_data_plane_resource.go
@@ -110,6 +110,9 @@ func (r *DataPlaneResource) Schema(ctx context.Context, request resource.SchemaR
 				Optional: true,
 				Computed: true,
 				Default:  defaults.DynamicDefault(types.StringValue("{}")),
+				Validators: []validator.Dynamic{
+					myvalidator.BodyValidator(),
+				},
 				PlanModifiers: []planmodifier.Dynamic{
 					myplanmodifier.DynamicUseStateWhen(bodySemanticallyEqual),
 				},

diff --git a/internal/services/azapi_resource.go b/internal/services/azapi_resource.go
@@ -149,6 +149,9 @@ func (r *AzapiResource) Schema(ctx context.Context, _ resource.SchemaRequest, re
 				Optional: true,
 				Computed: true,
 				Default:  defaults.DynamicDefault(types.StringValue("{}")),
+				Validators: []validator.Dynamic{
+					myvalidator.BodyValidator(),
+				},
 				PlanModifiers: []planmodifier.Dynamic{
 					myplanmodifier.DynamicUseStateWhen(bodySemanticallyEqual),
 				},
@@ -214,6 +217,7 @@ func (r *AzapiResource) Schema(ctx context.Context, _ resource.SchemaRequest, re
 		Blocks: map[string]schema.Block{
 			"identity": schema.ListNestedBlock{
 				NestedObject: schema.NestedBlockObject{
+					Validators: []validator.Object{myvalidator.IdentityValidator()},
 					Attributes: map[string]schema.Attribute{
 						"type": schema.StringAttribute{
 							Required: true,

diff --git a/internal/services/azapi_resource_action_data_source.go b/internal/services/azapi_resource_action_data_source.go
@@ -85,6 +85,9 @@ func (r *ResourceActionDataSource) Schema(ctx context.Context, request datasourc
 			// TODO: Remove the support for JSON string in the next major release
 			"body": schema.DynamicAttribute{
 				Optional: true,
+				Validators: []validator.Dynamic{
+					myvalidator.BodyValidator(),
+				},
 			},
 
 			"response_export_values": schema.ListAttribute{

diff --git a/internal/services/azapi_resource_action_resource.go b/internal/services/azapi_resource_action_resource.go
@@ -118,6 +118,9 @@ func (r *ActionResource) Schema(ctx context.Context, request resource.SchemaRequ
 				Optional: true,
 				Computed: true,
 				Default:  defaults.DynamicDefault(types.StringValue("{}")),
+				Validators: []validator.Dynamic{
+					myvalidator.BodyValidator(),
+				},
 				PlanModifiers: []planmodifier.Dynamic{
 					myplanmodifier.DynamicUseStateWhen(bodySemanticallyEqual),
 				},

diff --git a/internal/services/azapi_update_resource.go b/internal/services/azapi_update_resource.go
@@ -128,6 +128,9 @@ func (r *AzapiUpdateResource) Schema(ctx context.Context, request resource.Schem
 				Optional: true,
 				Computed: true,
 				Default:  defaults.DynamicDefault(types.StringValue("{}")),
+				Validators: []validator.Dynamic{
+					myvalidator.BodyValidator(),
+				},
 				PlanModifiers: []planmodifier.Dynamic{
 					myplanmodifier.DynamicUseStateWhen(bodySemanticallyEqual),
 				},

diff --git a/internal/services/myvalidator/body_validator.go b/internal/services/myvalidator/body_validator.go
@@ -0,0 +1,40 @@
+package myvalidator
+
+import (
+	"context"
+	"encoding/json"
+
+	"github.com/hashicorp/terraform-plugin-framework/schema/validator"
+	"github.com/hashicorp/terraform-plugin-framework/types"
+)
+
+type bodyValidator struct{}
+
+func (v bodyValidator) Description(ctx context.Context) string {
+	return "validate the identity block"
+}
+
+func (v bodyValidator) MarkdownDescription(ctx context.Context) string {
+	return "validate the identity block"
+}
+
+func (_ bodyValidator) ValidateDynamic(ctx context.Context, req validator.DynamicRequest, resp *validator.DynamicResponse) {
+	raw := req.ConfigValue
+
+	if raw.IsUnknown() || raw.IsNull() {
+		return
+	}
+
+	switch value := raw.UnderlyingValue().(type) {
+	case types.String:
+		var out interface{}
+		err := json.Unmarshal([]byte(value.ValueString()), &out)
+		if err != nil {
+			resp.Diagnostics.AddAttributeError(req.Path, "Invalid JSON", err.Error())
+		}
+	}
+}
+
+func BodyValidator() validator.Dynamic {
+	return bodyValidator{}
+}
diff --git a/internal/services/myvalidator/identity_validator.go b/internal/services/myvalidator/identity_validator.go
@@ -0,0 +1,40 @@
+package myvalidator
+
+import (
+	"context"
+
+	"github.com/Azure/terraform-provider-azapi/internal/azure/identity"
+	"github.com/hashicorp/terraform-plugin-framework/schema/validator"
+	"github.com/hashicorp/terraform-plugin-framework/types/basetypes"
+)
+
+type identityValidator struct{}
+
+func (v identityValidator) Description(ctx context.Context) string {
+	return "validate the identity block"
+}
+
+func (v identityValidator) MarkdownDescription(ctx context.Context) string {
+	return "validate the identity block"
+}
+
+func (_ identityValidator) ValidateObject(ctx context.Context, req validator.ObjectRequest, resp *validator.ObjectResponse) {
+	value := req.ConfigValue
+
+	if value.IsUnknown() || value.IsNull() {
+		return
+	}
+
+	var model identity.Model
+	if resp.Diagnostics.Append(value.As(ctx, &model, basetypes.ObjectAsOptions{})...); resp.Diagnostics.HasError() {
+		return
+	}
+
+	if _, err := identity.ExpandIdentity(model); err != nil {
+		resp.Diagnostics.AddAttributeError(req.Path, "Invalid `identity` block", err.Error())
+	}
+}
+
+func IdentityValidator() validator.Object {
+	return identityValidator{}
+}
diff --git a/internal/services/myvalidator/resource_id.go b/internal/services/myvalidator/resource_id.go
@@ -34,6 +34,6 @@ func (_ stringIsResourceID) ValidateString(ctx context.Context, req validator.St
 	}
 }
 
-func StringIsResourceID() stringIsResourceID {
+func StringIsResourceID() validator.String {
 	return stringIsResourceID{}
 }
diff --git a/internal/services/myvalidator/resource_type.go b/internal/services/myvalidator/resource_type.go
@@ -34,6 +34,6 @@ func (_ stringIsResourceType) ValidateString(ctx context.Context, req validator.
 	}
 }
 
-func StringIsResourceType() stringIsResourceType {
+func StringIsResourceType() validator.String {
 	return stringIsResourceType{}
 }
diff --git a/internal/services/myvalidator/string_is_UUID.go b/internal/services/myvalidator/string_is_UUID.go
@@ -34,6 +34,6 @@ func (_ stringIsUUID) ValidateString(ctx context.Context, req validator.StringRe
 	}
 }
 
-func StringIsUUID() stringIsUUID {
+func StringIsUUID() validator.String {
 	return stringIsUUID{}
 }
diff --git a/internal/services/myvalidator/string_is_json.go b/internal/services/myvalidator/string_is_json.go
@@ -34,6 +34,6 @@ func (_ stringIsJSON) ValidateString(ctx context.Context, req validator.StringRe
 	}
 }
 
-func StringIsJSON() stringIsJSON {
+func StringIsJSON() validator.String {
 	return stringIsJSON{}
 }