Skip to content

Add staged package hashes #38311

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

Merged
Abacn merged 6 commits into from
May 28, 2026
+7 −0
Merged

Add staged package hashes #38311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c31534e
Add staged package hashes
tarun-google Apr 28, 2026
57ab03f
Add package hashes
tarun-google Apr 29, 2026
11ee415
Merge branch 'master' of github.com:tarun-google/beam into add_packag…
tarun-google May 19, 2026
a35858e
Merge branch 'master' of github.com:tarun-google/beam into add_packag…
tarun-google May 26, 2026
a876a27
remove python changes
tarun-google May 28, 2026
aeeb335
remove space
tarun-google May 28, 2026
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
3 changes: 3 additions & 0 deletions ...-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/util/PackageUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,6 +438,7 @@ public static PackageAttributes forFileToStage(
.toString();
destination.setLocation(resourcePath);
destination.setName(dest);
destination.setSha256(hash);
return new AutoValue_PackageUtil_PackageAttributes(
file, null, destination, file.length(), hash);
}
Expand All @@ -456,6 +457,7 @@ public static PackageAttributes forBytesToStage(
DataflowPackage targetPackage = new DataflowPackage();
targetPackage.setName(target);
targetPackage.setLocation(resourcePath);
targetPackage.setSha256(hashCode.toString());

return new AutoValue_PackageUtil_PackageAttributes(
null, bytes, targetPackage, size, hashCode.toString());
Expand All @@ -465,6 +467,7 @@ public PackageAttributes withPackageName(String overridePackageName) {
DataflowPackage newDestination = new DataflowPackage();
newDestination.setName(overridePackageName);
newDestination.setLocation(getDestination().getLocation());
newDestination.setSha256(getHash());

return new AutoValue_PackageUtil_PackageAttributes(
getSource(), getBytes(), newDestination, getSize(), getHash());
Expand Down
4 changes: 4 additions & 0 deletions ...ud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/util/PackageUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,8 @@ public void testFileWithExtensionPackageNamingAndSize() throws Exception {
assertThat(target.getName(), endsWith(".txt"));
assertThat(target.getLocation(), equalTo(STAGING_PATH + target.getName()));
assertThat(attr.getSize(), equalTo((long) contents.length()));
String expectedHash = Files.asByteSource(tmpFile).hash(Hashing.sha256()).toString();
assertThat(target.getSha256(), equalTo(expectedHash));
}

@Test
Expand Down Expand Up @@ -299,6 +301,8 @@ public void testPackageUploadWithFileSucceeds() throws Exception {

assertThat(target.getName(), endsWith(".txt"));
assertThat(target.getLocation(), equalTo(STAGING_PATH + target.getName()));
String expectedHash = Files.asByteSource(tmpFile).hash(Hashing.sha256()).toString();
assertThat(target.getSha256(), equalTo(expectedHash));
assertThat(
new LineReader(Channels.newReader(pipe.source(), StandardCharsets.UTF_8.name())).readLine(),
equalTo(contents));
Expand Down
Loading