fix tests

Author: wasaga

example/main.tf

@@ -38,20 +38,20 @@ resource "pomerium_route" "test_route" {
   policies     = [pomerium_policy.test_policy.id]
 }
 
-# Data source examples
-data "pomerium_namespace" "existing_namespace" {
-  id = "9d8dbd2c-8cce-4e66-9c1f-c490b4a07243"
-}
-
-data "pomerium_route" "existing_route" {
-  id = pomerium_route.test_route.id
-}
-
-# Output examples
-output "namespace_name" {
-  value = data.pomerium_namespace.existing_namespace.name
-}
-
-output "route_from" {
-  value = data.pomerium_route.existing_route.from
-}
+# # Data source examples
+# data "pomerium_namespace" "existing_namespace" {
+#   id = "9d8dbd2c-8cce-4e66-9c1f-c490b4a07243"
+# }
+
+# data "pomerium_route" "existing_route" {
+#   id = pomerium_route.test_route.id
+# }
+
+# # Output examples
+# output "namespace_name" {
+#   value = data.pomerium_namespace.existing_namespace.name
+# }
+
+# output "route_from" {
+#   value = data.pomerium_route.existing_route.from
+# }

internal/provider/policy_types.go

@@ -42,7 +42,7 @@ func (p PolicyLanguageType) Equal(o attr.Type) bool {
 
 func (PolicyLanguageType) Parse(src basetypes.StringValue) (PolicyLanguage, error) {
 	if src.IsNull() {
-		return NewPolicyLanguageJSON("[]"), nil
+		return PolicyLanguage{}, nil
 	}
 
 	ppl, err := parser.New().ParseYAML(strings.NewReader(src.ValueString()))
@@ -100,12 +100,6 @@ type PolicyLanguage struct {
 	PolicyJSON json.RawMessage
 }
 
-func NewPolicyLanguageJSON(s string) PolicyLanguage {
-	return PolicyLanguage{
-		StringValue: basetypes.NewStringValue(s),
-	}
-}
-
 func (p PolicyLanguage) Type(context.Context) attr.Type {
 	return PolicyLanguageType{}
 }

internal/provider/policy_types_test.go

@@ -5,7 +5,7 @@ import (
 	_ "embed"
 	"testing"
 
-	"github.com/hashicorp/terraform-plugin-framework/attr"
+	"github.com/hashicorp/terraform-plugin-framework/types/basetypes"
 	"github.com/hashicorp/terraform-plugin-go/tftypes"
 	"github.com/pomerium/enterprise-terraform-provider/internal/provider"
 	"github.com/stretchr/testify/assert"
@@ -18,33 +18,39 @@ var pplObjectOK string
 func TestPolicyTypes(t *testing.T) {
 	t.Parallel()
 
+	jsonPPL := func(json string) provider.PolicyLanguage {
+		ppl, err := provider.PolicyLanguageType{}.Parse(basetypes.NewStringValue(json))
+		require.NoError(t, err)
+		return ppl
+	}
+
 	testCases := map[string]struct {
 		in          tftypes.Value
-		expected    attr.Value
+		expected    provider.PolicyLanguage
 		expectedErr error
 	}{
 		"object-ok": {
 			in:       tftypes.NewValue(tftypes.String, pplObjectOK),
-			expected: provider.NewPolicyLanguageJSON(`[{"allow":{"and":[{"accept":true}]}}]`),
+			expected: jsonPPL(`[{"allow":{"and":[{"accept":true}]}}]`),
 		},
 		"null": {
 			in:       tftypes.NewValue(tftypes.String, nil),
-			expected: provider.NewPolicyLanguageJSON(`[]`),
+			expected: provider.PolicyLanguage{},
 		},
 	}
 	for name, testCase := range testCases {
 		t.Run(name, func(t *testing.T) {
-			p := provider.PolicyLanguageType{}
-			got, err := p.ValueFromTerraform(context.Background(), testCase.in)
+			gotValue, err := provider.PolicyLanguageType{}.ValueFromTerraform(context.Background(), testCase.in)
 			if testCase.expectedErr != nil {
 				require.EqualError(t, err, testCase.expectedErr.Error())
 				return
 			}
+			got, ok := gotValue.(provider.PolicyLanguage)
+			require.True(t, ok)
 			require.NoError(t, err)
-			if !assert.True(t, testCase.expected.Equal(got), got) {
-				t.Logf("-: %s", testCase.expected)
-				t.Logf("+: %s", got)
-			}
+			equals, diag := testCase.expected.StringSemanticEquals(context.Background(), got)
+			assert.False(t, diag.HasError())
+			assert.True(t, equals)
 		})
 	}
 }