refactored space to space_id

Author: NA2047

mmv1/products/apigee/Space.yaml

@@ -27,7 +27,7 @@ import_format:
   - "{{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
@@ -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

@@ -34,13 +34,14 @@ 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"}}"
+  name         = "organizations/${google_apigee_organization.apigee_org.name}/spaces/{{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/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,7 +8,7 @@ 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{}{
@@ -24,7 +24,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,7 +35,7 @@ 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}"

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.