chore: minor refactoring for consistency

Author: acch

examples/data-sources/forgejo_personal_access_token/data-source.tf

@@ -17,6 +17,6 @@ data "forgejo_user" "test_user" {
 
 # Existing personal access token
 data "forgejo_personal_access_token" "test_token" {
-  user_id = data.forgejo_user.test_user.id
-  name    = "test token"
+  user = data.forgejo_user.test_user.login
+  name = "test token"
 }

examples/resources/forgejo_personal_access_token/resource.tf

@@ -21,8 +21,8 @@ resource "forgejo_user" "test_user" {
 }
 
 resource "forgejo_personal_access_token" "test_token" {
-  user_id = forgejo_user.test_user.id
-  name    = "test token"
+  user = forgejo_user.test_user.login
+  name = "test token"
   scopes = [
     "read:repository"
   ]

internal/provider/personal_access_token_data_source.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"slices"
+	"strings"
 
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
@@ -26,7 +27,7 @@ type personalAccessTokenDataSource struct {
 }
 
 // personalAccessTokenDataSourceModel maps the data source schema data.
-// https://pkg.go.dev/codeberg.org/mvdkleijn/forgejo-sdk/forgejo/v3#CreateAccessTokenOption
+// https://pkg.go.dev/codeberg.org/mvdkleijn/forgejo-sdk/forgejo/v3#AccessToken
 type personalAccessTokenDataSourceModel struct {
 	User           types.String `tfsdk:"user"`
 	ID             types.Int64  `tfsdk:"id"`
@@ -120,6 +121,9 @@ func (d *personalAccessTokenDataSource) Read(ctx context.Context, req datasource
 	data.TokenLastEight = types.StringValue(token.TokenLastEight)
 	data.Scopes, diags = types.SetValueFrom(ctx, types.StringType, token.Scopes)
 	resp.Diagnostics.Append(diags...)
+	if resp.Diagnostics.HasError() {
+		return
+	}
 
 	// Save data into Terraform state
 	diags = resp.State.Set(ctx, &data)
@@ -159,13 +163,13 @@ func getPersonalAccessToken(
 			switch res.StatusCode {
 			case 403:
 				msg = fmt.Sprintf(
-					"Personal access tokens from user %s forbidden: %s",
+					"Personal access tokens for user '%s' forbidden: %s",
 					user,
 					err,
 				)
 			case 404:
 				msg = fmt.Sprintf(
-					"Personal access tokens from user %s not found: %s",
+					"Personal access tokens for user '%s' not found: %s",
 					user,
 					err,
 				)
@@ -178,18 +182,19 @@ func getPersonalAccessToken(
 			}
 		}
 		diags.AddError("Unable to list personal access tokens", msg)
+
 		return nil, diags
 	}
 
 	// Search for personal access token with given name
 	idx := slices.IndexFunc(tokens, func(t *forgejo.AccessToken) bool {
-		return t.Name == tokenName
+		return strings.EqualFold(t.Name, tokenName)
 	})
 	if idx == -1 {
 		diags.AddError(
 			"Unable to find personal access token by name",
 			fmt.Sprintf(
-				"Personal access token from user %s and name %s not found",
+				"Personal access token with user '%s' and name '%s' not found",
 				user,
 				tokenName,
 			),

internal/provider/personal_access_token_data_source_test.go

@@ -23,7 +23,7 @@ data "forgejo_personal_access_token" "test" {
 	user = "non_existing_user"
 	name = "tftest"
 }`,
-				ExpectError: regexp.MustCompile("Personal access tokens from user non_existing_user not found"),
+				ExpectError: regexp.MustCompile("Personal access tokens for user 'non_existing_user' not found"),
 			},
 			// Read testing (non-existent resource)
 			{
@@ -37,7 +37,7 @@ data "forgejo_personal_access_token" "test" {
 	user = forgejo_user.test.login
 	name = "non_existent"
 }`,
-				ExpectError: regexp.MustCompile("Personal access token from user test_user and name non_existent not found"),
+				ExpectError: regexp.MustCompile("Personal access token with user 'test_user' and name 'non_existent' not found"),
 			},
 			// Read testing
 			{

internal/provider/personal_access_token_resource.go

@@ -56,6 +56,8 @@ func (m *personalAccessTokenResourceModel) from(ctx context.Context, t *forgejo.
 	m.Scopes, d = types.SetValueFrom(ctx, types.StringType, t.Scopes)
 	diags.Append(d...)
 
+	// Token intentionally omitted (API only returns it once during initial creation)
+
 	return diags
 }
 
@@ -84,9 +86,9 @@ func (r *personalAccessTokenResource) Metadata(_ context.Context, req resource.M
 // Schema defines the schema for the resource.
 func (r *personalAccessTokenResource) Schema(_ context.Context, _ resource.SchemaRequest, resp *resource.SchemaResponse) {
 	resp.Schema = schema.Schema{
-		Description: `Forgejo repository personal access token resource.
+		MarkdownDescription: `Forgejo personal access token resource.
 
-**Note**: Due to an upstream limitation, one cannot create access tokens when authorised with access tokens. Use basic-auth instead.`,
+**Note**: Due to an upstream limitation, one cannot create access tokens when authorized with access tokens. Use basic-auth instead.`,
 
 		Attributes: map[string]schema.Attribute{
 			"user": schema.StringAttribute{
@@ -245,18 +247,18 @@ func (r *personalAccessTokenResource) Create(ctx context.Context, req resource.C
 				)
 			case 401:
 				msg = fmt.Sprintf(
-					"Authentication method is not allowed, use basic-auth: %s",
+					"Authentication method not allowed, use basic-auth: %s",
 					err,
 				)
 			case 403:
 				msg = fmt.Sprintf(
-					"User %s forbidden: %s",
+					"Personal access token for user %s forbidden: %s",
 					data.User.String(),
 					err,
 				)
 			case 404:
 				msg = fmt.Sprintf(
-					"User %s not found: %s",
+					"Personal access token for user %s not found: %s",
 					data.User.String(),
 					err,
 				)
@@ -280,7 +282,7 @@ func (r *personalAccessTokenResource) Create(ctx context.Context, req resource.C
 		return
 	}
 
-	// The actual token is only returned on creation.
+	// The actual token is only returned once during initial creation
 	data.Token = types.StringValue(token.Token)
 
 	// Save data into Terraform state
@@ -302,7 +304,12 @@ func (r *personalAccessTokenResource) Read(ctx context.Context, req resource.Rea
 	}
 
 	// Use Forgejo client to get personal access token
-	token, diags := getPersonalAccessToken(ctx, r.client, data.User.ValueString(), data.Name.ValueString())
+	token, diags := getPersonalAccessToken(
+		ctx,
+		r.client,
+		data.User.ValueString(),
+		data.Name.ValueString(),
+	)
 	resp.Diagnostics.Append(diags...)
 	if resp.Diagnostics.HasError() {
 		return
@@ -368,14 +375,16 @@ func (r *personalAccessTokenResource) Delete(ctx context.Context, req resource.D
 		switch res.StatusCode {
 		case 403:
 			msg = fmt.Sprintf(
-				"User %s forbidden: %s",
+				"Personal access token with user %s and ID %d forbidden: %s",
 				data.User.String(),
+				data.ID.ValueInt64(),
 				err,
 			)
 		case 404:
 			msg = fmt.Sprintf(
-				"User %s not found: %s",
+				"Personal access token with user %s and ID %d not found: %s",
 				data.User.String(),
+				data.ID.ValueInt64(),
 				err,
 			)
 		case 422:
@@ -388,7 +397,7 @@ func (r *personalAccessTokenResource) Delete(ctx context.Context, req resource.D
 			)
 		}
 	}
-	resp.Diagnostics.AddError("Unable to delete deploy key", msg)
+	resp.Diagnostics.AddError("Unable to delete personal access token", msg)
 }
 
 // NewpersonalAccessTokenResource is a helper function to simplify the provider implementation.

internal/provider/personal_access_token_resource_test.go

@@ -24,7 +24,7 @@ resource "forgejo_personal_access_token" "test" {
 	name   = "tftest"
 	scopes = ["all"]
 }`,
-				ExpectError: regexp.MustCompile("User \"non_existing_user\" not found"),
+				ExpectError: regexp.MustCompile("Personal access token for user \"non_existing_user\" not found"),
 			},
 			// Create and Read testing
 			{