From d5600442684e9ef3d861616069509a7c1665d3ea Mon Sep 17 00:00:00 2001 From: Benjamin Pelletier Date: Wed, 2 Sep 2020 12:25:53 -0700 Subject: [PATCH 1/2] Replace reference to palantir/stacktrace with interuss fork --- cmds/grpc-backend/main.go | 2 +- cmds/http-gateway/main.go | 2 +- go.mod | 4 +--- go.sum | 2 -- pkg/auth/auth.go | 2 +- pkg/auth/auth_test.go | 2 +- pkg/auth/claims.go | 2 +- pkg/aux_/server.go | 2 +- pkg/cockroach/cockroach.go | 2 +- pkg/errors/errors.go | 2 +- pkg/errors/errors_test.go | 2 +- pkg/geo/errors.go | 2 +- pkg/geo/s2.go | 2 +- pkg/models/geo.go | 2 +- pkg/models/models.go | 2 +- pkg/models/rid_conversions.go | 2 +- pkg/models/scd_conversions.go | 2 +- pkg/rid/application/isa.go | 2 +- pkg/rid/application/isa_test.go | 2 +- pkg/rid/application/subscription.go | 2 +- pkg/rid/application/subscription_test.go | 2 +- pkg/rid/models/identification_service_area.go | 2 +- pkg/rid/models/subscriptions.go | 2 +- pkg/rid/server/isa_handler.go | 2 +- pkg/rid/server/server_test.go | 2 +- pkg/rid/server/subscription_handler.go | 2 +- pkg/rid/store/cockroach/identification_service_area.go | 2 +- pkg/rid/store/cockroach/identification_service_area_v3.go | 2 +- pkg/rid/store/cockroach/store.go | 2 +- pkg/rid/store/cockroach/subcriptions_v3.go | 2 +- pkg/rid/store/cockroach/subscriptions.go | 2 +- pkg/scd/constraints_handler.go | 2 +- pkg/scd/errors/errors.go | 2 +- pkg/scd/models/constraints.go | 2 +- pkg/scd/models/models.go | 2 +- pkg/scd/models/operations.go | 2 +- pkg/scd/models/subscriptions.go | 2 +- pkg/scd/operations_handler.go | 2 +- pkg/scd/server.go | 2 +- pkg/scd/store/cockroach/constraints.go | 2 +- pkg/scd/store/cockroach/operations.go | 2 +- pkg/scd/store/cockroach/store.go | 2 +- pkg/scd/store/cockroach/subscriptions.go | 2 +- pkg/scd/subscriptions_handler.go | 2 +- pkg/validations/validations.go | 2 +- 45 files changed, 44 insertions(+), 48 deletions(-) diff --git a/cmds/grpc-backend/main.go b/cmds/grpc-backend/main.go index b4affa8e5..8aa5e321b 100644 --- a/cmds/grpc-backend/main.go +++ b/cmds/grpc-backend/main.go @@ -29,7 +29,7 @@ import ( "github.com/interuss/dss/pkg/scd" scdc "github.com/interuss/dss/pkg/scd/store/cockroach" "github.com/interuss/dss/pkg/validations" - "github.com/palantir/stacktrace" + "github.com/interuss/stacktrace" grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" "go.uber.org/zap" diff --git a/cmds/http-gateway/main.go b/cmds/http-gateway/main.go index 3395ae5c5..69e2fa947 100644 --- a/cmds/http-gateway/main.go +++ b/cmds/http-gateway/main.go @@ -22,7 +22,7 @@ import ( "github.com/interuss/dss/pkg/logging" "github.com/grpc-ecosystem/grpc-gateway/runtime" - "github.com/palantir/stacktrace" + "github.com/interuss/stacktrace" "go.uber.org/zap" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/go.mod b/go.mod index b36bcd0b3..e79af457b 100644 --- a/go.mod +++ b/go.mod @@ -3,8 +3,6 @@ module github.com/interuss/dss // This forked version of openapi2proto has limited support for Open API v3. replace github.com/NYTimes/openapi2proto => github.com/davidsansome/openapi2proto v0.2.3-0.20190826092301-b98d13b38dab -replace github.com/palantir/stacktrace => github.com/interuss/stacktrace v0.0.0-20200827180054-b2e58cf48818 - go 1.14 require ( @@ -21,7 +19,7 @@ require ( github.com/grpc-ecosystem/go-grpc-middleware v1.2.0 github.com/grpc-ecosystem/grpc-gateway v1.14.3 github.com/lib/pq v1.5.2 - github.com/palantir/stacktrace v0.0.0-00010101000000-000000000000 + github.com/interuss/stacktrace v0.0.0-20200827180054-b2e58cf48818 github.com/stretchr/testify v1.5.1 go.uber.org/multierr v1.5.0 go.uber.org/zap v1.15.0 diff --git a/go.sum b/go.sum index 1d33fa168..6aca966bf 100644 --- a/go.sum +++ b/go.sum @@ -243,8 +243,6 @@ github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQ github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= -github.com/palantir/stacktrace v0.0.0-20161112013806-78658fd2d177 h1:nRlQD0u1871kaznCnn1EvYiMbum36v7hw1DLPEjds4o= -github.com/palantir/stacktrace v0.0.0-20161112013806-78658fd2d177/go.mod h1:ao5zGxj8Z4x60IOVYZUbDSmt3R8Ddo080vEgPosHpak= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= diff --git a/pkg/auth/auth.go b/pkg/auth/auth.go index 3cfa23133..1559a7979 100644 --- a/pkg/auth/auth.go +++ b/pkg/auth/auth.go @@ -19,7 +19,7 @@ import ( "github.com/interuss/dss/pkg/models" "github.com/dgrijalva/jwt-go" - "github.com/palantir/stacktrace" + "github.com/interuss/stacktrace" "go.uber.org/zap" "google.golang.org/grpc" "google.golang.org/grpc/metadata" diff --git a/pkg/auth/auth_test.go b/pkg/auth/auth_test.go index 16980bc2a..d43dda169 100644 --- a/pkg/auth/auth_test.go +++ b/pkg/auth/auth_test.go @@ -14,7 +14,7 @@ import ( "github.com/interuss/dss/pkg/models" "github.com/dgrijalva/jwt-go" - "github.com/palantir/stacktrace" + "github.com/interuss/stacktrace" "github.com/stretchr/testify/require" "google.golang.org/grpc" "google.golang.org/grpc/metadata" diff --git a/pkg/auth/claims.go b/pkg/auth/claims.go index cea6dbde2..74e727b99 100644 --- a/pkg/auth/claims.go +++ b/pkg/auth/claims.go @@ -7,7 +7,7 @@ import ( "time" "github.com/dgrijalva/jwt-go" - "github.com/palantir/stacktrace" + "github.com/interuss/stacktrace" ) var ( diff --git a/pkg/aux_/server.go b/pkg/aux_/server.go index 9488fe939..eaec8303b 100644 --- a/pkg/aux_/server.go +++ b/pkg/aux_/server.go @@ -8,7 +8,7 @@ import ( dsserr "github.com/interuss/dss/pkg/errors" ridserver "github.com/interuss/dss/pkg/rid/server" "github.com/interuss/dss/pkg/version" - "github.com/palantir/stacktrace" + "github.com/interuss/stacktrace" ) // Server implements auxpb.DSSAuxService. diff --git a/pkg/cockroach/cockroach.go b/pkg/cockroach/cockroach.go index 36ede2ae5..52b57b520 100644 --- a/pkg/cockroach/cockroach.go +++ b/pkg/cockroach/cockroach.go @@ -7,7 +7,7 @@ import ( "strconv" "github.com/coreos/go-semver/semver" - "github.com/palantir/stacktrace" + "github.com/interuss/stacktrace" ) var ( diff --git a/pkg/errors/errors.go b/pkg/errors/errors.go index d6d2893c9..395b84096 100644 --- a/pkg/errors/errors.go +++ b/pkg/errors/errors.go @@ -9,7 +9,7 @@ import ( "github.com/google/uuid" "github.com/interuss/dss/pkg/api/v1/auxpb" "github.com/interuss/dss/pkg/logging" - "github.com/palantir/stacktrace" + "github.com/interuss/stacktrace" "go.uber.org/zap" spb "google.golang.org/genproto/googleapis/rpc/status" "google.golang.org/grpc" diff --git a/pkg/errors/errors_test.go b/pkg/errors/errors_test.go index 4fe5c9e22..921b9cd28 100644 --- a/pkg/errors/errors_test.go +++ b/pkg/errors/errors_test.go @@ -4,7 +4,7 @@ import ( "errors" "testing" - "github.com/palantir/stacktrace" + "github.com/interuss/stacktrace" "github.com/stretchr/testify/assert" ) diff --git a/pkg/geo/errors.go b/pkg/geo/errors.go index 08c45e202..8bc1d7c55 100644 --- a/pkg/geo/errors.go +++ b/pkg/geo/errors.go @@ -2,7 +2,7 @@ package geo import ( dsserr "github.com/interuss/dss/pkg/errors" - "github.com/palantir/stacktrace" + "github.com/interuss/stacktrace" ) var ( diff --git a/pkg/geo/s2.go b/pkg/geo/s2.go index da40e8ba5..7ecc9e370 100644 --- a/pkg/geo/s2.go +++ b/pkg/geo/s2.go @@ -9,7 +9,7 @@ import ( "github.com/golang/geo/s1" "github.com/golang/geo/s2" - "github.com/palantir/stacktrace" + "github.com/interuss/stacktrace" ) const ( diff --git a/pkg/models/geo.go b/pkg/models/geo.go index 4bf7d8664..f12e29ed1 100644 --- a/pkg/models/geo.go +++ b/pkg/models/geo.go @@ -5,7 +5,7 @@ import ( "github.com/golang/geo/s2" "github.com/interuss/dss/pkg/geo" - "github.com/palantir/stacktrace" + "github.com/interuss/stacktrace" ) const ( diff --git a/pkg/models/models.go b/pkg/models/models.go index 1896e1932..bd340fd8e 100644 --- a/pkg/models/models.go +++ b/pkg/models/models.go @@ -5,7 +5,7 @@ import ( "time" "github.com/google/uuid" - "github.com/palantir/stacktrace" + "github.com/interuss/stacktrace" ) type ( diff --git a/pkg/models/rid_conversions.go b/pkg/models/rid_conversions.go index 123cb032b..7fbe5a773 100644 --- a/pkg/models/rid_conversions.go +++ b/pkg/models/rid_conversions.go @@ -5,7 +5,7 @@ import ( "google.golang.org/protobuf/proto" "github.com/interuss/dss/pkg/api/v1/ridpb" - "github.com/palantir/stacktrace" + "github.com/interuss/stacktrace" ) // === RID -> Business === diff --git a/pkg/models/scd_conversions.go b/pkg/models/scd_conversions.go index eed6e5565..7735553d5 100644 --- a/pkg/models/scd_conversions.go +++ b/pkg/models/scd_conversions.go @@ -4,7 +4,7 @@ import ( "github.com/golang/protobuf/ptypes" "github.com/interuss/dss/pkg/api/v1/scdpb" - "github.com/palantir/stacktrace" + "github.com/interuss/stacktrace" ) // Volume4DFromSCDProto converts vol4 proto to a Volume4D diff --git a/pkg/rid/application/isa.go b/pkg/rid/application/isa.go index e7be5c770..5abb8202d 100644 --- a/pkg/rid/application/isa.go +++ b/pkg/rid/application/isa.go @@ -10,7 +10,7 @@ import ( dssmodels "github.com/interuss/dss/pkg/models" ridmodels "github.com/interuss/dss/pkg/rid/models" "github.com/interuss/dss/pkg/rid/repos" - "github.com/palantir/stacktrace" + "github.com/interuss/stacktrace" ) // AppInterface provides the interface to the application logic for ISA entities diff --git a/pkg/rid/application/isa_test.go b/pkg/rid/application/isa_test.go index b8d3c23d0..0a6aa940c 100644 --- a/pkg/rid/application/isa_test.go +++ b/pkg/rid/application/isa_test.go @@ -11,7 +11,7 @@ import ( dsserr "github.com/interuss/dss/pkg/errors" dssmodels "github.com/interuss/dss/pkg/models" ridmodels "github.com/interuss/dss/pkg/rid/models" - "github.com/palantir/stacktrace" + "github.com/interuss/stacktrace" "github.com/stretchr/testify/require" "go.uber.org/zap" ) diff --git a/pkg/rid/application/subscription.go b/pkg/rid/application/subscription.go index bf0bbcac6..7275910d9 100644 --- a/pkg/rid/application/subscription.go +++ b/pkg/rid/application/subscription.go @@ -8,7 +8,7 @@ import ( dssmodels "github.com/interuss/dss/pkg/models" ridmodels "github.com/interuss/dss/pkg/rid/models" "github.com/interuss/dss/pkg/rid/repos" - "github.com/palantir/stacktrace" + "github.com/interuss/stacktrace" "go.uber.org/zap" ) diff --git a/pkg/rid/application/subscription_test.go b/pkg/rid/application/subscription_test.go index 1491e0811..ad5680ddb 100644 --- a/pkg/rid/application/subscription_test.go +++ b/pkg/rid/application/subscription_test.go @@ -10,7 +10,7 @@ import ( dsserr "github.com/interuss/dss/pkg/errors" dssmodels "github.com/interuss/dss/pkg/models" ridmodels "github.com/interuss/dss/pkg/rid/models" - "github.com/palantir/stacktrace" + "github.com/interuss/stacktrace" "github.com/stretchr/testify/require" "go.uber.org/zap" ) diff --git a/pkg/rid/models/identification_service_area.go b/pkg/rid/models/identification_service_area.go index 40b392e9f..31b9e541c 100644 --- a/pkg/rid/models/identification_service_area.go +++ b/pkg/rid/models/identification_service_area.go @@ -9,7 +9,7 @@ import ( dsserr "github.com/interuss/dss/pkg/errors" "github.com/interuss/dss/pkg/geo" dssmodels "github.com/interuss/dss/pkg/models" - "github.com/palantir/stacktrace" + "github.com/interuss/stacktrace" "google.golang.org/protobuf/proto" ) diff --git a/pkg/rid/models/subscriptions.go b/pkg/rid/models/subscriptions.go index 62d32f501..5be7e558c 100644 --- a/pkg/rid/models/subscriptions.go +++ b/pkg/rid/models/subscriptions.go @@ -10,7 +10,7 @@ import ( "github.com/golang/geo/s2" "github.com/golang/protobuf/ptypes" - "github.com/palantir/stacktrace" + "github.com/interuss/stacktrace" ) var ( diff --git a/pkg/rid/server/isa_handler.go b/pkg/rid/server/isa_handler.go index 23055c475..9175df2df 100644 --- a/pkg/rid/server/isa_handler.go +++ b/pkg/rid/server/isa_handler.go @@ -11,7 +11,7 @@ import ( "github.com/interuss/dss/pkg/geo" dssmodels "github.com/interuss/dss/pkg/models" ridmodels "github.com/interuss/dss/pkg/rid/models" - "github.com/palantir/stacktrace" + "github.com/interuss/stacktrace" ) // GetIdentificationServiceArea returns a single ISA for a given ID. diff --git a/pkg/rid/server/server_test.go b/pkg/rid/server/server_test.go index deee5ad53..bebf528d9 100644 --- a/pkg/rid/server/server_test.go +++ b/pkg/rid/server/server_test.go @@ -17,7 +17,7 @@ import ( "github.com/golang/protobuf/ptypes" tspb "github.com/golang/protobuf/ptypes/timestamp" "github.com/google/uuid" - "github.com/palantir/stacktrace" + "github.com/interuss/stacktrace" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" ) diff --git a/pkg/rid/server/subscription_handler.go b/pkg/rid/server/subscription_handler.go index 7a2f58721..333b19fa0 100644 --- a/pkg/rid/server/subscription_handler.go +++ b/pkg/rid/server/subscription_handler.go @@ -9,7 +9,7 @@ import ( "github.com/interuss/dss/pkg/geo" dssmodels "github.com/interuss/dss/pkg/models" ridmodels "github.com/interuss/dss/pkg/rid/models" - "github.com/palantir/stacktrace" + "github.com/interuss/stacktrace" ) // DeleteSubscription deletes an existing subscription. diff --git a/pkg/rid/store/cockroach/identification_service_area.go b/pkg/rid/store/cockroach/identification_service_area.go index 3a10b85b8..65243ad2a 100644 --- a/pkg/rid/store/cockroach/identification_service_area.go +++ b/pkg/rid/store/cockroach/identification_service_area.go @@ -17,7 +17,7 @@ import ( repos "github.com/interuss/dss/pkg/rid/repos" dssql "github.com/interuss/dss/pkg/sql" "github.com/lib/pq" - "github.com/palantir/stacktrace" + "github.com/interuss/stacktrace" "go.uber.org/zap" ) diff --git a/pkg/rid/store/cockroach/identification_service_area_v3.go b/pkg/rid/store/cockroach/identification_service_area_v3.go index ef7ed1a92..5c5e34180 100644 --- a/pkg/rid/store/cockroach/identification_service_area_v3.go +++ b/pkg/rid/store/cockroach/identification_service_area_v3.go @@ -13,7 +13,7 @@ import ( "github.com/golang/geo/s2" dssql "github.com/interuss/dss/pkg/sql" "github.com/lib/pq" - "github.com/palantir/stacktrace" + "github.com/interuss/stacktrace" "go.uber.org/zap" ) diff --git a/pkg/rid/store/cockroach/store.go b/pkg/rid/store/cockroach/store.go index 945860a66..2a67f390c 100644 --- a/pkg/rid/store/cockroach/store.go +++ b/pkg/rid/store/cockroach/store.go @@ -11,7 +11,7 @@ import ( "github.com/interuss/dss/pkg/cockroach" "github.com/interuss/dss/pkg/logging" "github.com/interuss/dss/pkg/rid/repos" - "github.com/palantir/stacktrace" + "github.com/interuss/stacktrace" "go.uber.org/zap" ) diff --git a/pkg/rid/store/cockroach/subcriptions_v3.go b/pkg/rid/store/cockroach/subcriptions_v3.go index 1a88ac215..ad4a0b583 100644 --- a/pkg/rid/store/cockroach/subcriptions_v3.go +++ b/pkg/rid/store/cockroach/subcriptions_v3.go @@ -13,7 +13,7 @@ import ( "github.com/golang/geo/s2" dssql "github.com/interuss/dss/pkg/sql" "github.com/lib/pq" - "github.com/palantir/stacktrace" + "github.com/interuss/stacktrace" "go.uber.org/zap" ) diff --git a/pkg/rid/store/cockroach/subscriptions.go b/pkg/rid/store/cockroach/subscriptions.go index 098985793..cc55b2e31 100644 --- a/pkg/rid/store/cockroach/subscriptions.go +++ b/pkg/rid/store/cockroach/subscriptions.go @@ -16,7 +16,7 @@ import ( repos "github.com/interuss/dss/pkg/rid/repos" dssql "github.com/interuss/dss/pkg/sql" "github.com/lib/pq" - "github.com/palantir/stacktrace" + "github.com/interuss/stacktrace" "go.uber.org/zap" ) diff --git a/pkg/scd/constraints_handler.go b/pkg/scd/constraints_handler.go index 9dace602c..57b004f72 100644 --- a/pkg/scd/constraints_handler.go +++ b/pkg/scd/constraints_handler.go @@ -11,7 +11,7 @@ import ( dssmodels "github.com/interuss/dss/pkg/models" scdmodels "github.com/interuss/dss/pkg/scd/models" "github.com/interuss/dss/pkg/scd/repos" - "github.com/palantir/stacktrace" + "github.com/interuss/stacktrace" ) // DeleteConstraintReference deletes a single constraint ref for a given ID at diff --git a/pkg/scd/errors/errors.go b/pkg/scd/errors/errors.go index 1e252f416..7c0eee0dd 100644 --- a/pkg/scd/errors/errors.go +++ b/pkg/scd/errors/errors.go @@ -4,7 +4,7 @@ import ( "github.com/interuss/dss/pkg/api/v1/scdpb" dsserrors "github.com/interuss/dss/pkg/errors" dssmodels "github.com/interuss/dss/pkg/scd/models" - "github.com/palantir/stacktrace" + "github.com/interuss/stacktrace" spb "google.golang.org/genproto/googleapis/rpc/status" "google.golang.org/grpc/codes" ) diff --git a/pkg/scd/models/constraints.go b/pkg/scd/models/constraints.go index 6fb022661..0bcd08e2f 100644 --- a/pkg/scd/models/constraints.go +++ b/pkg/scd/models/constraints.go @@ -8,7 +8,7 @@ import ( "github.com/interuss/dss/pkg/api/v1/scdpb" dsserr "github.com/interuss/dss/pkg/errors" dssmodels "github.com/interuss/dss/pkg/models" - "github.com/palantir/stacktrace" + "github.com/interuss/stacktrace" ) // Constraint models a constraint, as known by the DSS diff --git a/pkg/scd/models/models.go b/pkg/scd/models/models.go index ccf943f93..3935b7113 100644 --- a/pkg/scd/models/models.go +++ b/pkg/scd/models/models.go @@ -6,7 +6,7 @@ import ( "net/url" "time" - "github.com/palantir/stacktrace" + "github.com/interuss/stacktrace" ) type ( diff --git a/pkg/scd/models/operations.go b/pkg/scd/models/operations.go index 4737db7b2..5b7a80cfc 100644 --- a/pkg/scd/models/operations.go +++ b/pkg/scd/models/operations.go @@ -8,7 +8,7 @@ import ( "github.com/interuss/dss/pkg/api/v1/scdpb" dsserr "github.com/interuss/dss/pkg/errors" dssmodels "github.com/interuss/dss/pkg/models" - "github.com/palantir/stacktrace" + "github.com/interuss/stacktrace" ) // Aggregates constants for operations. diff --git a/pkg/scd/models/subscriptions.go b/pkg/scd/models/subscriptions.go index 86157254f..bfd67ccd6 100644 --- a/pkg/scd/models/subscriptions.go +++ b/pkg/scd/models/subscriptions.go @@ -9,7 +9,7 @@ import ( "github.com/golang/geo/s2" "github.com/golang/protobuf/ptypes" - "github.com/palantir/stacktrace" + "github.com/interuss/stacktrace" ) const ( diff --git a/pkg/scd/operations_handler.go b/pkg/scd/operations_handler.go index 611e300f7..c22be6599 100644 --- a/pkg/scd/operations_handler.go +++ b/pkg/scd/operations_handler.go @@ -13,7 +13,7 @@ import ( scderr "github.com/interuss/dss/pkg/scd/errors" scdmodels "github.com/interuss/dss/pkg/scd/models" "github.com/interuss/dss/pkg/scd/repos" - "github.com/palantir/stacktrace" + "github.com/interuss/stacktrace" "google.golang.org/grpc/status" ) diff --git a/pkg/scd/server.go b/pkg/scd/server.go index 3b01ab157..ec27f57ec 100644 --- a/pkg/scd/server.go +++ b/pkg/scd/server.go @@ -9,7 +9,7 @@ import ( dsserr "github.com/interuss/dss/pkg/errors" scdmodels "github.com/interuss/dss/pkg/scd/models" scdstore "github.com/interuss/dss/pkg/scd/store" - "github.com/palantir/stacktrace" + "github.com/interuss/stacktrace" ) const ( diff --git a/pkg/scd/store/cockroach/constraints.go b/pkg/scd/store/cockroach/constraints.go index bd0ea0394..18bba99f1 100644 --- a/pkg/scd/store/cockroach/constraints.go +++ b/pkg/scd/store/cockroach/constraints.go @@ -13,7 +13,7 @@ import ( dsssql "github.com/interuss/dss/pkg/sql" "github.com/lib/pq" - "github.com/palantir/stacktrace" + "github.com/interuss/stacktrace" ) const ( diff --git a/pkg/scd/store/cockroach/operations.go b/pkg/scd/store/cockroach/operations.go index af3bdfb61..1ecf0e7cd 100644 --- a/pkg/scd/store/cockroach/operations.go +++ b/pkg/scd/store/cockroach/operations.go @@ -12,7 +12,7 @@ import ( scdmodels "github.com/interuss/dss/pkg/scd/models" dsssql "github.com/interuss/dss/pkg/sql" "github.com/lib/pq" - "github.com/palantir/stacktrace" + "github.com/interuss/stacktrace" ) var ( diff --git a/pkg/scd/store/cockroach/store.go b/pkg/scd/store/cockroach/store.go index 261d26af1..41feaa66f 100644 --- a/pkg/scd/store/cockroach/store.go +++ b/pkg/scd/store/cockroach/store.go @@ -10,7 +10,7 @@ import ( "github.com/interuss/dss/pkg/cockroach" "github.com/interuss/dss/pkg/scd/repos" dsssql "github.com/interuss/dss/pkg/sql" - "github.com/palantir/stacktrace" + "github.com/interuss/stacktrace" "go.uber.org/zap" ) diff --git a/pkg/scd/store/cockroach/subscriptions.go b/pkg/scd/store/cockroach/subscriptions.go index bed6098de..f8f1f17c7 100644 --- a/pkg/scd/store/cockroach/subscriptions.go +++ b/pkg/scd/store/cockroach/subscriptions.go @@ -12,7 +12,7 @@ import ( "github.com/golang/geo/s2" "github.com/lib/pq" - "github.com/palantir/stacktrace" + "github.com/interuss/stacktrace" ) var ( diff --git a/pkg/scd/subscriptions_handler.go b/pkg/scd/subscriptions_handler.go index 2e5842a18..4c1abd572 100644 --- a/pkg/scd/subscriptions_handler.go +++ b/pkg/scd/subscriptions_handler.go @@ -12,7 +12,7 @@ import ( dssmodels "github.com/interuss/dss/pkg/models" scdmodels "github.com/interuss/dss/pkg/scd/models" "github.com/interuss/dss/pkg/scd/repos" - "github.com/palantir/stacktrace" + "github.com/interuss/stacktrace" ) var ( diff --git a/pkg/validations/validations.go b/pkg/validations/validations.go index d215fff2c..d27e6edfb 100644 --- a/pkg/validations/validations.go +++ b/pkg/validations/validations.go @@ -6,7 +6,7 @@ import ( "github.com/google/uuid" dsserr "github.com/interuss/dss/pkg/errors" - "github.com/palantir/stacktrace" + "github.com/interuss/stacktrace" "google.golang.org/grpc" ) From 460ee0e285f2928e6cb54690bea0ab54dfced95b Mon Sep 17 00:00:00 2001 From: Benjamin Pelletier Date: Wed, 2 Sep 2020 12:39:41 -0700 Subject: [PATCH 2/2] gofmt -s -w . --- pkg/rid/store/cockroach/identification_service_area.go | 2 +- pkg/rid/store/cockroach/identification_service_area_v3.go | 2 +- pkg/rid/store/cockroach/subcriptions_v3.go | 2 +- pkg/rid/store/cockroach/subscriptions.go | 2 +- pkg/scd/store/cockroach/constraints.go | 2 +- pkg/scd/store/cockroach/operations.go | 2 +- pkg/scd/store/cockroach/subscriptions.go | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/rid/store/cockroach/identification_service_area.go b/pkg/rid/store/cockroach/identification_service_area.go index 65243ad2a..02e0b5354 100644 --- a/pkg/rid/store/cockroach/identification_service_area.go +++ b/pkg/rid/store/cockroach/identification_service_area.go @@ -16,8 +16,8 @@ import ( "github.com/golang/geo/s2" repos "github.com/interuss/dss/pkg/rid/repos" dssql "github.com/interuss/dss/pkg/sql" - "github.com/lib/pq" "github.com/interuss/stacktrace" + "github.com/lib/pq" "go.uber.org/zap" ) diff --git a/pkg/rid/store/cockroach/identification_service_area_v3.go b/pkg/rid/store/cockroach/identification_service_area_v3.go index 5c5e34180..d3b486cb7 100644 --- a/pkg/rid/store/cockroach/identification_service_area_v3.go +++ b/pkg/rid/store/cockroach/identification_service_area_v3.go @@ -12,8 +12,8 @@ import ( "github.com/golang/geo/s2" dssql "github.com/interuss/dss/pkg/sql" - "github.com/lib/pq" "github.com/interuss/stacktrace" + "github.com/lib/pq" "go.uber.org/zap" ) diff --git a/pkg/rid/store/cockroach/subcriptions_v3.go b/pkg/rid/store/cockroach/subcriptions_v3.go index ad4a0b583..264eb8c9e 100644 --- a/pkg/rid/store/cockroach/subcriptions_v3.go +++ b/pkg/rid/store/cockroach/subcriptions_v3.go @@ -12,8 +12,8 @@ import ( "github.com/golang/geo/s2" dssql "github.com/interuss/dss/pkg/sql" - "github.com/lib/pq" "github.com/interuss/stacktrace" + "github.com/lib/pq" "go.uber.org/zap" ) diff --git a/pkg/rid/store/cockroach/subscriptions.go b/pkg/rid/store/cockroach/subscriptions.go index cc55b2e31..f81d17692 100644 --- a/pkg/rid/store/cockroach/subscriptions.go +++ b/pkg/rid/store/cockroach/subscriptions.go @@ -15,8 +15,8 @@ import ( "github.com/golang/geo/s2" repos "github.com/interuss/dss/pkg/rid/repos" dssql "github.com/interuss/dss/pkg/sql" - "github.com/lib/pq" "github.com/interuss/stacktrace" + "github.com/lib/pq" "go.uber.org/zap" ) diff --git a/pkg/scd/store/cockroach/constraints.go b/pkg/scd/store/cockroach/constraints.go index 18bba99f1..cbcc8368c 100644 --- a/pkg/scd/store/cockroach/constraints.go +++ b/pkg/scd/store/cockroach/constraints.go @@ -12,8 +12,8 @@ import ( scdmodels "github.com/interuss/dss/pkg/scd/models" dsssql "github.com/interuss/dss/pkg/sql" - "github.com/lib/pq" "github.com/interuss/stacktrace" + "github.com/lib/pq" ) const ( diff --git a/pkg/scd/store/cockroach/operations.go b/pkg/scd/store/cockroach/operations.go index 1ecf0e7cd..42206363a 100644 --- a/pkg/scd/store/cockroach/operations.go +++ b/pkg/scd/store/cockroach/operations.go @@ -11,8 +11,8 @@ import ( dssmodels "github.com/interuss/dss/pkg/models" scdmodels "github.com/interuss/dss/pkg/scd/models" dsssql "github.com/interuss/dss/pkg/sql" - "github.com/lib/pq" "github.com/interuss/stacktrace" + "github.com/lib/pq" ) var ( diff --git a/pkg/scd/store/cockroach/subscriptions.go b/pkg/scd/store/cockroach/subscriptions.go index f8f1f17c7..5b7516e3e 100644 --- a/pkg/scd/store/cockroach/subscriptions.go +++ b/pkg/scd/store/cockroach/subscriptions.go @@ -11,8 +11,8 @@ import ( dsssql "github.com/interuss/dss/pkg/sql" "github.com/golang/geo/s2" - "github.com/lib/pq" "github.com/interuss/stacktrace" + "github.com/lib/pq" ) var (