add export psc support to Network Connectivity Center hub (#11241) (#18866)

[upstream:1250c4a58730915e62d391539e2e7e8b86bf09fa]

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

Author: modular-magician

.changelog/11241.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+networkconnectivity: added `export_psc` field to `google_network_connectivity_hub` resource
+```

google/services/networkconnectivity/resource_network_connectivity_hub.go

@@ -68,6 +68,12 @@ func ResourceNetworkConnectivityHub() *schema.Resource {
 				Optional:    true,
 				Description: `An optional description of the hub.`,
 			},
+			"export_psc": {
+				Type:        schema.TypeBool,
+				Computed:    true,
+				Optional:    true,
+				Description: `Whether Private Service Connect transitivity is enabled for the hub. If true, Private Service Connect endpoints in VPC spokes attached to the hub are made accessible to other VPC spokes attached to the hub. The default value is false.`,
+			},
 			"labels": {
 				Type:     schema.TypeMap,
 				Optional: true,
@@ -156,6 +162,12 @@ func resourceNetworkConnectivityHubCreate(d *schema.ResourceData, meta interface
 	} else if v, ok := d.GetOkExists("description"); !tpgresource.IsEmptyValue(reflect.ValueOf(descriptionProp)) && (ok || !reflect.DeepEqual(v, descriptionProp)) {
 		obj["description"] = descriptionProp
 	}
+	exportPscProp, err := expandNetworkConnectivityHubExportPsc(d.Get("export_psc"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("export_psc"); !tpgresource.IsEmptyValue(reflect.ValueOf(exportPscProp)) && (ok || !reflect.DeepEqual(v, exportPscProp)) {
+		obj["exportPsc"] = exportPscProp
+	}
 	labelsProp, err := expandNetworkConnectivityHubEffectiveLabels(d.Get("effective_labels"), d, config)
 	if err != nil {
 		return err
@@ -285,6 +297,9 @@ func resourceNetworkConnectivityHubRead(d *schema.ResourceData, meta interface{}
 	if err := d.Set("routing_vpcs", flattenNetworkConnectivityHubRoutingVpcs(res["routingVpcs"], d, config)); err != nil {
 		return fmt.Errorf("Error reading Hub: %s", err)
 	}
+	if err := d.Set("export_psc", flattenNetworkConnectivityHubExportPsc(res["exportPsc"], d, config)); err != nil {
+		return fmt.Errorf("Error reading Hub: %s", err)
+	}
 	if err := d.Set("terraform_labels", flattenNetworkConnectivityHubTerraformLabels(res["labels"], d, config)); err != nil {
 		return fmt.Errorf("Error reading Hub: %s", err)
 	}
@@ -317,6 +332,12 @@ func resourceNetworkConnectivityHubUpdate(d *schema.ResourceData, meta interface
 	} else if v, ok := d.GetOkExists("description"); !tpgresource.IsEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, descriptionProp)) {
 		obj["description"] = descriptionProp
 	}
+	exportPscProp, err := expandNetworkConnectivityHubExportPsc(d.Get("export_psc"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("export_psc"); !tpgresource.IsEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, exportPscProp)) {
+		obj["exportPsc"] = exportPscProp
+	}
 	labelsProp, err := expandNetworkConnectivityHubEffectiveLabels(d.Get("effective_labels"), d, config)
 	if err != nil {
 		return err
@@ -337,6 +358,10 @@ func resourceNetworkConnectivityHubUpdate(d *schema.ResourceData, meta interface
 		updateMask = append(updateMask, "description")
 	}
 
+	if d.HasChange("export_psc") {
+		updateMask = append(updateMask, "exportPsc")
+	}
+
 	if d.HasChange("effective_labels") {
 		updateMask = append(updateMask, "labels")
 	}
@@ -520,6 +545,10 @@ func flattenNetworkConnectivityHubRoutingVpcsUri(v interface{}, d *schema.Resour
 	return v
 }
 
+func flattenNetworkConnectivityHubExportPsc(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
 func flattenNetworkConnectivityHubTerraformLabels(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
 	if v == nil {
 		return v
@@ -547,6 +576,10 @@ func expandNetworkConnectivityHubDescription(v interface{}, d tpgresource.Terraf
 	return v, nil
 }
 
+func expandNetworkConnectivityHubExportPsc(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}
+
 func expandNetworkConnectivityHubEffectiveLabels(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (map[string]string, error) {
 	if v == nil {
 		return map[string]string{}, nil

google/services/networkconnectivity/resource_network_connectivity_hub_generated_test.go

@@ -67,6 +67,41 @@ resource "google_network_connectivity_hub" "primary"  {
 `, context)
 }
 
+func TestAccNetworkConnectivityHub_networkConnectivityHubWithExportPscExample(t *testing.T) {
+	t.Parallel()
+
+	context := map[string]interface{}{
+		"random_suffix": acctest.RandString(t, 10),
+	}
+
+	acctest.VcrTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		CheckDestroy:             testAccCheckNetworkConnectivityHubDestroyProducer(t),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccNetworkConnectivityHub_networkConnectivityHubWithExportPscExample(context),
+			},
+			{
+				ResourceName:            "google_network_connectivity_hub.primary",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"labels", "terraform_labels"},
+			},
+		},
+	})
+}
+
+func testAccNetworkConnectivityHub_networkConnectivityHubWithExportPscExample(context map[string]interface{}) string {
+	return acctest.Nprintf(`
+resource "google_network_connectivity_hub" "primary"  {
+ name        = "basic%{random_suffix}"
+ description = "A sample hub with Private Service Connect transitivity is enabled"
+ export_psc = true
+}
+`, context)
+}
+
 func testAccCheckNetworkConnectivityHubDestroyProducer(t *testing.T) func(s *terraform.State) error {
 	return func(s *terraform.State) error {
 		for name, rs := range s.RootModule().Resources {

google/services/networkconnectivity/resource_network_connectivity_hub_test.go

@@ -141,6 +141,7 @@ resource "google_network_connectivity_hub" "primary" {
   labels = {
     label-two = "value-one"
   }
+  export_psc = true
 }
 
 

website/docs/r/network_connectivity_hub.html.markdown

@@ -45,6 +45,21 @@ resource "google_network_connectivity_hub" "primary"  {
   }
 }
 ```
+<div class = "oics-button" style="float: right; margin: 0 0 -15px">
+  <a href="https://console.cloud.google.com/cloudshell/open?cloudshell_git_repo=https%3A%2F%2Fgithub.jpy.wang%2Fterraform-google-modules%2Fdocs-examples.git&cloudshell_image=gcr.io%2Fcloudshell-images%2Fcloudshell%3Alatest&cloudshell_print=.%2Fmotd&cloudshell_tutorial=.%2Ftutorial.md&cloudshell_working_dir=network_connectivity_hub_with_export_psc&open_in_editor=main.tf" target="_blank">
+    <img alt="Open in Cloud Shell" src="//gstatic.com/cloudssh/images/open-btn.svg" style="max-height: 44px; margin: 32px auto; max-width: 100%;">
+  </a>
+</div>
+## Example Usage - Network Connectivity Hub With Export Psc
+
+
+```hcl
+resource "google_network_connectivity_hub" "primary"  {
+ name        = "basic"
+ description = "A sample hub with Private Service Connect transitivity is enabled"
+ export_psc = true
+}
+```
 
 ## Argument Reference
 
@@ -69,6 +84,10 @@ The following arguments are supported:
   (Optional)
   An optional description of the hub.
 
+* `export_psc` -
+  (Optional)
+  Whether Private Service Connect transitivity is enabled for the hub. If true, Private Service Connect endpoints in VPC spokes attached to the hub are made accessible to other VPC spokes attached to the hub. The default value is false.
+
 * `project` - (Optional) The ID of the project in which the resource belongs.
     If it is not provided, the provider project is used.