Upgrade to 0.12

[github/fretlink/terraform-provider-statuscake.git] / vendor / github.com / hashicorp / terraform / terraform / eval_import_state.go

diff --git a/vendor/github.com/hashicorp/terraform/terraform/eval_import_state.go b/vendor/github.com/hashicorp/terraform/terraform/eval_import_state.go
index 62cc581fadc296ad7b5f4472c441d2af1025b90d..a60f4a0a297490ef956770558cdae29f730a8ff6 100644 (file)
--- a/vendor/github.com/hashicorp/terraform/terraform/eval_import_state.go
+++ b/vendor/github.com/hashicorp/terraform/terraform/eval_import_state.go
@@ -2,47 +2,63 @@ package terraform
 
 import (
        "fmt"
+       "log"
+
+       "github.com/hashicorp/terraform/addrs"
+       "github.com/hashicorp/terraform/providers"
+       "github.com/hashicorp/terraform/states"
+       "github.com/hashicorp/terraform/tfdiags"
 )
 
 // EvalImportState is an EvalNode implementation that performs an
 // ImportState operation on a provider. This will return the imported
 // states but won't modify any actual state.
 type EvalImportState struct {
-       Provider *ResourceProvider
-       Info     *InstanceInfo
-       Id       string
-       Output   *[]*InstanceState
+       Addr     addrs.ResourceInstance
+       Provider *providers.Interface
+       ID       string
+       Output   *[]providers.ImportedResource
 }
 
 // TODO: test
 func (n *EvalImportState) Eval(ctx EvalContext) (interface{}, error) {
+       absAddr := n.Addr.Absolute(ctx.Path())
        provider := *n.Provider
+       var diags tfdiags.Diagnostics
 
        {
                // Call pre-import hook
                err := ctx.Hook(func(h Hook) (HookAction, error) {
-                       return h.PreImportState(n.Info, n.Id)
+                       return h.PreImportState(absAddr, n.ID)
                })
                if err != nil {
                        return nil, err
                }
        }
 
-       // Import!
-       state, err := provider.ImportState(n.Info, n.Id)
-       if err != nil {
-               return nil, fmt.Errorf(
-                       "import %s (id: %s): %s", n.Info.HumanId(), n.Id, err)
+       resp := provider.ImportResourceState(providers.ImportResourceStateRequest{
+               TypeName: n.Addr.Resource.Type,
+               ID:       n.ID,
+       })
+       diags = diags.Append(resp.Diagnostics)
+       if diags.HasErrors() {
+               return nil, diags.Err()
+       }
+
+       imported := resp.ImportedResources
+
+       for _, obj := range imported {
+               log.Printf("[TRACE] EvalImportState: import %s %q produced instance object of type %s", absAddr.String(), n.ID, obj.TypeName)
        }
 
        if n.Output != nil {
-               *n.Output = state
+               *n.Output = imported
        }
 
        {
                // Call post-import hook
                err := ctx.Hook(func(h Hook) (HookAction, error) {
-                       return h.PostImportState(n.Info, state)
+                       return h.PostImportState(absAddr, imported)
                })
                if err != nil {
                        return nil, err
@@ -55,22 +71,25 @@ func (n *EvalImportState) Eval(ctx EvalContext) (interface{}, error) {
 // EvalImportStateVerify verifies the state after ImportState and
 // after the refresh to make sure it is non-nil and valid.
 type EvalImportStateVerify struct {
-       Info  *InstanceInfo
-       Id    string
-       State **InstanceState
+       Addr  addrs.ResourceInstance
+       State **states.ResourceInstanceObject
 }
 
 // TODO: test
 func (n *EvalImportStateVerify) Eval(ctx EvalContext) (interface{}, error) {
+       var diags tfdiags.Diagnostics
+
        state := *n.State
-       if state.Empty() {
-               return nil, fmt.Errorf(
-                       "import %s (id: %s): Terraform detected a resource with this ID doesn't\n"+
-                               "exist. Please verify the ID is correct. You cannot import non-existent\n"+
-                               "resources using Terraform import.",
-                       n.Info.HumanId(),
-                       n.Id)
+       if state.Value.IsNull() {
+               diags = diags.Append(tfdiags.Sourceless(
+                       tfdiags.Error,
+                       "Cannot import non-existent remote object",
+                       fmt.Sprintf(
+                               "While attempting to import an existing object to %s, the provider detected that no object exists with the given id. Only pre-existing objects can be imported; check that the id is correct and that it is associated with the provider's configured region or endpoint, or use \"terraform apply\" to create a new remote object for this resource.",
+                               n.Addr.String(),
+                       ),
+               ))
        }
 
-       return nil, nil
+       return nil, diags.ErrWithWarnings()
 }