chore: Adjust data source tests follow up 3 (snowflakedb#4166)

Follow up for
snowflakedb#4115,
addressing the following data sources
- `account roles`
- `database roles`
- `masking policies`
- `network policies`
- `resource monitors`
- `row access policies`

Author: sfc-gh-jcieslak

pkg/acceptance/bettertestspoc/assert/resourceshowoutputassert/account_roles_datasource_show_output_ext.go

@@ -0,0 +1,17 @@
+package resourceshowoutputassert
+
+import (
+	"testing"
+
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
+)
+
+func AccountRolesDatasourceShowOutput(t *testing.T, datasourceReference string) *RoleShowOutputAssert {
+	t.Helper()
+
+	s := RoleShowOutputAssert{
+		ResourceAssert: assert.NewDatasourceAssert(datasourceReference, "show_output", "account_roles.0."),
+	}
+	s.AddAssertion(assert.ValueSet("show_output.#", "1"))
+	return &s
+}

pkg/acceptance/bettertestspoc/assert/resourceshowoutputassert/database_roles_datasource_show_output_ext.go

@@ -0,0 +1,17 @@
+package resourceshowoutputassert
+
+import (
+	"testing"
+
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
+)
+
+func DatabaseRolesDatasourceShowOutput(t *testing.T, datasourceReference string) *DatabaseRoleShowOutputAssert {
+	t.Helper()
+
+	s := DatabaseRoleShowOutputAssert{
+		ResourceAssert: assert.NewDatasourceAssert(datasourceReference, "show_output", "database_roles.0."),
+	}
+	s.AddAssertion(assert.ValueSet("show_output.#", "1"))
+	return &s
+}

pkg/acceptance/bettertestspoc/assert/resourceshowoutputassert/masking_policy_show_output_ext.go

@@ -6,18 +6,28 @@ import (
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
 )
 
-func (p *MaskingPolicyShowOutputAssert) HasCreatedOnNotEmpty() *MaskingPolicyShowOutputAssert {
-	p.AddAssertion(assert.ResourceShowOutputValuePresent("created_on"))
-	return p
-}
-
 // MaskingPoliciesDatasourceShowOutput is a temporary workaround to have better show output assertions in data source acceptance tests.
-func MaskingPoliciesDatasourceShowOutput(t *testing.T, name string) *MaskingPolicyShowOutputAssert {
+func MaskingPoliciesDatasourceShowOutput(t *testing.T, datasourceReference string) *MaskingPolicyShowOutputAssert {
 	t.Helper()
 
 	m := MaskingPolicyShowOutputAssert{
-		ResourceAssert: assert.NewDatasourceAssert("data."+name, "show_output", "masking_policies.0."),
+		ResourceAssert: assert.NewDatasourceAssert(datasourceReference, "show_output", "masking_policies.0."),
 	}
 	m.AddAssertion(assert.ValueSet("show_output.#", "1"))
 	return &m
 }
+
+func (p *MaskingPolicyShowOutputAssert) HasCreatedOnNotEmpty() *MaskingPolicyShowOutputAssert {
+	p.AddAssertion(assert.ResourceShowOutputValuePresent("created_on"))
+	return p
+}
+
+func (p *MaskingPolicyShowOutputAssert) HasOwnerNotEmpty() *MaskingPolicyShowOutputAssert {
+	p.AddAssertion(assert.ResourceShowOutputValuePresent("owner"))
+	return p
+}
+
+func (p *MaskingPolicyShowOutputAssert) HasOwnerRoleTypeNotEmpty() *MaskingPolicyShowOutputAssert {
+	p.AddAssertion(assert.ResourceShowOutputValuePresent("owner_role_type"))
+	return p
+}

pkg/acceptance/bettertestspoc/assert/resourceshowoutputassert/network_policies_datasource_show_output_ext.go

@@ -0,0 +1,17 @@
+package resourceshowoutputassert
+
+import (
+	"testing"
+
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
+)
+
+func NetworkPoliciesDatasourceShowOutput(t *testing.T, datasourceReference string) *NetworkPolicyShowOutputAssert {
+	t.Helper()
+
+	n := NetworkPolicyShowOutputAssert{
+		ResourceAssert: assert.NewDatasourceAssert(datasourceReference, "show_output", "network_policies.0."),
+	}
+	n.AddAssertion(assert.ValueSet("show_output.#", "1"))
+	return &n
+}

pkg/acceptance/bettertestspoc/assert/resourceshowoutputassert/resource_monitor_show_output_ext.go

@@ -7,11 +7,11 @@ import (
 )
 
 // ResourceMonitorDatasourceShowOutput is a temporary workaround to have better show output assertions in data source acceptance tests.
-func ResourceMonitorDatasourceShowOutput(t *testing.T, name string) *ResourceMonitorShowOutputAssert {
+func ResourceMonitorDatasourceShowOutput(t *testing.T, datasourceReference string) *ResourceMonitorShowOutputAssert {
 	t.Helper()
 
 	u := ResourceMonitorShowOutputAssert{
-		ResourceAssert: assert.NewDatasourceAssert("data."+name, "show_output", "resource_monitors.0."),
+		ResourceAssert: assert.NewDatasourceAssert(datasourceReference, "show_output", "resource_monitors.0."),
 	}
 	u.AddAssertion(assert.ValueSet("show_output.#", "1"))
 	return &u

pkg/acceptance/bettertestspoc/assert/resourceshowoutputassert/row_access_policy_show_output_ext.go

@@ -12,11 +12,11 @@ func (r *RowAccessPolicyShowOutputAssert) HasCreatedOnNotEmpty() *RowAccessPolic
 }
 
 // RowAccessPoliciesDatasourceShowOutput is a temporary workaround to have better show output assertions in data source acceptance tests.
-func RowAccessPoliciesDatasourceShowOutput(t *testing.T, name string) *RowAccessPolicyShowOutputAssert {
+func RowAccessPoliciesDatasourceShowOutput(t *testing.T, datasourceReference string) *RowAccessPolicyShowOutputAssert {
 	t.Helper()
 
 	r := RowAccessPolicyShowOutputAssert{
-		ResourceAssert: assert.NewDatasourceAssert("data."+name, "show_output", "row_access_policies.0."),
+		ResourceAssert: assert.NewDatasourceAssert(datasourceReference, "show_output", "row_access_policies.0."),
 	}
 	r.AddAssertion(assert.ValueSet("show_output.#", "1"))
 	return &r

pkg/acceptance/bettertestspoc/config/datasourcemodel/account_roles_model_gen.go

@@ -2,6 +2,14 @@ package datasourcemodel
 
 import tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
+func (d *DatabaseRolesModel) WithRows(rows int) *DatabaseRolesModel {
+	return d.WithLimitValue(
+		tfconfig.ObjectVariable(map[string]tfconfig.Variable{
+			"rows": tfconfig.IntegerVariable(rows),
+		}),
+	)
+}
+
 func (d *DatabaseRolesModel) WithRowsAndFrom(rows int, from string) *DatabaseRolesModel {
 	return d.WithLimitValue(
 		tfconfig.ObjectVariable(map[string]tfconfig.Variable{

pkg/acceptance/bettertestspoc/config/datasourcemodel/database_roles_model_ext.go

@@ -26,6 +26,10 @@ var allDatasourcesSchemaDefs = []DatasourceSchemaDef{
 		name:   "Accounts",
 		schema: datasources.Accounts().Schema,
 	},
+	{
+		name:   "AccountRoles",
+		schema: datasources.AccountRoles().Schema,
+	},
 	{
 		name:   "AuthenticationPolicies",
 		schema: datasources.AuthenticationPolicies().Schema,
@@ -82,6 +86,10 @@ var allDatasourcesSchemaDefs = []DatasourceSchemaDef{
 		name:   "ResourceMonitors",
 		schema: datasources.ResourceMonitors().Schema,
 	},
+	{
+		name:   "RowAccessPolicies",
+		schema: datasources.RowAccessPolicies().Schema,
+	},
 	{
 		name:   "Schemas",
 		schema: datasources.Schemas().Schema,

pkg/acceptance/bettertestspoc/config/datasourcemodel/gen/datasource_schema_def.go

@@ -0,0 +1,47 @@
+package datasourcemodel
+
+import (
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
+	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
+)
+
+func (m *MaskingPoliciesModel) WithInDatabase(databaseId sdk.AccountObjectIdentifier) *MaskingPoliciesModel {
+	return m.WithInValue(
+		tfconfig.ObjectVariable(map[string]tfconfig.Variable{
+			"database": tfconfig.StringVariable(databaseId.Name()),
+		}),
+	)
+}
+
+func (m *MaskingPoliciesModel) WithInSchema(schemaId sdk.DatabaseObjectIdentifier) *MaskingPoliciesModel {
+	return m.WithInValue(
+		tfconfig.ObjectVariable(map[string]tfconfig.Variable{
+			"schema": tfconfig.StringVariable(schemaId.FullyQualifiedName()),
+		}),
+	)
+}
+
+func (m *MaskingPoliciesModel) WithInAccount() *MaskingPoliciesModel {
+	return m.WithInValue(
+		tfconfig.ObjectVariable(map[string]tfconfig.Variable{
+			"account": tfconfig.BoolVariable(true),
+		}),
+	)
+}
+
+func (m *MaskingPoliciesModel) WithRows(rows int) *MaskingPoliciesModel {
+	return m.WithLimitValue(
+		tfconfig.ObjectVariable(map[string]tfconfig.Variable{
+			"rows": tfconfig.IntegerVariable(rows),
+		}),
+	)
+}
+
+func (m *MaskingPoliciesModel) WithRowsAndFrom(rows int, from string) *MaskingPoliciesModel {
+	return m.WithLimitValue(
+		tfconfig.ObjectVariable(map[string]tfconfig.Variable{
+			"rows": tfconfig.IntegerVariable(rows),
+			"from": tfconfig.StringVariable(from),
+		}),
+	)
+}