Fix tests

docs/resources/account_password_policy_attachment.md

@@ -19,7 +19,7 @@ resource "snowflake_password_policy" "default" {
 }
 
 resource "snowflake_account_password_policy_attachment" "attachment" {
-  password_policy = snowflake_password_policy.default.qualified_name
+  password_policy = snowflake_password_policy.default.fully_qualified_name
 }
 ```
 

docs/resources/stream.md

@@ -30,7 +30,7 @@ resource "snowflake_stream" "stream" {
   schema   = "schema"
   name     = "stream"
 
-  on_table    = snowflake_table.table.qualified_name
+  on_table    = snowflake_table.table.fully_qualified_name
   append_only = false
   insert_only = false
 

docs/resources/table_column_masking_policy_application.md

@@ -59,9 +59,9 @@ resource "snowflake_table" "table" {
 resource "snowflake_table_column_masking_policy_application" "application" {
   provider = snowflake.masking # Apply masking policy with masking_admin role
 
-  table          = snowflake_table.table.qualified_name
+  table          = snowflake_table.table.fully_qualified_name
   column         = "secret"
-  masking_policy = snowflake_masking_policy.policy.qualified_name
+  masking_policy = snowflake_masking_policy.policy.fully_qualified_name
 }
 ```
 

docs/resources/table_constraint.md

@@ -66,19 +66,19 @@ resource "snowflake_table" "fk_t" {
 resource "snowflake_table_constraint" "primary_key" {
   name     = "myconstraint"
   type     = "PRIMARY KEY"
-  table_id = snowflake_table.t.qualified_name
+  table_id = snowflake_table.t.fully_qualified_name
   columns  = ["col1"]
   comment  = "hello world"
 }
 
 resource "snowflake_table_constraint" "foreign_key" {
   name     = "myconstraintfk"
   type     = "FOREIGN KEY"
-  table_id = snowflake_table.t.qualified_name
+  table_id = snowflake_table.t.fully_qualified_name
   columns  = ["col2"]
   foreign_key_properties {
     references {
-      table_id = snowflake_table.fk_t.qualified_name
+      table_id = snowflake_table.fk_t.fully_qualified_name
       columns  = ["fk_col1"]
     }
   }
@@ -91,7 +91,7 @@ resource "snowflake_table_constraint" "foreign_key" {
 resource "snowflake_table_constraint" "unique" {
   name     = "unique"
   type     = "UNIQUE"
-  table_id = snowflake_table.t.qualified_name
+  table_id = snowflake_table.t.fully_qualified_name
   columns  = ["col3"]
   comment  = "hello unique"
 }

examples/resources/snowflake_account_password_policy_attachment/resource.tf

@@ -5,5 +5,5 @@ resource "snowflake_password_policy" "default" {
 }
 
 resource "snowflake_account_password_policy_attachment" "attachment" {
-  password_policy = snowflake_password_policy.default.qualified_name
+  password_policy = snowflake_password_policy.default.fully_qualified_name
 }

examples/resources/snowflake_stream/resource.tf

@@ -16,7 +16,7 @@ resource "snowflake_stream" "stream" {
   schema   = "schema"
   name     = "stream"
 
-  on_table    = snowflake_table.table.qualified_name
+  on_table    = snowflake_table.table.fully_qualified_name
   append_only = false
   insert_only = false
 

examples/resources/snowflake_table_column_masking_policy_application/resource.tf

@@ -40,7 +40,7 @@ resource "snowflake_table" "table" {
 resource "snowflake_table_column_masking_policy_application" "application" {
   provider = snowflake.masking # Apply masking policy with masking_admin role
 
-  table          = snowflake_table.table.qualified_name
+  table          = snowflake_table.table.fully_qualified_name
   column         = "secret"
-  masking_policy = snowflake_masking_policy.policy.qualified_name
+  masking_policy = snowflake_masking_policy.policy.fully_qualified_name
 }

examples/resources/snowflake_table_constraint/resource.tf

@@ -52,19 +52,19 @@ resource "snowflake_table" "fk_t" {
 resource "snowflake_table_constraint" "primary_key" {
   name     = "myconstraint"
   type     = "PRIMARY KEY"
-  table_id = snowflake_table.t.qualified_name
+  table_id = snowflake_table.t.fully_qualified_name
   columns  = ["col1"]
   comment  = "hello world"
 }
 
 resource "snowflake_table_constraint" "foreign_key" {
   name     = "myconstraintfk"
   type     = "FOREIGN KEY"
-  table_id = snowflake_table.t.qualified_name
+  table_id = snowflake_table.t.fully_qualified_name
   columns  = ["col2"]
   foreign_key_properties {
     references {
-      table_id = snowflake_table.fk_t.qualified_name
+      table_id = snowflake_table.fk_t.fully_qualified_name
       columns  = ["fk_col1"]
     }
   }
@@ -77,7 +77,7 @@ resource "snowflake_table_constraint" "foreign_key" {
 resource "snowflake_table_constraint" "unique" {
   name     = "unique"
   type     = "UNIQUE"
-  table_id = snowflake_table.t.qualified_name
+  table_id = snowflake_table.t.fully_qualified_name
   columns  = ["col3"]
   comment  = "hello unique"
 }

pkg/resources/account_password_policy_attachment_acceptance_test.go

@@ -53,7 +53,7 @@ resource "snowflake_password_policy" "pa" {
 }
 
 resource "snowflake_account_password_policy_attachment" "att" {
-	password_policy = snowflake_password_policy.pa.qualified_name
+	password_policy = snowflake_password_policy.pa.fully_qualified_name
 }
 `
 	return fmt.Sprintf(s, databaseName, schemaName, prefix)

pkg/resources/external_function.go

@@ -13,7 +13,6 @@ import (
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/hashicorp/go-cty/cty"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 )
@@ -197,9 +196,8 @@ func ExternalFunction() *schema.Resource {
 			StateContext: schema.ImportStatePassthroughContext,
 		},
 
-		CustomizeDiff: customdiff.All(
-			ComputedIfAnyAttributeChanged(FullyQualifiedNameAttributeName, "arg"),
-		),
+		// TODO(SNOW-1348352): add `name` and `arguments` to ComputedIfAnyAttributeChanged for FullyQualifiedNameAttributeName.
+		// This can't be done now because this function compares values without diff suppress.
 
 		StateUpgraders: []schema.StateUpgrader{
 			{

pkg/resources/function.go

@@ -172,7 +172,8 @@ func Function() *schema.Resource {
 		DeleteContext: DeleteContextFunction,
 
 		CustomizeDiff: customdiff.All(
-			ComputedIfAnyAttributeChanged(FullyQualifiedNameAttributeName, "name", "arguments"),
+			// TODO(SNOW-1348103): add `arguments` to ComputedIfAnyAttributeChanged. This can't be done now because this function compares values without diff suppress.
+			ComputedIfAnyAttributeChanged(FullyQualifiedNameAttributeName, "name"),
 		),
 
 		Schema: functionSchema,

pkg/resources/procedure.go

@@ -186,8 +186,10 @@ func Procedure() *schema.Resource {
 		UpdateContext: UpdateContextProcedure,
 		DeleteContext: DeleteContextProcedure,
 
+		// TODO(SNOW-1348106): add `arguments` to ComputedIfAnyAttributeChanged for FullyQualifiedNameAttributeName.
+		// This can't be done now because this function compares values without diff suppress.
 		CustomizeDiff: customdiff.All(
-			ComputedIfAnyAttributeChanged(FullyQualifiedNameAttributeName, "name", "arguments"),
+			ComputedIfAnyAttributeChanged(FullyQualifiedNameAttributeName, "name"),
 		),
 
 		Schema: procedureSchema,

pkg/resources/table_acceptance_test.go

@@ -1763,7 +1763,7 @@ resource "snowflake_table" "test_table" {
 	column {
 		name = "column1"
 		type = "VARCHAR(16)"
-		masking_policy = snowflake_masking_policy.%[4]s.qualified_name
+		masking_policy = snowflake_masking_policy.%[4]s.fully_qualified_name
 	}
 }
 `

pkg/resources/table_column_masking_policy_application_acceptance_test.go

@@ -67,8 +67,8 @@ resource "snowflake_table" "table" {
 }
 
 resource "snowflake_table_column_masking_policy_application" "mpa" {
-	table          = snowflake_table.table.qualified_name
+	table          = snowflake_table.table.fully_qualified_name
 	column         = "secret"
-	masking_policy = snowflake_masking_policy.test.qualified_name
+	masking_policy = snowflake_masking_policy.test.fully_qualified_name
 }`, databaseName, schemaName, databaseName, schemaName)
 }

pkg/resources/table_constraint.go

@@ -211,7 +211,7 @@ func (v *tableConstraintID) parse(s string) {
 func getTableIdentifier(s string) (*sdk.SchemaObjectIdentifier, error) {
 	var objectIdentifier sdk.ObjectIdentifier
 	var err error
-	// TODO [SNOW-999049]: Fallback for old implementations using table.id instead of table.qualified_name - probably will be removed later.
+	// TODO [SNOW-999049]: Fallback for old implementations using table.id instead of table.fully_qualified_name - probably will be removed later.
 	if strings.Contains(s, "|") {
 		objectIdentifier = helpers.DecodeSnowflakeID(s)
 	} else {

pkg/resources/table_constraint_acceptance_test.go

@@ -68,11 +68,11 @@ resource "snowflake_table" "fk_t" {
 resource "snowflake_table_constraint" "fk" {
 	name="%s"
 	type= "FOREIGN KEY"
-	table_id = snowflake_table.t.qualified_name
+	table_id = snowflake_table.t.fully_qualified_name
 	columns = ["col1"]
 	foreign_key_properties {
 	  references {
-		table_id = snowflake_table.fk_t.qualified_name
+		table_id = snowflake_table.fk_t.fully_qualified_name
 		columns = ["fk_col1"]
 	  }
 	}
@@ -129,7 +129,7 @@ resource "snowflake_table" "t" {
 resource "snowflake_table_constraint" "pk" {
 	name = "%[4]s"
 	type = "PRIMARY KEY"
-	table_id = snowflake_table.t.qualified_name
+	table_id = snowflake_table.t.fully_qualified_name
 	columns = ["col1"]
 	enable = false
 	deferrable = false
@@ -209,7 +209,7 @@ resource "snowflake_table" "t" {
 resource "snowflake_table_constraint" "unique" {
 	name="%s"
 	type= "UNIQUE"
-	table_id = snowflake_table.t.qualified_name
+	table_id = snowflake_table.t.fully_qualified_name
 	columns = ["col1"]
 	enforced = true
 	deferrable = false
@@ -388,7 +388,7 @@ resource "snowflake_table" "t" {
 resource "snowflake_table_constraint" "unique" {
 	name     = "%s"
 	type     = "UNIQUE"
-	table_id = snowflake_table.t.qualified_name
+	table_id = snowflake_table.t.fully_qualified_name
 	columns  = ["col1"]
 }
 `, n, databaseName, schemaName, n)
@@ -422,17 +422,17 @@ func tableConstraintEmptyForeignKeyProperties(name string, databaseName string,
 		name     = "%[3]s"
 		database = "%[1]s"
 		schema   = "%[2]s"
-	
+
 		column {
 			name = "col1"
 			type = "NUMBER(38,0)"
 		}
 	}
-	
+
 	resource "snowflake_table_constraint" "unique" {
 		name = "%[3]s"
 		type = "FOREIGN KEY"
-		table_id = snowflake_table.t.qualified_name
+		table_id = snowflake_table.t.fully_qualified_name
 		columns = ["col1"]
 		foreign_key_properties {
 		}
@@ -446,22 +446,22 @@ func tableConstraintForeignKeyProperties(name string, databaseName string, schem
 		name     = "%[3]s"
 		database = "%[1]s"
 		schema   = "%[2]s"
-	
+
 		column {
 			name = "col1"
 			type = "NUMBER(38,0)"
 		}
 	}
-	
+
 	resource "snowflake_table_constraint" "unique" {
 		name = "%[3]s"
 		type = "FOREIGN KEY"
-		table_id = snowflake_table.t.qualified_name
+		table_id = snowflake_table.t.fully_qualified_name
 		columns = ["col1"]
 		foreign_key_properties {
 			references {
 				columns = ["col1"]
-				table_id = snowflake_table.t.qualified_name
+				table_id = snowflake_table.t.fully_qualified_name
 			}
 		}
 	}

pkg/resources/user.go

@@ -286,12 +286,12 @@ func GetReadUserFunc(withExternalChangesMarking bool) schema.ReadContextFunc {
 			}
 			return diag.FromErr(err)
 		}
-		if err := d.Set(FullyQualifiedNameAttributeName, id.FullyQualifiedName()); err != nil {
+		userParameters, err := client.Users.ShowParameters(ctx, id)
+		if err != nil {
 			return diag.FromErr(err)
 		}
 
-		userParameters, err := client.Users.ShowParameters(ctx, id)
-		if err != nil {
+		if err := d.Set(FullyQualifiedNameAttributeName, id.FullyQualifiedName()); err != nil {
 			return diag.FromErr(err)
 		}
 

pkg/resources/user_acceptance_test.go

@@ -48,7 +48,7 @@ func TestAcc_User(t *testing.T) {
 	prefix := acc.TestClient().Ids.Alpha()
 	prefix2 := acc.TestClient().Ids.Alpha()
 	id := sdk.NewAccountObjectIdentifier(prefix)
-	id2 := sdk.NewAccountObjectIdentifier(prefix)
+	id2 := sdk.NewAccountObjectIdentifier(prefix2)
 
 	comment := random.Comment()
 	newComment := random.Comment()
@@ -238,8 +238,9 @@ resource "snowflake_user" "w" {
 	default_namespace="bar.baz"
 }
 `
+	s = fmt.Sprintf(s, prefix, prefix)
 	log.Printf("[DEBUG] s2 %s", s)
-	return fmt.Sprintf(s, prefix, prefix)
+	return s
 }
 
 // TestAcc_User_issue2058 proves https://github.com/Snowflake-Labs/terraform-provider-snowflake/issues/2058 issue.