feat: Add identifier parsers

pkg/acceptance/helpers/grant_client.go

@@ -0,0 +1,45 @@
+package helpers
+
+import (
+	"context"
+	"testing"
+
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
+	"github.com/stretchr/testify/require"
+)
+
+type GrantClient struct {
+	context *TestClientContext
+	ids     *IdsGenerator
+}
+
+func NewGrantClient(context *TestClientContext, idsGenerator *IdsGenerator) *GrantClient {
+	return &GrantClient{
+		context: context,
+		ids:     idsGenerator,
+	}
+}
+
+func (c *GrantClient) client() sdk.Grants {
+	return c.context.client.Grants
+}
+
+func (c *GrantClient) GrantOnSchemaToAccountRole(t *testing.T, schemaId sdk.DatabaseObjectIdentifier, accountRoleId sdk.AccountObjectIdentifier, privileges ...sdk.SchemaPrivilege) {
+	t.Helper()
+	ctx := context.Background()
+
+	err := c.client().GrantPrivilegesToAccountRole(
+		ctx,
+		&sdk.AccountRoleGrantPrivileges{
+			SchemaPrivileges: privileges,
+		},
+		&sdk.AccountRoleGrantOn{
+			Schema: &sdk.GrantOnSchema{
+				Schema: &schemaId,
+			},
+		},
+		accountRoleId,
+		new(sdk.GrantPrivilegesToAccountRoleOptions),
+	)
+	require.NoError(t, err)
+}

pkg/acceptance/helpers/test_client.go

@@ -24,6 +24,7 @@ type TestClient struct {
 	ExternalVolume            *ExternalVolumeClient
 	FailoverGroup             *FailoverGroupClient
 	FileFormat                *FileFormatClient
+	Grant                     *GrantClient
 	MaskingPolicy             *MaskingPolicyClient
 	MaterializedView          *MaterializedViewClient
 	NetworkPolicy             *NetworkPolicyClient
@@ -77,6 +78,7 @@ func NewTestClient(c *sdk.Client, database string, schema string, warehouse stri
 		ExternalVolume:            NewExternalVolumeClient(context, idsGenerator),
 		FailoverGroup:             NewFailoverGroupClient(context, idsGenerator),
 		FileFormat:                NewFileFormatClient(context, idsGenerator),
+		Grant:                     NewGrantClient(context, idsGenerator),
 		MaskingPolicy:             NewMaskingPolicyClient(context, idsGenerator),
 		MaterializedView:          NewMaterializedViewClient(context, idsGenerator),
 		NetworkPolicy:             NewNetworkPolicyClient(context, idsGenerator),

pkg/datasources/database.go

@@ -83,7 +83,11 @@ func ReadDatabase(d *schema.ResourceData, meta interface{}) error {
 	if err := d.Set("is_current", database.IsCurrent); err != nil {
 		return err
 	}
-	if err := d.Set("origin", database.Origin); err != nil {
+	var origin string
+	if database.Origin != nil {
+		origin = database.Origin.FullyQualifiedName()
+	}
+	if err := d.Set("origin", origin); err != nil {
 		return err
 	}
 	if err := d.Set("retention_time", database.RetentionTime); err != nil {

pkg/helpers/helpers.go

@@ -105,7 +105,7 @@ func DecodeSnowflakeID(id string) sdk.ObjectIdentifier {
 // The following configuration { "some_identifier": "db.name" } will be parsed as an object called "name" that lives
 // inside database called "db", not a database called "db.name". In this case quotes should be used.
 func DecodeSnowflakeParameterID(identifier string) (sdk.ObjectIdentifier, error) {
-	parts, err := ParseIdentifierString(identifier)
+	parts, err := sdk.ParseIdentifierString(identifier)
 	if err != nil {
 		return nil, err
 	}
@@ -126,7 +126,7 @@ func DecodeSnowflakeParameterID(identifier string) (sdk.ObjectIdentifier, error)
 // DecodeSnowflakeAccountIdentifier decodes account identifier (usually passed as one of the parameter in tf configuration) into sdk.AccountIdentifier.
 // Check more in https://docs.snowflake.com/en/sql-reference/sql/create-account#required-parameters.
 func DecodeSnowflakeAccountIdentifier(identifier string) (sdk.AccountIdentifier, error) {
-	parts, err := ParseIdentifierString(identifier)
+	parts, err := sdk.ParseIdentifierString(identifier)
 	if err != nil {
 		return sdk.AccountIdentifier{}, err
 	}
@@ -166,7 +166,7 @@ func ConcatSlices[T any](slices ...[]T) []T {
 // TODO(SNOW-999049): address during identifiers rework
 func ParseRootLocation(location string) (sdk.SchemaObjectIdentifier, string, error) {
 	location = strings.TrimPrefix(location, "@")
-	parts, err := parseIdentifierStringWithOpts(location, func(r *csv.Reader) {
+	parts, err := sdk.ParseIdentifierStringWithOpts(location, func(r *csv.Reader) {
 		r.Comma = '.'
 		r.LazyQuotes = true
 	})

pkg/helpers/resource_identifier_helpers.go

@@ -0,0 +1,18 @@
+package helpers
+
+import (
+	"strings"
+)
+
+const ResourceIdDelimiter = '|'
+
+func ParseResourceIdentifier(identifier string) []string {
+	if identifier == "" {
+		return make([]string, 0)
+	}
+	return strings.Split(identifier, string(ResourceIdDelimiter))
+}
+
+func EncodeResourceIdentifier(parts ...string) string {
+	return strings.Join(parts, string(ResourceIdDelimiter))
+}

pkg/helpers/resource_identifier_helpers_test.go

@@ -0,0 +1,39 @@
+package helpers
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
+	"github.com/stretchr/testify/assert"
+)
+
+func Test_Encoding_And_Parsing_Of_ResourceIdentifier(t *testing.T) {
+	testCases := []struct {
+		Input                 []string
+		Expected              string
+		ExpectedAfterDecoding []string
+	}{
+		{Input: []string{sdk.NewSchemaObjectIdentifier("a", "b", "c").FullyQualifiedName(), "info"}, Expected: `"a"."b"."c"|info`},
+		{Input: []string{}, Expected: ``},
+		{Input: []string{"", "", ""}, Expected: `||`},
+		{Input: []string{"a", "b", "c"}, Expected: `a|b|c`},
+		// If one of the parts contains a separator sign (pipe in this case),
+		// we can end up with more parts than we started with.
+		{Input: []string{"a", "b", "c|d"}, Expected: `a|b|c|d`, ExpectedAfterDecoding: []string{"a", "b", "c", "d"}},
+	}
+
+	for _, testCase := range testCases {
+		t.Run(fmt.Sprintf(`Encoding and parsing %s resource identifier`, testCase.Input), func(t *testing.T) {
+			encodedIdentifier := EncodeResourceIdentifier(testCase.Input...)
+			assert.Equal(t, testCase.Expected, encodedIdentifier)
+
+			parsedIdentifier := ParseResourceIdentifier(encodedIdentifier)
+			if testCase.ExpectedAfterDecoding != nil {
+				assert.Equal(t, testCase.ExpectedAfterDecoding, parsedIdentifier)
+			} else {
+				assert.Equal(t, testCase.Input, parsedIdentifier)
+			}
+		})
+	}
+}

pkg/resources/grant_ownership_identifier.go

@@ -2,7 +2,6 @@ package resources
 
 import (
 	"fmt"
-	"strings"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/helpers"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
@@ -59,7 +58,7 @@ func (g *OnObjectGrantOwnershipData) String() string {
 	var parts []string
 	parts = append(parts, g.ObjectType.String())
 	parts = append(parts, g.ObjectName.FullyQualifiedName())
-	return strings.Join(parts, helpers.IDDelimiter)
+	return helpers.EncodeResourceIdentifier(parts...)
 }
 
 func (g *GrantOwnershipId) String() string {
@@ -81,13 +80,13 @@ func (g *GrantOwnershipId) String() string {
 	if len(data) > 0 {
 		parts = append(parts, data)
 	}
-	return strings.Join(parts, helpers.IDDelimiter)
+	return helpers.EncodeResourceIdentifier(parts...)
 }
 
 func ParseGrantOwnershipId(id string) (*GrantOwnershipId, error) {
 	grantOwnershipId := new(GrantOwnershipId)
 
-	parts := strings.Split(id, helpers.IDDelimiter)
+	parts := helpers.ParseResourceIdentifier(id)
 	if len(parts) < 5 {
 		return grantOwnershipId, sdk.NewError(`grant ownership identifier should hold at least 5 parts "<target_role_kind>|<role_name>|<outbound_privileges_behavior>|<grant_type>|<grant_data>"`)
 	}

pkg/resources/grant_privileges_identifier_commons.go

@@ -39,7 +39,7 @@ func (d *OnSchemaGrantData) String() string {
 	case OnAllSchemasInDatabaseSchemaGrantKind, OnFutureSchemasInDatabaseSchemaGrantKind:
 		parts = append(parts, d.DatabaseName.FullyQualifiedName())
 	}
-	return strings.Join(parts, helpers.IDDelimiter)
+	return helpers.EncodeResourceIdentifier(parts...)
 }
 
 type OnSchemaObjectGrantData struct {
@@ -57,7 +57,7 @@ func (d *OnSchemaObjectGrantData) String() string {
 	case OnAllSchemaObjectGrantKind, OnFutureSchemaObjectGrantKind:
 		parts = append(parts, d.OnAllOrFuture.String())
 	}
-	return strings.Join(parts, helpers.IDDelimiter)
+	return helpers.EncodeResourceIdentifier(parts...)
 }
 
 type BulkOperationGrantKind string
@@ -84,7 +84,7 @@ func (d *BulkOperationGrantData) String() string {
 	case InSchemaBulkOperationGrantKind:
 		parts = append(parts, d.Schema.FullyQualifiedName())
 	}
-	return strings.Join(parts, helpers.IDDelimiter)
+	return helpers.EncodeResourceIdentifier(parts...)
 }
 
 func getBulkOperationGrantData(in *sdk.GrantOnSchemaObjectIn) *BulkOperationGrantData {

pkg/resources/grant_privileges_to_account_role_identifier.go

@@ -30,10 +30,7 @@ type OnAccountObjectGrantData struct {
 }
 
 func (d *OnAccountObjectGrantData) String() string {
-	return strings.Join([]string{
-		d.ObjectType.String(),
-		d.ObjectName.FullyQualifiedName(),
-	}, helpers.IDDelimiter)
+	return helpers.EncodeResourceIdentifier(d.ObjectType.String(), d.ObjectName.FullyQualifiedName())
 }
 
 type GrantPrivilegesToAccountRoleId struct {
@@ -61,13 +58,13 @@ func (g *GrantPrivilegesToAccountRoleId) String() string {
 	if len(data) > 0 {
 		parts = append(parts, data)
 	}
-	return strings.Join(parts, helpers.IDDelimiter)
+	return helpers.EncodeResourceIdentifier(parts...)
 }
 
 func ParseGrantPrivilegesToAccountRoleId(id string) (GrantPrivilegesToAccountRoleId, error) {
 	var accountRoleId GrantPrivilegesToAccountRoleId
 
-	parts := strings.Split(id, helpers.IDDelimiter)
+	parts := helpers.ParseResourceIdentifier(id)
 	if len(parts) < 5 {
 		return accountRoleId, sdk.NewError(`account role identifier should hold at least 5 parts "<role_name>|<with_grant_option>|<always_apply>|<privileges>|<grant_type>"`)
 	}

pkg/resources/grant_privileges_to_database_role_identifier.go

@@ -39,7 +39,7 @@ func (g *GrantPrivilegesToDatabaseRoleId) String() string {
 	}
 	parts = append(parts, string(g.Kind))
 	parts = append(parts, g.Data.String())
-	return strings.Join(parts, helpers.IDDelimiter)
+	return helpers.EncodeResourceIdentifier(parts...)
 }
 
 type OnDatabaseGrantData struct {
@@ -53,7 +53,7 @@ func (d *OnDatabaseGrantData) String() string {
 func ParseGrantPrivilegesToDatabaseRoleId(id string) (GrantPrivilegesToDatabaseRoleId, error) {
 	var databaseRoleId GrantPrivilegesToDatabaseRoleId
 
-	parts := strings.Split(id, helpers.IDDelimiter)
+	parts := helpers.ParseResourceIdentifier(id)
 	if len(parts) < 6 {
 		return databaseRoleId, sdk.NewError(`database role identifier should hold at least 6 parts "<database_role_name>|<with_grant_option>|<always_apply>|<privileges>|<grant_type>|<grant_data>"`)
 	}