aboutsummaryrefslogtreecommitdiffhomepage
path: root/vendor/github.com/hashicorp/terraform/configs/configload
diff options
context:
space:
mode:
Diffstat (limited to 'vendor/github.com/hashicorp/terraform/configs/configload')
-rw-r--r--vendor/github.com/hashicorp/terraform/configs/configload/getter.go2
-rw-r--r--vendor/github.com/hashicorp/terraform/configs/configload/loader_load.go10
2 files changed, 11 insertions, 1 deletions
diff --git a/vendor/github.com/hashicorp/terraform/configs/configload/getter.go b/vendor/github.com/hashicorp/terraform/configs/configload/getter.go
index 4a3dace..75c7ef1 100644
--- a/vendor/github.com/hashicorp/terraform/configs/configload/getter.go
+++ b/vendor/github.com/hashicorp/terraform/configs/configload/getter.go
@@ -20,6 +20,7 @@ import (
20var goGetterDetectors = []getter.Detector{ 20var goGetterDetectors = []getter.Detector{
21 new(getter.GitHubDetector), 21 new(getter.GitHubDetector),
22 new(getter.BitBucketDetector), 22 new(getter.BitBucketDetector),
23 new(getter.GCSDetector),
23 new(getter.S3Detector), 24 new(getter.S3Detector),
24 new(getter.FileDetector), 25 new(getter.FileDetector),
25} 26}
@@ -44,6 +45,7 @@ var goGetterDecompressors = map[string]getter.Decompressor{
44 45
45var goGetterGetters = map[string]getter.Getter{ 46var goGetterGetters = map[string]getter.Getter{
46 "file": new(getter.FileGetter), 47 "file": new(getter.FileGetter),
48 "gcs": new(getter.GCSGetter),
47 "git": new(getter.GitGetter), 49 "git": new(getter.GitGetter),
48 "hg": new(getter.HgGetter), 50 "hg": new(getter.HgGetter),
49 "s3": new(getter.S3Getter), 51 "s3": new(getter.S3Getter),
diff --git a/vendor/github.com/hashicorp/terraform/configs/configload/loader_load.go b/vendor/github.com/hashicorp/terraform/configs/configload/loader_load.go
index 93a9420..0e6cba9 100644
--- a/vendor/github.com/hashicorp/terraform/configs/configload/loader_load.go
+++ b/vendor/github.com/hashicorp/terraform/configs/configload/loader_load.go
@@ -64,7 +64,15 @@ func (l *Loader) moduleWalkerLoad(req *configs.ModuleRequest) (*configs.Module,
64 Subject: &req.SourceAddrRange, 64 Subject: &req.SourceAddrRange,
65 }) 65 })
66 } 66 }
67 if !req.VersionConstraint.Required.Check(record.Version) { 67 if len(req.VersionConstraint.Required) > 0 && record.Version == nil {
68 diags = append(diags, &hcl.Diagnostic{
69 Severity: hcl.DiagError,
70 Summary: "Module version requirements have changed",
71 Detail: "The version requirements have changed since this module was installed and the installed version is no longer acceptable. Run \"terraform init\" to install all modules required by this configuration.",
72 Subject: &req.SourceAddrRange,
73 })
74 }
75 if record.Version != nil && !req.VersionConstraint.Required.Check(record.Version) {
68 diags = append(diags, &hcl.Diagnostic{ 76 diags = append(diags, &hcl.Diagnostic{
69 Severity: hcl.DiagError, 77 Severity: hcl.DiagError,
70 Summary: "Module version requirements have changed", 78 Summary: "Module version requirements have changed",