Add support IAM policy for the Environment of Apigee X

mmv1/products/apigee/api.yaml

@@ -231,6 +231,13 @@ objects:
         message: 'message'
     description: |
       An `Environment` in Apigee.
+    iam_policy: !ruby/object:Api::Resource::IamPolicy
+      exclude: false
+      method_name_separator: ':'
+      parent_resource_attribute: 'env_id'
+      import_format: ["{{org_id}}/environments/{{name}}", "{{name}}"]
+      base_url: "{{org_id}}/environments/{{name}}"
+      self_link: "{{org_id}}/environments/{{name}}"
     parameters:
       - !ruby/object:Api::Type::String
         name: 'orgId'

mmv1/products/apigee/terraform.yaml

@@ -18,35 +18,44 @@ overrides: !ruby/object:Overrides::ResourceOverrides
     examples:
     - !ruby/object:Provider::Terraform::Examples
       name: "apigee_organization_cloud_basic"
-      skip_test: true
-    - !ruby/object:Provider::Terraform::Examples
-      # This is a more verbose version of the above that creates all
-      # the resources needed for the acceptance test.
-      name: "apigee_organization_cloud_basic_test"
-      primary_resource_id: "org"
-      test_env_vars:
-        org_id: :ORG_ID
-        billing_account: :BILLING_ACCT
-      skip_docs: true
+      primary_resource_id: "apigee-org"
+      vars:
+        network_id: "apigee-network"
+        network_range_id: "apigee-range"
       # Resource creation race
       skip_vcr: true
     - !ruby/object:Provider::Terraform::Examples
       name: "apigee_organization_cloud_full"
+      primary_resource_id: "apigee-org"
+      vars:
+        network_id: "apigee-network"
+        network_range_id: "apigee-range"
+        keyring_id: "apigee-keyring"
+        key_id: "apigee-key"
+      # While all Apigee resources in this test are in the GA API, we depend
+      # on a service identity resource which is only available in the beta
+      # provider.
+      min_version: beta
+      # This example is for docs purpose only.
+      # For test to pass, google-beta-provider needs to be added to all
+      # resources, and KMS key lifecycle has to be removed. These are set
+      # in "apigee_organization_cloud_full_test" below.
       skip_test: true
     - !ruby/object:Provider::Terraform::Examples
-      # This is a more verbose version of the above that creates all
-      # the resources needed for the acceptance test. While all Apigee
-      # resources in this test are in the GA API, we depend on a service
-      # identity resource which is only available in the beta provider.
       name: "apigee_organization_cloud_full_test"
-      primary_resource_id: "org"
-      test_env_vars:
-        org_id: :ORG_ID
-        billing_account: :BILLING_ACCT
-      skip_docs: true
+      primary_resource_id: "apigee-org"
+      vars:
+        network_id: "apigee-network"
+        network_range_id: "apigee-range"
+        keyring_id: "apigee-keyring"
+        key_id: "apigee-key"
+      # While all Apigee resources in this test are in the GA API, we depend
+      # on a service identity resource which is only available in the beta
+      # provider.
       min_version: beta
       # Resource creation race
       skip_vcr: true
+      skip_docs: true
     timeouts: !ruby/object:Api::Timeouts
       insert_minutes: 10
       delete_minutes: 10
@@ -97,16 +106,12 @@ overrides: !ruby/object:Overrides::ResourceOverrides
     examples:
     - !ruby/object:Provider::Terraform::Examples
       name: "apigee_environment_basic"
-      skip_test: true
-    - !ruby/object:Provider::Terraform::Examples
-      # This is a more verbose version of the above that creates all
-      # the resources needed for the acceptance test.
-      name: "apigee_environment_basic_test"
       primary_resource_id: "apigee_environment"
-      test_env_vars:
-        org_id: :ORG_ID
-        billing_account: :BILLING_ACCT
-      skip_docs: true
+      primary_resource_name: "getTestProjectFromEnv(), fmt.Sprintf(\"tf-test-apigee-env%s\", context[\"random_suffix\"])"
+      vars:
+        network_id: "apigee-network"
+        network_range_id: "apigee-range"
+        apigee_env_id: "apigee-env"
       # Resource creation race
       skip_vcr: true
     timeouts: !ruby/object:Api::Timeouts

mmv1/templates/terraform/encoders/apigee_organization.go.erb

@@ -1,2 +1,2 @@
 obj["name"] = d.Get("project_id").(string)
-return obj, nil
+return obj, nil

mmv1/templates/terraform/examples/apigee_environment_basic.tf.erb

@@ -1,11 +1,11 @@
 data "google_client_config" "current" {}
 
 resource "google_compute_network" "apigee_network" {
-  name = "apigee-network"
+  name       = "<%= ctx[:vars]['network_id'] %>"
 }
 
 resource "google_compute_global_address" "apigee_range" {
-  name          = "apigee-range"
+  name          = "<%= ctx[:vars]['network_range_id'] %>"
   purpose       = "VPC_PEERING"
   address_type  = "INTERNAL"
   prefix_length = 16
@@ -25,10 +25,9 @@ resource "google_apigee_organization" "apigee_org" {
   depends_on         = [google_service_networking_connection.apigee_vpc_connection]
 }
 
-resource "google_apigee_environment" "env" {
-  name        = "tf-test%{random_suffix}"
-  description = "Apigee Environment"
-  displayName = "environment-1"
-  org_id      = google_apigee_organization.apigee_org.id
+resource "google_apigee_environment" "<%= ctx[:primary_resource_id] %>" {
+  name         = "<%= ctx[:vars]['apigee_env_id'] %>"
+  description  = "Apigee Environment"
+  display_name = "environment-1"
+  org_id     = google_apigee_organization.apigee_org.id
 }
-

mmv1/templates/terraform/examples/apigee_organization_cloud_basic.tf.erb

@@ -1,11 +1,11 @@
 data "google_client_config" "current" {}
 
 resource "google_compute_network" "apigee_network" {
-  name       = "apigee-network"
+  name       = "<%= ctx[:vars]['network_id'] %>"
 }
 
 resource "google_compute_global_address" "apigee_range" {
-  name          = "apigee-range"
+  name          = "<%= ctx[:vars]['network_range_id'] %>"
   purpose       = "VPC_PEERING"
   address_type  = "INTERNAL"
   prefix_length = 16
@@ -18,7 +18,7 @@ resource "google_service_networking_connection" "apigee_vpc_connection" {
   reserved_peering_ranges = [google_compute_global_address.apigee_range.name]
 }
 
-resource "google_apigee_organization" "org" {
+resource "google_apigee_organization" "<%= ctx[:primary_resource_id] %>" {
   analytics_region   = "us-central1"
   project_id         = data.google_client_config.current.project
   authorized_network = google_compute_network.apigee_network.id

mmv1/templates/terraform/examples/apigee_organization_cloud_full.tf.erb

@@ -1,11 +1,11 @@
 data "google_client_config" "current" {}
 
 resource "google_compute_network" "apigee_network" {
-  name       = "apigee-network"
+  name       = "<%= ctx[:vars]['network_id'] %>"
 }
 
 resource "google_compute_global_address" "apigee_range" {
-  name          = "apigee-range"
+  name          = "<%= ctx[:vars]['network_range_id'] %>"
   purpose       = "VPC_PEERING"
   address_type  = "INTERNAL"
   prefix_length = 16
@@ -19,12 +19,12 @@ resource "google_service_networking_connection" "apigee_vpc_connection" {
 }
 
 resource "google_kms_key_ring" "apigee_keyring" {
-  name     = "apigee-keyring"
+  name     = "<%= ctx[:vars]['keyring_id'] %>"
   location = "us-central1"
 }
 
 resource "google_kms_crypto_key" "apigee_key" {
-  name            = "apigee-key"
+  name            = "<%= ctx[:vars]['key_id'] %>"
   key_ring        = google_kms_key_ring.apigee_keyring.id
 
   lifecycle {
@@ -34,8 +34,9 @@ resource "google_kms_crypto_key" "apigee_key" {
 
 resource "google_project_service_identity" "apigee_sa" {
   provider = google-beta
-  project  = google_project.project.project_id
-  service  = google_project_service.apigee.service
+
+  project  = data.google_client_config.current.project
+  service  = "apigee.googleapis.com"
 }
 
 resource "google_kms_crypto_key_iam_binding" "apigee_sa_keyuser" {
@@ -47,7 +48,7 @@ resource "google_kms_crypto_key_iam_binding" "apigee_sa_keyuser" {
   ]
 }
 
-resource "google_apigee_organization" "org" {
+resource "google_apigee_organization" "<%= ctx[:primary_resource_id] %>" {
   analytics_region                     = "us-central1"
   display_name                         = "apigee-org"
   description                          = "Terraform-provisioned Apigee Org."
@@ -59,4 +60,4 @@ resource "google_apigee_organization" "org" {
     google_service_networking_connection.apigee_vpc_connection,
     google_kms_crypto_key_iam_binding.apigee_sa_keyuser,
   ]
-}
+}