Support 0.13 provider identities

commands/completion_command.go

@@ -110,7 +110,7 @@ func (c *CompletionCommand) Run(args []string) int {
  return 1
  }
 
- w, err := rootmodule.NewRootModule(context.Background(), fh.Dir())
+ w, err := rootmodule.NewRootModule(context.Background(), fs, fh.Dir())
  if err != nil {
  c.Ui.Error(fmt.Sprintf("failed to load root module: %s", err.Error()))
  return 1

commands/inspect_module_command.go

@@ -14,6 +14,7 @@ import (
 
  "github.com/hashicorp/go-multierror"
  ictx "github.com/hashicorp/terraform-ls/internal/context"
+ "github.com/hashicorp/terraform-ls/internal/filesystem"
  "github.com/hashicorp/terraform-ls/internal/terraform/rootmodule"
  "github.com/hashicorp/terraform-ls/logging"
  "github.com/mitchellh/cli"
@@ -81,7 +82,9 @@ func (c *InspectModuleCommand) inspect(rootPath string) error {
  return fmt.Errorf("expected %s to be a directory", rootPath)
  }
 
- rmm := rootmodule.NewRootModuleManager()
+ fs := filesystem.NewFilesystem()
+
+ rmm := rootmodule.NewRootModuleManager(fs)
  rmm.SetLogger(c.logger)
  walker := rootmodule.NewWalker()
  walker.SetLogger(c.logger)

go.mod

@@ -10,6 +10,7 @@ require (
  github.com/hashicorp/go-multierror v1.1.0
  github.com/hashicorp/go-version v1.2.0
  github.com/hashicorp/hcl/v2 v2.5.2-0.20200528183353-fa7c453538de
+ github.com/hashicorp/terraform-config-inspect v0.0.0-20200806211835-c481b8bfa41e
  github.com/hashicorp/terraform-json v0.5.0
  github.com/hashicorp/terraform-svchost v0.0.0-20191119180714-d2e4933b9136
  github.com/mh-cbon/go-fmt-fail v0.0.0-20160815164508-67765b3fbcb5

go.sum

@@ -5,6 +5,8 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/agext/levenshtein v1.2.1 h1:QmvMAjj2aEICytGiWzmxoE0x2KZvE0fvmqMOfy2tjT8=
 github.com/agext/levenshtein v1.2.1/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
+github.com/agext/levenshtein v1.2.2 h1:0S/Yg6LYmFJ5stwQeRp6EeOcCbj7xiqQSdNelsXvaqE=
+github.com/agext/levenshtein v1.2.2/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
 github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3/go.mod h1:oL81AME2rN47vu18xqj1S1jPIPuN7afo62yKTNn3XMM=
 github.com/apparentlymart/go-textseg v1.0.0 h1:rRmlIsPEEhUTIKQb7T++Nz/A5Q6C9IuX2wFoYVvnCs0=
 github.com/apparentlymart/go-textseg v1.0.0/go.mod h1:z96Txxhf3xSFMPmb5X/1W05FF/Nj9VFpLOpjS5yuumk=
@@ -28,6 +30,8 @@ github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68=
 github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
 github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
@@ -40,8 +44,13 @@ github.com/hashicorp/go-multierror v1.1.0 h1:B9UzwGQJehnUY1yNrnwREHc3fGbC2xefo8g
 github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA=
 github.com/hashicorp/go-version v1.2.0 h1:3vNe/fWF5CBgRIguda1meWhsZHy3m8gCJ5wx+dIzX/E=
 github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
+github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f h1:UdxlrJz4JOnY8W+DbLISwf2B8WXEolNRA8BGCwI9jws=
+github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f/go.mod h1:oZtUIOe8dh44I2q6ScRibXws4Ajl+d+nod3AaR9vL5w=
+github.com/hashicorp/hcl/v2 v2.0.0/go.mod h1:oVVDG71tEinNGYCxinCYadcmKU9bglqW9pV3txagJ90=
 github.com/hashicorp/hcl/v2 v2.5.2-0.20200528183353-fa7c453538de h1:bCeWhTigOmP9am0cJA+5kaTtA2RFDmnWIRtBIxo+Ydg=
 github.com/hashicorp/hcl/v2 v2.5.2-0.20200528183353-fa7c453538de/go.mod h1:bQTN5mpo+jewjJgh8jr0JUguIi7qPHUF6yIfAEN3jqY=
+github.com/hashicorp/terraform-config-inspect v0.0.0-20200806211835-c481b8bfa41e h1:wIsEsIITggCC4FTO9PisDjy561UU7OPL6uTu7tnkHH8=
+github.com/hashicorp/terraform-config-inspect v0.0.0-20200806211835-c481b8bfa41e/go.mod h1:Z0Nnk4+3Cy89smEbrq+sl1bxc9198gIP4I7wcQF6Kqs=
 github.com/hashicorp/terraform-json v0.5.0 h1:7TV3/F3y7QVSuN4r9BEXqnWqrAyeOtON8f0wvREtyzs=
 github.com/hashicorp/terraform-json v0.5.0/go.mod h1:eAbqb4w0pSlRmdvl8fOyHAi/+8jnkVYN28gJkSJrLhU=
 github.com/hashicorp/terraform-svchost v0.0.0-20191119180714-d2e4933b9136 h1:81Dg7SK6Q5vzqFItO8e1iIF2Nj8bLXV23NXjEgbev/s=
@@ -54,6 +63,8 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348 h1:MtvEpTB6LX3vkb4ax0b5D2DHbNAUsen0Gx5wZoq3lV4=
 github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k=
+github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
+github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-isatty v0.0.3 h1:ns/ykhmWi7G9O+8a448SecJU3nSMBXJfqQkl0upE1jI=
@@ -66,6 +77,8 @@ github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 h1:DpOJ2HYzCv8LZP15IdmG+YdwD2luVPHITV96TkirNBM=
 github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
+github.com/mitchellh/go-wordwrap v1.0.0 h1:6GlHJ/LTGMrIJbwgdqdl2eEH8o+Exx/0m8ir9Gns0u4=
+github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
 github.com/mitchellh/mapstructure v1.3.2 h1:mRS76wmkOn3KkKAyXDu42V+6ebnXWIztFSYGN7GeoRg=
 github.com/mitchellh/mapstructure v1.3.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -81,9 +94,13 @@ github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAm
 github.com/spf13/afero v1.3.2 h1:GDarE4TJQI52kYSbSAmLiId1Elfj+xgSDqrUZxFhxlU=
 github.com/spf13/afero v1.3.2/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4=
 github.com/spf13/pflag v1.0.2/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
+github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
 github.com/zclconf/go-cty v1.1.0/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s=
@@ -121,5 +138,7 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

internal/filesystem/document.go

@@ -2,29 +2,19 @@ package filesystem
 
 import (
  "bytes"
- "io/ioutil"
  "path/filepath"
 
  "github.com/hashicorp/terraform-ls/internal/source"
  "github.com/spf13/afero"
 )
 
-type fileOpener interface {
- Open(name string) (afero.File, error)
-}
-
 type document struct {
  meta *documentMetadata
- fo fileOpener
+ fs afero.Fs
 }
 
 func (d *document) Text() ([]byte, error) {
- f, err := d.fo.Open(d.meta.dh.FullPath())
- if err != nil {
- return nil, err
- }
-
- return ioutil.ReadAll(f)
+ return afero.ReadFile(d.fs, d.meta.dh.FullPath())
 }
 
 func (d *document) FullPath() string {

internal/filesystem/document_test.go

@@ -10,7 +10,7 @@ import (
 
 func TestFile_ApplyChange_fullUpdate(t *testing.T) {
  fs := testDocumentStorage()
- dh := &testHandler{"file:///test.tf"}
+ dh := &testHandler{uri: "file:///test.tf"}
 
  err := fs.CreateAndOpenDocument(dh, []byte("hello world"))
  if err != nil {
@@ -171,7 +171,7 @@ func TestFile_ApplyChange_partialUpdate(t *testing.T) {
 
  for _, v := range testData {
  fs := testDocumentStorage()
- dh := &testHandler{"file:///test.tf"}
+ dh := &testHandler{uri: "file:///test.tf"}
 
  err := fs.CreateAndOpenDocument(dh, []byte(v.Content))
  if err != nil {
@@ -214,7 +214,7 @@ func testDocument(t *testing.T, dh DocumentHandler, meta *documentMetadata, b []
 
  return &document{
  meta: meta,
- fo: fs,
+ fs: fs,
  }
 }
 

internal/filesystem/filesystem.go

@@ -7,11 +7,13 @@ import (
  "os"
  "sync"
 
+ "github.com/hashicorp/terraform-config-inspect/tfconfig"
  "github.com/spf13/afero"
 )
 
 type fsystem struct {
  memFs afero.Fs
+ osFs afero.Fs
 
  docMeta map[string]*documentMetadata
  docMetaMu *sync.RWMutex
@@ -22,6 +24,7 @@ type fsystem struct {
 func NewFilesystem() *fsystem {
  return &fsystem{
  memFs: afero.NewMemMapFs(),
+ osFs: afero.NewReadOnlyFs(afero.NewOsFs()),
  docMeta: make(map[string]*documentMetadata, 0),
  docMetaMu: &sync.RWMutex{},
  logger: log.New(ioutil.Discard, "", 0),
@@ -173,6 +176,54 @@ func (fs *fsystem) GetDocument(dh DocumentHandler) (Document, error) {
 
  return &document{
  meta: dm,
- fo: fs.memFs,
+ fs: fs.memFs,
  }, nil
 }
+
+func (fs *fsystem) ReadFile(name string) ([]byte, error) {
+ b, err := afero.ReadFile(fs.memFs, name)
+ if err != nil && os.IsNotExist(err) {
+ return afero.ReadFile(fs.osFs, name)
+ }
+
+ return b, err
+}
+
+func (fs *fsystem) ReadDir(name string) ([]os.FileInfo, error) {
+ memList, err := afero.ReadDir(fs.memFs, name)
+ if err != nil {
+ return nil, err
+ }
+ osList, err := afero.ReadDir(fs.osFs, name)
+ if err != nil {
+ return nil, err
+ }
+
+ list := memList
+ for _, osFi := range osList {
+ if fileIsInList(list, osFi) {
+ continue
+ }
+ list = append(list, osFi)
+ }
+
+ return list, nil
+}
+
+func fileIsInList(list []os.FileInfo, file os.FileInfo) bool {
+ for _, fi := range list {
+ if fi.Name() == file.Name() {
+ return true
+ }
+ }
+ return false
+}
+
+func (fs *fsystem) Open(name string) (tfconfig.File, error) {
+ f, err := fs.memFs.Open(name)
+ if err != nil && os.IsNotExist(err) {
+ return fs.osFs.Open(name)
+ }
+
+ return f, err
+}