Skip to content

Commit 142d79c

Browse files
langmartinshoenig
authored andcommitted
missing umask/mode and copy util calls
1 parent 3c581d4 commit 142d79c

File tree

3 files changed

+5
-31
lines changed

3 files changed

+5
-31
lines changed

get_file_windows.go

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -112,19 +112,7 @@ func (g *FileGetter) GetFile(dst string, u *url.URL) error {
112112
}
113113

114114
// Copy
115-
srcF, err := os.Open(path)
116-
if err != nil {
117-
return err
118-
}
119-
defer srcF.Close()
120-
121-
dstF, err := os.Create(dst)
122-
if err != nil {
123-
return err
124-
}
125-
defer dstF.Close()
126-
127-
_, err = Copy(ctx, dstF, srcF)
115+
_, err = copyFile(ctx, dst, path, 0666, g.client.umask())
128116
return err
129117
}
130118

get_gcs.go

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func (g *GCSGetter) Get(dst string, u *url.URL) error {
7777
}
7878

7979
// Create all the parent directories
80-
if err := os.MkdirAll(filepath.Dir(dst), 0755); err != nil {
80+
if err := os.MkdirAll(filepath.Dir(dst), g.client.mode(0755)); err != nil {
8181
return err
8282
}
8383

@@ -138,18 +138,11 @@ func (g *GCSGetter) getObject(ctx context.Context, client *storage.Client, dst,
138138
defer rc.Close()
139139

140140
// Create all the parent directories
141-
if err := os.MkdirAll(filepath.Dir(dst), 0755); err != nil {
141+
if err := os.MkdirAll(filepath.Dir(dst), g.client.mode(0755)); err != nil {
142142
return err
143143
}
144144

145-
f, err := os.Create(dst)
146-
if err != nil {
147-
return err
148-
}
149-
defer f.Close()
150-
151-
_, err = Copy(ctx, f, rc)
152-
return err
145+
return copyReader(dst, rc, 0666, g.client.umask())
153146
}
154147

155148
func (g *GCSGetter) parseURL(u *url.URL) (bucket, path string, err error) {

get_s3.go

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -169,14 +169,7 @@ func (g *S3Getter) getObject(ctx context.Context, client *s3.S3, dst, bucket, ke
169169
return err
170170
}
171171

172-
f, err := os.Create(dst)
173-
if err != nil {
174-
return err
175-
}
176-
defer f.Close()
177-
178-
_, err = Copy(ctx, f, resp.Body)
179-
return err
172+
return copyReader(dst, resp.Body, 0666, g.client.umask())
180173
}
181174

182175
func (g *S3Getter) getAWSConfig(region string, url *url.URL, creds *credentials.Credentials) *aws.Config {

0 commit comments

Comments
 (0)