From 2063df89202bcde4d4e94271c6c441f49bcefe54 Mon Sep 17 00:00:00 2001 From: Massaki Archambault Date: Mon, 28 Dec 2020 21:37:18 -0500 Subject: [PATCH] basic git clone implementation --- fs/filesystem.go | 9 ++-- fs/group.go | 13 +++-- fs/repository.go | 16 ++++-- fs/utils.go | 10 ---- git/client.go | 66 ++++++++++++++++++++++++ git/pullclone.go | 131 +++++++++++++++++++++++++++++++++++++++++++++++ gitlab/client.go | 38 ++++++++------ go.mod | 4 ++ go.sum | 77 ++++++++++++++++++++++++++++ main.go | 38 ++++++++------ 10 files changed, 349 insertions(+), 53 deletions(-) delete mode 100644 fs/utils.go create mode 100644 git/client.go create mode 100644 git/pullclone.go diff --git a/fs/filesystem.go b/fs/filesystem.go index cdf3570..81b16bb 100644 --- a/fs/filesystem.go +++ b/fs/filesystem.go @@ -3,23 +3,24 @@ package fs import ( "fmt" + "github.com/badjware/gitlabfs/git" "github.com/badjware/gitlabfs/gitlab" "github.com/hanwen/go-fuse/v2/fs" ) -func Start(gf gitlab.GroupFetcher, mountpoint string, rootGrouptID int) error { +func Start(gf gitlab.GroupFetcher, gp git.GitClonerPuller, mountpoint string, rootGrouptID int) error { fmt.Printf("Mounting in %v\n", mountpoint) opts := &fs.Options{} opts.Debug = true - root, err := newRootGroupNode(gf, rootGrouptID) + root, err := newRootGroupNode(gf, gp, rootGrouptID) if err != nil { - return fmt.Errorf("root group fetch fail: %w", err) + return fmt.Errorf("root group fetch fail: %v", err) } server, err := fs.Mount(mountpoint, root, opts) if err != nil { - return fmt.Errorf("mount failed: %w", err) + return fmt.Errorf("mount failed: %v", err) } server.Wait() diff --git a/fs/group.go b/fs/group.go index 6c1247b..2d48a33 100644 --- a/fs/group.go +++ b/fs/group.go @@ -4,6 +4,8 @@ import ( "context" "syscall" + "github.com/badjware/gitlabfs/git" + "github.com/badjware/gitlabfs/gitlab" "github.com/hanwen/go-fuse/v2/fs" "github.com/hanwen/go-fuse/v2/fuse" @@ -13,6 +15,7 @@ type groupNode struct { fs.Inode group *gitlab.Group gf gitlab.GroupFetcher + gcp git.GitClonerPuller } // Ensure we are implementing the NodeReaddirer interface @@ -21,7 +24,7 @@ var _ = (fs.NodeReaddirer)((*groupNode)(nil)) // Ensure we are implementing the NodeLookuper interface var _ = (fs.NodeLookuper)((*groupNode)(nil)) -func newRootGroupNode(gf gitlab.GroupFetcher, gid int) (*groupNode, error) { +func newRootGroupNode(gf gitlab.GroupFetcher, gcp git.GitClonerPuller, gid int) (*groupNode, error) { group, err := gf.FetchGroup(gid) if err != nil { return nil, err @@ -29,14 +32,16 @@ func newRootGroupNode(gf gitlab.GroupFetcher, gid int) (*groupNode, error) { node := &groupNode{ group: group, gf: gf, + gcp: gcp, } return node, nil } -func newGroupNode(gf gitlab.GroupFetcher, group *gitlab.Group) (*groupNode, error) { +func newGroupNode(gf gitlab.GroupFetcher, gcp git.GitClonerPuller, group *gitlab.Group) (*groupNode, error) { node := &groupNode{ group: group, gf: gf, + gcp: gcp, } return node, nil } @@ -71,7 +76,7 @@ func (n *groupNode) Lookup(ctx context.Context, name string, out *fuse.EntryOut) Ino: uint64(group.ID), Mode: fuse.S_IFDIR, } - groupNode, _ := newGroupNode(n.gf, group) + groupNode, _ := newGroupNode(n.gf, n.gcp, group) return n.NewInode(ctx, groupNode, attrs), 0 } @@ -82,7 +87,7 @@ func (n *groupNode) Lookup(ctx context.Context, name string, out *fuse.EntryOut) Ino: uint64(repository.ID), Mode: fuse.S_IFLNK, } - repositoryNode, _ := newRepositoryNode(repository) // TODO + repositoryNode, _ := newRepositoryNode(n.gcp, repository) return n.NewInode(ctx, repositoryNode, attrs), 0 } return nil, syscall.ENOENT diff --git a/fs/repository.go b/fs/repository.go index aeae69a..04581dc 100644 --- a/fs/repository.go +++ b/fs/repository.go @@ -2,9 +2,9 @@ package fs import ( "context" - "strconv" "syscall" + "github.com/badjware/gitlabfs/git" "github.com/badjware/gitlabfs/gitlab" "github.com/hanwen/go-fuse/v2/fs" ) @@ -12,19 +12,27 @@ import ( type RepositoryNode struct { fs.Inode repository *gitlab.Repository + + gcp git.GitClonerPuller } // Ensure we are implementing the NodeReaddirer interface var _ = (fs.NodeReadlinker)((*RepositoryNode)(nil)) -func newRepositoryNode(repository *gitlab.Repository) (*RepositoryNode, error) { +func newRepositoryNode(gcp git.GitClonerPuller, repository *gitlab.Repository) (*RepositoryNode, error) { + node := &RepositoryNode{ repository: repository, + gcp: gcp, } + // Passthrough the error if there is one, nothing to add here + // Errors on clone/pull are non-fatal return node, nil } func (n *RepositoryNode) Readlink(ctx context.Context) ([]byte, syscall.Errno) { - // TODO - return []byte(strconv.Itoa(n.repository.ID)), 0 + // Create the local copy of the repo + localRepoLoc, _ := n.gcp.CloneOrPull(n.repository.CloneURL, n.repository.ID, "master") + + return []byte(localRepoLoc), 0 } diff --git a/fs/utils.go b/fs/utils.go deleted file mode 100644 index eaafefc..0000000 --- a/fs/utils.go +++ /dev/null @@ -1,10 +0,0 @@ -package fs - -import ( - "path/filepath" - "strings" -) - -func stripSlash(fn string) string { - return strings.TrimRight(fn, string(filepath.Separator)) -} diff --git a/git/client.go b/git/client.go new file mode 100644 index 0000000..be1937e --- /dev/null +++ b/git/client.go @@ -0,0 +1,66 @@ +package git + +import ( + "errors" + "net/url" + "os" + "path/filepath" +) + +type GitClientParam struct { + CloneLocation string + RemoteName string + RemoteURL *url.URL + Fetch bool + Checkout bool + SingleBranch bool + PullDepth int + AutoClone bool + AutoPull bool + + ChanBuffSize int + ChanWorkerCount int +} + +type gitClient struct { + GitClientParam + clonePullChan chan *gitClonePullParam +} + +func NewClient(p GitClientParam) (*gitClient, error) { + // Some validations + if p.RemoteURL == nil { + return nil, errors.New("required param RemoteURL is nil") + } + + // Setup defaults + if p.CloneLocation == "" { + dataHome := os.Getenv("XDG_DATA_HOME") + if dataHome == "" { + dataHome = filepath.Join(os.Getenv("HOME"), ".local/share") + } + p.CloneLocation = filepath.Join(dataHome, "gitlabfs") + } + if p.RemoteName == "" { + p.RemoteName = "origin" + } + if p.ChanBuffSize == 0 { + p.ChanBuffSize = 500 + } + if p.ChanWorkerCount == 0 { + p.ChanWorkerCount = 5 + } + + // Create the client + c := &gitClient{ + GitClientParam: p, + clonePullChan: make(chan *gitClonePullParam, p.ChanBuffSize), + } + + // Start worker goroutines + for i := 0; i < p.ChanWorkerCount; i++ { + go c.clonePullWorker() + } + + return c, nil +} diff --git a/git/pullclone.go b/git/pullclone.go new file mode 100644 index 0000000..c76883d --- /dev/null +++ b/git/pullclone.go @@ -0,0 +1,131 @@ +package git + +import ( + "errors" + "fmt" + "os" + "path/filepath" + "strconv" + + "github.com/go-git/go-billy/v5/osfs" + "github.com/go-git/go-git/v5" + "github.com/go-git/go-git/v5/config" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/cache" + "github.com/go-git/go-git/v5/storage/filesystem" +) + +type GitClonerPuller interface { + CloneOrPull(url string, pid int, defaultBranch string) (localRepoLoc string, err error) +} + +type gitClonePullParam struct { + url string + defaultBranch string + dst string +} + +func (c *gitClient) getLocalRepoLoc(pid int) string { + return filepath.Join(c.CloneLocation, c.RemoteURL.Hostname(), strconv.Itoa(pid)) +} + +func (c *gitClient) CloneOrPull(url string, pid int, defaultBranch string) (localRepoLoc string, err error) { + localRepoLoc = c.getLocalRepoLoc(pid) + select { + case c.clonePullChan <- &gitClonePullParam{ + url: url, + defaultBranch: defaultBranch, + dst: localRepoLoc, + }: + default: + return localRepoLoc, errors.New("failed to clone/pull local repo") + } + return localRepoLoc, nil +} + +func (c *gitClient) clonePullWorker() { + fmt.Println("Started git cloner/puller worker routine") + + for gpp := range c.clonePullChan { + if _, err := os.Stat(gpp.dst); os.IsNotExist(err) { + if err := c.clone(gpp); err != nil { + fmt.Println(err) + } + } else if c.AutoPull { + if err := c.pull(gpp); err != nil { + fmt.Println(err) + } + } + } +} + +func (c *gitClient) clone(gpp *gitClonePullParam) error { + branchRef := plumbing.NewBranchReferenceName(gpp.defaultBranch) + + if c.AutoClone { + if c.Fetch { + // Clone the repo + // TODO: figure out why this operation is so memory intensive... + fmt.Printf("Cloning %v into %v\n", gpp.url, gpp.dst) + fs := osfs.New(gpp.dst) + storer := filesystem.NewStorage(fs, cache.NewObjectLRU(0)) + _, err := git.Clone(storer, fs, &git.CloneOptions{ + URL: gpp.url, + RemoteName: c.RemoteName, + ReferenceName: branchRef, + NoCheckout: !c.Checkout, + SingleBranch: c.SingleBranch, + Depth: c.PullDepth, + }) + if err != nil { + return fmt.Errorf("failed to clone git repo %v to %v: %v", gpp.url, gpp.dst, err) + } + } else { + // "Fake" cloning the repo by never actually talking to the git server + // This skip a fetch operation that we would do if we where to do a proper clone + // We can save a lot of time and network i/o doing it this way, at the cost of + // resulting in a very barebone local copy + fmt.Printf("Initializing %v into %v\n", gpp.url, gpp.dst) + r, err := git.PlainInit(gpp.dst, false) + if err != nil { + return fmt.Errorf("failed to clone git repo %v to %v: %v", gpp.url, gpp.dst, err) + } + + // Configure the remote + _, err = r.CreateRemote(&config.RemoteConfig{ + Name: c.RemoteName, + URLs: []string{gpp.url}, + }) + if err != nil { + return fmt.Errorf("failed to setup remote %v in git repo %v: %v", gpp.url, gpp.dst, err) + } + + // Configure a local branch to track the remote branch + err = r.CreateBranch(&config.Branch{ + Name: gpp.defaultBranch, + Remote: c.RemoteName, + Merge: plumbing.ReferenceName(fmt.Sprintf("refs/heads/%s", gpp.defaultBranch)), + }) + if err != nil { + return fmt.Errorf("failed to create branch %v of git repo %v: %v", gpp.defaultBranch, gpp.dst, err) + } + + // Checkout the default branch + w, err := r.Worktree() + if err != nil { + return fmt.Errorf("failed to retrieve worktree of git repo %v: %v", gpp.dst, err) + } + w.Checkout(&git.CheckoutOptions{ + Branch: branchRef, + }) + } + } + return nil +} + +func (c *gitClient) pull(gpp *gitClonePullParam) error { + // Check if the local repo is on default branch + // Check if the local repo is dirty + // Checkout the remote default branch + return nil +} diff --git a/gitlab/client.go b/gitlab/client.go index 6220254..93b19a3 100644 --- a/gitlab/client.go +++ b/gitlab/client.go @@ -30,21 +30,25 @@ type Repository struct { CloneURL string } -type GitlabClient struct { - Client *gitlab.Client +type GitlabClientParam struct { } -func NewClient(gitlabUrl string, gitlabToken string) (*GitlabClient, error) { +type gitlabClient struct { + GitlabClientParam + client *gitlab.Client +} + +func NewClient(gitlabUrl string, gitlabToken string, p GitlabClientParam) (*gitlabClient, error) { client, err := gitlab.NewClient( gitlabToken, gitlab.WithBaseURL(gitlabUrl), ) if err != nil { - return nil, fmt.Errorf("failed to create gitlab client: %w", err) + return nil, fmt.Errorf("failed to create gitlab client: %v", err) } - gitlabClient := &GitlabClient{ - Client: client, + gitlabClient := &gitlabClient{ + client: client, } return gitlabClient, nil } @@ -69,16 +73,16 @@ func NewGroupFromGitlabGroup(group *gitlab.Group) Group { } } -func (c GitlabClient) FetchGroup(gid int) (*Group, error) { - gitlabGroup, _, err := c.Client.Groups.GetGroup(gid) +func (c gitlabClient) FetchGroup(gid int) (*Group, error) { + gitlabGroup, _, err := c.client.Groups.GetGroup(gid) if err != nil { - return nil, fmt.Errorf("failed to fetch root group with id %v: %w\n", gid, err) + return nil, fmt.Errorf("failed to fetch group with id %v: %v\n", gid, err) } group := NewGroupFromGitlabGroup(gitlabGroup) return &group, nil } -func (c GitlabClient) FetchGroupContent(group *Group) (*GroupContent, error) { +func (c gitlabClient) FetchGroupContent(group *Group) (*GroupContent, error) { if group.Content != nil { return group.Content, nil } @@ -91,12 +95,13 @@ func (c GitlabClient) FetchGroupContent(group *Group) (*GroupContent, error) { // List subgroups in path ListGroupsOpt := &gitlab.ListSubgroupsOptions{ ListOptions: gitlab.ListOptions{ - Page: 1, + Page: 1, + PerPage: 1000, }} for { - gitlabGroups, response, err := c.Client.Groups.ListSubgroups(group.ID, ListGroupsOpt) + gitlabGroups, response, err := c.client.Groups.ListSubgroups(group.ID, ListGroupsOpt) if err != nil { - return nil, fmt.Errorf("failed to fetch groups in gitlab: %w", err) + return nil, fmt.Errorf("failed to fetch groups in gitlab: %v", err) } for _, gitlabGroup := range gitlabGroups { group := NewGroupFromGitlabGroup(gitlabGroup) @@ -112,12 +117,13 @@ func (c GitlabClient) FetchGroupContent(group *Group) (*GroupContent, error) { // List repositories in path listProjectOpt := &gitlab.ListGroupProjectsOptions{ ListOptions: gitlab.ListOptions{ - Page: 1, + Page: 1, + PerPage: 1000, }} for { - gitlabProjects, response, err := c.Client.Groups.ListGroupProjects(group.ID, listProjectOpt) + gitlabProjects, response, err := c.client.Groups.ListGroupProjects(group.ID, listProjectOpt) if err != nil { - return nil, fmt.Errorf("failed to fetch projects in gitlab: %w", err) + return nil, fmt.Errorf("failed to fetch projects in gitlab: %v", err) } for _, gitlabProject := range gitlabProjects { repository := NewRepositoryFromGitlabProject(gitlabProject) diff --git a/go.mod b/go.mod index 904bca7..c4d8ec1 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,11 @@ module github.com/badjware/gitlabfs go 1.15 require ( + github.com/go-git/go-billy/v5 v5.0.0 + github.com/go-git/go-git v4.7.0+incompatible + github.com/go-git/go-git/v5 v5.2.0 github.com/hanwen/go-fuse v1.0.0 github.com/hanwen/go-fuse/v2 v2.0.3 github.com/xanzy/go-gitlab v0.40.2 + gopkg.in/src-d/go-git.v4 v4.13.1 // indirect ) diff --git a/go.sum b/go.sum index db8975b..90c071a 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,26 @@ +github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs= +github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= +github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= +github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg= +github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= +github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= +github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= +github.com/go-git/gcfg v1.5.0 h1:Q5ViNfGF8zFgyJWPqYwA7qGFoMTEiBmdlkcfRmpIMa4= +github.com/go-git/gcfg v1.5.0/go.mod h1:5m20vg6GwYabIxaOonVkTdrILxQMpEShl1xiMF4ua+E= +github.com/go-git/go-billy/v5 v5.0.0 h1:7NQHvd9FVid8VL4qVUMm8XifBK+2xCoZ2lSk0agRrHM= +github.com/go-git/go-billy/v5 v5.0.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0= +github.com/go-git/go-git v1.0.0 h1:YcN9iDGDoXuIw0vHls6rINwV416HYa0EB2X+RBsyYp4= +github.com/go-git/go-git v4.7.0+incompatible h1:+W9rgGY4DOKKdX2x6HxSR7HNeTxqiKrOvKnuittYVdA= +github.com/go-git/go-git v4.7.0+incompatible/go.mod h1:6+421e08gnZWn30y26Vchf7efgYLe4dl5OQbBSUXShE= +github.com/go-git/go-git-fixtures/v4 v4.0.2-0.20200613231340-f56387b50c12/go.mod h1:m+ICp2rF3jDhFgEZ/8yziagdT1C+ZpZcrJjappBCDSw= +github.com/go-git/go-git/v5 v5.2.0 h1:YPBLG/3UK1we1ohRkncLjaXWLW+HKp5QNM/jTli2JgI= +github.com/go-git/go-git/v5 v5.2.0/go.mod h1:kh02eMX+wdqqxgNMEyq8YgwlIOsDOa9homkUq1PoTMs= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/hanwen/go-fuse v1.0.0 h1:GxS9Zrn6c35/BnfiVsZVWmsG803xwE7eVRDvcf/BEVc= @@ -12,24 +32,81 @@ github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtng github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= github.com/hashicorp/go-retryablehttp v0.6.4 h1:BbgctKO892xEyOXnGiaAwIoSq1QZ/SS4AhjoAh9DnfY= github.com/hashicorp/go-retryablehttp v0.6.4/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY= +github.com/imdario/mergo v0.3.9 h1:UauaLniWCFHWd+Jp9oCEkTBj8VO/9DKg3PV3VCNMDIg= +github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= +github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= +github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= +github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd h1:Coekwdh0v2wtGp9Gmz1Ze3eVRAWJMLokvN3QjdzCHLY= +github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k= +github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= +github.com/pelletier/go-buffruneio v0.2.0/go.mod h1:JkE26KsDizTr40EUHkXVtNPvgGtbSNq5BcowyYOWdKo= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= +github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= +github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= +github.com/src-d/gcfg v1.4.0 h1:xXbNR5AlLSA315x2UO+fTSSAXCDf+Ar38/6oyGbDKQ4= +github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/xanzy/go-gitlab v0.40.2 h1:XSMIrvcv+7/zK2NPX7Xsa8wC9Qb5vbLfeQ723v4S+qA= github.com/xanzy/go-gitlab v0.40.2/go.mod h1:sPLojNBn68fMUWSxIJtdVVIP8uSBYqesTfDUseX11Ug= +github.com/xanzy/ssh-agent v0.2.1 h1:TCbipTQL2JiiCprBWx9frJ2eJlCYT00NmctrHxVAr70= +github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4= +golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073 h1:xMPOj6Pz6UipU1wXLkrtqpHbR0AVFnyPEQq/wRWz9lM= +golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181108082009-03003ca0c849 h1:FSqE2GGG7wzsYUsWiQ8MZrvEd1EOyU3NCF0AW3Wtltg= golang.org/x/net v0.0.0-20181108082009-03003ca0c849/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200301022130-244492dfa37a h1:GuSPYbZzB5/dcLNCwLQLsg3obCJtX9IJhpXkvY7kzk0= +golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288 h1:JIqe8uIcRBHXDQVvZtHwp80ai3Lw3IJAeJEs55Dc1W0= golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522 h1:Ve1ORMCxvRmSXBwJK+t3Oy+V2vRW2OetUQBq4rJIkZE= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527 h1:uYVVQ9WP/Ds2ROhcaGPeIdVq0RIXVLwsHlnvJ+cT1So= +golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/time v0.0.0-20191024005414-555d28b269f0 h1:/5xXl8Y5W96D+TtHSlonuFqGHIWVuyCkGJLwGh9JJFs= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190729092621-ff9f1409240a/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI= google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/src-d/go-billy.v4 v4.3.2 h1:0SQA1pRztfTFx2miS8sA97XvooFeNOmvUenF4o0EcVg= +gopkg.in/src-d/go-billy.v4 v4.3.2/go.mod h1:nDjArDMp+XMs1aFAESLRjfGSgfvoYN0hDfzEk0GjC98= +gopkg.in/src-d/go-git-fixtures.v3 v3.5.0/go.mod h1:dLBcvytrw/TYZsNTWCnkNF2DSIlzWYqTe3rJR56Ac7g= +gopkg.in/src-d/go-git.v4 v4.13.1 h1:SRtFyV8Kxc0UP7aCHcijOMQGPxHSmMOPrzulQWolkYE= +gopkg.in/src-d/go-git.v4 v4.13.1/go.mod h1:nx5NYcxdKxq5fpltdHnPa2Exj4Sx0EclMWZQbYDu2z8= +gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= +gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/main.go b/main.go index 4a0a053..394df9f 100644 --- a/main.go +++ b/main.go @@ -3,9 +3,11 @@ package main import ( "flag" "fmt" + "net/url" "os" "github.com/badjware/gitlabfs/fs" + "github.com/badjware/gitlabfs/git" "github.com/badjware/gitlabfs/gitlab" ) @@ -20,22 +22,28 @@ func main() { os.Exit(2) } mountpoint := flag.Arg(0) + parsedGitlabURL, err := url.Parse(*gitlabURL) + if err != nil { + fmt.Printf("%v is not a valid url: %v\n", *gitlabURL, err) + os.Exit(1) + } - gitlabClient, _ := gitlab.NewClient(*gitlabURL, *gitlabToken) + // Create the gitlab client + gitlabClientParam := gitlab.GitlabClientParam{} + gitlabClient, _ := gitlab.NewClient(*gitlabURL, *gitlabToken, gitlabClientParam) - fs.Start(gitlabClient, mountpoint, *gitlabRootGroupID) + // Create the git client + gitClientParam := git.GitClientParam{ + RemoteURL: parsedGitlabURL, + AutoClone: true, + AutoPull: false, + Fetch: false, + Checkout: false, + SingleBranch: true, + PullDepth: 0, + } + gitClient, _ := git.NewClient(gitClientParam) - // content, err := gitlabClient.FetchGroupContent(&rootGroup) - // if err != nil { - // fmt.Println(err) - // } - - // fmt.Println("Projects") - // for _, r := range content.Repositories { - // fmt.Println(r.Name, r.Path, r.CloneURL) - // } - // fmt.Println("Groups") - // for _, g := range content.Groups { - // fmt.Println(g.Name, g.Path) - // } + // Start the filesystem + fs.Start(gitlabClient, gitClient, mountpoint, *gitlabRootGroupID) }