diff options
| author |  ulfjack <ulfjack@google.com> | 2017-06-21 17:09:24 +0200 |
|---|---|---|
| committer |  Philipp Wollermann <philwo@google.com> | 2017-06-22 11:52:41 +0200 |
| commit | 524b90d9e5acc4fa568f215c9415eaa902e979f8 (patch) | |
| tree | 5c6d809368c2d87259969cef8d972afb63cae47c | |
| parent | 52c041762ce703a8bdb9b07e1d558b0d2460d2cc (diff) | |
Change CAS URI to use the "bytestream" scheme instead of being scheme-less
This makes the URIs absolute, which makes them easier to process server-side.
PiperOrigin-RevId: 159694335
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/remote/RemoteModule.java | 4 | ||||
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/remote/CasPathConverterTest.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/remote/RemoteModule.java b/src/main/java/com/google/devtools/build/lib/remote/RemoteModule.java index 8da0e9c477..d3fd125dfb 100644 --- a/src/main/java/com/google/devtools/build/lib/remote/RemoteModule.java +++ b/src/main/java/com/google/devtools/build/lib/remote/RemoteModule.java @@ -54,12 +54,12 @@ public final class RemoteModule extends BlazeModule { Digest digest = Digests.computeDigest(path); return remoteInstanceName.isEmpty() ? String.format( - "//%s/blobs/%s/%d", + "bytestream://%s/blobs/%s/%d", server, digest.getHash(), digest.getSizeBytes()) : String.format( - "//%s/%s/blobs/%s/%d", + "bytestream://%s/%s/blobs/%s/%d", server, remoteInstanceName, digest.getHash(), diff --git a/src/test/java/com/google/devtools/build/lib/remote/CasPathConverterTest.java b/src/test/java/com/google/devtools/build/lib/remote/CasPathConverterTest.java index e7b846fe70..5ba4ef0435 100644 --- a/src/test/java/com/google/devtools/build/lib/remote/CasPathConverterTest.java +++ b/src/test/java/com/google/devtools/build/lib/remote/CasPathConverterTest.java @@ -51,7 +51,7 @@ public class CasPathConverterTest { Path path = fs.getPath("/foo"); FileSystemUtils.writeContentAsLatin1(path, "foobar"); assertThat(converter.apply(fs.getPath("/foo"))) - .isEqualTo("//machine/blobs/3858f62230ac3c915f300c664312c63f/6"); + .isEqualTo("bytestream://machine/blobs/3858f62230ac3c915f300c664312c63f/6"); } @Test @@ -62,6 +62,6 @@ public class CasPathConverterTest { Path path = fs.getPath("/foo"); FileSystemUtils.writeContentAsLatin1(path, "foobar"); assertThat(converter.apply(fs.getPath("/foo"))) - .isEqualTo("//machine/projects/bazel/blobs/3858f62230ac3c915f300c664312c63f/6"); + .isEqualTo("bytestream://machine/projects/bazel/blobs/3858f62230ac3c915f300c664312c63f/6"); } } |