refactored space to space_id

Author: NA2047

mmv1/products/apigee/Space.yaml

@@ -20,21 +20,21 @@ references:
     "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"
+self_link: "{{org_id}}/spaces/{{name}}"
 import_format:
-  - "organizations/{{org_id}}/spaces/{{name}}"
+  - "{{org_id}}/spaces/{{name}}"
   - "{{org_id}}/{{name}}"
 iam_policy:
   method_name_separator: ':'
-  parent_resource_attribute: 'space'
+  parent_resource_attribute: 'space_id'
   fetch_iam_policy_verb: 'GET'
   set_iam_policy_verb: 'POST'
   wrapped_policy_obj: false
   allowed_iam_role: 'roles/apigee.spaceViewer'
 examples:
   - name: "apigee_space_basic"
-    primary_resource_id: "apigee_space"
+    primary_resource_id: "space"
     vars:
       name: "my-space"
       display_name: "My Space"
@@ -60,7 +60,7 @@ properties:
   - name: "name"
     type: String
     description: |
-      Identifier. Id of the space. 
+      Identifier. Id of the space.
       This field is used as the resource name, and must follow AIP-122 guidelines.
     output: true
   - name: "displayName"

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

@@ -1,7 +1,7 @@
 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" {
@@ -34,14 +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
-  name          = "{{index $.Vars "product_name"}}"
+  space         = google_apigee_space.space.space_id
   display_name  = "My Space API Product"
 
   approval_type = "auto"

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

@@ -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,14 +8,16 @@ 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),
 		"display_name":    "Test Space",
+    "random_suffix":   acctest.RandString(t, 10),
+
 	}
 
 	acctest.VcrTest(t, resource.TestCase{
@@ -24,7 +26,7 @@ func TestAccApigeeSpace_handwritten(t *testing.T) {
 		CheckDestroy:             testAccCheckApigeeSpaceDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
-				Config: testAccApigeeSpace_handwrittenConfig(context),
+				Config: testAccApigeeSpace_basicTest(context),
 			},
 			{
 				ResourceName:      "google_apigee_space.primary",
@@ -35,11 +37,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"
@@ -83,7 +85,6 @@ 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}"
   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.