refactored space to space_id

Author: NA2047

mmv1/products/apigee/Space.yaml

@@ -19,22 +19,28 @@ references:
   guides:
     "Managing Spaces": "https://cloud.google.com/apigee/docs/api-platform/system-administration/spaces/manage-spaces"
   api: "https://cloud.google.com/apigee/docs/reference/apis/apigee/rest/v1/organizations.spaces"
-docs:
-base_url: "organizations/{{org_id}}/spaces"
-self_link: "organizations/{{org_id}}/spaces/{{name}}"
+base_url: "{{org_id}}/spaces"
+create_url: "{{org_id}}/spaces?spaceId={{space_id}}"
+self_link: "{{org_id}}/spaces/{{space_id}}"
+update_verb: 'PATCH'
+update_mask: true
 import_format:
-  - "organizations/{{org_id}}/spaces/{{name}}"
-  - "{{org_id}}/{{name}}"
+  - "{{org_id}}/spaces/{{space_id}}"
+  - "{{org_id}}/{{space_id}}"
+autogen_async: true
 iam_policy:
   method_name_separator: ':'
-  parent_resource_attribute: 'space'
+  parent_resource_attribute: 'name'
   fetch_iam_policy_verb: 'GET'
   set_iam_policy_verb: 'POST'
   wrapped_policy_obj: false
   allowed_iam_role: 'roles/apigee.spaceViewer'
+  import_format:
+    - "{{org_id}}/spaces/{{space_id}}"
+    - "{{org_id}}/{{space_id}}"
 examples:
   - name: "apigee_space_basic"
-    primary_resource_id: "apigee_space"
+    primary_resource_id: "space"
     vars:
       name: "my-space"
       display_name: "My Space"
@@ -44,8 +50,7 @@ parameters:
   - name: "orgId"
     type: String
     description: |
-      The Apigee Organization associated with the Apigee Space,
-      in the format `organizations/{{org_name}}`.
+      The Apigee Organization associated with the Apigee Space, in the format `organizations/{{org_name}}`.
     url_param_only: true
     required: true
     immutable: true
@@ -60,8 +65,7 @@ properties:
   - name: "name"
     type: String
     description: |
-      Identifier. Id of the space. 
-      This field is used as the resource name, and must follow AIP-122 guidelines.
+      Identifier. Id of the space. This field is used as the resource name, and must follow AIP-122 guidelines.
     output: true
   - name: "displayName"
     type: String

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

@@ -1,11 +1,11 @@
 data "google_client_config" "current" {}
 
 resource "google_compute_network" "apigee_network" {
-  name = "apigee-network"
+  name = "apigee-network-{{index $.Vars "instance_name"}}"
 }
 
 resource "google_compute_global_address" "apigee_range" {
-  name          = "apigee-range"
+  name          = "apigee-range-{{index $.Vars "instance_name"}}"
   purpose       = "VPC_PEERING"
   address_type  = "INTERNAL"
   prefix_length = 16
@@ -34,13 +34,13 @@ resource "google_apigee_instance" "apigee_instance" {
 
 resource "google_apigee_space" "space" {
   org_id       = google_apigee_organization.apigee_org.id
-  name         = "{{index $.Vars "space_name"}}"
+  space_id     = "{{index $.Vars "space_name"}}"
   display_name = "{{index $.Vars "space_display_name"}}"
 }
 
 resource "google_apigee_api_product" "space_api_product" {
   org_id        = google_apigee_organization.apigee_org.id
-  space         = google_apigee_space.space.name
+  space         = google_apigee_space.space.space_id
   name          = "{{index $.Vars "product_name"}}"
   display_name  = "My Space API Product"
 

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

@@ -1,11 +1,11 @@
 data "google_client_config" "current" {}
 
 resource "google_compute_network" "apigee_network" {
-  name = "apigee-network"
+  name = "apigee-network-{{index $.Vars "name"}}"
 }
 
 resource "google_compute_global_address" "apigee_range" {
-  name          = "apigee-range"
+  name          = "apigee-range-{{index $.Vars "name"}}"
   purpose       = "VPC_PEERING"
   address_type  = "INTERNAL"
   prefix_length = 16
@@ -28,6 +28,5 @@ resource "google_apigee_organization" "apigee_org" {
 resource "google_apigee_space" "space" {
   org_id       = google_apigee_organization.apigee_org.id
   space_id     = "{{index $.Vars "name"}}"
-  name         = "organizations/${google_apigee_organization.apigee_org.name}/spaces/{{index $.Vars "name"}}"
   display_name = "{{index $.Vars "display_name"}}"
 }

mmv1/third_party/terraform/services/apigee/resource_apigee_sharedflow.go

@@ -349,7 +349,7 @@ func resourceApigeeSharedFlowDelete(d *schema.ResourceData, meta interface{}) er
 }
 
 func resourceApigeeSharedFlowImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
-	
+
 	var id string
 	var err error
 

mmv1/third_party/terraform/services/apigee/resource_apigee_space_test.go

@@ -8,23 +8,27 @@ import (
 	"github.com/hashicorp/terraform-provider-google/google/envvar"
 )
 
-func TestAccApigeeSpace_handwritten(t *testing.T) {
+func TestAccApigeeSpace_basicTest(t *testing.T) {
 	t.Parallel()
 
 	context := map[string]interface{}{
 		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"billing_account": envvar.GetTestBillingAccountFromEnv(t),
-		"space_name":      "test-space-" + acctest.RandString(t, 10),
+		"space_id":      "test-space",
 		"display_name":    "Test Space",
+		"random_suffix":   acctest.RandString(t, 10),
 	}
 
 	acctest.VcrTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
 		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		ExternalProviders: map[string]resource.ExternalProvider{
+			"time": {},
+		},
 		CheckDestroy:             testAccCheckApigeeSpaceDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
-				Config: testAccApigeeSpace_handwrittenConfig(context),
+				Config: testAccApigeeSpace_basicTest(context),
 			},
 			{
 				ResourceName:      "google_apigee_space.primary",
@@ -35,11 +39,11 @@ func TestAccApigeeSpace_handwritten(t *testing.T) {
 	})
 }
 
-func testAccApigeeSpace_handwrittenConfig(context map[string]interface{}) string {
+func testAccApigeeSpace_basicTest(context map[string]interface{}) string {
 	return acctest.Nprintf(`
 resource "google_project" "project" {
-  project_id      = "%{org_id}-%{space_name}"
-  name            = "%{org_id}-%{space_name}"
+  project_id      = "tf-test%{random_suffix}"
+  name            = "tf-test%{random_suffix}"
   org_id          = "%{org_id}"
   billing_account = "%{billing_account}"
   deletion_policy = "DELETE"
@@ -50,9 +54,25 @@ resource "google_project_service" "apigee" {
   service = "apigee.googleapis.com"
 }
 
+resource "google_project_service" "compute" {
+  project = google_project.project.project_id
+  service = "compute.googleapis.com"
+}
+
+resource "google_project_service" "servicenetworking" {
+  project = google_project.project.project_id
+  service = "servicenetworking.googleapis.com"
+}
+
+resource "time_sleep" "wait_120_seconds" {
+  create_duration = "120s"
+  depends_on = [google_project_service.compute, google_project_service.servicenetworking]
+}
+
 resource "google_compute_network" "apigee_network" {
   name    = "apigee-network"
   project = google_project.project.project_id
+  depends_on = [time_sleep.wait_120_seconds]
 }
 
 resource "google_compute_global_address" "apigee_range" {
@@ -82,9 +102,9 @@ resource "google_apigee_organization" "apigee_org" {
 
 resource "google_apigee_space" "primary" {
   org_id       = google_apigee_organization.apigee_org.id
-  space_id     = "%{space_name}"
-  name         = "organizations/${google_apigee_organization.apigee_org.name}/spaces/%{space_name}"
+  space_id     = "%{space_id}"
   display_name = "%{display_name}"
 }
 `, context)
 }
+

mmv1/third_party/terraform/website/docs/r/apigee_api.html.markdown

@@ -53,7 +53,7 @@ The following arguments are supported:
   (Required)
   Path to the config zip bundle.
 
-* `space_id` -
+* `space` -
   (Optional)
   The id of the space.
 

mmv1/third_party/terraform/website/docs/r/apigee_sharedflow.html.markdown

@@ -34,7 +34,7 @@ The following arguments are supported:
   (Required)
   Path to the config zip bundle.
 
-* `space_id` -
+* `space` -
   (Optional)
   The id of the space.