fix: setting key_id, schemaVersion, website arguments

Author: simonostendorf

github/resource_github_user_ssh_key.go

@@ -105,9 +105,6 @@ func resourceGithubUserSshKeyRead(ctx context.Context, d *schema.ResourceData, m
 	}
 
 	// set computed fields
-	if err = d.Set("key_id", userKey.GetID()); err != nil {
-		return diag.FromErr(err)
-	}
 	if err = d.Set("etag", resp.Header.Get("ETag")); err != nil {
 		return diag.FromErr(err)
 	}
@@ -160,8 +157,9 @@ func resourceGithubUserSshKeyImport(ctx context.Context, d *schema.ResourceData,
 		return nil, err
 	}
 
-	d.SetId(strconv.FormatInt(key.GetID(), 10))
-
+	if err = d.Set("key_id", key.GetID()); err != nil {
+		return nil, err
+	}
 	if err = d.Set("title", key.GetTitle()); err != nil {
 		return nil, err
 	}

github/resource_github_user_ssh_key_migration.go

@@ -11,7 +11,7 @@ import (
 
 func resourceGithubUserSshKeyV0() *schema.Resource {
 	return &schema.Resource{
-		SchemaVersion: 1,
+		SchemaVersion: 0,
 		Schema: map[string]*schema.Schema{
 			"title": {
 				Type:        schema.TypeString,

github/resource_github_user_ssh_signing_key.go

@@ -82,15 +82,12 @@ func resourceGithubUserSshSigningKeyRead(ctx context.Context, d *schema.Resource
 	client := meta.(*Owner).v3client
 
 	keyID := int64(d.Get("key_id").(int))
-	userKey, resp, err := client.Users.GetSSHSigningKey(ctx, keyID)
+	_, resp, err := client.Users.GetSSHSigningKey(ctx, keyID)
 	if err != nil {
 		return diag.FromErr(deleteResourceOn404AndSwallow304OtherwiseReturnError(err, d, "user SSH signing key (%d)", keyID))
 	}
 
 	// set computed fields
-	if err = d.Set("key_id", userKey.GetID()); err != nil {
-		return diag.FromErr(err)
-	}
 	if err = d.Set("etag", resp.Header.Get("ETag")); err != nil {
 		return diag.FromErr(err)
 	}
@@ -131,8 +128,9 @@ func resourceGithubUserSshSigningKeyImport(ctx context.Context, d *schema.Resour
 		return nil, err
 	}
 
-	d.SetId(strconv.FormatInt(key.GetID(), 10))
-
+	if err = d.Set("key_id", key.GetID()); err != nil {
+		return nil, err
+	}
 	if err = d.Set("title", key.GetTitle()); err != nil {
 		return nil, err
 	}

website/docs/r/user_ssh_key.html.markdown

@@ -24,16 +24,16 @@ resource "github_user_ssh_key" "example" {
 
 The following arguments are supported:
 
-* `id` - The ID of the SSH key
-* `url` - The URL of the SSH key
 * `title` - (Required) A descriptive name for the new key.
 * `key` - (Required) The public SSH key to add to your GitHub account.
 
 ## Attributes Reference
 
 The following attributes are exported:
 
-* `key_id` - The unique identifier of the SSH signing key.
+* `id` - The ID of the SSH key
+* `url` - The URL of the SSH key
+* `key_id` - The unique identifier of the SSH key.
 * `etag`
 
 ## Import

website/docs/r/user_ssh_signing_key.html.markdown

@@ -24,14 +24,14 @@ resource "github_user_ssh_signing_key" "example" {
 
 The following arguments are supported:
 
-* `id` - The ID of the SSH signing key
 * `title` - (Required) A descriptive name for the new key.
 * `key` - (Required) The public SSH signing key to add to your GitHub account.
 
 ## Attributes Reference
 
 The following attributes are exported:
 
+* `id` - The ID of the SSH signing key
 * `key_id` - The unique identifier of the SSH signing key.
 * `etag`