1 files changed, 47 insertions, 4 deletions

diff --git a/vendor/github.com/hashicorp/terraform/terraform/plan.go b/vendor/github.com/hashicorp/terraform/terraform/plan.go
index ea08845..51d6652 100644
--- a/vendor/github.com/hashicorp/terraform/terraform/plan.go
+++ b/vendor/github.com/hashicorp/terraform/terraform/plan.go
@@ -6,6 +6,7 @@ import (
         "errors"
         "fmt"
         "io"
+        "log"
         "sync"
 
         "github.com/hashicorp/terraform/config/module"
@@ -31,6 +32,9 @@ type Plan struct {
         Vars    map[string]interface{}
         Targets []string
 
+        TerraformVersion string
+        ProviderSHA256s  map[string][]byte
+
         // Backend is the backend that this plan should use and store data with.
         Backend *BackendState
 
@@ -40,19 +44,58 @@ type Plan struct {
 // Context returns a Context with the data encapsulated in this plan.
 //
 // The following fields in opts are overridden by the plan: Config,
-// Diff, State, Variables.
+// Diff, Variables.
+//
+// If State is not provided, it is set from the plan. If it _is_ provided,
+// it must be Equal to the state stored in plan, but may have a newer
+// serial.
 func (p *Plan) Context(opts *ContextOpts) (*Context, error) {
+        var err error
+        opts, err = p.contextOpts(opts)
+        if err != nil {
+                return nil, err
+        }
+        return NewContext(opts)
+}
+
+// contextOpts mutates the given base ContextOpts in place to use input
+// objects obtained from the receiving plan.
+func (p *Plan) contextOpts(base *ContextOpts) (*ContextOpts, error) {
+        opts := base
+
         opts.Diff = p.Diff
         opts.Module = p.Module
-        opts.State = p.State
         opts.Targets = p.Targets
+        opts.ProviderSHA256s = p.ProviderSHA256s
+
+        if opts.State == nil {
+                opts.State = p.State
+        } else if !opts.State.Equal(p.State) {
+                // Even if we're overriding the state, it should be logically equal
+                // to what's in plan. The only valid change to have made by the time
+                // we get here is to have incremented the serial.
+                //
+                // Due to the fact that serialization may change the representation of
+                // the state, there is little chance that these aren't actually equal.
+                // Log the error condition for reference, but continue with the state
+                // we have.
+                log.Println("[WARNING] Plan state and ContextOpts state are not equal")
+        }
+
+        thisVersion := VersionString()
+        if p.TerraformVersion != "" && p.TerraformVersion != thisVersion {
+                return nil, fmt.Errorf(
+                        "plan was created with a different version of Terraform (created with %s, but running %s)",
+                        p.TerraformVersion, thisVersion,
+                )
+        }
 
         opts.Variables = make(map[string]interface{})
         for k, v := range p.Vars {
                 opts.Variables[k] = v
         }
 
-        return NewContext(opts)
+        return opts, nil
 }
 
 func (p *Plan) String() string {
@@ -86,7 +129,7 @@ func (p *Plan) init() {
 // the ability in the future to change the file format if we want for any
 // reason.
 const planFormatMagic = "tfplan"
-const planFormatVersion byte = 1
+const planFormatVersion byte = 2
 
 // ReadPlan reads a plan structure out of a reader in the format that
 // was written by WritePlan.