sql: Add consumer_network_status, ip_address, and status fields to google_sql_database_instance (#14643)

Author: jbuck

mmv1/third_party/terraform/services/sql/resource_sql_database_instance.go.tmpl

@@ -561,6 +561,21 @@ API (for read pools, effective_availability_type may differ from availability_ty
                                                                                                                                 Required:     true,
                                                                                                                                 Description:  `The consumer network of this consumer endpoint. This must be a resource path that includes both the host project and the network name. The consumer host project of this network might be different from the consumer service project.`,
                                                                                                                         },
+                                                                                                                        "consumer_network_status": {
+                                                                                                                                Type:         schema.TypeString,
+                                                                                                                                Computed:     true,
+                                                                                                                                Description:  `The connection policy status of the consumer network.`,
+                                                                                                                        },
+                                                                                                                        "ip_address": {
+                                                                                                                                Type:         schema.TypeString,
+                                                                                                                                Computed:     true,
+                                                                                                                                Description:  `The IP address of the consumer endpoint.`,
+                                                                                                                        },
+                                                                                                                        "status": {
+                                                                                                                                Type:         schema.TypeString,
+                                                                                                                                Computed:     true,
+                                                                                                                                Description:  `The connection status of the consumer endpoint.`,
+                                                                                                                        },
                                                                                                                 },
 													},
 													Description: `A comma-separated list of networks or a comma-separated list of network-project pairs. Each project in this list is represented by a project number (numeric) or by a project ID (alphanumeric). This allows Private Service Connect connections to be created automatically for the specified networks.`,
@@ -2701,7 +2716,10 @@ func flattenPscAutoConnections(pscAutoConnections []*sqladmin.PscAutoConnectionC
         for _, flag := range pscAutoConnections {
                 data := map[string]interface{}{
                         "consumer_network":   flag.ConsumerNetwork,
+                        "consumer_network_status":   flag.ConsumerNetworkStatus,
                         "consumer_service_project_id":   flag.ConsumerProject,
+                        "ip_address":   flag.IpAddress,
+                        "status":   flag.Status,
                 }
 
                 flags = append(flags, data)

mmv1/third_party/terraform/services/sql/resource_sql_database_instance_meta.yaml

@@ -100,7 +100,10 @@ fields:
   - field: 'settings.ip_configuration.private_network'
   - field: 'settings.ip_configuration.psc_config.allowed_consumer_projects'
   - field: 'settings.ip_configuration.psc_config.psc_auto_connections.consumer_network'
+  - field: 'settings.ip_configuration.psc_config.psc_auto_connections.consumer_network_status'
   - field: 'settings.ip_configuration.psc_config.psc_auto_connections.consumer_service_project_id'
+  - field: 'settings.ip_configuration.psc_config.psc_auto_connections.ip_address'
+  - field: 'settings.ip_configuration.psc_config.psc_auto_connections.status'
   - field: 'settings.ip_configuration.psc_config.psc_enabled'
   - field: 'settings.ip_configuration.server_ca_mode'
   - field: 'settings.ip_configuration.server_ca_pool'

mmv1/third_party/terraform/website/docs/r/sql_database_instance.html.markdown

@@ -698,6 +698,12 @@ performing filtering in a Terraform config.
 
 ~> **NOTE:** Users can upgrade a read replica instance to a stand-alone Cloud SQL instance with the help of `instance_type`. To promote, users have to set the `instance_type` property as `CLOUD_SQL_INSTANCE` and remove/unset `master_instance_name` and `replica_configuration` from instance configuration. This operation might cause your instance to restart.
 
+* `settings.ip_configuration.psc_config.psc_auto_connections.consumer_network_status` - (Output) The connection policy status of the consumer network.
+
+* `settings.ip_configuration.psc_config.psc_auto_connections.ip_address` - (Output) The IP address of the consumer endpoint.
+
+* `settings.ip_configuration.psc_config.psc_auto_connections.status` - (Output) The connection status of the consumer endpoint.
+
 * `settings.version` - Used to make sure changes to the `settings` block are
     atomic.