Add custom import logic

Author: edwinfranciss

mmv1/products/apihub/ApiHubInstance.yaml

@@ -16,11 +16,13 @@ name: ApiHubInstance
 description: An ApiHubInstance represents the instance resources of the API Hub. Currently, only one ApiHub instance is allowed for each project.
 base_url: projects/{{project}}/locations/{{location}}/apiHubInstances
 immutable: true
-self_link: projects/{{project}}/locations/{{location}}/apiHubInstances/{{api_hub_instance_id}}
+self_link: '{{name}}'
 create_url: projects/{{project}}/locations/{{location}}/apiHubInstances?apiHubInstanceId={{api_hub_instance_id}}
-id_format: projects/{{project}}/locations/{{location}}/apiHubInstances/{{api_hub_instance_id}}
+id_format: '{{name}}'
 import_format:
 - projects/{{project}}/locations/{{location}}/apiHubInstances/{{api_hub_instance_id}}
+custom_code:
+  custom_import: 'templates/terraform/custom_import/apihub_api_hub_instance_set_id.go.tmpl'
 examples:
 - name: apihub_api_hub_instance_basic
   primary_resource_id: apihub-instance
@@ -63,7 +65,6 @@ parameters:
     are `/a-z[0-9]-_/`.
   immutable: true
   url_param_only: true
-  required: true
 properties:
 - name: description
   type: String
@@ -108,6 +109,7 @@ properties:
   properties:
   - name: encryptionType
     type: String
+    default_from_api: true
     description: |-
       Optional. Encryption type for the region. If the encryption type is CMEK, the
       cmek_key_name must be provided. If no encryption type is provided,

mmv1/products/apihub/product.yaml

@@ -19,4 +19,3 @@ scopes:
 versions:
 - base_url: https://apihub.googleapis.com/v1/
   name: ga
-caibaseurl: ""

mmv1/templates/terraform/custom_import/apihub_api_hub_instance_set_id.go.tmpl

@@ -0,0 +1,22 @@
+config := meta.(*transport_tpg.Config)
+if err := tpgresource.ParseImportId([]string{
+  "^projects/(?P<project>[^/]+)/locations/(?P<location>[^/]+)/apiHubInstances/(?P<api_hub_instance_id>[^/]+)$",
+  "^(?P<project>[^/]+)/(?P<location>[^/]+)/(?P<api_hub_instance_id>[^/]+)$",
+  "^(?P<location>[^/]+)/(?P<api_hub_instance_id>[^/]+)$",
+}, d, config); err != nil {
+  return nil, err
+}
+
+// Set name based on the components
+if err := d.Set("name", "projects/{{"{{"}}project{{"}}"}}/locations/{{"{{"}}location{{"}}"}}/apiHubInstances/{{"{{"}}api_hub_instance_id{{"}}"}}"); err != nil {
+  return nil, fmt.Errorf("Error setting name: %s", err)
+}
+
+// Replace import id for the resource id
+id, err := tpgresource.ReplaceVars(d, config, d.Get("name").(string))
+if err != nil {
+  return nil, fmt.Errorf("Error constructing id: %s", err)
+}
+d.SetId(id)
+
+return []*schema.ResourceData{d}, nil

mmv1/templates/terraform/examples/apihub_api_hub_instance_basic.tf.tmpl

@@ -1,8 +1,6 @@
 resource "google_apihub_api_hub_instance" "{{$.PrimaryResourceId}}"{
-    api_hub_instance_id = "{{index $.Vars "instance_id"}}"
     location = "us-central1"
     config {
-        encryption_type = "GMEK"
         disable_search = true
     }
 }