github/drone
5
0
Fork 0
mirror of https://github.com/harness/drone.git synced 2025-05-10 07:30:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix reposGraveyard dir path (#939)

Browse Source
This commit is contained in:
Atefeh Mohseni-Ejiyeh 2024-01-22 20:30:51 +00:00 committed by Harness
parent a4d47e12b2
commit bd495845ae
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git/merge.go
View File

@ -183,7 +183,7 @@ func (s *Service) Merge(ctx context.Context, params *MergeParams) (MergeOutput,
log.Debug().Msg("prepare sparse-checkout") log.Debug().Msg("prepare sparse-checkout")
infoPath := filepath.Join(tmpRepo.Path, ".git", "info") infoPath := filepath.Join(tmpRepo.Path, ".git", "info")
if err = os.MkdirAll(infoPath, 0o700); err != nil { if err = os.MkdirAll(infoPath, fileMode700); err != nil {
return MergeOutput{}, fmt.Errorf("unable to create .git/info in tmpRepo.Path: %w", err) return MergeOutput{}, fmt.Errorf("unable to create .git/info in tmpRepo.Path: %w", err)
} }

8
git/repo.go
View File

@ -45,6 +45,8 @@ const (
gitReferenceNamePrefixTag = "refs/tags/" gitReferenceNamePrefixTag = "refs/tags/"
gitHooksDir = "hooks" gitHooksDir = "hooks"
fileMode700 = 0o700
) )
var ( var (
@ -223,6 +225,12 @@ func (s *Service) DeleteRepositoryBestEffort(ctx context.Context, repoUID string
repoPath := getFullPathForRepo(s.reposRoot, repoUID) repoPath := getFullPathForRepo(s.reposRoot, repoUID)
tempPath := path.Join(s.reposGraveyard, repoUID) tempPath := path.Join(s.reposGraveyard, repoUID)
// delete should not fail if repoGraveyard dir does not exist
if _, err := os.Stat(s.reposGraveyard); os.IsNotExist(err) {
if errdir := os.MkdirAll(s.reposGraveyard, fileMode700); errdir != nil {
return fmt.Errorf("clean up dir '%s' doesn't exist and can't be created: %w", s.reposGraveyard, errdir)
}
}
// move current dir to a temp dir (prevent partial deletion) // move current dir to a temp dir (prevent partial deletion)
if err := os.Rename(repoPath, tempPath); err != nil { if err := os.Rename(repoPath, tempPath); err != nil {
return fmt.Errorf("couldn't move dir %s to %s : %w", repoPath, tempPath, err) return fmt.Errorf("couldn't move dir %s to %s : %w", repoPath, tempPath, err)

6
git/service.go
View File

@ -45,16 +45,16 @@ func New(
// Create repos folder // Create repos folder
reposRoot := filepath.Join(config.Root, repoSubdirName) reposRoot := filepath.Join(config.Root, repoSubdirName)
if _, err := os.Stat(reposRoot); errors.Is(err, os.ErrNotExist) { if _, err := os.Stat(reposRoot); errors.Is(err, os.ErrNotExist) {
if err = os.MkdirAll(reposRoot, 0o700); err != nil { if err = os.MkdirAll(reposRoot, fileMode700); err != nil {
return nil, err return nil, err
} }
} }
// create a temp dir for deleted repositories // create a temp dir for deleted repositories
// this dir should get cleaned up peridocally if it's not empty // this dir should get cleaned up peridocally if it's not empty
reposGraveyard := filepath.Join(reposRoot, ReposGraveyardSubdirName) reposGraveyard := filepath.Join(config.Root, ReposGraveyardSubdirName)
if _, errdir := os.Stat(reposGraveyard); os.IsNotExist(errdir) { if _, errdir := os.Stat(reposGraveyard); os.IsNotExist(errdir) {
if errdir = os.MkdirAll(reposGraveyard, 0o700); errdir != nil { if errdir = os.MkdirAll(reposGraveyard, fileMode700); errdir != nil {
return nil, errdir return nil, errdir
} }
} }