Bump github.com/apache/beam/sdks/v2 from 2.49.0 to 2.50.0 (#905)

* Bump github.com/apache/beam/sdks/v2 from 2.49.0 to 2.50.0

Bumps [github.com/apache/beam/sdks/v2](https://github.com/apache/beam) from 2.49.0 to 2.50.0.
- [Release notes](https://github.com/apache/beam/releases)
- [Changelog](https://github.com/apache/beam/blob/master/CHANGES.md)
- [Commits](apache/beam@v2.49.0...v2.50.0)

---
updated-dependencies:
- dependency-name: github.com/apache/beam/sdks/v2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Fix up beam registrations

* mod tidy

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Al Cutter <al@google.com>

binary_transparency/firmware/internal/ftmap/aggregate.go

@@ -30,6 +30,8 @@ import (
 
 func init() {
  beam.RegisterFunction(aggregationFn)
+ beam.RegisterFunction(annotationLogIndexFn)
+ beam.RegisterFunction(logEntryIndexFn)
  beam.RegisterType(reflect.TypeOf((*api.AggregatedFirmware)(nil)).Elem())
  beam.RegisterType(reflect.TypeOf((*aggregatedFirmwareHashFn)(nil)).Elem())
 }
@@ -40,14 +42,18 @@ func init() {
 // - AnnotationMalware: `Good` is true providing there are no malware annotations that claim the
 // firmware is bad.
 func Aggregate(s beam.Scope, treeID int64, fws, annotationMalwares beam.PCollection) (beam.PCollection, beam.PCollection) {
- keyedFws := beam.ParDo(s, func(l *firmwareLogEntry) (uint64, *firmwareLogEntry) { return uint64(l.Index), l }, fws)
- keyedAnns := beam.ParDo(s, func(a *annotationMalwareLogEntry) (uint64, *annotationMalwareLogEntry) {
- return a.Annotation.FirmwareID.LogIndex, a
- }, annotationMalwares)
+ keyedFws := beam.ParDo(s, logEntryIndexFn, fws)
+ keyedAnns := beam.ParDo(s, annotationLogIndexFn, annotationMalwares)
  annotations := beam.ParDo(s, aggregationFn, beam.CoGroupByKey(s, keyedFws, keyedAnns))
  return beam.ParDo(s, &aggregatedFirmwareHashFn{treeID}, annotations), annotations
 }
 
+func logEntryIndexFn(l *firmwareLogEntry) (uint64, *firmwareLogEntry) { return uint64(l.Index), l }
+
+func annotationLogIndexFn(a *annotationMalwareLogEntry) (uint64, *annotationMalwareLogEntry) {
+ return a.Annotation.FirmwareID.LogIndex, a
+}
+
 func aggregationFn(fwIndex uint64, fwit func(**firmwareLogEntry) bool, amit func(**annotationMalwareLogEntry) bool) (*api.AggregatedFirmware, error) {
  // There will be exactly one firmware entry for the log index.
  var fwle *firmwareLogEntry

binary_transparency/firmware/internal/ftmap/aggregate_test.go

@@ -19,11 +19,20 @@ import (
  "testing"
 
  "github.com/apache/beam/sdks/v2/go/pkg/beam"
+ "github.com/apache/beam/sdks/v2/go/pkg/beam/register"
  "github.com/apache/beam/sdks/v2/go/pkg/beam/testing/passert"
  "github.com/apache/beam/sdks/v2/go/pkg/beam/testing/ptest"
  "github.com/google/trillian-examples/binary_transparency/firmware/api"
 )
 
+func init() {
+ register.Function1x1(testAggregationToStringFn)
+}
+
+func TestMain(m *testing.M) {
+ ptest.Main(m)
+}
+
 func TestAggregate(t *testing.T) {
  fwEntries := []*firmwareLogEntry{
  {Index: 0, Firmware: createFW("dummy", 400)},
@@ -104,8 +113,7 @@ func TestAggregate(t *testing.T) {
  passert.Count(s, entries, "entries", len(fwEntries))
  passert.Count(s, aggs, "aggs", len(fwEntries))
 
- aggregationToString := func(a *api.AggregatedFirmware) string { return fmt.Sprintf("%d: %t", a.Index, a.Good) }
- passert.Equals(s, beam.ParDo(s, aggregationToString, aggs), beam.CreateList(s, test.wantGood))
+ passert.Equals(s, beam.ParDo(s, testAggregationToStringFn, aggs), beam.CreateList(s, test.wantGood))
 
  err := ptest.Run(p)
  if err != nil {
@@ -114,3 +122,7 @@ func TestAggregate(t *testing.T) {
  })
  }
 }
+
+func testAggregationToStringFn(a *api.AggregatedFirmware) string {
+ return fmt.Sprintf("%d: %t", a.Index, a.Good)
+}

binary_transparency/firmware/internal/ftmap/log.go

@@ -32,6 +32,7 @@ import (
 )
 
 func init() {
+ beam.RegisterFunction(logEntryDeviceIDFn)
  beam.RegisterFunction(makeDeviceReleaseLogFn)
  beam.RegisterType(reflect.TypeOf((*moduleLogHashFn)(nil)).Elem())
  beam.RegisterType(reflect.TypeOf((*api.DeviceReleaseLog)(nil)).Elem())
@@ -44,11 +45,15 @@ func init() {
 // 1. the first is of type Entry; the key/value data to include in the map
 // 2. the second is of type DeviceReleaseLog.
 func MakeReleaseLogs(s beam.Scope, treeID int64, logEntries beam.PCollection) (beam.PCollection, beam.PCollection) {
- keyed := beam.ParDo(s, func(l *firmwareLogEntry) (string, *firmwareLogEntry) { return l.Firmware.DeviceID, l }, logEntries)
+ keyed := beam.ParDo(s, logEntryDeviceIDFn, logEntries)
  logs := beam.ParDo(s, makeDeviceReleaseLogFn, beam.GroupByKey(s, keyed))
  return beam.ParDo(s, &moduleLogHashFn{TreeID: treeID}, logs), logs
 }
 
+func logEntryDeviceIDFn(l *firmwareLogEntry) (string, *firmwareLogEntry) {
+ return l.Firmware.DeviceID, l
+}
+
 type moduleLogHashFn struct {
  TreeID int64
 

binary_transparency/firmware/internal/ftmap/pipeline_test.go

@@ -21,12 +21,18 @@ import (
  "testing"
 
  "github.com/apache/beam/sdks/v2/go/pkg/beam"
+ "github.com/apache/beam/sdks/v2/go/pkg/beam/register"
  "github.com/apache/beam/sdks/v2/go/pkg/beam/testing/passert"
  "github.com/apache/beam/sdks/v2/go/pkg/beam/testing/ptest"
  "github.com/google/trillian-examples/binary_transparency/firmware/api"
  "github.com/google/trillian/experimental/batchmap"
 )
 
+func init() {
+ register.Function1x1(testLogToStringFn)
+ register.Function1x1(testRootToStringFn)
+}
+
 func TestCreate(t *testing.T) {
  tests := []struct {
  name string
@@ -74,11 +80,9 @@ func TestCreate(t *testing.T) {
  t.Fatalf("failed to Create(): %v", err)
  }
 
- rootToString := func(t *batchmap.Tile) string { return fmt.Sprintf("%x", t.RootHash) }
- passert.Equals(s, beam.ParDo(s, rootToString, result.MapTiles), test.wantRoot)
+ passert.Equals(s, beam.ParDo(s, testRootToStringFn, result.MapTiles), test.wantRoot)
 
- logToString := func(l *api.DeviceReleaseLog) string { return fmt.Sprintf("%s: %v", l.DeviceID, l.Revisions) }
- passert.Equals(s, beam.ParDo(s, logToString, result.DeviceLogs), beam.CreateList(s, test.wantLogs))
+ passert.Equals(s, beam.ParDo(s, testLogToStringFn, result.DeviceLogs), beam.CreateList(s, test.wantLogs))
 
  err = ptest.Run(p)
  if err != nil {
@@ -87,6 +91,10 @@ func TestCreate(t *testing.T) {
  })
  }
 }
+func testRootToStringFn(t *batchmap.Tile) string { return fmt.Sprintf("%x", t.RootHash) }
+func testLogToStringFn(l *api.DeviceReleaseLog) string {
+ return fmt.Sprintf("%s: %v", l.DeviceID, l.Revisions)
+}
 
 func createFW(device string, revision uint64) api.FirmwareMetadata {
  image := fmt.Sprintf("this image is the firmware at revision %d for device %s.", revision, device)

go.mod

@@ -3,7 +3,7 @@ module github.com/google/trillian-examples
 go 1.20
 
 require (
- github.com/apache/beam/sdks/v2 v2.49.0
+ github.com/apache/beam/sdks/v2 v2.50.0
  github.com/cenkalti/backoff/v4 v4.2.1
  github.com/dsoprea/go-ext4 v0.0.0-20190528173430-c13b09fc0ff8
  github.com/go-sql-driver/mysql v1.7.1
@@ -36,7 +36,7 @@ require (
  cloud.google.com/go/compute/metadata v0.2.3 // indirect
  cloud.google.com/go/iam v1.1.1 // indirect
  cloud.google.com/go/profiler v0.3.1 // indirect
- cloud.google.com/go/storage v1.30.1 // indirect
+ cloud.google.com/go/storage v1.31.0 // indirect
  github.com/dsoprea/go-logging v0.0.0-20200710184922-b02d349568dd // indirect
  github.com/dustin/go-humanize v1.0.1 // indirect
  github.com/frankban/quicktest v1.11.3 // indirect
@@ -50,19 +50,19 @@ require (
  github.com/google/s2a-go v0.1.4 // indirect
  github.com/google/uuid v1.3.0 // indirect
  github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect
- github.com/googleapis/gax-go/v2 v2.11.0 // indirect
+ github.com/googleapis/gax-go/v2 v2.12.0 // indirect
  github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
  go.opencensus.io v0.24.0 // indirect
  golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea // indirect
  golang.org/x/net v0.15.0 // indirect
  golang.org/x/sys v0.12.0 // indirect
  golang.org/x/text v0.13.0 // indirect
  golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
- google.golang.org/api v0.129.0 // indirect
+ google.golang.org/api v0.135.0 // indirect
  google.golang.org/appengine v1.6.7 // indirect
  google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98 // indirect
  google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 // indirect
- google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
+ google.golang.org/genproto/googleapis/rpc v0.0.0-20230726155614-23370e0ffb3e // indirect
  gopkg.in/retry.v1 v1.0.3 // indirect
  k8s.io/klog/v2 v2.100.1 // indirect
 )

go.sum

@@ -12,13 +12,13 @@ cloud.google.com/go/iam v1.1.1 h1:lW7fzj15aVIXYHREOqjRBV9PsH0Z6u8Y46a1YGvQP4Y=
 cloud.google.com/go/iam v1.1.1/go.mod h1:A5avdyVL2tCppe4unb0951eI9jreack+RJ0/d+KUZOU=
 cloud.google.com/go/profiler v0.3.1 h1:b5got9Be9Ia0HVvyt7PavWxXEht15B9lWnigdvHtxOc=
 cloud.google.com/go/profiler v0.3.1/go.mod h1:GsG14VnmcMFQ9b+kq71wh3EKMZr3WRMgLzNiFRpW7tE=
-cloud.google.com/go/pubsub v1.32.0 h1:JOEkgEYBuUTHSyHS4TcqOFuWr+vD6qO/imsFqShUCp4=
-cloud.google.com/go/storage v1.30.1 h1:uOdMxAs8HExqBlnLtnQyP0YkvbiDpdGShGKtx6U/oNM=
-cloud.google.com/go/storage v1.30.1/go.mod h1:NfxhC0UJE1aXSx7CIIbCf7y9HKT7BiccwkR7+P7gN8E=
+cloud.google.com/go/pubsub v1.33.0 h1:6SPCPvWav64tj0sVX/+npCBKhUi/UjJehy9op/V3p2g=
+cloud.google.com/go/storage v1.31.0 h1:+S3LjjEN2zZ+L5hOwj4+1OkGCsLVe0NzpXKQ1pSdTCI=
+cloud.google.com/go/storage v1.31.0/go.mod h1:81ams1PrhW16L4kF7qg+4mTq7SRs5HsbDTM0bWvrwJ0=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
-github.com/apache/beam/sdks/v2 v2.49.0 h1:Aim/7wEu39NThDEdk9ERyk8ojLRu59sv5+/22WLRbss=
-github.com/apache/beam/sdks/v2 v2.49.0/go.mod h1:eo95+Cuc18pasAQiwen/Kh3o36CSf9r8hws0EESWrwA=
+github.com/apache/beam/sdks/v2 v2.50.0 h1:5/VM4TPRBk8KKU3t/nKWIUGbNiLZRMusFPxtMY8Op4w=
+github.com/apache/beam/sdks/v2 v2.50.0/go.mod h1:l8zcwQ8ZBMI1zgvA/iI9k9+EaapvAchruwtT1Jxz/ow=
 github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=
 github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
@@ -50,7 +50,7 @@ github.com/felixge/httpsnoop v1.0.2 h1:+nS9g82KMXccJ/wp0zyRW9ZBHFETmMGtkk+2CTTrW
 github.com/frankban/quicktest v1.2.2/go.mod h1:Qh/WofXFeiAFII1aEBu529AtJo6Zg2VHscnEsbBnJ20=
 github.com/frankban/quicktest v1.11.3 h1:8sXhOn0uLys67V8EsXLc6eszDs8VXWxL3iRvebPhedY=
 github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k=
-github.com/fsouza/fake-gcs-server v1.45.2 h1:m4hkghNBY7lmPtpgE41nZa1mOo2PedAZnw3Hd2RfsGk=
+github.com/fsouza/fake-gcs-server v1.47.4 h1:gfBhBxEra20/Om02cvcyL8EnekV8KDb01Yffjat6AKQ=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/go-errors/errors v1.0.2 h1:xMxH9j2fNg/L4hLn/4y3M0IUsn0M6Wbu/Uh9QlOfBh4=
 github.com/go-errors/errors v1.0.2/go.mod h1:psDX2osz5VnTOnFWbDeWwS7yejl+uV3FEWEp4lssFEs=
@@ -118,8 +118,8 @@ github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/enterprise-certificate-proxy v0.2.5 h1:UR4rDjcgpgEnqpIEvkiqTYKBCKLNmlge2eVjoZfySzM=
 github.com/googleapis/enterprise-certificate-proxy v0.2.5/go.mod h1:RxW0N9901Cko1VOCW3SXCpWP+mlIEkk2tP7jnHy9a3w=
-github.com/googleapis/gax-go/v2 v2.11.0 h1:9V9PWXEsWnPpQhu/PeQIkS4eGzMlTLGgt80cUUI8Ki4=
-github.com/googleapis/gax-go/v2 v2.11.0/go.mod h1:DxmR61SGKkGLa2xigwuZIQpkCI2S5iydzRfb3peWZJI=
+github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56etFpas=
+github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU=
 github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4=
 github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
 github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
@@ -138,11 +138,11 @@ github.com/perlin-network/life v0.0.0-20191203030451-05c0e0f7eaea/go.mod h1:3KEU
 github.com/pkg/xattr v0.4.9 h1:5883YPCtkSd8LFbs13nXplj9g9tlrwoJRjgpgMu1/fE=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/proullon/ramsql v0.0.0-20211120092837-c8d0a408b939 h1:mtMU7aT8cTAyNL3O4RyOfe/OOUxwCN525SIbKQoUvw0=
+github.com/proullon/ramsql v0.0.1 h1:tI7qN48Oj1LTmgdo4aWlvI9z45a4QlWaXlmdJ+IIfbU=
 github.com/rogpeppe/clock v0.0.0-20190514195947-2896927a307a h1:3QH7VyOaaiUHNrA9Se4YQIRkDTCw1EJls9xTUCaCeRM=
 github.com/rogpeppe/clock v0.0.0-20190514195947-2896927a307a/go.mod h1:4r5QyqhjIWCcK8DO4KMclc5Iknq5qVBAlbYYzAbUScQ=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
-github.com/sirupsen/logrus v1.9.2 h1:oxx1eChJGI6Uks2ZC4W1zpLlVgqB8ner4EuQwV4Ik1Y=
+github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
@@ -254,8 +254,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk=
 golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
-google.golang.org/api v0.129.0 h1:2XbdjjNfFPXQyufzQVwPf1RRnHH8Den2pfNE2jw7L8w=
-google.golang.org/api v0.129.0/go.mod h1:dFjiXlanKwWE3612X97llhsoI36FAoIiRj3aTl5b/zE=
+google.golang.org/api v0.135.0 h1:6Vgfj6uPMXcyy66waYWBwmkeNB+9GmUlJDOzkukPQYQ=
+google.golang.org/api v0.135.0/go.mod h1:Bp77uRFgwsSKI0BWH573F5Q6wSlznwI2NFayLOp/7mQ=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -269,8 +269,8 @@ google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98 h1:Z0hjGZePRE0ZBWo
 google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98/go.mod h1:S7mY02OqCJTD0E1OiQy1F72PWFB4bZJ87cAtLPYgDR0=
 google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 h1:FmF5cCW94Ij59cfpoLiwTgodWmm60eEV0CjlsVg2fuw=
 google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98/go.mod h1:rsr7RhLuwsDKL7RmgDDCUc6yaGr1iqceVb5Wv6f6YvQ=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 h1:bVf09lpb+OJbByTj913DRJioFFAjf/ZGxEz7MajTp2U=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20230726155614-23370e0ffb3e h1:S83+ibolgyZ0bqz7KEsUOPErxcv4VzlszxY+31OfB/E=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20230726155614-23370e0ffb3e/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=