Improve functions naming

Author: Fodoj

internal/provider/data_source_openai_project_user.go

@@ -47,9 +47,9 @@ func dataSourceOpenAIProjectUser() *schema.Resource {
 	}
 }
 
-// findProjectUserWithPaginationDataSource finds a user in a project by ID with automatic pagination.
+// dataSourceFindProjectUser finds a user in a project by ID with automatic pagination.
 // This is used by the data source to ensure proper user lookups across all pages.
-func findProjectUserWithPaginationDataSource(ctx context.Context, c interface{}, projectID, userID string) (*client.ProjectUser, bool, error) {
+func dataSourceFindProjectUser(ctx context.Context, c interface{}, projectID, userID string) (*client.ProjectUser, bool, error) {
 	clientInstance, err := GetOpenAIClientWithAdminKey(c)
 	if err != nil {
 		return nil, false, err
@@ -90,9 +90,9 @@ func findProjectUserWithPaginationDataSource(ctx context.Context, c interface{},
 	return nil, false, nil
 }
 
-// findProjectUserByEmailWithPaginationDataSource finds a user in a project by email with automatic pagination.
+// dataSourceFindProjectUserByEmail finds a user in a project by email with automatic pagination.
 // This is used by the data source to ensure proper user lookups across all pages.
-func findProjectUserByEmailWithPaginationDataSource(ctx context.Context, c interface{}, projectID, email string) (*client.ProjectUser, bool, error) {
+func dataSourceFindProjectUserByEmail(ctx context.Context, c interface{}, projectID, email string) (*client.ProjectUser, bool, error) {
 	clientInstance, err := GetOpenAIClientWithAdminKey(c)
 	if err != nil {
 		return nil, false, err
@@ -157,7 +157,7 @@ func dataSourceOpenAIProjectUserRead(ctx context.Context, d *schema.ResourceData
 		tflog.Debug(ctx, fmt.Sprintf("Checking if user %s exists in project %s", userID, projectID))
 
 		// Check if the user exists in the project using the provider's API key
-		projectUser, exists, err = findProjectUserWithPaginationDataSource(ctx, m, projectID, userID)
+		projectUser, exists, err = dataSourceFindProjectUser(ctx, m, projectID, userID)
 		if err != nil {
 			tflog.Error(ctx, fmt.Sprintf("Error checking if user exists: %v", err))
 			return diag.Errorf("Error checking if user exists in project: %s", err)
@@ -179,7 +179,7 @@ func dataSourceOpenAIProjectUserRead(ctx context.Context, d *schema.ResourceData
 		tflog.Debug(ctx, fmt.Sprintf("Checking if user with email %s exists in project %s", email, projectID))
 
 		// Check if the user exists in the project by email using the provider's API key
-		projectUser, exists, err = findProjectUserByEmailWithPaginationDataSource(ctx, m, projectID, email)
+		projectUser, exists, err = dataSourceFindProjectUserByEmail(ctx, m, projectID, email)
 		if err != nil {
 			tflog.Error(ctx, fmt.Sprintf("Error checking if user exists by email: %v", err))
 			return diag.Errorf("Error checking if user exists in project by email: %s", err)

internal/provider/resource_openai_project_user.go

@@ -57,9 +57,9 @@ func resourceOpenAIProjectUser() *schema.Resource {
 	}
 }
 
-// findProjectUserWithPagination finds a user in a project by ID with automatic pagination.
+// findProjectUser finds a user in a project by ID with automatic pagination.
 // This helper function ensures we search through all pages of users to properly detect drift.
-func findProjectUserWithPagination(ctx context.Context, c interface{}, projectID, userID string) (*client.ProjectUser, bool, error) {
+func findProjectUser(ctx context.Context, c interface{}, projectID, userID string) (*client.ProjectUser, bool, error) {
 	clientInstance, err := GetOpenAIClientWithAdminKey(c)
 	if err != nil {
 		return nil, false, err
@@ -118,7 +118,7 @@ func resourceOpenAIProjectUserCreate(ctx context.Context, d *schema.ResourceData
 
 	// First check if the user is already in the project
 	tflog.Debug(ctx, fmt.Sprintf("Checking if user %s already exists in project %s", userID, projectID))
-	existingUser, exists, err := findProjectUserWithPagination(ctx, m, projectID, userID)
+	existingUser, exists, err := findProjectUser(ctx, m, projectID, userID)
 	if err != nil {
 		tflog.Error(ctx, fmt.Sprintf("Error checking if user exists: %v", err))
 		return diag.Errorf("Error checking if user exists in project: %s", err)
@@ -155,7 +155,7 @@ func resourceOpenAIProjectUserCreate(ctx context.Context, d *schema.ResourceData
 			tflog.Info(ctx, fmt.Sprintf("User %s already exists in project, continuing: %s", userID, err))
 
 			// Try to get user details again
-			existingUser, exists, findErr := findProjectUserWithPagination(ctx, m, projectID, userID)
+			existingUser, exists, findErr := findProjectUser(ctx, m, projectID, userID)
 			if findErr == nil && exists {
 				// Update the Terraform state with values from the existing user
 				if err := d.Set("email", existingUser.Email); err != nil {
@@ -205,7 +205,7 @@ func resourceOpenAIProjectUserRead(ctx context.Context, d *schema.ResourceData,
 
 	// Check if the user exists in the project
 	tflog.Debug(ctx, fmt.Sprintf("Checking if user %s exists in project %s", userID, projectID))
-	existingUser, exists, err := findProjectUserWithPagination(ctx, m, projectID, userID)
+	existingUser, exists, err := findProjectUser(ctx, m, projectID, userID)
 	if err != nil {
 		// If it's a permissions error, just keep the state
 		if strings.Contains(err.Error(), "insufficient permissions") {
@@ -411,7 +411,7 @@ func resourceOpenAIProjectUserImport(ctx context.Context, d *schema.ResourceData
 	}
 
 	// Find the user in the project to get additional details
-	existingUser, exists, err := findProjectUserWithPagination(ctx, m, projectID, userID)
+	existingUser, exists, err := findProjectUser(ctx, m, projectID, userID)
 	if err != nil {
 		return nil, fmt.Errorf("error retrieving project user: %s", err)
 	}