chore: Remove unused old implementation from snowflake pkg (#2458)

- Remove unused code from snowflake package
- Migrate datasources missed earlier
- Migrate small statements still using old package

pkg/datasources/current_account.go

@@ -1,11 +1,12 @@
 package datasources
 
 import (
+	"context"
 	"database/sql"
 	"fmt"
 	"log"
 
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/snowflake"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
@@ -40,23 +41,26 @@ func CurrentAccount() *schema.Resource {
 // ReadCurrentAccount read the current snowflake account information.
 func ReadCurrentAccount(d *schema.ResourceData, meta interface{}) error {
 	db := meta.(*sql.DB)
-	acc, err := snowflake.ReadCurrentAccount(db)
+	ctx := context.Background()
+	client := sdk.NewClientFromDB(db)
+
+	current, err := client.ContextFunctions.CurrentSessionDetails(ctx)
 	if err != nil {
 		log.Println("[DEBUG] current_account failed to decode")
 		d.SetId("")
 		return nil
 	}
 
-	d.SetId(fmt.Sprintf("%s.%s", acc.Account, acc.Region))
-	accountErr := d.Set("account", acc.Account)
+	d.SetId(fmt.Sprintf("%s.%s", current.Account, current.Region))
+	accountErr := d.Set("account", current.Account)
 	if accountErr != nil {
 		return accountErr
 	}
-	regionErr := d.Set("region", acc.Region)
+	regionErr := d.Set("region", current.Region)
 	if regionErr != nil {
 		return regionErr
 	}
-	url, err := acc.AccountURL()
+	url, err := current.AccountURL()
 	if err != nil {
 		log.Println("[DEBUG] generating snowflake url failed")
 		return nil

pkg/datasources/current_account_acceptance_test.go

@@ -3,12 +3,18 @@ package datasources_test
 import (
 	"testing"
 
+	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
+
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/tfversion"
 )
 
 func TestAcc_CurrentAccount(t *testing.T) {
 	resource.ParallelTest(t, resource.TestCase{
-		Providers:    providers(),
+		ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
+		TerraformVersionChecks: []tfversion.TerraformVersionCheck{
+			tfversion.RequireAbove(tfversion.Version1_5_0),
+		},
 		CheckDestroy: nil,
 		Steps: []resource.TestStep{
 			{

pkg/datasources/current_role.go

@@ -1,11 +1,11 @@
 package datasources
 
 import (
+	"context"
 	"database/sql"
-	"fmt"
 	"log"
 
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/snowflake"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
@@ -26,15 +26,18 @@ func CurrentRole() *schema.Resource {
 
 func ReadCurrentRole(d *schema.ResourceData, meta interface{}) error {
 	db := meta.(*sql.DB)
-	role, err := snowflake.ReadCurrentRole(db)
+	ctx := context.Background()
+	client := sdk.NewClientFromDB(db)
+
+	role, err := client.ContextFunctions.CurrentRole(ctx)
 	if err != nil {
 		log.Printf("[DEBUG] current_role failed to decode")
 		d.SetId("")
 		return nil
 	}
 
-	d.SetId(fmt.Sprintf(role.Role))
-	err = d.Set("name", role.Role)
+	d.SetId(role)
+	err = d.Set("name", role)
 	if err != nil {
 		return err
 	}

pkg/datasources/current_role_acceptance_test.go

@@ -3,12 +3,18 @@ package datasources_test
 import (
 	"testing"
 
+	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
+
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/tfversion"
 )
 
 func TestAcc_CurrentRole(t *testing.T) {
-	resource.ParallelTest(t, resource.TestCase{
-		Providers: providers(),
+	resource.Test(t, resource.TestCase{
+		ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
+		TerraformVersionChecks: []tfversion.TerraformVersionCheck{
+			tfversion.RequireAbove(tfversion.Version1_5_0),
+		},
 		Steps: []resource.TestStep{
 			{
 				Config: currentRole(),

pkg/datasources/resource_monitors.go

@@ -1,12 +1,12 @@
 package datasources
 
 import (
+	"context"
 	"database/sql"
-	"errors"
 	"fmt"
 	"log"
 
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/snowflake"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
@@ -49,8 +49,10 @@ func ResourceMonitors() *schema.Resource {
 
 func ReadResourceMonitors(d *schema.ResourceData, meta interface{}) error {
 	db := meta.(*sql.DB)
+	client := sdk.NewClientFromDB(db)
+	ctx := context.Background()
 
-	account, err := snowflake.ReadCurrentAccount(db)
+	account, err := client.ContextFunctions.CurrentSessionDetails(ctx)
 	if err != nil {
 		log.Print("[DEBUG] unable to retrieve current account")
 		d.SetId("")
@@ -59,29 +61,22 @@ func ReadResourceMonitors(d *schema.ResourceData, meta interface{}) error {
 
 	d.SetId(fmt.Sprintf("%s.%s", account.Account, account.Region))
 
-	currentResourceMonitors, err := snowflake.ListResourceMonitors(db)
-	if errors.Is(err, sql.ErrNoRows) {
-		// If not found, mark resource to be removed from state file during apply or refresh
-		log.Printf("[DEBUG] no resource monitors found in account (%s)", d.Id())
-		d.SetId("")
-		return nil
-	} else if err != nil {
+	extractedResourceMonitors, err := client.ResourceMonitors.Show(ctx, &sdk.ShowResourceMonitorOptions{})
+	if err != nil {
 		log.Printf("[DEBUG] unable to parse resource monitors in account (%s)", d.Id())
 		d.SetId("")
 		return nil
 	}
 
-	resourceMonitors := []map[string]interface{}{}
-
-	for _, resourceMonitor := range currentResourceMonitors {
-		resourceMonitorMap := map[string]interface{}{}
-
-		resourceMonitorMap["name"] = resourceMonitor.Name.String
-		resourceMonitorMap["frequency"] = resourceMonitor.Frequency.String
-		resourceMonitorMap["credit_quota"] = resourceMonitor.CreditQuota.String
-		resourceMonitorMap["comment"] = resourceMonitor.Comment.String
+	resourceMonitors := make([]map[string]any, len(extractedResourceMonitors))
 
-		resourceMonitors = append(resourceMonitors, resourceMonitorMap)
+	for i, resourceMonitor := range extractedResourceMonitors {
+		resourceMonitors[i] = map[string]any{
+			"name":         resourceMonitor.Name,
+			"frequency":    resourceMonitor.Frequency,
+			"credit_quota": fmt.Sprintf("%f", resourceMonitor.CreditQuota),
+			"comment":      resourceMonitor.Comment,
+		}
 	}
 
 	return d.Set("resource_monitors", resourceMonitors)

pkg/datasources/resource_monitors_acceptance_test.go

@@ -5,14 +5,22 @@ import (
 	"strings"
 	"testing"
 
+	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
+
 	"github.com/hashicorp/terraform-plugin-testing/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/tfversion"
 )
 
 func TestAcc_ResourceMonitors(t *testing.T) {
 	resourceMonitorName := strings.ToUpper(acctest.RandStringFromCharSet(10, acctest.CharSetAlpha))
-	resource.ParallelTest(t, resource.TestCase{
-		Providers:    providers(),
+
+	resource.Test(t, resource.TestCase{
+		ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
+		PreCheck:                 func() { acc.TestAccPreCheck(t) },
+		TerraformVersionChecks: []tfversion.TerraformVersionCheck{
+			tfversion.RequireAbove(tfversion.Version1_5_0),
+		},
 		CheckDestroy: nil,
 		Steps: []resource.TestStep{
 			{

pkg/datasources/role.go

@@ -1,11 +1,11 @@
 package datasources
 
 import (
+	"context"
 	"database/sql"
-	"errors"
 	"log"
 
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/snowflake"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
@@ -37,23 +37,23 @@ func Role() *schema.Resource {
 // ReadRole Reads the database metadata information.
 func ReadRole(d *schema.ResourceData, meta interface{}) error {
 	db := meta.(*sql.DB)
+	client := sdk.NewClientFromDB(db)
+	ctx := context.Background()
+
 	roleName := d.Get("name").(string)
-	role, err := snowflake.NewRoleBuilder(db, roleName).Show()
 
-	if errors.Is(err, sql.ErrNoRows) {
+	role, err := client.Roles.ShowByID(ctx, sdk.NewShowByIdRoleRequest(sdk.NewAccountObjectIdentifier(roleName)))
+	if err != nil {
 		log.Printf("[DEBUG] role (%s) not found", roleName)
 		d.SetId("")
 		return nil
 	}
-	if err != nil {
-		return err
-	}
 
-	d.SetId(role.Name.String)
-	if err := d.Set("name", role.Name.String); err != nil {
+	d.SetId(role.Name)
+	if err := d.Set("name", role.Name); err != nil {
 		return err
 	}
-	if err := d.Set("comment", role.Comment.String); err != nil {
+	if err := d.Set("comment", role.Comment); err != nil {
 		return err
 	}
 	return nil

pkg/datasources/role_acceptance_test.go

@@ -5,15 +5,23 @@ import (
 	"strings"
 	"testing"
 
+	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
+
 	"github.com/hashicorp/terraform-plugin-testing/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/tfversion"
 )
 
 func TestAcc_Role(t *testing.T) {
 	roleName := strings.ToUpper(acctest.RandStringFromCharSet(10, acctest.CharSetAlpha))
 	comment := strings.ToUpper(acctest.RandStringFromCharSet(10, acctest.CharSetAlpha))
+
 	resource.ParallelTest(t, resource.TestCase{
-		Providers:    providers(),
+		ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
+		PreCheck:                 func() { acc.TestAccPreCheck(t) },
+		TerraformVersionChecks: []tfversion.TerraformVersionCheck{
+			tfversion.RequireAbove(tfversion.Version1_5_0),
+		},
 		CheckDestroy: nil,
 		Steps: []resource.TestStep{
 			{

pkg/datasources/row_access_policies_acceptance_test.go

@@ -5,16 +5,24 @@ import (
 	"strings"
 	"testing"
 
+	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
+
 	"github.com/hashicorp/terraform-plugin-testing/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/tfversion"
 )
 
 func TestAcc_RowAccessPolicies(t *testing.T) {
 	databaseName := strings.ToUpper(acctest.RandStringFromCharSet(10, acctest.CharSetAlpha))
 	schemaName := strings.ToUpper(acctest.RandStringFromCharSet(10, acctest.CharSetAlpha))
 	rowAccessPolicyName := strings.ToUpper(acctest.RandStringFromCharSet(10, acctest.CharSetAlpha))
-	resource.ParallelTest(t, resource.TestCase{
-		Providers:    providers(),
+
+	resource.Test(t, resource.TestCase{
+		ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
+		PreCheck:                 func() { acc.TestAccPreCheck(t) },
+		TerraformVersionChecks: []tfversion.TerraformVersionCheck{
+			tfversion.RequireAbove(tfversion.Version1_5_0),
+		},
 		CheckDestroy: nil,
 		Steps: []resource.TestStep{
 			{

pkg/datasources/streams.go

@@ -7,7 +7,6 @@ import (
 	"log"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
-
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 

pkg/datasources/system_get_snowflake_platform_info.go

@@ -1,11 +1,13 @@
 package datasources
 
 import (
+	"context"
 	"database/sql"
 	"errors"
 	"fmt"
 	"log"
 
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/snowflake"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
@@ -35,10 +37,12 @@ func SystemGetSnowflakePlatformInfo() *schema.Resource {
 // ReadSystemGetSnowflakePlatformInfo implements schema.ReadFunc.
 func ReadSystemGetSnowflakePlatformInfo(d *schema.ResourceData, meta interface{}) error {
 	db := meta.(*sql.DB)
+	client := sdk.NewClientFromDB(db)
+
 	sel := snowflake.SystemGetSnowflakePlatformInfoQuery()
 	row := snowflake.QueryRow(db, sel)
 
-	acc, err := snowflake.ReadCurrentAccount(db)
+	acc, err := client.ContextFunctions.CurrentSessionDetails(context.Background())
 	if err != nil {
 		// If not found, mark resource to be removed from state file during apply or refresh
 		d.SetId("")