Apigee environment group attachment

mmv1/products/apigee/api.yaml

@@ -363,3 +363,53 @@ objects:
         'Creating an environment':
           'https://cloud.google.com/apigee/docs/api-platform/get-started/create-environment'
       api: 'https://cloud.google.com/apigee/docs/reference/apis/apigee/rest/v1/organizations.instances.attachments/create'
+  - !ruby/object:Api::Resource
+    name: 'EnvgroupAttachment'
+    base_url: '{{envgroup_id}}/attachments'
+    create_url: '{{envgroup_id}}/attachments'
+    delete_url: '{{envgroup_id}}/attachments/{{name}}'
+    self_link: '{{envgroup_id}}/attachments/{{name}}'
+    async: !ruby/object:Api::OpAsync
+      operation: !ruby/object:Api::OpAsync::Operation
+        path: 'name'
+        base_url: '{{op_id}}'
+        wait_ms: 1000
+      result: !ruby/object:Api::OpAsync::Result
+        path: 'response'
+        resource_inside_response: true
+      status: !ruby/object:Api::OpAsync::Status
+        path: 'done'
+        complete: True
+        allowed:
+          - True
+          - False
+      error: !ruby/object:Api::OpAsync::Error
+        path: 'error'
+        message: 'message'
+    input: true
+    description: |
+      An `Environment Group attachment` in Apigee.
+    parameters:
+     - !ruby/object:Api::Type::String
+        name: 'envgroupId'
+        description: |
+          The Apigee environment group associated with the Apigee environment,
+          in the format `organisations/{{org_name}}/envgroups/{{envgroup_name}}`.
+        required: true
+        url_param_only: true
+    properties:
+     - !ruby/object:Api::Type::String
+        name: 'environment'
+        description: |
+          The resource ID of the environment.
+        required: true
+     - !ruby/object:Api::Type::String
+        name: 'name'
+        description: |
+          The name of the newly created  attachment (output parameter).
+        output: true
+    references: !ruby/object:Api::Resource::ReferenceLinks
+      guides:
+        'Creating an environment':
+          'https://cloud.google.com/apigee/docs/api-platform/get-started/create-environment'
+      api: 'https://cloud.google.com/apigee/docs/reference/apis/apigee/rest/v1/organizations.envgroups.attachments/create'

mmv1/products/apigee/terraform.yaml

@@ -161,6 +161,30 @@ overrides: !ruby/object:Overrides::ResourceOverrides
       delete_minutes: 30
     custom_code: !ruby/object:Provider::Terraform::CustomCode
       custom_import: templates/terraform/custom_import/apigee_instance_attachment.go.erb
+  EnvgroupAttachment: !ruby/object:Overrides::Terraform::ResourceOverride
+    autogen_async: true
+    import_format: ["{{envgroup_id}}/attachments/{{name}}", "{{envgroup_id}}/{{name}}"]
+    delete_url: '{{envgroup_id}}/attachments/{{name}}'
+    examples:
+    - !ruby/object:Provider::Terraform::Examples
+      name: "apigee_environment_group_attachment_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_group_attachment_basic_test"
+      primary_resource_id: "apigee_environment_group_attachment"
+      test_env_vars:
+        org_id: :ORG_ID
+        billing_account: :BILLING_ACCT
+      skip_docs: true
+      # Resource creation race
+      skip_vcr: true
+    timeouts: !ruby/object:Api::Timeouts
+      insert_minutes: 30
+      delete_minutes: 30
+    custom_code: !ruby/object:Provider::Terraform::CustomCode
+      custom_import: templates/terraform/custom_import/apigee_environment_group_attachment.go.erb      
 files: !ruby/object:Provider::Config::Files
   # These files have templating (ERB) code that will be run.
   # This is usually to add licensing info, autogeneration notices, etc.

mmv1/templates/terraform/custom_import/apigee_environment_group_attachment.go.erb

@@ -0,0 +1,18 @@
+config := meta.(*Config)
+
+// current import_formats cannot import fields with forward slashes in their value
+if err := parseImportId([]string{
+		"(?P<envgroup_id>.+)/attachments/(?P<name>.+)",
+		"(?P<envgroup_id>.+)/(?P<name>.+)",
+	}, d, config); err != nil {
+		return nil, err
+	}
+
+// Replace import id for the resource id
+id, err := replaceVars(d, config, "{{envgroup_id}}/attachments/{{name}}")
+if err != nil {
+	return nil, fmt.Errorf("Error constructing id: %s", err)
+}
+d.SetId(id)
+
+return []*schema.ResourceData{d}, nil

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

@@ -0,0 +1,71 @@
+resource "google_project" "project" {
+  project_id      = "tf-test%{random_suffix}"
+  name            = "tf-test%{random_suffix}"
+  org_id          = "<%= ctx[:test_env_vars]['org_id'] %>"
+  billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>"
+}
+
+resource "google_project_service" "apigee" {
+  project = google_project.project.project_id
+  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 "google_compute_network" "apigee_network" {
+  name       = "apigee-network"
+  project    = google_project.project.project_id
+  depends_on = [google_project_service.compute]
+}
+
+resource "google_compute_global_address" "apigee_range" {
+  name          = "apigee-range"
+  purpose       = "VPC_PEERING"
+  address_type  = "INTERNAL"
+  prefix_length = 16
+  network       = google_compute_network.apigee_network.id
+  project       = google_project.project.project_id
+}
+
+resource "google_service_networking_connection" "apigee_vpc_connection" {
+  network                 = google_compute_network.apigee_network.id
+  service                 = "servicenetworking.googleapis.com"
+  reserved_peering_ranges = [google_compute_global_address.apigee_range.name]
+  depends_on              = [google_project_service.servicenetworking]
+}
+
+resource "google_apigee_organization" "apigee_org" {
+  analytics_region   = "us-central1"
+  project_id         = google_project.project.project_id
+  authorized_network = google_compute_network.apigee_network.id
+  depends_on         = [
+    google_service_networking_connection.apigee_vpc_connection,
+    google_project_service.apigee,
+  ]
+}
+
+resource "google_apigee_envgroup" "apigee_envgroup" {
+  org_id    = google_apigee_organization.apigee_org.id
+  name      = "tf-test%{random_suffix}"
+  hostnames = ["abc.foo.com"]
+}
+
+resource "google_apigee_environment" "apigee_env" {
+  org_id       = google_apigee_organization.apigee_org.id
+  name         = "tf-test%{random_suffix}"
+  description  = "Apigee Environment"
+  display_name = "tf-test%{random_suffix}"
+}
+
+resource "google_apigee_envgroup_attachment" "<%= ctx[:primary_resource_id] %>" {
+  envgroup_id  = google_apigee_envgroup.apigee_envgroup.name
+  environment  = google_apigee_environment.apigee_env.name
+}

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

@@ -0,0 +1,71 @@
+resource "google_project" "project" {
+  project_id      = "tf-test%{random_suffix}"
+  name            = "tf-test%{random_suffix}"
+  org_id          = "<%= ctx[:test_env_vars]['org_id'] %>"
+  billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>"
+}
+
+resource "google_project_service" "apigee" {
+  project = google_project.project.project_id
+  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 "google_compute_network" "apigee_network" {
+  name       = "apigee-network"
+  project    = google_project.project.project_id
+  depends_on = [google_project_service.compute]
+}
+
+resource "google_compute_global_address" "apigee_range" {
+  name          = "apigee-range"
+  purpose       = "VPC_PEERING"
+  address_type  = "INTERNAL"
+  prefix_length = 16
+  network       = google_compute_network.apigee_network.id
+  project       = google_project.project.project_id
+}
+
+resource "google_service_networking_connection" "apigee_vpc_connection" {
+  network                 = google_compute_network.apigee_network.id
+  service                 = "servicenetworking.googleapis.com"
+  reserved_peering_ranges = [google_compute_global_address.apigee_range.name]
+  depends_on              = [google_project_service.servicenetworking]
+}
+
+resource "google_apigee_organization" "apigee_org" {
+  analytics_region   = "us-central1"
+  project_id         = google_project.project.project_id
+  authorized_network = google_compute_network.apigee_network.id
+  depends_on         = [
+    google_service_networking_connection.apigee_vpc_connection,
+    google_project_service.apigee,
+  ]
+}
+
+resource "google_apigee_envgroup" "apigee_envgroup" {
+  org_id    = google_apigee_organization.apigee_org.id
+  name      = "tf-test%{random_suffix}"
+  hostnames = ["abc.foo.com"]
+}
+
+resource "google_apigee_environment" "apigee_env" {
+  org_id       = google_apigee_organization.apigee_org.id
+  name         = "tf-test%{random_suffix}"
+  description  = "Apigee Environment"
+  display_name = "tf-test%{random_suffix}"
+}
+
+resource "google_apigee_envgroup_attachment" "<%= ctx[:primary_resource_id] %>" {
+  envgroup_id  = google_apigee_envgroup.apigee_envgroup.id
+  environment  = google_apigee_environment.apigee_env.name
+}