Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

POD-768 | Update devcontainer helper funcs #1226

Merged
merged 1 commit into from
Aug 20, 2024
Merged

POD-768 | Update devcontainer helper funcs #1226

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions pkg/devcontainer/helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,21 @@ type GetWorkspaceConfigResult struct {
}

func FindDevcontainerFiles(ctx context.Context, rawSource, tmpDirPath string, maxDepth int, log log.Logger) (*GetWorkspaceConfigResult, error) {
result := &GetWorkspaceConfigResult{ConfigPaths: []string{}}

// local path
isLocalPath, _ := file.IsLocalDir(rawSource)
if isLocalPath {
return FindFilesInLocalDir(result, rawSource, maxDepth, log)
return FindFilesInLocalDir(rawSource, maxDepth, log)
}

// git repo
gitRepository, gitPRReference, gitBranch, gitCommit, gitSubDir := git.NormalizeRepository(rawSource)
if strings.HasSuffix(rawSource, ".git") || git.PingRepository(gitRepository) {
log.Debug("Git repository detected")
return FindFilesInGitRepo(ctx, result, gitRepository, gitPRReference, gitBranch, gitCommit, gitSubDir, tmpDirPath, maxDepth, log)
return FindFilesInGitRepo(ctx, gitRepository, gitPRReference, gitBranch, gitCommit, gitSubDir, tmpDirPath, maxDepth, log)
}

result := &GetWorkspaceConfigResult{ConfigPaths: []string{}}

// container image
_, err := image.GetImage(ctx, rawSource)
if err == nil {
Expand All @@ -50,8 +50,9 @@ func FindDevcontainerFiles(ctx context.Context, rawSource, tmpDirPath string, ma
return result, nil
}

func FindFilesInLocalDir(result *GetWorkspaceConfigResult, rawSource string, maxDepth int, log log.Logger) (*GetWorkspaceConfigResult, error) {
func FindFilesInLocalDir(rawSource string, maxDepth int, log log.Logger) (*GetWorkspaceConfigResult, error) {
log.Debug("Local directory detected")
result := &GetWorkspaceConfigResult{ConfigPaths: []string{}}
result.IsLocal = true
initialDepth := strings.Count(rawSource, string(filepath.Separator))
err := filepath.WalkDir(rawSource, func(path string, info fs.DirEntry, err error) error {
Expand Down Expand Up @@ -81,8 +82,11 @@ func FindFilesInLocalDir(result *GetWorkspaceConfigResult, rawSource string, max
return result, nil
}

func FindFilesInGitRepo(ctx context.Context, result *GetWorkspaceConfigResult, gitRepository, gitPRReference, gitBranch, gitCommit, gitSubDir, tmpDirPath string, maxDepth int, log log.Logger) (*GetWorkspaceConfigResult, error) {
result.IsGitRepository = true
func FindFilesInGitRepo(ctx context.Context, gitRepository, gitPRReference, gitBranch, gitCommit, gitSubDir, tmpDirPath string, maxDepth int, log log.Logger) (*GetWorkspaceConfigResult, error) {
result := &GetWorkspaceConfigResult{
ConfigPaths: []string{},
IsGitRepository: true,
}

gitInfo := git.NewGitInfo(gitRepository, gitBranch, gitCommit, gitPRReference, gitSubDir)
log.Debugf("Cloning git repository into %s", tmpDirPath)
Expand Down
Loading