Merge pull request #970 from imjaroiswebdev/issue-967-unable-to-impor…

…t-serv-deps Address: Unable to import service dependencies
PagerDuty · Jan 15, 2025 · 7b25333 · 7b25333
2 parents 98dd5d5 + d7793c7
commit 7b25333
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/pagerdutyplugin/import_pagerduty_service_dependency_test.go b/pagerdutyplugin/import_pagerduty_service_dependency_test.go
@@ -2,6 +2,7 @@ package pagerduty
 
 import (
 	"fmt"
+	"regexp"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/acctest"
@@ -31,6 +32,13 @@ func TestAccPagerDutyServiceDependency_import(t *testing.T) {
 				ImportState:       true,
 				ImportStateVerify: true,
 			},
+
+			{
+				ResourceName:  "pagerduty_service_dependency.foo",
+				ImportStateId: "wrongFormatID",
+				ImportState:   true,
+				ExpectError:   regexp.MustCompile(`Expecting an importation ID formed as`),
+			},
 		},
 	})
 }

diff --git a/pagerdutyplugin/resource_pagerduty_service_dependency.go b/pagerdutyplugin/resource_pagerduty_service_dependency.go
@@ -334,6 +334,7 @@ func (r *resourceServiceDependency) ImportState(ctx context.Context, req resourc
 			"Error importing pagerduty_service_dependency",
 			"Expecting an importation ID formed as '<supporting_service_id>.<supporting_service_type>.<service_dependency_id>'",
 		)
+		return
 	}
 	supID, supRt, id := ids[0], ids[1], ids[2]
 	serviceDependency, err := r.requestGetServiceDependency(ctx, id, supID, supRt)