fix: handle incorrect ids when importing alert_configuration or project_ip_access_list resources (#1472)

* fix: error handling for alert_configuration import

* fix: an error condition reading project data source

* fix: error handling for project_ip_access_list import

* make tests more concise and clear following PR comments

Author: lantoli

mongodbatlas/fw_data_source_mongodbatlas_projects.go

@@ -160,6 +160,7 @@ func (d *ProjectsDS) Read(ctx context.Context, req datasource.ReadRequest, resp
 	err = populateProjectsDataSourceModel(ctx, conn, connV2, &stateModel, projectsRes)
 	if err != nil {
 		resp.Diagnostics.AddError("error in monogbatlas_projects data source", err.Error())
+		return
 	}
 
 	resp.Diagnostics.Append(resp.State.Set(ctx, &stateModel)...)

mongodbatlas/fw_resource_mongodbatlas_alert_configuration.go

@@ -534,7 +534,8 @@ func (r *AlertConfigurationRS) ImportState(ctx context.Context, req resource.Imp
 	parts := strings.SplitN(req.ID, "-", 2)
 
 	if len(parts) != 2 {
-		resp.Diagnostics.AddError("import format error: to import a cluster, use the format {project_id}-{id}", "")
+		resp.Diagnostics.AddError("import format error", "to import an alert configuration, use the format {project_id}-{alert_configuration_id}")
+		return
 	}
 
 	projectID := parts[0]

mongodbatlas/fw_resource_mongodbatlas_alert_configuration_test.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"os"
+	"regexp"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/acctest"
@@ -312,6 +313,31 @@ func TestAccConfigRSAlertConfiguration_importBasic(t *testing.T) {
 	})
 }
 
+func TestAccConfigRSAlertConfiguration_importIncorrectId(t *testing.T) {
+	var (
+		orgID        = os.Getenv("MONGODB_ATLAS_ORG_ID")
+		projectName  = acctest.RandomWithPrefix("test-acc")
+		resourceName = "mongodbatlas_alert_configuration.test"
+	)
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:                 func() { testAccPreCheckBasic(t) },
+		ProtoV6ProviderFactories: testAccProviderV6Factories,
+		CheckDestroy:             testAccCheckMongoDBAtlasAlertConfigurationDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccMongoDBAtlasAlertConfigurationConfig(orgID, projectName, true),
+			},
+			{
+				ResourceName:  resourceName,
+				ImportState:   true,
+				ImportStateId: "incorrect_id_without_project_id_and_dash",
+				ExpectError:   regexp.MustCompile("import format error"),
+			},
+		},
+	})
+}
+
 func TestAccConfigRSAlertConfiguration_importConfigNotifications(t *testing.T) {
 	var (
 		orgID        = os.Getenv("MONGODB_ATLAS_ORG_ID")

mongodbatlas/fw_resource_mongodbatlas_project_ip_access_list.go

@@ -354,6 +354,7 @@ func (r *ProjectIPAccessListRS) ImportState(ctx context.Context, req resource.Im
 
 	if len(parts) != 2 {
 		resp.Diagnostics.AddError("import format error", "to import a projectIP Access List, use the format {project_id}-{entry}")
+		return
 	}
 
 	projectID := parts[0]

mongodbatlas/fw_resource_mongodbatlas_project_ip_access_list_test.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"os"
+	"regexp"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/acctest"
@@ -220,6 +221,31 @@ func TestAccProjectRSProjectIPAccessList_importBasic(t *testing.T) {
 	})
 }
 
+func TestAccProjectRSProjectIPAccessList_importIncorrectId(t *testing.T) {
+	orgID := os.Getenv("MONGODB_ATLAS_ORG_ID")
+	projectName := acctest.RandomWithPrefix("test-acc")
+	ipAddress := fmt.Sprintf("179.154.226.%d", acctest.RandIntRange(0, 255))
+	comment := fmt.Sprintf("TestAcc for ipaddres (%s)", ipAddress)
+	resourceName := "mongodbatlas_project_ip_access_list.test"
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:                 func() { testAccPreCheckBasic(t) },
+		ProtoV6ProviderFactories: testAccProviderV6Factories,
+		CheckDestroy:             testAccCheckMongoDBAtlasProjectIPAccessListDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccMongoDBAtlasProjectIPAccessListConfigSettingIPAddress(orgID, projectName, ipAddress, comment),
+			},
+			{
+				ResourceName:  resourceName,
+				ImportState:   true,
+				ImportStateId: "incorrect_id_without_project_id_and_dash",
+				ExpectError:   regexp.MustCompile("import format error"),
+			},
+		},
+	})
+}
+
 func testAccCheckMongoDBAtlasProjectIPAccessListExists(resourceName string) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		conn := testMongoDBClient.(*MongoDBClient).Atlas