Skip to content

Commit

Permalink
Replace reference to palantir/stacktrace with interuss fork (#430)
Browse files Browse the repository at this point in the history
* Replace reference to palantir/stacktrace with interuss fork

* gofmt -s -w .
  • Loading branch information
BenjaminPelletier authored Sep 3, 2020
1 parent 518b157 commit 52a2504
Show file tree
Hide file tree
Showing 45 changed files with 44 additions and 48 deletions.
2 changes: 1 addition & 1 deletion cmds/grpc-backend/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmds/http-gateway/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 1 addition & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand All @@ -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
Expand Down
2 changes: 0 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
2 changes: 1 addition & 1 deletion pkg/auth/auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/auth/auth_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/auth/claims.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"time"

"github.com/dgrijalva/jwt-go"
"github.com/palantir/stacktrace"
"github.com/interuss/stacktrace"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion pkg/aux_/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion pkg/cockroach/cockroach.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strconv"

"github.com/coreos/go-semver/semver"
"github.com/palantir/stacktrace"
"github.com/interuss/stacktrace"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion pkg/errors/errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/errors/errors_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"errors"
"testing"

"github.com/palantir/stacktrace"
"github.com/interuss/stacktrace"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/geo/errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package geo

import (
dsserr "github.com/interuss/dss/pkg/errors"
"github.com/palantir/stacktrace"
"github.com/interuss/stacktrace"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion pkg/geo/s2.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"github.com/golang/geo/s1"
"github.com/golang/geo/s2"
"github.com/palantir/stacktrace"
"github.com/interuss/stacktrace"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion pkg/models/geo.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion pkg/models/models.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"time"

"github.com/google/uuid"
"github.com/palantir/stacktrace"
"github.com/interuss/stacktrace"
)

type (
Expand Down
2 changes: 1 addition & 1 deletion pkg/models/rid_conversions.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 ===
Expand Down
2 changes: 1 addition & 1 deletion pkg/models/scd_conversions.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/rid/application/isa.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/rid/application/isa_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/rid/application/subscription.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/rid/application/subscription_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/rid/models/identification_service_area.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/rid/models/subscriptions.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

"github.com/golang/geo/s2"
"github.com/golang/protobuf/ptypes"
"github.com/palantir/stacktrace"
"github.com/interuss/stacktrace"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion pkg/rid/server/isa_handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion pkg/rid/server/server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/rid/server/subscription_handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion pkg/rid/store/cockroach/identification_service_area.go
Original file line number Diff line number Diff line change
Expand Up @@ -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/interuss/stacktrace"
"github.com/lib/pq"
"github.com/palantir/stacktrace"
"go.uber.org/zap"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/rid/store/cockroach/identification_service_area_v3.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (

"github.com/golang/geo/s2"
dssql "github.com/interuss/dss/pkg/sql"
"github.com/interuss/stacktrace"
"github.com/lib/pq"
"github.com/palantir/stacktrace"
"go.uber.org/zap"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/rid/store/cockroach/store.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/rid/store/cockroach/subcriptions_v3.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (

"github.com/golang/geo/s2"
dssql "github.com/interuss/dss/pkg/sql"
"github.com/interuss/stacktrace"
"github.com/lib/pq"
"github.com/palantir/stacktrace"
"go.uber.org/zap"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/rid/store/cockroach/subscriptions.go
Original file line number Diff line number Diff line change
Expand Up @@ -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/interuss/stacktrace"
"github.com/lib/pq"
"github.com/palantir/stacktrace"
"go.uber.org/zap"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/scd/constraints_handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/scd/errors/errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/scd/models/constraints.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/scd/models/models.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"net/url"
"time"

"github.com/palantir/stacktrace"
"github.com/interuss/stacktrace"
)

type (
Expand Down
2 changes: 1 addition & 1 deletion pkg/scd/models/operations.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion pkg/scd/models/subscriptions.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"github.com/golang/geo/s2"
"github.com/golang/protobuf/ptypes"
"github.com/palantir/stacktrace"
"github.com/interuss/stacktrace"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion pkg/scd/operations_handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/scd/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion pkg/scd/store/cockroach/constraints.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
scdmodels "github.com/interuss/dss/pkg/scd/models"
dsssql "github.com/interuss/dss/pkg/sql"

"github.com/interuss/stacktrace"
"github.com/lib/pq"
"github.com/palantir/stacktrace"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion pkg/scd/store/cockroach/operations.go
Original file line number Diff line number Diff line change
Expand Up @@ -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/interuss/stacktrace"
"github.com/lib/pq"
"github.com/palantir/stacktrace"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion pkg/scd/store/cockroach/store.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
Loading

0 comments on commit 52a2504

Please sign in to comment.