missing umask/mode and copy util calls

hashicorp · May 28, 2020 · 142d79c · 142d79c
1 parent 3c581d4
commit 142d79c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 31 deletions.
diff --git a/get_file_windows.go b/get_file_windows.go
@@ -112,19 +112,7 @@ func (g *FileGetter) GetFile(dst string, u *url.URL) error {
 	}
 
 	// Copy
-	srcF, err := os.Open(path)
-	if err != nil {
-		return err
-	}
-	defer srcF.Close()
-
-	dstF, err := os.Create(dst)
-	if err != nil {
-		return err
-	}
-	defer dstF.Close()
-
-	_, err = Copy(ctx, dstF, srcF)
+	_, err = copyFile(ctx, dst, path, 0666, g.client.umask())
 	return err
 }
 

diff --git a/get_gcs.go b/get_gcs.go
@@ -77,7 +77,7 @@ func (g *GCSGetter) Get(dst string, u *url.URL) error {
 	}
 
 	// Create all the parent directories
-	if err := os.MkdirAll(filepath.Dir(dst), 0755); err != nil {
+	if err := os.MkdirAll(filepath.Dir(dst), g.client.mode(0755)); err != nil {
 		return err
 	}
 
@@ -138,18 +138,11 @@ func (g *GCSGetter) getObject(ctx context.Context, client *storage.Client, dst,
 	defer rc.Close()
 
 	// Create all the parent directories
-	if err := os.MkdirAll(filepath.Dir(dst), 0755); err != nil {
+	if err := os.MkdirAll(filepath.Dir(dst), g.client.mode(0755)); err != nil {
 		return err
 	}
 
-	f, err := os.Create(dst)
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-
-	_, err = Copy(ctx, f, rc)
-	return err
+	return copyReader(dst, rc, 0666, g.client.umask())
 }
 
 func (g *GCSGetter) parseURL(u *url.URL) (bucket, path string, err error) {

diff --git a/get_s3.go b/get_s3.go
@@ -169,14 +169,7 @@ func (g *S3Getter) getObject(ctx context.Context, client *s3.S3, dst, bucket, ke
 		return err
 	}
 
-	f, err := os.Create(dst)
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-
-	_, err = Copy(ctx, f, resp.Body)
-	return err
+	return copyReader(dst, resp.Body, 0666, g.client.umask())
 }
 
 func (g *S3Getter) getAWSConfig(region string, url *url.URL, creds *credentials.Credentials) *aws.Config {