Support for service owned project number (#13345) (#21863)

[upstream:1283b0fd9357aa2012fe49188a61441ab106976d]

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/13345.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+alloydb: added `psc_config` field to ``google_alloydb_cluster` resource
+```

google/services/alloydb/resource_alloydb_cluster.go

@@ -423,6 +423,12 @@ It is specified in the form: "projects/{projectNumber}/global/networks/{network_
 							Optional:    true,
 							Description: `Create an instance that allows connections from Private Service Connect endpoints to the instance.`,
 						},
+						"service_owned_project_number": {
+							Type:     schema.TypeInt,
+							Computed: true,
+							Description: `The project number that needs to be allowlisted on the network attachment to enable outbound connectivity, if the network attachment is configured to ACCEPT_MANUAL connections.
+In case the network attachment is configured to ACCEPT_AUTOMATIC, this project number does not need to be allowlisted explicitly.`,
+						},
 					},
 				},
 			},
@@ -1679,12 +1685,31 @@ func flattenAlloydbClusterPscConfig(v interface{}, d *schema.ResourceData, confi
 	transformed := make(map[string]interface{})
 	transformed["psc_enabled"] =
 		flattenAlloydbClusterPscConfigPscEnabled(original["pscEnabled"], d, config)
+	transformed["service_owned_project_number"] =
+		flattenAlloydbClusterPscConfigServiceOwnedProjectNumber(original["serviceOwnedProjectNumber"], d, config)
 	return []interface{}{transformed}
 }
 func flattenAlloydbClusterPscConfigPscEnabled(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
 	return v
 }
 
+func flattenAlloydbClusterPscConfigServiceOwnedProjectNumber(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	// Handles the string fixed64 format
+	if strVal, ok := v.(string); ok {
+		if intVal, err := tpgresource.StringToFixed64(strVal); err == nil {
+			return intVal
+		}
+	}
+
+	// number values are represented as float64
+	if floatVal, ok := v.(float64); ok {
+		intVal := int(floatVal)
+		return intVal
+	}
+
+	return v // let terraform core handle it otherwise
+}
+
 func flattenAlloydbClusterContinuousBackupConfig(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
 	if v == nil {
 		return nil
@@ -2293,13 +2318,24 @@ func expandAlloydbClusterPscConfig(v interface{}, d tpgresource.TerraformResourc
 		transformed["pscEnabled"] = transformedPscEnabled
 	}
 
+	transformedServiceOwnedProjectNumber, err := expandAlloydbClusterPscConfigServiceOwnedProjectNumber(original["service_owned_project_number"], d, config)
+	if err != nil {
+		return nil, err
+	} else if val := reflect.ValueOf(transformedServiceOwnedProjectNumber); val.IsValid() && !tpgresource.IsEmptyValue(val) {
+		transformed["serviceOwnedProjectNumber"] = transformedServiceOwnedProjectNumber
+	}
+
 	return transformed, nil
 }
 
 func expandAlloydbClusterPscConfigPscEnabled(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
 	return v, nil
 }
 
+func expandAlloydbClusterPscConfigServiceOwnedProjectNumber(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}
+
 func expandAlloydbClusterInitialUser(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
 	l := v.([]interface{})
 	if len(l) == 0 || l[0] == nil {

google/services/alloydb/resource_alloydb_cluster_generated_meta.yaml

@@ -59,6 +59,7 @@ fields:
   - field: 'network_config.allocated_ip_range'
   - field: 'network_config.network'
   - field: 'psc_config.psc_enabled'
+  - field: 'psc_config.service_owned_project_number'
   - field: 'reconciling'
   - field: 'restore_backup_source.backup_name'
   - field: 'restore_continuous_backup_source.cluster'

google/services/alloydb/resource_alloydb_cluster_test.go

@@ -1474,6 +1474,7 @@ func TestAccAlloydbCluster_withPrivateServiceConnect(t *testing.T) {
 				Config: testAccAlloydbCluster_withPrivateServiceConnect(context),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("google_alloydb_cluster.default", "psc_config.0.psc_enabled", "true"),
+					resource.TestMatchResourceAttr("google_alloydb_cluster.default", "psc_config.0.service_owned_project_number", regexp.MustCompile("^[1-9]\\d*$")),
 				),
 			},
 		},

website/docs/r/alloydb_cluster.html.markdown

@@ -523,6 +523,11 @@ Default value: "true"
   (Optional)
   Create an instance that allows connections from Private Service Connect endpoints to the instance.
 
+* `service_owned_project_number` -
+  (Output)
+  The project number that needs to be allowlisted on the network attachment to enable outbound connectivity, if the network attachment is configured to ACCEPT_MANUAL connections.
+  In case the network attachment is configured to ACCEPT_AUTOMATIC, this project number does not need to be allowlisted explicitly.
+
 <a name="nested_initial_user"></a>The `initial_user` block supports:
 
 * `user` -