Add connectedDeploymentGroup and associations fields to intercept endpoint group. (#13373) (#9586)

modular-magician · web-flow · commit 802fa03a6b1f · 2025-03-19T13:38:52.000-07:00
[upstream:1c34755fab75d7d5d903e227101007b7e03d1567]

Signed-off-by: Modular Magician &lt;magic-modules@google.com&gt;
diff --git a/.changelog/13373.txt b/.changelog/13373.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+networksecurity: added `connectedDeploymentGroup` and `associations` fields to `google_network_security_intercept_endpoint_group` resource
+```
diff --git a/google-beta/services/networksecurity/resource_network_security_intercept_endpoint_group.go b/google-beta/services/networksecurity/resource_network_security_intercept_endpoint_group.go
@@ -93,6 +93,36 @@ Used as additional context for the endpoint group.`,
 Please refer to the field 'effective_labels' for all of the labels present on the resource.`,
 				Elem: &schema.Schema{Type: schema.TypeString},
 			},
+			"associations": {
+				Type:        schema.TypeSet,
+				Computed:    true,
+				Description: `List of associations to this endpoint group.`,
+				Elem:        networksecurityInterceptEndpointGroupAssociationsSchema(),
+				// Default schema.HashSchema is used.
+			},
+			"connected_deployment_group": {
+				Type:        schema.TypeList,
+				Computed:    true,
+				Description: `The endpoint group's view of a connected deployment group.`,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"locations": {
+							Type:        schema.TypeSet,
+							Computed:    true,
+							Description: `The list of locations where the deployment group is present.`,
+							Elem:        networksecurityInterceptEndpointGroupConnectedDeploymentGroupLocationsSchema(),
+							// Default schema.HashSchema is used.
+						},
+						"name": {
+							Type:     schema.TypeString,
+							Computed: true,
+							Description: `The connected deployment group's resource name, for example:
+'projects/123456789/locations/global/interceptDeploymentGroups/my-dg'.
+See https://google.aip.dev/124.`,
+						},
+					},
+				},
+			},
 			"create_time": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -158,6 +188,61 @@ See https://google.aip.dev/148#timestamps.`,
 	}
 }
 
+func networksecurityInterceptEndpointGroupAssociationsSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"name": {
+				Type:     schema.TypeString,
+				Computed: true,
+				Description: `The connected association's resource name, for example:
+'projects/123456789/locations/global/interceptEndpointGroupAssociations/my-ega'.
+See https://google.aip.dev/124.`,
+			},
+			"network": {
+				Type:     schema.TypeString,
+				Computed: true,
+				Description: `The associated network, for example:
+projects/123456789/global/networks/my-network.
+See https://google.aip.dev/124.`,
+			},
+			"state": {
+				Type:     schema.TypeString,
+				Computed: true,
+				Description: `Most recent known state of the association.
+Possible values:
+STATE_UNSPECIFIED
+ACTIVE
+CREATING
+DELETING
+CLOSED
+OUT_OF_SYNC
+DELETE_FAILED`,
+			},
+		},
+	}
+}
+
+func networksecurityInterceptEndpointGroupConnectedDeploymentGroupLocationsSchema() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"location": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: `The cloud location, e.g. 'us-central1-a' or 'asia-south1-b'.`,
+			},
+			"state": {
+				Type:     schema.TypeString,
+				Computed: true,
+				Description: `The current state of the association in this location.
+Possible values:
+STATE_UNSPECIFIED
+ACTIVE
+OUT_OF_SYNC`,
+			},
+		},
+	}
+}
+
 func resourceNetworkSecurityInterceptEndpointGroupCreate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*transport_tpg.Config)
 	userAgent, err := tpgresource.GenerateUserAgentString(d, config.UserAgent)
@@ -321,6 +406,12 @@ func resourceNetworkSecurityInterceptEndpointGroupRead(d *schema.ResourceData, m
 	if err := d.Set("description", flattenNetworkSecurityInterceptEndpointGroupDescription(res["description"], d, config)); err != nil {
 		return fmt.Errorf("Error reading InterceptEndpointGroup: %s", err)
 	}
+	if err := d.Set("associations", flattenNetworkSecurityInterceptEndpointGroupAssociations(res["associations"], d, config)); err != nil {
+		return fmt.Errorf("Error reading InterceptEndpointGroup: %s", err)
+	}
+	if err := d.Set("connected_deployment_group", flattenNetworkSecurityInterceptEndpointGroupConnectedDeploymentGroup(res["connectedDeploymentGroup"], d, config)); err != nil {
+		return fmt.Errorf("Error reading InterceptEndpointGroup: %s", err)
+	}
 	if err := d.Set("terraform_labels", flattenNetworkSecurityInterceptEndpointGroupTerraformLabels(res["labels"], d, config)); err != nil {
 		return fmt.Errorf("Error reading InterceptEndpointGroup: %s", err)
 	}
@@ -538,6 +629,84 @@ func flattenNetworkSecurityInterceptEndpointGroupDescription(v interface{}, d *s
 	return v
 }
 
+func flattenNetworkSecurityInterceptEndpointGroupAssociations(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	if v == nil {
+		return v
+	}
+	l := v.([]interface{})
+	transformed := schema.NewSet(schema.HashResource(networksecurityInterceptEndpointGroupAssociationsSchema()), []interface{}{})
+	for _, raw := range l {
+		original := raw.(map[string]interface{})
+		if len(original) < 1 {
+			// Do not include empty json objects coming back from the api
+			continue
+		}
+		transformed.Add(map[string]interface{}{
+			"name":    flattenNetworkSecurityInterceptEndpointGroupAssociationsName(original["name"], d, config),
+			"network": flattenNetworkSecurityInterceptEndpointGroupAssociationsNetwork(original["network"], d, config),
+			"state":   flattenNetworkSecurityInterceptEndpointGroupAssociationsState(original["state"], d, config),
+		})
+	}
+	return transformed
+}
+func flattenNetworkSecurityInterceptEndpointGroupAssociationsName(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
+func flattenNetworkSecurityInterceptEndpointGroupAssociationsNetwork(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
+func flattenNetworkSecurityInterceptEndpointGroupAssociationsState(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
+func flattenNetworkSecurityInterceptEndpointGroupConnectedDeploymentGroup(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	if v == nil {
+		return nil
+	}
+	original := v.(map[string]interface{})
+	if len(original) == 0 {
+		return nil
+	}
+	transformed := make(map[string]interface{})
+	transformed["name"] =
+		flattenNetworkSecurityInterceptEndpointGroupConnectedDeploymentGroupName(original["name"], d, config)
+	transformed["locations"] =
+		flattenNetworkSecurityInterceptEndpointGroupConnectedDeploymentGroupLocations(original["locations"], d, config)
+	return []interface{}{transformed}
+}
+func flattenNetworkSecurityInterceptEndpointGroupConnectedDeploymentGroupName(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
+func flattenNetworkSecurityInterceptEndpointGroupConnectedDeploymentGroupLocations(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	if v == nil {
+		return v
+	}
+	l := v.([]interface{})
+	transformed := schema.NewSet(schema.HashResource(networksecurityInterceptEndpointGroupConnectedDeploymentGroupLocationsSchema()), []interface{}{})
+	for _, raw := range l {
+		original := raw.(map[string]interface{})
+		if len(original) < 1 {
+			// Do not include empty json objects coming back from the api
+			continue
+		}
+		transformed.Add(map[string]interface{}{
+			"location": flattenNetworkSecurityInterceptEndpointGroupConnectedDeploymentGroupLocationsLocation(original["location"], d, config),
+			"state":    flattenNetworkSecurityInterceptEndpointGroupConnectedDeploymentGroupLocationsState(original["state"], d, config),
+		})
+	}
+	return transformed
+}
+func flattenNetworkSecurityInterceptEndpointGroupConnectedDeploymentGroupLocationsLocation(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
+func flattenNetworkSecurityInterceptEndpointGroupConnectedDeploymentGroupLocationsState(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
 func flattenNetworkSecurityInterceptEndpointGroupTerraformLabels(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
 	if v == nil {
 		return v
diff --git a/google-beta/services/networksecurity/resource_network_security_intercept_endpoint_group_generated_meta.yaml b/google-beta/services/networksecurity/resource_network_security_intercept_endpoint_group_generated_meta.yaml
@@ -5,6 +5,12 @@ api_service_name: 'networksecurity.googleapis.com'
 api_version: 'v1beta1'
 api_resource_type_kind: 'InterceptEndpointGroup'
 fields:
+  - field: 'associations.name'
+  - field: 'associations.network'
+  - field: 'associations.state'
+  - field: 'connected_deployment_group.locations.location'
+  - field: 'connected_deployment_group.locations.state'
+  - field: 'connected_deployment_group.name'
   - field: 'create_time'
   - field: 'description'
   - field: 'effective_labels'
diff --git a/website/docs/r/network_security_intercept_endpoint_group.html.markdown b/website/docs/r/network_security_intercept_endpoint_group.html.markdown
@@ -141,6 +141,14 @@ In addition to the arguments listed above, the following computed attributes are
   operation (e.g. adding a new association to the group).
   See https://google.aip.dev/128.
 
+* `associations` -
+  List of associations to this endpoint group.
+  Structure is [documented below](#nested_associations).
+
+* `connected_deployment_group` -
+  The endpoint group's view of a connected deployment group.
+  Structure is [documented below](#nested_connected_deployment_group).
+
 * `terraform_labels` -
   The combination of labels configured directly on the resource
    and default labels configured on the provider.
@@ -149,6 +157,60 @@ In addition to the arguments listed above, the following computed attributes are
   All of labels (key/value pairs) present on the resource in GCP, including the labels configured through Terraform, other clients and services.
 
 
+<a name="nested_associations"></a>The `associations` block contains:
+
+* `name` -
+  (Output)
+  The connected association's resource name, for example:
+  `projects/123456789/locations/global/interceptEndpointGroupAssociations/my-ega`.
+  See https://google.aip.dev/124.
+
+* `network` -
+  (Output)
+  The associated network, for example:
+  projects/123456789/global/networks/my-network.
+  See https://google.aip.dev/124.
+
+* `state` -
+  (Output)
+  Most recent known state of the association.
+  Possible values:
+  STATE_UNSPECIFIED
+  ACTIVE
+  CREATING
+  DELETING
+  CLOSED
+  OUT_OF_SYNC
+  DELETE_FAILED
+
+<a name="nested_connected_deployment_group"></a>The `connected_deployment_group` block contains:
+
+* `name` -
+  (Output)
+  The connected deployment group's resource name, for example:
+  `projects/123456789/locations/global/interceptDeploymentGroups/my-dg`.
+  See https://google.aip.dev/124.
+
+* `locations` -
+  (Output)
+  The list of locations where the deployment group is present.
+  Structure is [documented below](#nested_connected_deployment_group_locations).
+
+
+<a name="nested_connected_deployment_group_locations"></a>The `locations` block contains:
+
+* `location` -
+  (Output)
+  The cloud location, e.g. `us-central1-a` or `asia-south1-b`.
+
+* `state` -
+  (Output)
+  The current state of the association in this location.
+  Possible values:
+  STATE_UNSPECIFIED
+  ACTIVE
+  OUT_OF_SYNC
+
 ## Timeouts
 
 This resource provides the following

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+```release-note:enhancement
	`2`	+networksecurity: added `connectedDeploymentGroup` and `associations` fields to `google_network_security_intercept_endpoint_group` resource
	`3`	+```