feat: Be able to specify user_id when creating keypair

openstack/compute_keypair_v2.go

@@ -2,6 +2,10 @@ package openstack
 
 import "github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/keypairs"
 
+const (
+	computeKeyPairV2UserIDMicroversion = "2.10"
+)
+
 // ComputeKeyPairV2CreateOpts is a custom KeyPair struct to include the ValueSpecs field.
 type ComputeKeyPairV2CreateOpts struct {
 	keypairs.CreateOpts

openstack/resource_openstack_compute_keypair_v2.go

@@ -56,6 +56,12 @@ func resourceComputeKeypairV2() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+
+			"user_id": {
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+			},
 		},
 	}
 }
@@ -67,11 +73,17 @@ func resourceComputeKeypairV2Create(ctx context.Context, d *schema.ResourceData,
 		return diag.Errorf("Error creating OpenStack compute client: %s", err)
 	}
 
+	userID := d.Get("user_id").(string)
+	if userID != "" {
+		computeClient.Microversion = computeKeyPairV2UserIDMicroversion
+	}
+
 	name := d.Get("name").(string)
 	createOpts := ComputeKeyPairV2CreateOpts{
 		keypairs.CreateOpts{
 			Name:      name,
 			PublicKey: d.Get("public_key").(string),
+			UserID:    d.Get("user_id").(string),
 		},
 		MapValueSpecs(d),
 	}
@@ -84,6 +96,7 @@ func resourceComputeKeypairV2Create(ctx context.Context, d *schema.ResourceData,
 	}
 
 	d.SetId(kp.Name)
+	d.Set("user_id", d.Get("user_id").(string))
 
 	// Private Key is only available in the response to a create.
 	d.Set("private_key", kp.PrivateKey)
@@ -98,7 +111,18 @@ func resourceComputeKeypairV2Read(_ context.Context, d *schema.ResourceData, met
 		return diag.Errorf("Error creating OpenStack compute client: %s", err)
 	}
 
-	kp, err := keypairs.Get(computeClient, d.Id(), keypairs.GetOpts{}).Extract()
+	userID := d.Get("user_id").(string)
+	if userID != "" {
+		computeClient.Microversion = computeKeyPairV2UserIDMicroversion
+	}
+
+	log.Printf("[DEBUG] Microversion %s", computeClient.Microversion)
+
+	kpopts := keypairs.GetOpts{
+		UserID: userID,
+	}
+
+	kp, err := keypairs.Get(computeClient, d.Id(), kpopts).Extract()
 	if err != nil {
 		return diag.FromErr(CheckDeleted(d, err, "Error retrieving openstack_compute_keypair_v2"))
 	}
@@ -109,6 +133,9 @@ func resourceComputeKeypairV2Read(_ context.Context, d *schema.ResourceData, met
 	d.Set("public_key", kp.PublicKey)
 	d.Set("fingerprint", kp.Fingerprint)
 	d.Set("region", GetRegion(d, config))
+	if userID != "" {
+		d.Set("user_id", kp.UserID)
+	}
 
 	return nil
 }
@@ -120,7 +147,19 @@ func resourceComputeKeypairV2Delete(_ context.Context, d *schema.ResourceData, m
 		return diag.Errorf("Error creating OpenStack compute client: %s", err)
 	}
 
-	err = keypairs.Delete(computeClient, d.Id(), keypairs.DeleteOpts{}).ExtractErr()
+	userID := d.Get("user_id").(string)
+	if userID != "" {
+		computeClient.Microversion = computeKeyPairV2UserIDMicroversion
+	}
+
+	log.Printf("[DEBUG] User ID %s", userID)
+	log.Printf("[DEBUG] Microversion %s", computeClient.Microversion)
+
+	kpopts := keypairs.DeleteOpts{
+		UserID: userID,
+	}
+
+	err = keypairs.Delete(computeClient, d.Id(), kpopts).ExtractErr()
 	if err != nil {
 		return diag.FromErr(CheckDeleted(d, err, "Error deleting openstack_compute_keypair_v2"))
 	}

website/docs/r/compute_keypair_v2.html.markdown

@@ -53,6 +53,10 @@ The following arguments are supported:
     created, then destroying this resource means you will lose access to that
     keypair forever.
 
+* `user_id` - (Optional) This allows administrative users to operate key-pairs
+    of specified user ID. For this feature your need to have openstack microversion
+    2.10 (Liberty) or later.
+
 * `value_specs` - (Optional) Map of additional options.
 
 ## Attributes Reference