Merge "x/ref: Rename DownloadURL to DownloadUrl."
diff --git a/cmd/binary/impl.go b/cmd/binary/impl.go
index 259ccc4..d41a9dc 100644
--- a/cmd/binary/impl.go
+++ b/cmd/binary/impl.go
@@ -110,7 +110,7 @@
return cmd.UsageErrorf("rooturl: incorrect number of arguments, expected %d, got %d", expected, got)
}
von := args[0]
- url, _, err := binary.DownloadURL(gctx, von)
+ url, _, err := binary.DownloadUrl(gctx, von)
if err != nil {
return err
}
diff --git a/cmd/binary/impl_test.go b/cmd/binary/impl_test.go
index 43e4c42..62fbe40 100644
--- a/cmd/binary/impl_test.go
+++ b/cmd/binary/impl_test.go
@@ -50,8 +50,8 @@
return nil
}
-func (s *server) DownloadURL(ipc.ServerCall) (string, int64, error) {
- vlog.Infof("DownloadURL() was called. suffix=%v", s.suffix)
+func (s *server) DownloadUrl(ipc.ServerCall) (string, int64, error) {
+ vlog.Infof("DownloadUrl() was called. suffix=%v", s.suffix)
if s.suffix != "" {
return "", 0, fmt.Errorf("non-empty suffix: %v", s.suffix)
}
diff --git a/cmd/mgmt/device/impl/local_install.go b/cmd/mgmt/device/impl/local_install.go
index ceb2fc4..f9906e8 100644
--- a/cmd/mgmt/device/impl/local_install.go
+++ b/cmd/mgmt/device/impl/local_install.go
@@ -176,7 +176,7 @@
}
}
-func (binaryInvoker) DownloadURL(ipc.ServerCall) (string, int64, error) {
+func (binaryInvoker) DownloadUrl(ipc.ServerCall) (string, int64, error) {
return "", 0, errNotImplemented
}
diff --git a/services/mgmt/binary/impl/http.go b/services/mgmt/binary/impl/http.go
index 27e5745..d5136d0 100644
--- a/services/mgmt/binary/impl/http.go
+++ b/services/mgmt/binary/impl/http.go
@@ -22,7 +22,7 @@
state *state
}
-// TODO(caprita): Tie this in with DownloadURL, to control which binaries
+// TODO(caprita): Tie this in with DownloadUrl, to control which binaries
// are downloadable via url.
// Open implements http.FileSystem. It uses the multipart file implementation
diff --git a/services/mgmt/binary/impl/service.go b/services/mgmt/binary/impl/service.go
index 99b692e..84b898b 100644
--- a/services/mgmt/binary/impl/service.go
+++ b/services/mgmt/binary/impl/service.go
@@ -251,8 +251,8 @@
// TODO(jsimsa): Design and implement an access control mechanism for
// the URL-based downloads.
-func (i *binaryService) DownloadURL(ipc.ServerCall) (string, int64, error) {
- vlog.Infof("%v.DownloadURL()", i.suffix)
+func (i *binaryService) DownloadUrl(ipc.ServerCall) (string, int64, error) {
+ vlog.Infof("%v.DownloadUrl()", i.suffix)
return i.state.rootURL + "/" + i.suffix, 0, nil
}
diff --git a/services/mgmt/device/impl/mock_repo_test.go b/services/mgmt/device/impl/mock_repo_test.go
index 23ec322..0a2365c 100644
--- a/services/mgmt/device/impl/mock_repo_test.go
+++ b/services/mgmt/device/impl/mock_repo_test.go
@@ -145,8 +145,8 @@
}
}
-func (*brInvoker) DownloadURL(ipc.ServerCall) (string, int64, error) {
- vlog.VI(1).Infof("DownloadURL()")
+func (*brInvoker) DownloadUrl(ipc.ServerCall) (string, int64, error) {
+ vlog.VI(1).Infof("DownloadUrl()")
return "", 0, nil
}
diff --git a/services/mgmt/lib/binary/impl.go b/services/mgmt/lib/binary/impl.go
index 92c7460..afff282 100644
--- a/services/mgmt/lib/binary/impl.go
+++ b/services/mgmt/lib/binary/impl.go
@@ -198,12 +198,12 @@
return nil
}
-func DownloadURL(ctx *context.T, von string) (string, int64, error) {
+func DownloadUrl(ctx *context.T, von string) (string, int64, error) {
ctx, cancel := context.WithTimeout(ctx, time.Minute)
defer cancel()
- url, ttl, err := repository.BinaryClient(von).DownloadURL(ctx)
+ url, ttl, err := repository.BinaryClient(von).DownloadUrl(ctx)
if err != nil {
- vlog.Errorf("DownloadURL() failed: %v", err)
+ vlog.Errorf("DownloadUrl() failed: %v", err)
return "", 0, err
}
return url, ttl, nil
diff --git a/services/mgmt/lib/binary/impl_test.go b/services/mgmt/lib/binary/impl_test.go
index b62ce06..58f90c0 100644
--- a/services/mgmt/lib/binary/impl_test.go
+++ b/services/mgmt/lib/binary/impl_test.go
@@ -179,9 +179,9 @@
}
}
-// TestDownloadURL tests the binary repository client-side library
-// DownloadURL method.
-func TestDownloadURL(t *testing.T) {
+// TestDownloadUrl tests the binary repository client-side library
+// DownloadUrl method.
+func TestDownloadUrl(t *testing.T) {
ctx, shutdown := test.InitForTest()
defer shutdown()
@@ -189,9 +189,9 @@
von, cleanup := setupRepository(t, ctx)
defer cleanup()
- url, _, err := DownloadURL(ctx, von)
+ url, _, err := DownloadUrl(ctx, von)
if err != nil {
- t.Fatalf("DownloadURL(%v) failed: %v", von, err)
+ t.Fatalf("DownloadUrl(%v) failed: %v", von, err)
}
if got, want := url, "http://test-root-url/test"; got != want {
t.Fatalf("unexpect output: got %v, want %v", got, want)
