Skip to content

Commit

Permalink
Upgrade artefactual-sdps/temporal-activities
Browse files Browse the repository at this point in the history 
Upgrade `github.com/artefactual-sdps/temporal-activities` after the
re-org, which also upgrades `google.golang.org/grpc` and other deps.
Ignore `grpc.DialContext` and `grpc.WithBlock` deprecated warning.

[skip-codecov]
  • Loading branch information
@jraddaoui
jraddaoui committed Aug 27, 2024
1 parent e829a58 commit 3a873ab
Show file tree
Hide file tree
Showing 10 changed files with 452 additions and 271 deletions.
18 changes: 9 additions & 9 deletions cmd/enduro-a3m-worker/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (
"ariga.io/sqlcomment"
"entgo.io/ent/dialect/sql"
bagit_gython "github.com/artefactual-labs/bagit-gython"
"github.com/artefactual-sdps/temporal-activities/archive"
bagit_activity "github.com/artefactual-sdps/temporal-activities/bagit"
"github.com/artefactual-sdps/temporal-activities/filesys"
"github.com/artefactual-sdps/temporal-activities/archiveextract"
"github.com/artefactual-sdps/temporal-activities/bagvalidate"
"github.com/artefactual-sdps/temporal-activities/removepaths"
"github.com/hashicorp/go-cleanhttp"
"github.com/oklog/run"
"github.com/prometheus/client_golang/prometheus/promhttp"
Expand Down Expand Up @@ -224,16 +224,16 @@ func main() {
temporalsdk_activity.RegisterOptions{Name: activities.DownloadActivityName},
)
w.RegisterActivityWithOptions(
archive.NewExtractActivity(cfg.ExtractActivity).Execute,
temporalsdk_activity.RegisterOptions{Name: archive.ExtractActivityName},
archiveextract.New(cfg.ExtractActivity).Execute,
temporalsdk_activity.RegisterOptions{Name: archiveextract.Name},
)
w.RegisterActivityWithOptions(
activities.NewClassifyPackageActivity(logger).Execute,
temporalsdk_activity.RegisterOptions{Name: activities.ClassifyPackageActivityName},
)
w.RegisterActivityWithOptions(
bagit_activity.NewValidateActivity(validator).Execute,
temporalsdk_activity.RegisterOptions{Name: bagit_activity.ValidateActivityName},
bagvalidate.New(validator).Execute,
temporalsdk_activity.RegisterOptions{Name: bagvalidate.Name},
)
w.RegisterActivityWithOptions(
activities.NewBundleActivity(logger).Execute,
Expand All @@ -250,8 +250,8 @@ func main() {
temporalsdk_activity.RegisterOptions{Name: a3m.CreateAIPActivityName},
)
w.RegisterActivityWithOptions(
filesys.NewRemoveActivity().Execute,
temporalsdk_activity.RegisterOptions{Name: filesys.RemoveActivityName},
removepaths.New().Execute,
temporalsdk_activity.RegisterOptions{Name: removepaths.Name},
)

httpClient := cleanhttp.DefaultPooledClient()
Expand Down
23 changes: 12 additions & 11 deletions cmd/enduro-am-worker/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,10 @@ import (
"ariga.io/sqlcomment"
"entgo.io/ent/dialect/sql"
bagit_gython "github.com/artefactual-labs/bagit-gython"
"github.com/artefactual-sdps/temporal-activities/archive"
bagit_activity "github.com/artefactual-sdps/temporal-activities/bagit"
"github.com/artefactual-sdps/temporal-activities/filesys"
"github.com/artefactual-sdps/temporal-activities/archiveextract"
"github.com/artefactual-sdps/temporal-activities/bagcreate"
"github.com/artefactual-sdps/temporal-activities/bagvalidate"
"github.com/artefactual-sdps/temporal-activities/removepaths"
"github.com/hashicorp/go-cleanhttp"
"github.com/jonboulle/clockwork"
"github.com/oklog/run"
Expand Down Expand Up @@ -230,24 +231,24 @@ func main() {
temporalsdk_activity.RegisterOptions{Name: activities.DownloadActivityName},
)
w.RegisterActivityWithOptions(
archive.NewExtractActivity(cfg.ExtractActivity).Execute,
temporalsdk_activity.RegisterOptions{Name: archive.ExtractActivityName},
archiveextract.New(cfg.ExtractActivity).Execute,
temporalsdk_activity.RegisterOptions{Name: archiveextract.Name},
)
w.RegisterActivityWithOptions(
activities.NewClassifyPackageActivity(logger).Execute,
temporalsdk_activity.RegisterOptions{Name: activities.ClassifyPackageActivityName},
)
w.RegisterActivityWithOptions(
bagit_activity.NewValidateActivity(validator).Execute,
temporalsdk_activity.RegisterOptions{Name: bagit_activity.ValidateActivityName},
bagvalidate.New(validator).Execute,
temporalsdk_activity.RegisterOptions{Name: bagvalidate.Name},
)
w.RegisterActivityWithOptions(
activities.NewBundleActivity(logger).Execute,
temporalsdk_activity.RegisterOptions{Name: activities.BundleActivityName},
)
w.RegisterActivityWithOptions(
bagit_activity.NewCreateBagActivity(cfg.BagIt).Execute,
temporalsdk_activity.RegisterOptions{Name: bagit_activity.CreateBagActivityName},
bagcreate.New(cfg.BagIt).Execute,
temporalsdk_activity.RegisterOptions{Name: bagcreate.Name},
)
w.RegisterActivityWithOptions(
activities.NewZipActivity(
Expand Down Expand Up @@ -296,8 +297,8 @@ func main() {
temporalsdk_activity.RegisterOptions{Name: activities.CreateStoragePackageActivityName},
)
w.RegisterActivityWithOptions(
filesys.NewRemoveActivity().Execute,
temporalsdk_activity.RegisterOptions{Name: filesys.RemoveActivityName},
removepaths.New().Execute,
temporalsdk_activity.RegisterOptions{Name: removepaths.Name},
)

g.Add(
Expand Down
108 changes: 53 additions & 55 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@ require (
entgo.io/ent v0.13.1
github.com/XSAM/otelsql v0.29.0
github.com/alicebob/miniredis/v2 v2.32.1
github.com/artefactual-labs/bagit-gython v0.0.0-20240723112522-d8d3815a59e6
github.com/artefactual-sdps/temporal-activities v0.0.0-20240722184934-3e9ad5a6dcda
github.com/artefactual-labs/bagit-gython v0.2.0
github.com/artefactual-sdps/temporal-activities v0.0.0-20240821162351-47302711bc7b
github.com/coreos/go-oidc/v3 v3.10.0
github.com/cyphar/filepath-securejoin v0.2.4
github.com/dolmen-go/contextio v1.0.0
github.com/fsnotify/fsnotify v1.7.0
github.com/gliderlabs/ssh v0.3.6
github.com/go-jose/go-jose/v3 v3.0.3
github.com/go-logr/logr v1.4.1
github.com/go-sql-driver/mysql v1.8.0
github.com/go-logr/logr v1.4.2
github.com/go-sql-driver/mysql v1.8.1
github.com/golang-migrate/migrate/v4 v4.17.0
github.com/google/go-cmp v0.6.0
github.com/google/uuid v1.6.0
Expand All @@ -45,23 +45,23 @@ require (
github.com/stretchr/testify v1.9.0
go.artefactual.dev/amclient v0.4.1-0.20240705155055-0c5abef5207c
go.artefactual.dev/tools v0.14.0
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.49.0
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0
go.opentelemetry.io/otel v1.24.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.24.0
go.opentelemetry.io/otel/sdk v1.24.0
go.opentelemetry.io/otel/trace v1.24.0
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.54.0
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0
go.opentelemetry.io/otel v1.29.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.29.0
go.opentelemetry.io/otel/sdk v1.29.0
go.opentelemetry.io/otel/trace v1.29.0
go.temporal.io/api v1.32.0
go.temporal.io/sdk v1.26.1
go.temporal.io/sdk/contrib/opentelemetry v0.4.0
go.uber.org/mock v0.4.0
goa.design/goa/v3 v3.15.2
goa.design/plugins/v3 v3.15.2
gocloud.dev v0.37.0
golang.org/x/crypto v0.22.0
google.golang.org/grpc v1.63.2
google.golang.org/protobuf v1.33.0
gocloud.dev v0.39.0
golang.org/x/crypto v0.26.0
google.golang.org/grpc v1.65.0
google.golang.org/protobuf v1.34.2
gotest.tools/v3 v3.5.1
)

Expand All @@ -73,32 +73,32 @@ require (
github.com/andybalholm/brotli v1.0.6 // indirect
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirect
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
github.com/aws/aws-sdk-go v1.50.36 // indirect
github.com/aws/aws-sdk-go-v2 v1.26.1 // indirect
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.2 // indirect
github.com/aws/aws-sdk-go-v2/config v1.27.11 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.17.11 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.1 // indirect
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.16.9 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.5 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.5 // indirect
github.com/aws/aws-sdk-go v1.55.5 // indirect
github.com/aws/aws-sdk-go-v2 v1.30.3 // indirect
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.3 // indirect
github.com/aws/aws-sdk-go-v2/config v1.27.27 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.17.27 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.11 // indirect
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.10 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.15 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.15 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 // indirect
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.5 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.7 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.7 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.5 // indirect
github.com/aws/aws-sdk-go-v2/service/s3 v1.53.1 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.20.5 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.4 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.28.6 // indirect
github.com/aws/smithy-go v1.20.2 // indirect
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.15 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.3 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.17 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.17 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.15 // indirect
github.com/aws/aws-sdk-go-v2/service/s3 v1.58.3 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.22.4 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.4 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.30.3 // indirect
github.com/aws/smithy-go v1.20.3 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bodgit/plumbing v1.2.0 // indirect
github.com/bodgit/sevenzip v1.3.0 // indirect
github.com/bodgit/windows v1.0.0 // indirect
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/connesc/cipherio v0.2.1 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
Expand All @@ -114,14 +114,13 @@ require (
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/mock v1.6.0 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/safeopen v0.0.0-20240125081138-66b54d5181c6 // indirect
github.com/google/wire v0.6.0 // indirect
github.com/googleapis/gax-go/v2 v2.12.2 // indirect
github.com/googleapis/gax-go/v2 v2.13.0 // indirect
github.com/gorilla/schema v1.4.1 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
Expand Down Expand Up @@ -159,27 +158,26 @@ require (
github.com/yuin/gopher-lua v1.1.1 // indirect
github.com/zclconf/go-cty v1.14.1 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0 // indirect
go.opentelemetry.io/otel/metric v1.24.0 // indirect
go.opentelemetry.io/proto/otlp v1.1.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.29.0 // indirect
go.opentelemetry.io/otel/metric v1.29.0 // indirect
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
go4.org v0.0.0-20200411211856-f5505b9728dd // indirect
golang.org/x/exp v0.0.0-20231219180239-dc181d75b848 // indirect
golang.org/x/mod v0.16.0 // indirect
golang.org/x/net v0.24.0 // indirect
golang.org/x/oauth2 v0.18.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.22.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.19.0 // indirect
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
google.golang.org/api v0.169.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240401170217-c3f982113cda // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect
golang.org/x/mod v0.17.0 // indirect
golang.org/x/net v0.28.0 // indirect
golang.org/x/oauth2 v0.22.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.24.0 // indirect
golang.org/x/text v0.17.0 // indirect
golang.org/x/time v0.6.0 // indirect
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 // indirect
google.golang.org/api v0.191.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240822170219-fc7c04adadcd // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240822170219-fc7c04adadcd // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading

0 comments on commit 3a873ab

Please sign in to comment.