Add name to google_kms_crypto_key_version datasource (#5065) (#3500)

Co-authored-by: upodroid <[email protected]> Signed-off-by: Modular Magician <[email protected]> Co-authored-by: upodroid <[email protected]>
hashicorp · Aug 10, 2021 · aaceb3b · aaceb3b
1 parent e87da38
commit aaceb3b
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 4 deletions.
diff --git a/.changelog/5065.txt b/.changelog/5065.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+kms: added `name` field to `google_kms_crypto_key_version` datasource
+```
diff --git a/google-beta/data_source_google_kms_crypto_key_version.go b/google-beta/data_source_google_kms_crypto_key_version.go
@@ -18,6 +18,10 @@ func dataSourceGoogleKmsCryptoKeyVersion() *schema.Resource {
 				Required: true,
 				ForceNew: true,
 			},
+			"name": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"version": {
 				Type:     schema.TypeInt,
 				Optional: true,
@@ -81,6 +85,9 @@ func dataSourceGoogleKmsCryptoKeyVersionRead(d *schema.ResourceData, meta interf
 	if err := d.Set("version", flattenKmsCryptoKeyVersionVersion(res["name"], d)); err != nil {
 		return fmt.Errorf("Error setting CryptoKeyVersion: %s", err)
 	}
+	if err := d.Set("name", flattenKmsCryptoKeyVersionName(res["name"], d)); err != nil {
+		return fmt.Errorf("Error setting CryptoKeyVersion: %s", err)
+	}
 	if err := d.Set("state", flattenKmsCryptoKeyVersionState(res["state"], d)); err != nil {
 		return fmt.Errorf("Error setting CryptoKeyVersion: %s", err)
 	}
@@ -135,6 +142,10 @@ func flattenKmsCryptoKeyVersionVersion(v interface{}, d *schema.ResourceData) in
 	return v
 }
 
+func flattenKmsCryptoKeyVersionName(v interface{}, d *schema.ResourceData) interface{} {
+	return v
+}
+
 func flattenKmsCryptoKeyVersionState(v interface{}, d *schema.ResourceData) interface{} {
 	return v
 }

diff --git a/google-beta/resource_gke_hub_feature_membership_test.go b/google-beta/resource_gke_hub_feature_membership_test.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	dcl "github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl"
+	"github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl"
 	gkehub "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/gkehub/beta"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"

diff --git a/website/docs/d/kms_crypto_key_version.html.markdown b/website/docs/d/kms_crypto_key_version.html.markdown
@@ -26,19 +26,20 @@ data "google_kms_key_ring" "my_key_ring" {
 
 data "google_kms_crypto_key" "my_crypto_key" {
   name     = "my-crypto-key"
-  key_ring = data.google_kms_key_ring.my_key_ring.self_link
+  key_ring = data.google_kms_key_ring.my_key_ring.id
 }
 
 data "google_kms_crypto_key_version" "my_crypto_key_version" {
-  crypto_key = data.google_kms_key.my_key.self_link
+  crypto_key = data.google_kms_key.my_key.id
 }
 ```
 
 ## Argument Reference
 
 The following arguments are supported:
 
-* `crypto_key` - (Required) The `self_link` of the Google Cloud Platform CryptoKey to which the key version belongs.
+* `crypto_key` - (Required) The `self_link` of the Google Cloud Platform CryptoKey to which the key version belongs. This is also the `id` field of the 
+`google_kms_crypto_key` resource/datasource.
 
 * `version` - (Optional) The version number for this CryptoKeyVersion. Defaults to `1`.
 
@@ -49,6 +50,8 @@ exported:
 
 * `id` - an identifier for the resource with format `//cloudkms.googleapis.com/v1/{{crypto_key}}/cryptoKeyVersions/{{version}}`
 
+* `name` - The resource name for this CryptoKeyVersion in the format `projects/*/locations/*/keyRings/*/cryptoKeys/*/cryptoKeyVersions/*`
+
 * `state` - The current state of the CryptoKeyVersion. See the [state reference](https://cloud.google.com/kms/docs/reference/rest/v1/projects.locations.keyRings.cryptoKeys.cryptoKeyVersions#CryptoKeyVersion.CryptoKeyVersionState) for possible outputs.
 
 * `protection_level` - The ProtectionLevel describing how crypto operations are performed with this CryptoKeyVersion. See the [protection_level reference](https://cloud.google.com/kms/docs/reference/rest/v1/ProtectionLevel) for possible outputs.