Skip to content

Commit fb8d050

Browse files
siddhartha97siddhartha97
committed
Added changes
Signed-off-by: Siddhartha Chowdhuri <[email protected]>
1 parent 64a6f14 commit fb8d050

File tree

15 files changed

+27
-27
lines changed

15 files changed

+27
-27
lines changed

‎cmd/thanos/downsample.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ func downsampleBucket(
162162
dir string,
163163
hashFunc metadata.HashFunc,
164164
) (rerr error) {
165-
if err := os.MkdirAll(dir, 0777); err != nil {
165+
if err := os.MkdirAll(dir, 0750); err != nil {
166166
return errors.Wrap(err, "create dir")
167167
}
168168

‎cmd/thanos/receive.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -652,7 +652,7 @@ func migrateLegacyStorage(logger log.Logger, dataDir, defaultTenantID string) er
652652
return errors.Wrapf(err, "read legacy data dir: %v", dataDir)
653653
}
654654

655-
if err := os.MkdirAll(defaultTenantDataDir, 0777); err != nil {
655+
if err := os.MkdirAll(defaultTenantDataDir, 0750); err != nil {
656656
return errors.Wrapf(err, "create default tenant data dir: %v", defaultTenantDataDir)
657657
}
658658

‎pkg/block/block.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ const (
4747
// have a hash calculated in the meta file and it matches with what is in the destination path then
4848
// we do not download it. We always re-download the meta file.
4949
func Download(ctx context.Context, logger log.Logger, bucket objstore.Bucket, id ulid.ULID, dst string) error {
50-
if err := os.MkdirAll(dst, 0777); err != nil {
50+
if err := os.MkdirAll(dst, 0750); err != nil {
5151
return errors.Wrap(err, "create dir")
5252
}
5353

‎pkg/block/indexheader/binary_reader.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ type FileWriter struct {
295295

296296
// TODO(bwplotka): Added size to method, upstream this.
297297
func NewFileWriter(name string, size int) (*FileWriter, error) {
298-
f, err := os.OpenFile(filepath.Clean(name), os.O_CREATE|os.O_RDWR, 0666)
298+
f, err := os.OpenFile(filepath.Clean(name), os.O_CREATE|os.O_RDWR, 0600)
299299
if err != nil {
300300
return nil, err
301301
}

‎pkg/block/writer.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ func NewDiskWriter(ctx context.Context, logger log.Logger, bDir string) (_ *Disk
7878
if err = os.RemoveAll(bTmp); err != nil {
7979
return nil, err
8080
}
81-
if err = os.MkdirAll(bTmp, 0777); err != nil {
81+
if err = os.MkdirAll(bTmp, 0750); err != nil {
8282
return nil, err
8383
}
8484

‎pkg/compact/compact.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,7 @@ func (cg *Group) Compact(ctx context.Context, dir string, planner Planner, comp
501501
}
502502
}()
503503

504-
if err := os.MkdirAll(subDir, 0777); err != nil {
504+
if err := os.MkdirAll(subDir, 0750); err != nil {
505505
return false, ulid.ULID{}, errors.Wrap(err, "create compaction group dir")
506506
}
507507

‎pkg/compact/downsample/downsample.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ func Downsample(
6666

6767
// Create block directory to populate with chunks, meta and index files into.
6868
blockDir := filepath.Join(dir, uid.String())
69-
if err := os.MkdirAll(blockDir, 0777); err != nil {
69+
if err := os.MkdirAll(blockDir, 0750); err != nil {
7070
return id, errors.Wrap(err, "mkdir block dir")
7171
}
7272

‎pkg/objstore/filesystem/filesystem.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ func (b *Bucket) GetRange(_ context.Context, name string, off, length int64) (io
145145
return nil, errors.Wrapf(err, "stat %s", file)
146146
}
147147

148-
f, err := os.OpenFile(filepath.Clean(file), os.O_RDONLY, 0666)
148+
f, err := os.OpenFile(filepath.Clean(file), os.O_RDONLY, 0600)
149149
if err != nil {
150150
return nil, err
151151
}

‎pkg/objstore/objstore.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ func DownloadFile(ctx context.Context, logger log.Logger, bkt BucketReader, src,
249249

250250
// DownloadDir downloads all object found in the directory into the local directory.
251251
func DownloadDir(ctx context.Context, logger log.Logger, bkt BucketReader, originalSrc, src, dst string, ignoredPaths ...string) error {
252-
if err := os.MkdirAll(dst, 0777); err != nil {
252+
if err := os.MkdirAll(dst, 0750); err != nil {
253253
return errors.Wrap(err, "create dir")
254254
}
255255

‎pkg/receive/multitsdb.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ func (t *tenant) set(storeTSDB *store.TSDBStore, tenantTSDB *tsdb.DB, ship *ship
117117
}
118118

119119
func (t *MultiTSDB) Open() error {
120-
if err := os.MkdirAll(t.dataDir, 0777); err != nil {
120+
if err := os.MkdirAll(t.dataDir, 0750); err != nil {
121121
return err
122122
}
123123

‎pkg/reloader/reloader.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ func (r *Reloader) apply(ctx context.Context) error {
290290
defer func() {
291291
_ = os.Remove(tmpFile)
292292
}()
293-
if err := ioutil.WriteFile(tmpFile, b, 0666); err != nil {
293+
if err := ioutil.WriteFile(tmpFile, b, 0600); err != nil {
294294
return errors.Wrap(err, "write file")
295295
}
296296
if err := os.Rename(tmpFile, r.cfgOutputFile); err != nil {

‎pkg/shipper/shipper.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ func (s *Shipper) upload(ctx context.Context, meta *metadata.Meta) error {
344344
if err := os.RemoveAll(updir); err != nil {
345345
return errors.Wrap(err, "clean upload directory")
346346
}
347-
if err := os.MkdirAll(updir, 0777); err != nil {
347+
if err := os.MkdirAll(updir, 0750); err != nil {
348348
return errors.Wrap(err, "create upload dir")
349349
}
350350
defer func() {
@@ -408,7 +408,7 @@ func (s *Shipper) blockMetasFromOldest() (metas []*metadata.Meta, _ error) {
408408
func hardlinkBlock(src, dst string) error {
409409
chunkDir := filepath.Join(dst, block.ChunksDirname)
410410

411-
if err := os.MkdirAll(chunkDir, 0777); err != nil {
411+
if err := os.MkdirAll(chunkDir, 0750); err != nil {
412412
return errors.Wrap(err, "create chunks dir")
413413
}
414414

‎pkg/store/bucket.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ func NewBucketStore(
411411
s.indexReaderPool = indexheader.NewReaderPool(s.logger, lazyIndexReaderEnabled, lazyIndexReaderIdleTimeout, extprom.WrapRegistererWithPrefix("thanos_bucket_store_", s.reg))
412412
s.metrics = newBucketStoreMetrics(s.reg) // TODO(metalmatze): Might be possible via Option too
413413

414-
if err := os.MkdirAll(dir, 0777); err != nil {
414+
if err := os.MkdirAll(dir, 0750); err != nil {
415415
return nil, errors.Wrap(err, "create dir")
416416
}
417417

‎scripts/copyright/copyright.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func applyLicenseToProtoAndGo() error {
5656
var bb bytes.Buffer
5757
_, _ = bb.Write(license)
5858
_, _ = bb.Write(b)
59-
if err = ioutil.WriteFile(path, bb.Bytes(), 0666); err != nil {
59+
if err = ioutil.WriteFile(path, bb.Bytes(), 0600); err != nil {
6060
return err
6161
}
6262
}

‎test/e2e/e2ethanos/services.go

+12-12
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@ func DefaultImage() string {
5858
func NewPrometheus(sharedDir string, name string, config, promImage string) (*e2e.HTTPService, string, error) {
5959
dir := filepath.Join(sharedDir, "data", "prometheus", name)
6060
container := filepath.Join(e2e.ContainerSharedDir, "data", "prometheus", name)
61-
if err := os.MkdirAll(dir, 0777); err != nil {
61+
if err := os.MkdirAll(dir, 0750); err != nil {
6262
return nil, "", errors.Wrap(err, "create prometheus dir")
6363
}
6464

65-
if err := ioutil.WriteFile(filepath.Join(dir, "prometheus.yml"), []byte(config), 0666); err != nil {
65+
if err := ioutil.WriteFile(filepath.Join(dir, "prometheus.yml"), []byte(config), 0600); err != nil {
6666
return nil, "", errors.Wrap(err, "creating prom config failed")
6767
}
6868

@@ -152,7 +152,7 @@ func NewQuerier(sharedDir, name string, storeAddresses, fileSDStoreAddresses, ru
152152
if len(fileSDStoreAddresses) > 0 {
153153
queryFileSDDir := filepath.Join(sharedDir, "data", "querier", name)
154154
container := filepath.Join(e2e.ContainerSharedDir, "data", "querier", name)
155-
if err := os.MkdirAll(queryFileSDDir, 0777); err != nil {
155+
if err := os.MkdirAll(queryFileSDDir, 0750); err != nil {
156156
return nil, errors.Wrap(err, "create query dir failed")
157157
}
158158

@@ -166,7 +166,7 @@ func NewQuerier(sharedDir, name string, storeAddresses, fileSDStoreAddresses, ru
166166
return nil, err
167167
}
168168

169-
if err := ioutil.WriteFile(queryFileSDDir+"/filesd.yaml", b, 0666); err != nil {
169+
if err := ioutil.WriteFile(queryFileSDDir+"/filesd.yaml", b, 0600); err != nil {
170170
return nil, errors.Wrap(err, "creating query SD config failed")
171171
}
172172

@@ -206,7 +206,7 @@ func NewReceiver(sharedDir string, networkName string, name string, replicationF
206206
dir := filepath.Join(sharedDir, "data", "receive", name)
207207
dataDir := filepath.Join(dir, "data")
208208
container := filepath.Join(e2e.ContainerSharedDir, "data", "receive", name)
209-
if err := os.MkdirAll(dataDir, 0777); err != nil {
209+
if err := os.MkdirAll(dataDir, 0750); err != nil {
210210
return nil, errors.Wrap(err, "create receive dir")
211211
}
212212
b, err := json.Marshal(hashring)
@@ -251,15 +251,15 @@ func NewReceiverWithConfigWatcher(sharedDir string, networkName string, name str
251251
dir := filepath.Join(sharedDir, "data", "receive", name)
252252
dataDir := filepath.Join(dir, "data")
253253
container := filepath.Join(e2e.ContainerSharedDir, "data", "receive", name)
254-
if err := os.MkdirAll(dataDir, 0777); err != nil {
254+
if err := os.MkdirAll(dataDir, 0750); err != nil {
255255
return nil, errors.Wrap(err, "create receive dir")
256256
}
257257
b, err := json.Marshal(hashring)
258258
if err != nil {
259259
return nil, errors.Wrapf(err, "generate hashring file: %v", hashring)
260260
}
261261

262-
if err := ioutil.WriteFile(filepath.Join(dir, "hashrings.json"), b, 0666); err != nil {
262+
if err := ioutil.WriteFile(filepath.Join(dir, "hashrings.json"), b, 0600); err != nil {
263263
return nil, errors.Wrap(err, "creating receive config")
264264
}
265265

@@ -295,7 +295,7 @@ func NewReceiverWithConfigWatcher(sharedDir string, networkName string, name str
295295
func NewRuler(sharedDir string, name string, ruleSubDir string, amCfg []alert.AlertmanagerConfig, queryCfg []query.Config) (*Service, error) {
296296
dir := filepath.Join(sharedDir, "data", "rule", name)
297297
container := filepath.Join(e2e.ContainerSharedDir, "data", "rule", name)
298-
if err := os.MkdirAll(dir, 0777); err != nil {
298+
if err := os.MkdirAll(dir, 0750); err != nil {
299299
return nil, errors.Wrap(err, "create rule dir")
300300
}
301301

@@ -343,7 +343,7 @@ func NewRuler(sharedDir string, name string, ruleSubDir string, amCfg []alert.Al
343343
func NewAlertmanager(sharedDir string, name string) (*e2e.HTTPService, error) {
344344
dir := filepath.Join(sharedDir, "data", "am", name)
345345
container := filepath.Join(e2e.ContainerSharedDir, "data", "am", name)
346-
if err := os.MkdirAll(dir, 0777); err != nil {
346+
if err := os.MkdirAll(dir, 0750); err != nil {
347347
return nil, errors.Wrap(err, "create am dir")
348348
}
349349
const config = `
@@ -355,7 +355,7 @@ route:
355355
receivers:
356356
- name: 'null'
357357
`
358-
if err := ioutil.WriteFile(filepath.Join(dir, "config.yaml"), []byte(config), 0666); err != nil {
358+
if err := ioutil.WriteFile(filepath.Join(dir, "config.yaml"), []byte(config), 0600); err != nil {
359359
return nil, errors.Wrap(err, "creating alertmanager config file failed")
360360
}
361361

@@ -382,7 +382,7 @@ receivers:
382382
func NewStoreGW(sharedDir string, name string, bucketConfig client.BucketConfig, relabelConfig ...relabel.Config) (*Service, error) {
383383
dir := filepath.Join(sharedDir, "data", "store", name)
384384
container := filepath.Join(e2e.ContainerSharedDir, "data", "store", name)
385-
if err := os.MkdirAll(dir, 0777); err != nil {
385+
if err := os.MkdirAll(dir, 0750); err != nil {
386386
return nil, errors.Wrap(err, "create store dir")
387387
}
388388

@@ -428,7 +428,7 @@ func NewCompactor(sharedDir string, name string, bucketConfig client.BucketConfi
428428
dir := filepath.Join(sharedDir, "data", "compact", name)
429429
container := filepath.Join(e2e.ContainerSharedDir, "data", "compact", name)
430430

431-
if err := os.MkdirAll(dir, 0777); err != nil {
431+
if err := os.MkdirAll(dir, 0750); err != nil {
432432
return nil, errors.Wrap(err, "create compact dir")
433433
}
434434

0 commit comments

Comments
 (0)