From fc22eeb49ebbded3097ed986f8f8e02cd6cf8de2 Mon Sep 17 00:00:00 2001 From: Josh Liburdi Date: Thu, 3 Oct 2024 08:53:49 -0700 Subject: [PATCH] fix(condition): Remove v1 Imports (#246) --- condition/format_json.go | 2 +- condition/network.go | 2 +- condition/number.go | 2 +- go.mod | 3 +-- go.sum | 5 +++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/condition/format_json.go b/condition/format_json.go index 83b6bb18..7c92dc35 100644 --- a/condition/format_json.go +++ b/condition/format_json.go @@ -7,7 +7,7 @@ import ( "github.com/brexhq/substation/v2/config" "github.com/brexhq/substation/v2/message" - iconfig "github.com/brexhq/substation/internal/config" + iconfig "github.com/brexhq/substation/v2/internal/config" ) type formatJSONConfig struct{} diff --git a/condition/network.go b/condition/network.go index c1506c9a..246ab392 100644 --- a/condition/network.go +++ b/condition/network.go @@ -1,7 +1,7 @@ package condition import ( - iconfig "github.com/brexhq/substation/internal/config" + iconfig "github.com/brexhq/substation/v2/internal/config" ) type networkIPConfig struct { diff --git a/condition/number.go b/condition/number.go index 979c171c..464f9120 100644 --- a/condition/number.go +++ b/condition/number.go @@ -3,7 +3,7 @@ package condition import ( "unicode/utf8" - iconfig "github.com/brexhq/substation/internal/config" + iconfig "github.com/brexhq/substation/v2/internal/config" ) type numberBitwiseConfig struct { diff --git a/go.mod b/go.mod index 751718fa..15fdf777 100644 --- a/go.mod +++ b/go.mod @@ -24,8 +24,8 @@ require ( github.com/aws/aws-sdk-go-v2/service/sts v1.30.5 github.com/aws/aws-xray-sdk-go v1.8.4 github.com/awslabs/kinesis-aggregation/go/v2 v2.0.0-20230808105340-e631fe742486 - github.com/brexhq/substation v1.7.1 github.com/golang/protobuf v1.5.4 + github.com/google/go-jsonnet v0.20.0 github.com/google/uuid v1.6.0 github.com/hashicorp/go-retryablehttp v0.7.7 github.com/iancoleman/strcase v0.3.0 @@ -58,7 +58,6 @@ require ( github.com/aws/aws-sdk-go-v2/service/sso v1.22.5 // indirect github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.5 // indirect github.com/aws/smithy-go v1.20.4 // indirect - github.com/google/go-jsonnet v0.20.0 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/itchyny/timefmt-go v0.1.6 // indirect diff --git a/go.sum b/go.sum index 9e6f1ac5..b615c295 100644 --- a/go.sum +++ b/go.sum @@ -79,8 +79,6 @@ github.com/aws/smithy-go v1.20.4 h1:2HK1zBdPgRbjFOHlfeQZfpC4r72MOb9bZkiFwggKO+4= github.com/aws/smithy-go v1.20.4/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg= github.com/awslabs/kinesis-aggregation/go/v2 v2.0.0-20230808105340-e631fe742486 h1:266Pq6JfxdphziJ1LiqU68OJrKiTxyF8hbiceQWX3Cs= github.com/awslabs/kinesis-aggregation/go/v2 v2.0.0-20230808105340-e631fe742486/go.mod h1:0Qr1uMHFmHsIYMcG4T7BJ9yrJtWadhOmpABCX69dwuc= -github.com/brexhq/substation v1.7.1 h1:v5SwdexouuTLzLdwSVJ/RbkJyt+lN+2a5WOw+l11ULI= -github.com/brexhq/substation v1.7.1/go.mod h1:4GFx9JFQVZX17xjA7fY0tMaLnsPzhVKb8YzLNeymm2I= github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= @@ -133,6 +131,8 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= +github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= @@ -177,6 +177,7 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=