projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
20602: Attach assigned priority to response log entry.
[arvados.git]
/
lib
/
crunchrun
/
git_mount.go
diff --git
a/lib/crunchrun/git_mount.go
b/lib/crunchrun/git_mount.go
index 92bb6d11d94a3f0ad49095db5d45692f0dc9f8b7..561ea18de402ef04f04545dd3b2f8cde855eeffc 100644
(file)
--- a/
lib/crunchrun/git_mount.go
+++ b/
lib/crunchrun/git_mount.go
@@
-48,25
+48,22
@@
func (gm gitMount) validate() error {
// ExtractTree extracts the specified tree into dir, which is an
// existing empty local directory.
// ExtractTree extracts the specified tree into dir, which is an
// existing empty local directory.
-func (gm gitMount) extractTree(ac
IArvados
Client, dir string, token string) error {
+func (gm gitMount) extractTree(ac
*arvados.
Client, dir string, token string) error {
err := gm.validate()
if err != nil {
return err
}
err := gm.validate()
if err != nil {
return err
}
-
baseURL, err := ac.Discovery("gitUrl"
)
+
dd, err := ac.DiscoveryDocument(
)
if err != nil {
if err != nil {
- return fmt.Errorf("discover gitUrl from API: %s", err)
- } else if _, ok := baseURL.(string); !ok {
- return fmt.Errorf("discover gitUrl from API: expected string, found %T", baseURL)
+ return fmt.Errorf("error getting discovery document: %w", err)
}
}
-
- u, err := url.Parse(baseURL.(string))
+ u, err := url.Parse(dd.GitURL)
if err != nil {
if err != nil {
- return fmt.Errorf("parse gitUrl %q: %s",
base
URL, err)
+ return fmt.Errorf("parse gitUrl %q: %s",
dd.Git
URL, err)
}
u, err = u.Parse("/" + gm.UUID + ".git")
if err != nil {
}
u, err = u.Parse("/" + gm.UUID + ".git")
if err != nil {
- return fmt.Errorf("build git url from %q, %q: %s",
base
URL, gm.UUID, err)
+ return fmt.Errorf("build git url from %q, %q: %s",
dd.Git
URL, gm.UUID, err)
}
store := memory.NewStorage()
repo, err := git.Init(store, osfs.New(dir))
}
store := memory.NewStorage()
repo, err := git.Init(store, osfs.New(dir))