feat(apigee): google_apigee_instance datasource

mmv1/products/apigee/EndpointAttachment.yaml

@@ -14,7 +14,9 @@
 ---
 name: 'EndpointAttachment'
 description: |
-  Apigee Endpoint Attachment.
+  An `EndpointAttachment` in Apigee is a resource that facilitates private connectivity between Apigee and backend services using Private Service Connect (PSC).
+
+  For more information, see the [Apigee documentation](https://cloud.google.com/apigee/docs/api-platform/architecture/southbound-networking-patterns-psc).
 references:
   guides:
     'Creating an environment': 'https://cloud.google.com/apigee/docs/api-platform/get-started/create-environment'
@@ -43,6 +45,11 @@ async:
 custom_code:
   custom_import: 'templates/terraform/custom_import/apigee_endpoint_attachment.go.tmpl'
 exclude_sweeper: true
+examples:
+  - name: 'apigee_endpoint_attachment_basic'
+    primary_resource_id: 'apigee_endpoint_attachment'
+    vars:
+      endpoint_attachment_id: "my-endpoint-attachment"
 parameters:
   - name: 'orgId'
     type: String
@@ -69,7 +76,7 @@ properties:
   - name: 'location'
     type: String
     description: |
-      Location of the endpoint attachment.
+      The location of the endpoint attachment.
     required: true
   - name: 'host'
     type: String
@@ -79,10 +86,12 @@ properties:
   - name: 'serviceAttachment'
     type: String
     description: |
-      Format: projects/*/regions/*/serviceAttachments/*
+      The resource URL of the service attachment in the format:
+      `projects/*/regions/*/serviceAttachments/*`.
     required: true
   - name: 'connectionState'
     type: String
     description: |
       State of the endpoint attachment connection to the service attachment.
+      Possible values are: `CONNECTION_STATE_UNSPECIFIED`, `PENDING`, `ACCEPTED`, `REJECTED`, `CLOSED`.
     output: true

mmv1/products/apigee/Instance.yaml

@@ -29,6 +29,8 @@
 import_format:
   - '{{org_id}}/instances/{{name}}'
   - '{{org_id}}/{{name}}'
+datasource:
+  generate: true
 timeouts:
   insert_minutes: 60
   update_minutes: 20
@@ -54,7 +56,7 @@
     vars:
       instance_name: 'my-instance-name'
     exclude_test: true
       # This is a more verbose version of the above that creates all
       # the resources needed for the acceptance test.
   - name: 'apigee_instance_basic_test'
     primary_resource_id: 'apigee_instance'
@@ -62,14 +64,14 @@
       org_id: 'ORG_ID'
       billing_account: 'BILLING_ACCT'
     exclude_docs: true
       # Resource creation race
     skip_vcr: true
     external_providers: ["time"]
   - name: 'apigee_instance_cidr_range'
     vars:
       instance_name: 'my-instance-name'
     exclude_test: true
       # This is a more verbose version of the above that creates all
       # the resources needed for the acceptance test.
   - name: 'apigee_instance_cidr_range_test'
     primary_resource_id: 'apigee_instance'
@@ -77,14 +79,14 @@
       org_id: 'ORG_ID'
       billing_account: 'BILLING_ACCT'
     exclude_docs: true
       # Resource creation race
     skip_vcr: true
     external_providers: ["time"]
   - name: 'apigee_instance_ip_range'
     vars:
       instance_name: 'my-instance-name'
     exclude_test: true
       # This is a more verbose version of the above that creates all
       # the resources needed for the acceptance test.
   - name: 'apigee_instance_ip_range_test'
     primary_resource_id: 'apigee_instance'
@@ -92,14 +94,14 @@
       org_id: 'ORG_ID'
       billing_account: 'BILLING_ACCT'
     exclude_docs: true
       # Resource creation race
     skip_vcr: true
     external_providers: ["time"]
   - name: 'apigee_instance_full'
     vars:
       instance_name: 'my-instance-name'
     exclude_test: true
       # This is a more verbose version of the above that creates all
       # the resources needed for the acceptance test.
   - name: 'apigee_instance_full_test'
     primary_resource_id: 'apigee_instance'
@@ -108,7 +110,7 @@
       org_id: 'ORG_ID'
       billing_account: 'BILLING_ACCT'
     exclude_docs: true
       # Resource creation race
     skip_vcr: true
     external_providers: ["time"]
   - name: 'apigee_instance_service_attachment_basic_test'
@@ -117,7 +119,7 @@
       org_id: 'ORG_ID'
       billing_account: 'BILLING_ACCT'
     exclude_docs: true
       # Resource creation race
     skip_vcr: true
     external_providers: ["time"]
 parameters:

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

@@ -30,7 +30,7 @@ func TestAccApigeeEndpointAttachment_apigeeEndpointAttachmentBasicTestExample(t
 		ExternalProviders: map[string]resource.ExternalProvider{
 			"time": {},
 		},
-		CheckDestroy: testAccCheckApigeeEndpointAttachmentDestroyProducer(t),
+		CheckDestroy: testAccCheckApigeeEndpointAttachmentDestroyDefaultProducer(t),
 		Steps: []resource.TestStep{
 			{
 				Config: testAccApigeeEndpointAttachment_apigeeEndpointAttachmentBasicTestExample(context),
@@ -216,7 +216,7 @@ resource "google_apigee_endpoint_attachment" "apigee_endpoint_attachment" {
 `, context)
 }
 
-func testAccCheckApigeeEndpointAttachmentDestroyProducer(t *testing.T) func(s *terraform.State) error {
+func testAccCheckApigeeEndpointAttachmentDestroyDefaultProducer(t *testing.T) func(s *terraform.State) error {
 	return func(s *terraform.State) error {
 		for name, rs := range s.RootModule().Resources {
 			if rs.Type != "google_apigee_endpoint_attachment" {