Merge branch 'master' into pr/datasource-dir

hairyhenderson · Apr 28, 2017 · a5764c0 · a5764c0
2 parents 5b8e400 + 5649b5b
commit a5764c0
Show file tree

Hide file tree

Showing 44 changed files with 1,396 additions and 537 deletions.
diff --git a/data.go b/data.go
@@ -254,7 +254,7 @@ func readFile(source *Source, args ...string) ([]byte, error) {
 		return nil, err
 	}
 
-	f, err := source.FS.OpenFile(source.URL.Path, os.O_RDWR, 0)
+	f, err := source.FS.OpenFile(source.URL.Path, os.O_RDONLY, 0)
 	if err != nil {
 		log.Fatalf("Can't open %s: %#v", source.URL.Path, err)
 		return nil, err

diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -1,7 +1,7 @@
 package: github.com/hairyhenderson/gomplate
 import:
 - package: github.com/aws/aws-sdk-go
-  version: ^1.6.21
+  version: ^1.8.17
   subpackages:
   - aws
   - aws/session

diff --git a/vendor/github.com/aws/aws-sdk-go/CHANGELOG.md b/vendor/github.com/aws/aws-sdk-go/CHANGELOG.md
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/credentials/stscreds/assume_role_provider.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/stscreds/assume_role_provider.go
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go b/vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/endpoints/endpoints.go b/vendor/github.com/aws/aws-sdk-go/aws/endpoints/endpoints.go