wip

pkg/acceptance/asserts.go

@@ -2,8 +2,9 @@ package acceptance
 
 import (
 	"fmt"
-	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"strconv"
+
+	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 )
 
 func IsGreaterOrEqualTo(greaterOrEqualValue int) resource.CheckResourceAttrWithFunc {

pkg/acceptance/bettertestspoc/assert/commons.go

@@ -3,11 +3,12 @@ package assert
 import (
 	"errors"
 	"fmt"
-	"golang.org/x/exp/maps"
 	"strconv"
 	"strings"
 	"testing"
 
+	"golang.org/x/exp/maps"
+
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/terraform"
 )
@@ -105,7 +106,6 @@ func AssertThatObject(t *testing.T, objectAssert InPlaceAssertionVerifier) {
 	objectAssert.VerifyAll(t)
 }
 
-// TODO: This function should iterate over items and look for list item in attributes that matches ALL items' entries AT ONCE (currently it's a pretty dumb assert running through all attributes)
 func HasListItemsOrderIndependent(resourceKey string, attributePath string, expectedItems []map[string]string) resource.TestCheckFunc {
 	return func(state *terraform.State) error {
 		var actualItems []map[string]string
@@ -120,7 +120,7 @@ func HasListItemsOrderIndependent(resourceKey string, attributePath string, expe
 						if attr == "#" {
 							attrValueLen, err := strconv.Atoi(attrValue)
 							if err != nil {
-								return fmt.Errorf("failed to convert length of the attribute %s: %s", attrKey, err)
+								return fmt.Errorf("failed to convert length of the attribute %s: %w", attrKey, err)
 							}
 							if len(expectedItems) != attrValueLen {
 								return fmt.Errorf("expected to find %d items in %s, but found %d", len(expectedItems), attributePath, attrValueLen)

pkg/acceptance/helpers/database_client.go

@@ -48,14 +48,6 @@ func (c *DatabaseClient) CreateDatabaseWithOptions(t *testing.T, id sdk.AccountO
 	return database, c.DropDatabaseFunc(t, id)
 }
 
-func (c *DatabaseClient) Alter(t *testing.T, id sdk.AccountObjectIdentifier, opts *sdk.AlterDatabaseOptions) {
-	t.Helper()
-	ctx := context.Background()
-
-	err := c.client().Alter(ctx, id, opts)
-	require.NoError(t, err)
-}
-
 func (c *DatabaseClient) DropDatabaseFunc(t *testing.T, id sdk.AccountObjectIdentifier) func() {
 	t.Helper()
 	return func() { require.NoError(t, c.DropDatabase(t, id)) }
@@ -192,3 +184,11 @@ func (c *DatabaseClient) ShowAllReplicationDatabases(t *testing.T) ([]sdk.Replic
 
 	return c.context.client.ReplicationFunctions.ShowReplicationDatabases(ctx, nil)
 }
+
+func (c *DatabaseClient) Alter(t *testing.T, id sdk.AccountObjectIdentifier, opts *sdk.AlterDatabaseOptions) {
+	t.Helper()
+	ctx := context.Background()
+
+	err := c.client().Alter(ctx, id, opts)
+	require.NoError(t, err)
+}

pkg/acceptance/helpers/schema_client.go

@@ -55,14 +55,6 @@ func (c *SchemaClient) CreateSchemaWithOpts(t *testing.T, id sdk.DatabaseObjectI
 	return schema, c.DropSchemaFunc(t, id)
 }
 
-func (c *SchemaClient) Alter(t *testing.T, id sdk.DatabaseObjectIdentifier, opts *sdk.AlterSchemaOptions) {
-	t.Helper()
-	ctx := context.Background()
-
-	err := c.client().Alter(ctx, id, opts)
-	require.NoError(t, err)
-}
-
 func (c *SchemaClient) DropSchemaFunc(t *testing.T, id sdk.DatabaseObjectIdentifier) func() {
 	t.Helper()
 	ctx := context.Background()
@@ -112,3 +104,11 @@ func (c *SchemaClient) ShowWithOptions(t *testing.T, opts *sdk.ShowSchemaOptions
 	require.NoError(t, err)
 	return schemas
 }
+
+func (c *SchemaClient) Alter(t *testing.T, id sdk.DatabaseObjectIdentifier, opts *sdk.AlterSchemaOptions) {
+	t.Helper()
+	ctx := context.Background()
+
+	err := c.client().Alter(ctx, id, opts)
+	require.NoError(t, err)
+}

pkg/provider/provider.go

@@ -3,13 +3,14 @@ package provider
 import (
 	"errors"
 	"fmt"
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testenvs"
 	"net"
 	"net/url"
 	"os"
 	"strings"
 	"time"
 
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testenvs"
+
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/datasources"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/provider"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/provider/docs"

pkg/resources/object_renaming_lists_and_sets.go

@@ -4,14 +4,15 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"log"
+	"strconv"
+	"strings"
+
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/collections"
 	"github.com/hashicorp/go-cty/cty"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"golang.org/x/exp/slices"
-	"log"
-	"strconv"
-	"strings"
 )
 
 type objectRenamingDatabaseListItem struct {
@@ -222,9 +223,7 @@ func UpdateObjectRenamingListsAndSets(ctx context.Context, d *schema.ResourceDat
 			})
 		}
 
-		for _, addedItem := range addedItems {
-			ObjectRenamingDatabaseInstance.List = append(ObjectRenamingDatabaseInstance.List, addedItem)
-		}
+		ObjectRenamingDatabaseInstance.List = append(ObjectRenamingDatabaseInstance.List, addedItems...)
 	}
 
 	if d.HasChange("ordered_list") {

pkg/resources/object_renaming_lists_and_sets_acceptance_test.go

@@ -2,14 +2,15 @@ package resources_test
 
 import (
 	"fmt"
+	"testing"
+
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testenvs"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/resources"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/tfversion"
-	"testing"
 )
 
 func TestAcc_BasicListFlow(t *testing.T) {