fix: Define values of altas_gcp_project_id and atlas_vpc_name in network peering by fetching associated container (#2315)

* fix: Define values of altas_gcp_project_id and atlas_vpc_name in network peering by fetching associated container

* add additional check in test add update documentation

* add changelog entry

* Update website/docs/r/network_peering.html.markdown

Co-authored-by: Leo Antoli <[email protected]>

* adjust changelog entry removing implementation detail

---------

Co-authored-by: Leo Antoli <[email protected]>

Author: AgustinBettati

.changelog/2315.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/mongodbatlas_network_peering: Fixes computed values of `altas_gcp_project_id` and `atlas_vpc_name` to provide GCP related values
+```

internal/service/networkpeering/data_source_network_peering.go

@@ -164,9 +164,14 @@ func dataSourceRead(ctx context.Context, d *schema.ResourceData, meta any) diag.
 }
 
 func readAtlasCidrBlock(ctx context.Context, conn admin.NetworkPeeringApi, projectID, containerID string) (string, error) {
-	container, _, err := conn.GetPeeringContainer(ctx, projectID, containerID).Execute()
+	container, err := getContainer(ctx, conn, projectID, containerID)
 	if err != nil {
 		return "", err
 	}
 	return container.GetAtlasCidrBlock(), nil
 }
+
+func getContainer(ctx context.Context, conn admin.NetworkPeeringApi, projectID, containerID string) (*admin.CloudProviderContainer, error) {
+	container, _, err := conn.GetPeeringContainer(ctx, projectID, containerID).Execute()
+	return container, err
+}

internal/service/networkpeering/resource_network_peering.go

@@ -273,6 +273,7 @@ func resourceRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Di
 	ids := conversion.DecodeStateID(d.Id())
 	projectID := ids["project_id"]
 	peerID := ids["peer_id"]
+	providerName := d.Get("provider_name").(string)
 
 	peer, resp, err := conn.NetworkPeeringApi.GetPeeringConnection(ctx, projectID, peerID).Execute()
 	if err != nil {
@@ -283,20 +284,25 @@ func resourceRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Di
 
 		return diag.FromErr(fmt.Errorf(errorPeersRead, peerID, err))
 	}
-	atlasCidrBlock, err := readAtlasCidrBlock(ctx, conn.NetworkPeeringApi, projectID, peer.GetContainerId())
+
+	container, err := getContainer(ctx, conn.NetworkPeeringApi, projectID, peer.GetContainerId())
 	if err != nil {
 		return diag.FromErr(err)
 	}
-	if err := d.Set("atlas_cidr_block", atlasCidrBlock); err != nil {
+
+	if err := d.Set("atlas_cidr_block", container.GetAtlasCidrBlock()); err != nil {
 		return diag.Errorf("error setting `atlas_cidr_block` for Network Peering Connection (%s): %s", peerID, err)
 	}
 
-	if err := d.Set("atlas_gcp_project_id", peer.GetGcpProjectId()); err != nil {
-		return diag.FromErr(fmt.Errorf("error setting `atlas_gcp_project_id` for Network Peering Connection (%s): %s", peerID, err))
-	}
+	// If provider name is GCP we need to get the parameters to configure the the reciprocal connection between Mongo and Google
+	if providerName == "GCP" {
+		if err := d.Set("atlas_gcp_project_id", container.GetGcpProjectId()); err != nil {
+			return diag.FromErr(fmt.Errorf("error setting `atlas_gcp_project_id` for Network Peering Connection (%s): %s", peerID, err))
+		}
 
-	if err := d.Set("atlas_vpc_name", peer.GetNetworkName()); err != nil {
-		return diag.FromErr(fmt.Errorf("error setting `atlas_vpc_name` for Network Peering Connection (%s): %s", peerID, err))
+		if err := d.Set("atlas_vpc_name", container.GetNetworkName()); err != nil {
+			return diag.FromErr(fmt.Errorf("error setting `atlas_vpc_name` for Network Peering Connection (%s): %s", peerID, err))
+		}
 	}
 
 	if err := d.Set("peer_id", peerID); err != nil {

internal/service/networkpeering/resource_network_peering_test.go

@@ -125,11 +125,14 @@ func TestAccNetworkRSNetworkPeering_basicGCP(t *testing.T) {
 					checkExists(resourceName),
 					resource.TestCheckResourceAttrSet(resourceName, "project_id"),
 					resource.TestCheckResourceAttrSet(resourceName, "container_id"),
-					resource.TestCheckResourceAttrSet(resourceName, "network_name"),
 
 					resource.TestCheckResourceAttr(resourceName, "provider_name", providerName),
 					resource.TestCheckResourceAttr(resourceName, "gcp_project_id", gcpProjectID),
 					resource.TestCheckResourceAttr(resourceName, "network_name", networkName),
+
+					// computed values that are obtain from associated container, checks for existing prefix convention to ensure they are gcp related values
+					resource.TestCheckResourceAttrWith(resourceName, "atlas_gcp_project_id", acc.MatchesExpression("p-.*")),
+					resource.TestCheckResourceAttrWith(resourceName, "atlas_vpc_name", acc.MatchesExpression("nt-.*")),
 				),
 			},
 			{

website/docs/r/network_peering.html.markdown

@@ -408,7 +408,8 @@ In addition to all arguments above, the following attributes are exported:
 * `gcp_project_id` - GCP project ID of the owner of the network peer.
 * `error_message` - When `"status" : "FAILED"`, Atlas provides a description of the error.
 * `network_name` - Name of the network peer to which Atlas connects.
-* `atlas_gcp_project_id` - The Atlas GCP Project ID for the GCP VPC used by your atlas cluster that it is need to set up the reciprocal connection.
+* `atlas_gcp_project_id` - The Atlas GCP Project ID for the GCP VPC used by your atlas cluster that is needed to set up the reciprocal connection.
+* `atlas_vpc_name` - Name of the GCP VPC used by your atlas cluster that is needed to set up the reciprocal connection.
 
 **AZURE ONLY:**
 
@@ -429,4 +430,4 @@ $ terraform import mongodbatlas_network_peering.my_peering 1112222b3bf99403840e8
 
 See detailed information for arguments and attributes: [MongoDB API Network Peering Connection](https://docs.atlas.mongodb.com/reference/api/vpc-create-peering-connection/)
 
--> **NOTE:** If you need to get an existing container ID see the [How-To Guide](https://registry.terraform.io/providers/mongodb/mongodbatlas/latest/docs/guides/howto-guide.html).
+-> **NOTE:** If you need to get an existing container ID see the [How-To Guide](https://registry.terraform.io/providers/mongodb/mongodbatlas/latest/docs/guides/howto-guide.html).