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

Fix GetFile support for GitHub getter #355

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix GetFile support for GitHub getter #355

Show file tree
Hide file tree
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
11 changes: 9 additions & 2 deletions get_git.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,15 @@ func (g *GitGetter) GetFile(dst string, u *url.URL) error {

// Get the filename, and strip the filename from the URL so we can
// just get the repository directly.
filename := filepath.Base(u.Path)
u.Path = filepath.Dir(u.Path)
var filename string
if u.Host == "github.com" {
tokens := strings.SplitN(u.Path[1:], "/", 3)
u.Path = "/" + tokens[0] + "/" + tokens[1]
filename = tokens[2]
} else {
filename = filepath.Base(u.Path)
u.Path = filepath.Dir(u.Path)
}

// Get the full repository
if err := g.Get(td, u); err != nil {
Expand Down
43 changes: 43 additions & 0 deletions get_git_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,6 +410,49 @@ func TestGitGetter_GetFile(t *testing.T) {
assertContents(t, dst, "hello")
}

func TestGitGetter_githubGetWithFileMode(t *testing.T) {
if !testHasGit {
t.Skip("git not found, skipping")
}

dst := tempTestFile(t)
defer os.RemoveAll(filepath.Dir(dst))

c := Client{
Src: "git::https://github.com/arikkfir/go-getter/testdata/basic/foo/main.tf?ref=master",
Dst: dst,
Mode: ClientModeFile,
}
if err := c.Get(); err != nil {
t.Fatalf("err: %s", err)
}

// Verify the main file exists
if _, err := os.Stat(dst); err != nil {
t.Fatalf("err: %s", err)
}
assertContents(t, dst, "# Hello\n")
}

func TestGitGetter_githubGetFile(t *testing.T) {
if !testHasGit {
t.Skip("git not found, skipping")
}

dst := tempTestFile(t)
defer os.RemoveAll(filepath.Dir(dst))

if err := GetFile(dst, "git::https://github.com/arikkfir/go-getter/testdata/basic/foo/main.tf?ref=master"); err != nil {
t.Fatalf("err: %s", err)
}

// Verify the main file exists
if _, err := os.Stat(dst); err != nil {
t.Fatalf("err: %s", err)
}
assertContents(t, dst, "# Hello\n")
}

func TestGitGetter_gitVersion(t *testing.T) {
if !testHasGit {
t.Skip("git not found, skipping")
Expand Down