use standard variable naming convention

cyral/internal/policy/set/constants.go

@@ -1,6 +1,6 @@
 package policyset
 
 const (
-	policySetResourceName   = "cyral_policy_set"
-	policySetDataSourceName = policySetResourceName
+	resourceName   = "cyral_policy_set"
+	dataSourceName = resourceName
 )

cyral/internal/policy/set/datasource.go

@@ -7,16 +7,16 @@ import (
 	"github.com/cyralinc/terraform-provider-cyral/cyral/core/types/resourcetype"
 )
 
-var policySetDataSourceContextHandler = core.ContextHandler{
-	ResourceName: policySetDataSourceName,
+var dsContextHandler = core.ContextHandler{
+	ResourceName: dataSourceName,
 	ResourceType: resourcetype.DataSource,
 	Read:         readPolicySet,
 }
 
-func policySetDataSourceSchema() *schema.Resource {
+func dataSourceSchema() *schema.Resource {
 	return &schema.Resource{
 		Description: "This data source provides information about a policy set.",
-		ReadContext: policySetDataSourceContextHandler.ReadContext,
+		ReadContext: dsContextHandler.ReadContext,
 		Schema: map[string]*schema.Schema{
 			"id": {
 				Description: "Identifier for the policy set.",

cyral/internal/policy/set/model.go

@@ -47,8 +47,8 @@ func scopeToMap(s *msg.Scope) []map[string]interface{} {
 	}
 }
 
-// updatePolicySetSchema writes the policy set data to the schema
-func updatePolicySetSchema(ps *msg.PolicySet, d *schema.ResourceData) error {
+// updateSchema writes the policy set data to the schema
+func updateSchema(ps *msg.PolicySet, d *schema.ResourceData) error {
 	if err := d.Set("id", ps.GetId()); err != nil {
 		return fmt.Errorf("error setting 'id' field: %w", err)
 	}
@@ -141,7 +141,7 @@ func readPolicySet(ctx context.Context, cl *client.Client, rd *schema.ResourceDa
 	if err != nil {
 		return err
 	}
-	return updatePolicySetSchema(resp.GetPolicySet(), rd)
+	return updateSchema(resp.GetPolicySet(), rd)
 }
 
 func updatePolicySet(ctx context.Context, cl *client.Client, rd *schema.ResourceData) error {
@@ -155,7 +155,7 @@ func updatePolicySet(ctx context.Context, cl *client.Client, rd *schema.Resource
 	if err != nil {
 		return err
 	}
-	return updatePolicySetSchema(resp.GetPolicySet(), rd)
+	return updateSchema(resp.GetPolicySet(), rd)
 }
 
 func deletePolicySet(ctx context.Context, cl *client.Client, rd *schema.ResourceData) error {

cyral/internal/policy/set/resource.go

@@ -9,22 +9,22 @@ import (
 	"github.com/cyralinc/terraform-provider-cyral/cyral/core/types/resourcetype"
 )
 
-var policySetResourceContextHandler = core.ContextHandler{
-	ResourceName: policySetResourceName,
+var resourceContextHandler = core.ContextHandler{
+	ResourceName: resourceName,
 	ResourceType: resourcetype.Resource,
 	Create:       createPolicySet,
 	Read:         readPolicySet,
 	Update:       updatePolicySet,
 	Delete:       deletePolicySet,
 }
 
-func policySetResourceSchema() *schema.Resource {
+func resourceSchema() *schema.Resource {
 	return &schema.Resource{
 		Description:   "This resource allows management of policy sets in the Cyral platform.",
-		CreateContext: policySetResourceContextHandler.CreateContext,
-		ReadContext:   policySetResourceContextHandler.ReadContext,
-		UpdateContext: policySetResourceContextHandler.UpdateContext,
-		DeleteContext: policySetResourceContextHandler.DeleteContext,
+		CreateContext: resourceContextHandler.CreateContext,
+		ReadContext:   resourceContextHandler.ReadContext,
+		UpdateContext: resourceContextHandler.UpdateContext,
+		DeleteContext: resourceContextHandler.DeleteContext,
 		Importer: &schema.ResourceImporter{
 			StateContext: importPolicySetStateContext,
 		},

cyral/internal/policy/set/schema_loader.go

@@ -13,14 +13,14 @@ func (p *packageSchema) Schemas() []*core.SchemaDescriptor {
 	return []*core.SchemaDescriptor{
 
 		{
-			Name:   policySetDataSourceName,
+			Name:   dataSourceName,
 			Type:   core.DataSourceSchemaType,
-			Schema: policySetDataSourceSchema,
+			Schema: dataSourceSchema,
 		},
 		{
-			Name:   policySetResourceName,
+			Name:   resourceName,
 			Type:   core.ResourceSchemaType,
-			Schema: policySetResourceSchema,
+			Schema: resourceSchema,
 		},
 	}
 }

cyral/internal/policy/wizard/constants.go

@@ -1,5 +1,5 @@
 package wizard
 
 const (
-	policyWizardsDataSourceName = "cyral_policy_wizards"
+	dataSourceName = "cyral_policy_wizards"
 )

cyral/internal/policy/wizard/datasource.go

@@ -7,16 +7,16 @@ import (
 	"github.com/cyralinc/terraform-provider-cyral/cyral/core/types/resourcetype"
 )
 
-var policyWizardsDataSourceContextHandler = core.ContextHandler{
-	ResourceName: policyWizardsDataSourceName,
+var dsContextHandler = core.ContextHandler{
+	ResourceName: dataSourceName,
 	ResourceType: resourcetype.DataSource,
 	Read:         readPolicyWizards,
 }
 
-func policyWizardsDataSourceSchema() *schema.Resource {
+func dataSourceSchema() *schema.Resource {
 	return &schema.Resource{
 		Description: "This data source provides information policy wizards",
-		ReadContext: policyWizardsDataSourceContextHandler.ReadContext,
+		ReadContext: dsContextHandler.ReadContext,
 		Schema: map[string]*schema.Schema{
 			"wizard_id": {
 				Description: "id of the policy wizard of interest.",

cyral/internal/policy/wizard/model.go

@@ -36,7 +36,7 @@ func readPolicyWizards(ctx context.Context, cl *client.Client, rd *schema.Resour
 		}
 		wizardList = resp.GetPolicyWizards()
 	}
-	updatePolicyWizardsSchema(wizardList, rd)
+	updateSchema(wizardList, rd)
 	return nil
 }
 
@@ -56,7 +56,7 @@ func wizardToMap(wiz *msg.PolicyWizard) map[string]any {
 	}
 }
 
-func updatePolicyWizardsSchema(wizards []*msg.PolicyWizard, rd *schema.ResourceData) {
+func updateSchema(wizards []*msg.PolicyWizard, rd *schema.ResourceData) {
 	wizardList := make([]any, 0, len(wizards))
 	for _, wiz := range wizards {
 		wizardList = append(wizardList, wizardToMap(wiz))

cyral/internal/policy/wizard/schema_loader.go

@@ -12,9 +12,9 @@ func (p *packageSchema) Name() string {
 func (p *packageSchema) Schemas() []*core.SchemaDescriptor {
 	return []*core.SchemaDescriptor{
 		{
-			Name:   policyWizardsDataSourceName,
+			Name:   dataSourceName,
 			Type:   core.DataSourceSchemaType,
-			Schema: policyWizardsDataSourceSchema,
+			Schema: dataSourceSchema,
 		},
 	}
 }