Merge pull request #27 from terraform-providers/go-modules-2019-02-22

[MODULES] Switch to Go Modules

1 files changed, 12 insertions, 3 deletions

diff --git a/vendor/github.com/hashicorp/terraform/helper/resource/testing_import_state.go b/vendor/github.com/hashicorp/terraform/helper/resource/testing_import_state.go
index 28ad105..94fef3c 100644
--- a/vendor/github.com/hashicorp/terraform/helper/resource/testing_import_state.go
+++ b/vendor/github.com/hashicorp/terraform/helper/resource/testing_import_state.go
@@ -16,15 +16,24 @@ func testStepImportState(
         state *terraform.State,
         step TestStep) (*terraform.State, error) {
         // Determine the ID to import
-        importId := step.ImportStateId
-        if importId == "" {
+        var importId string
+        switch {
+        case step.ImportStateIdFunc != nil:
+                var err error
+                importId, err = step.ImportStateIdFunc(state)
+                if err != nil {
+                        return state, err
+                }
+        case step.ImportStateId != "":
+                importId = step.ImportStateId
+        default:
                 resource, err := testResource(step, state)
                 if err != nil {
                         return state, err
                 }
-
                 importId = resource.Primary.ID
         }
+
         importPrefix := step.ImportStateIdPrefix
         if importPrefix != "" {
                 importId = fmt.Sprintf("%s%s", importPrefix, importId)