Skip to content

migrate github_user_gpg_key to context-aware CRUD functions #3330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
texasich wants to merge 1 commit into from
Closed

migrate github_user_gpg_key to context-aware CRUD functions #3330

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 14 additions & 19 deletions github/resource_github_user_gpg_key.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,15 @@ import (
"strconv"

"github.com/google/go-github/v84/github"
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)

func resourceGithubUserGpgKey() *schema.Resource {
return &schema.Resource{
Create: resourceGithubUserGpgKeyCreate,
Read: resourceGithubUserGpgKeyRead,
Delete: resourceGithubUserGpgKeyDelete,
CreateContext: resourceGithubUserGpgKeyCreate,
ReadContext: resourceGithubUserGpgKeyRead,
DeleteContext: resourceGithubUserGpgKeyDelete,

Schema: map[string]*schema.Schema{
"armored_public_key": {
Expand All @@ -37,32 +38,27 @@ func resourceGithubUserGpgKey() *schema.Resource {
}
}

func resourceGithubUserGpgKeyCreate(d *schema.ResourceData, meta any) error {
func resourceGithubUserGpgKeyCreate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
client := meta.(*Owner).v3client

pubKey := d.Get("armored_public_key").(string)
ctx := context.Background()

key, _, err := client.Users.CreateGPGKey(ctx, pubKey)
if err != nil {
return err
return diag.FromErr(err)
}

d.SetId(strconv.FormatInt(key.GetID(), 10))

return resourceGithubUserGpgKeyRead(d, meta)
return resourceGithubUserGpgKeyRead(ctx, d, meta)
}

func resourceGithubUserGpgKeyRead(d *schema.ResourceData, meta any) error {
func resourceGithubUserGpgKeyRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
client := meta.(*Owner).v3client

id, err := strconv.ParseInt(d.Id(), 10, 64)
if err != nil {
return unconvertibleIdErr(d.Id(), err)
}
ctx := context.WithValue(context.Background(), ctxId, d.Id())
if !d.IsNewResource() {
ctx = context.WithValue(ctx, ctxEtag, d.Get("etag").(string))
return diag.FromErr(unconvertibleIdErr(d.Id(), err))
}

key, _, err := client.Users.GetGPGKey(ctx, id)
Expand All @@ -79,26 +75,25 @@ func resourceGithubUserGpgKeyRead(d *schema.ResourceData, meta any) error {
return nil
}
}
return err
return diag.FromErr(err)
}

if err = d.Set("key_id", key.GetKeyID()); err != nil {
return err
return diag.FromErr(err)
}

return nil
}

func resourceGithubUserGpgKeyDelete(d *schema.ResourceData, meta any) error {
func resourceGithubUserGpgKeyDelete(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
client := meta.(*Owner).v3client

id, err := strconv.ParseInt(d.Id(), 10, 64)
if err != nil {
return unconvertibleIdErr(d.Id(), err)
return diag.FromErr(unconvertibleIdErr(d.Id(), err))
}
ctx := context.WithValue(context.Background(), ctxId, d.Id())

_, err = client.Users.DeleteGPGKey(ctx, id)

return err
return diag.FromErr(err)
}