Fixed an unstable JSON error

Author: mauriceackel

internal/provider/authorizationmodel/authorization_model_data_source_test.go

@@ -42,8 +42,8 @@ func TestAccAuthorizationModelDataSource(t *testing.T) {
 	})
 }
 
-const expectedFirstAuthorizationModelDataSourceModelJson = `{"schema_version":"1.1","type_definitions":[{"type":"document"}]}`
-const expectedLatestAuthorizationModelDataSourceModelJson = `{"schema_version":"1.1","type_definitions":[{"type":"file"}]}`
+const expectedFirstAuthorizationModelDataSourceModelJson = `{"conditions":{},"schema_version":"1.1","type_definitions":[{"relations":{},"type":"document"}]}`
+const expectedLatestAuthorizationModelDataSourceModelJson = `{"conditions":{},"schema_version":"1.1","type_definitions":[{"relations":{},"type":"file"}]}`
 
 func testAccAuthorizationModelDataSourceConfig() string {
 	return fmt.Sprintf(`

internal/provider/authorizationmodel/authorization_model_document_data_source.go

@@ -10,6 +10,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
 	"github.com/hashicorp/terraform-plugin-framework/path"
 	"github.com/hashicorp/terraform-plugin-framework/types"
+	"google.golang.org/protobuf/encoding/protojson"
 
 	openfga "github.com/openfga/go-sdk"
 	"github.com/openfga/language/pkg/go/transformer"
@@ -98,8 +99,8 @@ func (d *AuthorizationModelDocumentDataSource) Read(ctx context.Context, req dat
 	}
 
 	model := state.Model
-	jsonString := state.Json.ValueStringPointer()
 	dslString := state.Dsl.ValueStringPointer()
+	jsonString := state.Json.ValueStringPointer()
 
 	if model != nil {
 		result, err := json.Marshal(state.Model)
@@ -111,43 +112,48 @@ func (d *AuthorizationModelDocumentDataSource) Read(ctx context.Context, req dat
 		jsonString = openfga.PtrString(string(result))
 	}
 
-	if jsonString != nil {
-		result, err := transformer.TransformJSONStringToDSL(*jsonString)
+	if dslString != nil {
+		result, err := transformer.TransformDSLToJSON(*dslString)
 		if err != nil {
-			resp.Diagnostics.AddError("Input Error", fmt.Sprintf("Unable to transform JSON into DSL, got error: %s", err))
+			resp.Diagnostics.AddError("Input Error", fmt.Sprintf("Unable to transform DSL into JSON, got error: %s", err))
 			return
 		}
 
-		dslString = result
+		jsonString = openfga.PtrString(result)
 	}
 
-	if dslString == nil {
-		resp.Diagnostics.AddError("Input Error", "DSL is undefined")
+	if jsonString == nil {
+		resp.Diagnostics.AddError("Input Error", "JSON is undefined")
 		return
 	}
 
-	// Transform DSL to canonical JSON form
-	unstableResult, err := transformer.TransformDSLToJSON(*dslString)
+	modelProto, err := transformer.LoadJSONStringToProto(*jsonString)
 	if err != nil {
-		resp.Diagnostics.AddError("Input Error", fmt.Sprintf("Unable to transform DSL into JSON, got error: %s", err))
+		resp.Diagnostics.AddError("Input Error", fmt.Sprintf("Unable to transform JSON into Proto, got error: %s", err))
 		return
 	}
 
-	var tmp any
-	err = json.Unmarshal([]byte(unstableResult), &tmp)
+	marshaller := protojson.MarshalOptions{EmitDefaultValues: true}
+	unstableJsonBytes, err := marshaller.Marshal(modelProto)
 	if err != nil {
 		resp.Diagnostics.AddError("Input Error", fmt.Sprintf("Unable to bring JSON in canonical form, got error: %s", err))
 		return
 	}
-	stableResultBytes, err := json.Marshal(tmp)
+
+	var sanitizedAuthorizationModel AuthorizationModelWithoutId
+	err = json.Unmarshal(unstableJsonBytes, &sanitizedAuthorizationModel)
 	if err != nil {
 		resp.Diagnostics.AddError("Input Error", fmt.Sprintf("Unable to bring JSON in canonical form, got error: %s", err))
 		return
 	}
 
-	stableResult := string(stableResultBytes)
+	stableResultBytes, err := json.Marshal(sanitizedAuthorizationModel)
+	if err != nil {
+		resp.Diagnostics.AddError("Input Error", fmt.Sprintf("Unable to bring JSON in canonical form, got error: %s", err))
+		return
+	}
 
-	state.Result = types.StringValue(stableResult)
+	state.Result = types.StringValue(string(stableResultBytes))
 
 	resp.Diagnostics.Append(resp.State.Set(ctx, &state)...)
 }

internal/provider/authorizationmodel/authorization_model_document_data_source_test.go

@@ -54,7 +54,7 @@ func TestAccAuthorizationModelDocumentDataSource(t *testing.T) {
 	})
 }
 
-const expectedAuthorizationModelDocumentDataSourceResult = `{"conditions":{"larger_than":{"expression":"a \u003e b","name":"larger_than","parameters":{"a":{"type_name":"TYPE_NAME_INT"},"b":{"type_name":"TYPE_NAME_INT"}}}},"schema_version":"1.1","type_definitions":[{"type":"user"},{"metadata":{"relations":{"viewer":{"directly_related_user_types":[{"type":"user"}]}}},"relations":{"viewer":{"this":{}}},"type":"document"}]}`
+const expectedAuthorizationModelDocumentDataSourceResult = `{"conditions":{"larger_than":{"expression":"a \u003e b","name":"larger_than","parameters":{"a":{"generic_types":[],"type_name":"TYPE_NAME_INT"},"b":{"generic_types":[],"type_name":"TYPE_NAME_INT"}}}},"schema_version":"1.1","type_definitions":[{"relations":{},"type":"user"},{"metadata":{"module":"","relations":{"viewer":{"directly_related_user_types":[{"condition":"","type":"user"}],"module":""}}},"relations":{"viewer":{"this":{}}},"type":"document"}]}`
 
 func testAccAuthorizationModelDocumentDataSourceConfigDsl() string {
 	return fmt.Sprintf(`

internal/provider/authorizationmodel/authorization_model_resource_test.go

@@ -96,7 +96,7 @@ func TestAccAuthorizationModelResource(t *testing.T) {
 }
 
 func testAccAuthorizationModelResourceModelJson(typeName string) string {
-	return fmt.Sprintf(`{"conditions":{"non_expired_grant":{"expression":"current_time == grant_time + grant_duration","name":"non_expired_grant","parameters":{"current_time":{"type_name":"TYPE_NAME_TIMESTAMP"},"grant_duration":{"type_name":"TYPE_NAME_DURATION"},"grant_time":{"type_name":"TYPE_NAME_TIMESTAMP"}}}},"schema_version":"1.1","type_definitions":[{"type":"user"},{"metadata":{"relations":{"viewer":{"directly_related_user_types":[{"condition":"non_expired_grant","type":"user"}]}}},"relations":{"viewer":{"this":{}}},"type":%[1]q}]}`, typeName)
+	return fmt.Sprintf(`{"conditions":{"non_expired_grant":{"expression":"current_time == grant_time + grant_duration","name":"non_expired_grant","parameters":{"current_time":{"generic_types":[],"type_name":"TYPE_NAME_TIMESTAMP"},"grant_duration":{"generic_types":[],"type_name":"TYPE_NAME_DURATION"},"grant_time":{"generic_types":[],"type_name":"TYPE_NAME_TIMESTAMP"}}}},"schema_version":"1.1","type_definitions":[{"relations":{},"type":"user"},{"metadata":{"module":"","relations":{"viewer":{"directly_related_user_types":[{"condition":"non_expired_grant","type":"user"}],"module":""}}},"relations":{"viewer":{"this":{}}},"type":%[1]q}]}`, typeName)
 }
 
 func testAccAuthorizationModelResourceConfig(modelJson string) string {

internal/provider/authorizationmodel/authorization_models_data_source_test.go

@@ -66,7 +66,7 @@ func TestAccAuthorizationModelsDataSource(t *testing.T) {
 }
 
 func testAccAuthorizationModelsDataSourceModelJson(typeName string) string {
-	return fmt.Sprintf(`{"schema_version":"1.1","type_definitions":[{"type":%[1]q}]}`, typeName)
+	return fmt.Sprintf(`{"conditions":{},"schema_version":"1.1","type_definitions":[{"relations":{},"type":%[1]q}]}`, typeName)
 }
 
 func testAccAuthorizationModelsDataSourceConfig(modelJsons ...string) string {