file mode change

viant · Jul 27, 2017 · 3d3bd7c · 3d3bd7c
1 parent f5cff8f
commit 3d3bd7c
Show file tree

Hide file tree

Showing 14 changed files with 16 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
diff --git a/storage/aws/config.go b/storage/aws/config.go
diff --git a/storage/aws/service.go b/storage/aws/service.go
@@ -134,7 +134,6 @@ func (s *service) Download(object storage.Object) (io.Reader, error) {
 	if err != nil {
 		return nil, err
 	}
-
 	config, err := s.getAwsConfig()
 	if err != nil {
 		return nil, err
@@ -204,3 +203,12 @@ func (s *service) Register(schema string, service storage.Service) error {
 func NewService(config *Config) storage.Service {
 	return &service{config: config}
 }
+
+//NewService creates a new aws storage service
+func NewServiceWithCredential(credentials string) (storage.Service, error) {
+	config, err := NewConfig("file://" + credentials)
+	if err != nil {
+		return nil, err
+	}
+	return NewService(config), nil
+}
diff --git a/storage/gs/object.go b/storage/gs/object.go
diff --git a/storage/gs/service.go b/storage/gs/service.go
@@ -120,13 +120,13 @@ func (s *service) Upload(URL string, reader io.Reader) error {
 		Object(name).
 		NewWriter(context.Background())
 
-	//expiry := parsedUrl.Query().Get("expiry")
-	//fmt.Printf("expiry :%v\n", expiry )
-	//if expiry != "" {
-	//	writer.Metadata = map[string]string{
-	//		"Cache-Control": "private, max-age=" + expiry,
-	//	}
-	//}
+
+	expiry := parsedUrl.Query().Get("expiry")
+	if expiry != "" {
+		writer.Metadata = map[string]string{
+			"Cache-Control": "private, max-age=" + expiry,
+		}
+	}
 
 	io.Copy(writer, reader)
 	return writer.Close()

diff --git a/storage/object.go b/storage/object.go
diff --git a/storage/service.go b/storage/service.go
diff --git a/storage/service_test.go b/storage/service_test.go
diff --git a/storage/test/dir/file.json b/storage/test/dir/file.json
diff --git a/storage/test/file1.txt b/storage/test/file1.txt
diff --git a/storage/test/file2.txt b/storage/test/file2.txt
diff --git a/test/config.json b/test/config.json
diff --git a/test/corrupted_config.json b/test/corrupted_config.json
diff --git a/writer_at_test.go b/writer_at_test.go