Upgrade to 0.12

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

diff --git a/vendor/github.com/hashicorp/terraform/terraform/resource_provider.go b/vendor/github.com/hashicorp/terraform/terraform/resource_provider.go
index 93fd14fc803eb8ac83ef0506430eab0474a4db45..3455ad88c5aff90f267b60a192f3d0854860f208 100644 (file)
--- a/vendor/github.com/hashicorp/terraform/terraform/resource_provider.go
+++ b/vendor/github.com/hashicorp/terraform/terraform/resource_provider.go
@@ -3,8 +3,10 @@ package terraform
 import (
        "fmt"
 
-       multierror "github.com/hashicorp/go-multierror"
+       "github.com/hashicorp/terraform/tfdiags"
+
        "github.com/hashicorp/terraform/plugin/discovery"
+       "github.com/hashicorp/terraform/providers"
 )
 
 // ResourceProvider is an interface that must be implemented by any
@@ -30,13 +32,12 @@ type ResourceProvider interface {
        // resource or data source has the SchemaAvailable flag set.
        GetSchema(*ProviderSchemaRequest) (*ProviderSchema, error)
 
-       // Input is called to ask the provider to ask the user for input
-       // for completing the configuration if necesarry.
+       // Input was used prior to v0.12 to ask the provider to prompt the user
+       // for input to complete the configuration.
        //
-       // This may or may not be called, so resource provider writers shouldn't
-       // rely on this being available to set some default values for validate
-       // later. Example of a situation where this wouldn't be called is if
-       // the user is not using a TTY.
+       // From v0.12 onwards this method is never called because Terraform Core
+       // is able to handle the necessary input logic itself based on the
+       // schema returned from GetSchema.
        Input(UIInput, *ResourceConfig) (*ResourceConfig, error)
 
        // Validate is called once at the beginning with the raw configuration
@@ -170,18 +171,6 @@ type ResourceProvider interface {
        ReadDataApply(*InstanceInfo, *InstanceDiff) (*InstanceState, error)
 }
 
-// ResourceProviderError may be returned when creating a Context if the
-// required providers cannot be satisfied. This error can then be used to
-// format a more useful message for the user.
-type ResourceProviderError struct {
-       Errors []error
-}
-
-func (e *ResourceProviderError) Error() string {
-       // use multierror to format the default output
-       return multierror.Append(nil, e.Errors...).Error()
-}
-
 // ResourceProviderCloser is an interface that providers that can close
 // connections that aren't needed anymore must implement.
 type ResourceProviderCloser interface {
@@ -296,13 +285,35 @@ func ProviderHasDataSource(p ResourceProvider, n string) bool {
 // This should be called only with configurations that have passed calls
 // to config.Validate(), which ensures that all of the given version
 // constraints are valid. It will panic if any invalid constraints are present.
-func resourceProviderFactories(resolver ResourceProviderResolver, reqd discovery.PluginRequirements) (map[string]ResourceProviderFactory, error) {
+func resourceProviderFactories(resolver providers.Resolver, reqd discovery.PluginRequirements) (map[string]providers.Factory, tfdiags.Diagnostics) {
+       var diags tfdiags.Diagnostics
        ret, errs := resolver.ResolveProviders(reqd)
        if errs != nil {
-               return nil, &ResourceProviderError{
-                       Errors: errs,
+               diags = diags.Append(
+                       tfdiags.Sourceless(tfdiags.Error,
+                               "Could not satisfy plugin requirements",
+                               errPluginInit,
+                       ),
+               )
+
+               for _, err := range errs {
+                       diags = diags.Append(err)
                }
+
+               return nil, diags
        }
 
        return ret, nil
 }
+
+const errPluginInit = `
+Plugin reinitialization required. Please run "terraform init".
+
+Plugins are external binaries that Terraform uses to access and manipulate
+resources. The configuration provided requires plugins which can't be located,
+don't satisfy the version constraints, or are otherwise incompatible.
+
+Terraform automatically discovers provider requirements from your
+configuration, including providers used in child modules. To see the
+requirements and constraints from each module, run "terraform providers".
+`