Fixing the site_v3 resource tests (#521)

Author: Pavel-Koev

incapsula/resource_site_v3.go

@@ -23,7 +23,7 @@ func resourceSiteV3() *schema.Resource {
 				log.Printf("[DEBUG] Starting to import site v3. Parameters: %s\n", d.Id())
 
 				if len(idSlice) != 2 || idSlice[0] == "" || idSlice[1] == "" {
-					return nil, fmt.Errorf("unexpected format of ID (%q), expected site_id or account_id/site_id", d.Id())
+					return nil, fmt.Errorf("unexpected format of ID (%q), expected account_id/site_id", d.Id())
 				}
 
 				err := d.Set("account_id", idSlice[0])
@@ -34,7 +34,7 @@ func resourceSiteV3() *schema.Resource {
 
 				_, err = strconv.Atoi(idSlice[1])
 				if err != nil {
-					return nil, fmt.Errorf("unexpected format of ID (%q), expected site_id or account_id/site_id", d.Id())
+					return nil, fmt.Errorf("unexpected format of ID (%q), expected account_id/site_id", d.Id())
 				}
 
 				d.SetId(idSlice[1])

incapsula/resource_site_v3_test.go

@@ -44,6 +44,7 @@ func TestIncapsulaSiteV3_Basic(t *testing.T) {
 				ResourceName:      siteV3ResourceName,
 				ImportState:       true,
 				ImportStateVerify: true,
+				ImportStateIdFunc: testSiteV3Importer,
 			},
 		},
 	})
@@ -90,3 +91,16 @@ func testCheckIncapsulaSiteV3ConfigBasic(name string, siteType string) string {
 		siteType,
 	)
 }
+
+func testSiteV3Importer(s *terraform.State) (string, error) {
+	for _, rs := range s.RootModule().Resources {
+
+		accountId1, err := strconv.Atoi(rs.Primary.Attributes["account_id"])
+		if err != nil {
+			return "", fmt.Errorf("Error parsing API ID %v to int", rs.Primary.Attributes["id"])
+		}
+
+		return fmt.Sprintf("%d/%s", accountId1, rs.Primary.ID), nil
+	}
+	return "", fmt.Errorf("Error finding an Site V3")
+}