Add skip_initial_version_creation to kms crypto key

products/kms/api.yaml

@@ -65,7 +65,7 @@ objects:
   - !ruby/object:Api::Resource
     name: 'CryptoKey'
     base_url: '{{key_ring}}/cryptoKeys'
-    create_url: '{{key_ring}}/cryptoKeys?cryptoKeyId={{name}}'
+    create_url: '{{key_ring}}/cryptoKeys?cryptoKeyId={{name}}&skipInitialVersionCreation={{skip_initial_version_creation}}'
     self_link: '{{key_ring}}/cryptoKeys/{{name}}'
     update_verb: :PATCH
     update_mask: true
@@ -80,6 +80,14 @@ objects:
         required: true
         input: true
         url_param_only: true
+      - !ruby/object:Api::Type::Boolean
+        name: 'skipInitialVersionCreation'
+        description: |
+          If set to true, the request will create a CryptoKey without any CryptoKeyVersions. 
+          You must use the `google_kms_key_ring_import_job` resource to import the CryptoKeyVersion.
+        default_value: false
+        input: true
+        url_param_only: true
     properties:
       - !ruby/object:Api::Type::String
         name: 'name'

products/kms/terraform.yaml

@@ -19,7 +19,7 @@ overrides: !ruby/object:Overrides::ResourceOverrides
 
       ~> **Note:** KeyRings cannot be deleted from Google Cloud Platform.
       Destroying a Terraform-managed KeyRing will remove it from state but
-      *will not delete the resource on the server.*
+      *will not delete the resource from the project.*
     id_format: "projects/{{project}}/locations/{{location}}/keyRings/{{name}}"
     import_format: ["projects/{{project}}/locations/{{location}}/keyRings/{{name}}"]
     skip_delete: true
@@ -53,7 +53,7 @@ overrides: !ruby/object:Overrides::ResourceOverrides
       ~> **Note:** CryptoKeys cannot be deleted from Google Cloud Platform.
       Destroying a Terraform-managed CryptoKey will remove it from state
       and delete all CryptoKeyVersions, rendering the key unusable, but *will
-      not delete the resource on the server.* When Terraform destroys these keys,
+      not delete the resource from the project.* When Terraform destroys these keys,
       any data previously encrypted with these keys will be irrecoverable.
       For this reason, it is strongly recommended that you add lifecycle hooks
       to the resource to prevent accidental destruction.
@@ -108,7 +108,7 @@ overrides: !ruby/object:Overrides::ResourceOverrides
 
       ~> **Note:** KeyRingImportJobs cannot be deleted from Google Cloud Platform.
       Destroying a Terraform-managed KeyRingImportJob will remove it from state but
-      *will not delete the resource on the server.* 
+      *will not delete the resource from the project.* 
     id_format: "{{name}}"
     import_format: ["{{name}}"]
     examples:
@@ -117,6 +117,7 @@ overrides: !ruby/object:Overrides::ResourceOverrides
         primary_resource_id: "import-job"
         vars:
           keyring: "keyring-example"
+          cryptokey: "cryptokey-example"
         skip_test: true
     properties:
       createTime: !ruby/object:Overrides::Terraform::PropertyOverride

templates/terraform/custom_delete/kms_crypto_key.erb

@@ -5,7 +5,7 @@
 
 	log.Printf(`
 [WARNING] KMS CryptoKey resources cannot be deleted from GCP. The CryptoKey %s will be removed from Terraform state,
-and all its CryptoKeyVersions will be destroyed, but it will still be present on the server.`, cryptoKeyId.cryptoKeyId())
+and all its CryptoKeyVersions will be destroyed, but it will still be present in the project.`, cryptoKeyId.cryptoKeyId())
 
 	// Delete all versions of the key
 	if err := clearCryptoKeyVersions(cryptoKeyId, userAgent, config); err != nil {

templates/terraform/custom_import/kms_crypto_key.go.erb

@@ -13,4 +13,8 @@
 		return nil, fmt.Errorf("Error setting name: %s", err)
 	}
 
+	if err := d.Set("skip_initial_version_creation", false); err != nil {
+		return nil, fmt.Errorf("Error setting skip_initial_version_creation: %s", err)
+	}
+
 	return []*schema.ResourceData{d}, nil

templates/terraform/examples/kms_key_ring_import_job.tf.erb

@@ -3,6 +3,12 @@ resource "google_kms_key_ring" "keyring" {
   location = "global"
 }
 
+resource "google_kms_crypto_key" "example-key" {
+  name            = "<%= ctx[:vars]['cryptokey'] %>""
+  key_ring        = google_kms_key_ring.keyring.id
+  skip_initial_version_creation = true
+}
+
 resource "google_kms_key_ring_import_job" "<%= ctx[:primary_resource_id] %>" {
   key_ring = google_kms_key_ring.keyring.id
   import_job_id = "my-import-job"

templates/terraform/resource.erb

@@ -809,8 +809,8 @@ if <%= props.map { |prop| "d.HasChange(\"#{prop.name.underscore}\")" }.join ' ||
 func resource<%= resource_name -%>Delete(d *schema.ResourceData, meta interface{}) error {
 <% if object.skip_delete -%>
     log.Printf("[WARNING] <%= object.__product.name + " " + object.name %> resources" +
-    " cannot be deleted from GCP. The resource %s will be removed from Terraform" +
-    " state, but will still be present on the server.", d.Id())
+    " cannot be deleted from Google Cloud. The resource %s will be removed from Terraform" +
+    " state, but will still be present on Google Cloud.", d.Id())
     d.SetId("")
 
     return nil