Merge pull request #859 from dhaynespls/dhaynes/858-off-by-one

Err check for importing aop resources now checks for three params rather than two
cloudflare · Nov 4, 2020 · 4766fe9 · 4766fe9
2 parents 8afde29 + 961b789
commit 4766fe9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cloudflare/resource_cloudflare_authenticated_origin_pulls.go b/cloudflare/resource_cloudflare_authenticated_origin_pulls.go
@@ -155,7 +155,7 @@ func resourceCloudflareAuthenticatedOriginPullsImport(d *schema.ResourceData, me
 	// split the id so we can lookup
 	idAttr := strings.SplitN(d.Id(), "/", 3)
 
-	if len(idAttr) != 2 {
+	if len(idAttr) != 3 {
 		return nil, fmt.Errorf("invalid id (\"%s\") specified, should be in format \"zoneID/certID/hostname\"", d.Id())
 	}
 	zoneID, certID, hostname := idAttr[0], idAttr[1], idAttr[2]

diff --git a/cloudflare/resource_cloudflare_authenticated_origin_pulls_certificate.go b/cloudflare/resource_cloudflare_authenticated_origin_pulls_certificate.go
@@ -202,7 +202,7 @@ func resourceCloudflareAuthenticatedOriginPullsCertificateImport(d *schema.Resou
 	// split the id so we can lookup
 	idAttr := strings.SplitN(d.Id(), "/", 3)
 
-	if len(idAttr) != 2 {
+	if len(idAttr) != 3 {
 		return nil, fmt.Errorf("invalid id (\"%s\") specified, should be in format \"zoneID/type/certID\"", d.Id())
 	}
 	zoneID, aopType, certID := idAttr[0], idAttr[1], idAttr[2]