Skip to content

Commit e3100a9

Browse files
authored
gosnowflake/v2 (#4266)
1 parent 765ca72 commit e3100a9

8 files changed

Lines changed: 58 additions & 71 deletions

File tree

e2e_cleanup/go.mod

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.26.0
55
require (
66
cloud.google.com/go/bigquery v1.72.0
77
cloud.google.com/go/pubsub/v2 v2.3.0
8-
github.com/snowflakedb/gosnowflake v1.18.1
8+
github.com/snowflakedb/gosnowflake/v2 v2.0.2
99
github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78
1010
google.golang.org/api v0.257.0 // Note: 0.258.0 replaces WithCredentialsJSON with something that needs more digging to integrate
1111
)
@@ -22,10 +22,8 @@ require (
2222
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2 // indirect
2323
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.4 // indirect
2424
github.com/BurntSushi/toml v1.6.0 // indirect
25-
github.com/andybalholm/brotli v1.2.0 // indirect
2625
github.com/apache/arrow-go/v18 v18.5.0 // indirect
2726
github.com/apache/arrow/go/v15 v15.0.2 // indirect
28-
github.com/apache/thrift v0.22.0 // indirect
2927
github.com/aws/aws-sdk-go-v2 v1.41.1 // indirect
3028
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.4 // indirect
3129
github.com/aws/aws-sdk-go-v2/config v1.32.7 // indirect
@@ -57,30 +55,25 @@ require (
5755
github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
5856
github.com/golang-jwt/jwt/v5 v5.3.0 // indirect
5957
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
60-
github.com/golang/snappy v1.0.0 // indirect
6158
github.com/google/flatbuffers v25.12.19+incompatible // indirect
6259
github.com/google/s2a-go v0.1.9 // indirect
6360
github.com/google/uuid v1.6.0 // indirect
6461
github.com/googleapis/enterprise-certificate-proxy v0.3.11 // indirect
6562
github.com/googleapis/gax-go/v2 v2.16.0 // indirect
6663
github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
67-
github.com/klauspost/asmfmt v1.3.2 // indirect
6864
github.com/klauspost/compress v1.18.3 // indirect
6965
github.com/klauspost/cpuid/v2 v2.3.0 // indirect
70-
github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 // indirect
71-
github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 // indirect
7266
github.com/mtibben/percent v0.2.1 // indirect
7367
github.com/pierrec/lz4/v4 v4.1.25 // indirect
7468
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
75-
github.com/sirupsen/logrus v1.9.4 // indirect
7669
github.com/zeebo/xxh3 v1.0.2 // indirect
7770
go.opencensus.io v0.24.0 // indirect
7871
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
7972
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.64.0 // indirect
8073
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.64.0 // indirect
81-
go.opentelemetry.io/otel v1.39.0 // indirect
82-
go.opentelemetry.io/otel/metric v1.39.0 // indirect
83-
go.opentelemetry.io/otel/trace v1.39.0 // indirect
74+
go.opentelemetry.io/otel v1.40.0 // indirect
75+
go.opentelemetry.io/otel/metric v1.40.0 // indirect
76+
go.opentelemetry.io/otel/trace v1.40.0 // indirect
8477
golang.org/x/crypto v0.47.0 // indirect
8578
golang.org/x/exp v0.0.0-20260112195511-716be5621a96 // indirect
8679
golang.org/x/mod v0.32.0 // indirect
@@ -97,7 +90,7 @@ require (
9790
google.golang.org/genproto v0.0.0-20260120174246-409b4a993575 // indirect
9891
google.golang.org/genproto/googleapis/api v0.0.0-20260120174246-409b4a993575 // indirect
9992
google.golang.org/genproto/googleapis/rpc v0.0.0-20260120174246-409b4a993575 // indirect
100-
google.golang.org/grpc v1.78.0 // indirect
93+
google.golang.org/grpc v1.79.3 // indirect
10194
google.golang.org/protobuf v1.36.11 // indirect
10295
)
10396

e2e_cleanup/go.sum

Lines changed: 23 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
cel.dev/expr v0.24.0 h1:56OvJKSH3hDGL0ml5uSxZmz3/3Pq4tJ+fb1unVLAFcY=
2-
cel.dev/expr v0.24.0/go.mod h1:hLPLo1W4QUmuYdA72RBX06QTs6MXw941piREPl3Yfiw=
1+
cel.dev/expr v0.25.1 h1:1KrZg61W6TWSxuNZ37Xy49ps13NUovb66QLprthtwi4=
2+
cel.dev/expr v0.25.1/go.mod h1:hrXvqGP6G6gyx8UAHSHJ5RGk//1Oj5nXQ2NI02Nrsg4=
33
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
44
cloud.google.com/go v0.123.0 h1:2NAUJwPR47q+E35uaJeYoNhuNEM9kM8SjgRgdeOJUSE=
55
cloud.google.com/go v0.123.0/go.mod h1:xBoMV08QcqUGuPW65Qfm1o9Y4zKZBpGS+7bImXLTAZU=
@@ -101,8 +101,8 @@ github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UF
101101
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
102102
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
103103
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
104-
github.com/cncf/xds/go v0.0.0-20251022180443-0feb69152e9f h1:Y8xYupdHxryycyPlc9Y+bSQAYZnetRJ70VMVKm5CKI0=
105-
github.com/cncf/xds/go v0.0.0-20251022180443-0feb69152e9f/go.mod h1:HlzOvOjVBOfTGSRXRyY0OiCS/3J1akRGQQpRO/7zyF4=
104+
github.com/cncf/xds/go v0.0.0-20251210132809-ee656c7534f5 h1:6xNmx7iTtyBRev0+D/Tv1FZd4SCg8axKApyNyRsAt/w=
105+
github.com/cncf/xds/go v0.0.0-20251210132809-ee656c7534f5/go.mod h1:KdCmV+x/BuvyMxRnYBlmVaq4OLiKW6iRQfvC62cvdkI=
106106
github.com/danieljoos/wincred v1.2.3 h1:v7dZC2x32Ut3nEfRH+vhoZGvN72+dQ/snVXo/vMFLdQ=
107107
github.com/danieljoos/wincred v1.2.3/go.mod h1:6qqX0WNrS4RzPZ1tnroDzq9kY3fu1KwE7MRLQK4X0bs=
108108
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -114,12 +114,12 @@ github.com/dvsekhvalnov/jose2go v1.8.0/go.mod h1:QsHjhyTlD/lAVqn/NSbVZmSCGeDehTB
114114
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
115115
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
116116
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
117-
github.com/envoyproxy/go-control-plane v0.13.5-0.20251024222203-75eaa193e329 h1:K+fnvUM0VZ7ZFJf0n4L/BRlnsb9pL/GuDG6FqaH+PwM=
118-
github.com/envoyproxy/go-control-plane/envoy v1.35.0 h1:ixjkELDE+ru6idPxcHLj8LBVc2bFP7iBytj353BoHUo=
119-
github.com/envoyproxy/go-control-plane/envoy v1.35.0/go.mod h1:09qwbGVuSWWAyN5t/b3iyVfz5+z8QWGrzkoqm/8SbEs=
117+
github.com/envoyproxy/go-control-plane v0.14.0 h1:hbG2kr4RuFj222B6+7T83thSPqLjwBIfQawTkC++2HA=
118+
github.com/envoyproxy/go-control-plane/envoy v1.36.0 h1:yg/JjO5E7ubRyKX3m07GF3reDNEnfOboJ0QySbH736g=
119+
github.com/envoyproxy/go-control-plane/envoy v1.36.0/go.mod h1:ty89S1YCCVruQAm9OtKeEkQLTb+Lkz0k8v9W0Oxsv98=
120120
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
121-
github.com/envoyproxy/protoc-gen-validate v1.2.1 h1:DEo3O99U8j4hBFwbJfrz9VtgcDfUKS7KJ7spH3d86P8=
122-
github.com/envoyproxy/protoc-gen-validate v1.2.1/go.mod h1:d/C80l/jxXLdfEIhX1W2TmLfsJ31lvEjwamM4DxlWXU=
121+
github.com/envoyproxy/protoc-gen-validate v1.3.0 h1:TvGH1wof4H33rezVKWSpqKz5NXWg5VPuZ0uONDT6eb4=
122+
github.com/envoyproxy/protoc-gen-validate v1.3.0/go.mod h1:HvYl7zwPa5mffgyeTUHA9zHIH36nmrm7oCbo4YKoSWA=
123123
github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
124124
github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
125125
github.com/gabriel-vasile/mimetype v1.4.12 h1:e9hWvmLYvtp846tLHam2o++qitpguFiYCKbn0w9jyqw=
@@ -211,10 +211,8 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH
211211
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
212212
github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
213213
github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
214-
github.com/sirupsen/logrus v1.9.4 h1:TsZE7l11zFCLZnZ+teH4Umoq5BhEIfIzfRDZ1Uzql2w=
215-
github.com/sirupsen/logrus v1.9.4/go.mod h1:ftWc9WdOfJ0a92nsE2jF5u5ZwH8Bv2zdeOC42RjbV2g=
216-
github.com/snowflakedb/gosnowflake v1.18.1 h1:Nb4AWSnSBWe1UKpKTwCZxjYhYo1JH7GgKhO3wW1kR10=
217-
github.com/snowflakedb/gosnowflake v1.18.1/go.mod h1:7D4+cLepOWrerVsH+tevW3zdMJ5/WrEN7ZceAC6xBv0=
214+
github.com/snowflakedb/gosnowflake/v2 v2.0.2 h1:8UZo+v1T2Y9sgoPk3JYT3RatAUd9o6q6yjL40TyHluA=
215+
github.com/snowflakedb/gosnowflake/v2 v2.0.2/go.mod h1:c0hIqJ/dxgaMl7g1o8n4Ca3Mf5YCiiVx9igio/PNqC8=
218216
github.com/spiffe/go-spiffe/v2 v2.6.0 h1:l+DolpxNWYgruGQVV0xsfeya3CsC7m8iBzDnMpsbLuo=
219217
github.com/spiffe/go-spiffe/v2 v2.6.0/go.mod h1:gm2SeUoMZEtpnzPNs2Csc0D/gX33k1xIx7lEzqblHEs=
220218
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -227,8 +225,6 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
227225
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
228226
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
229227
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
230-
github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZqKjWU=
231-
github.com/xyproto/randomstring v1.0.5/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E=
232228
github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 h1:ilQV1hzziu+LLM3zUTJ0trRztfwgjqKnBWNtSRkbmwM=
233229
github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78/go.mod h1:aL8wCCfTfSfmXjznFBSZNN13rSJjlIOI1fUNAtF7rmI=
234230
github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ=
@@ -241,22 +237,22 @@ go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
241237
go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
242238
go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
243239
go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
244-
go.opentelemetry.io/contrib/detectors/gcp v1.38.0 h1:ZoYbqX7OaA/TAikspPl3ozPI6iY6LiIY9I8cUfm+pJs=
245-
go.opentelemetry.io/contrib/detectors/gcp v1.38.0/go.mod h1:SU+iU7nu5ud4oCb3LQOhIZ3nRLj6FNVrKgtflbaf2ts=
240+
go.opentelemetry.io/contrib/detectors/gcp v1.39.0 h1:kWRNZMsfBHZ+uHjiH4y7Etn2FK26LAGkNFw7RHv1DhE=
241+
go.opentelemetry.io/contrib/detectors/gcp v1.39.0/go.mod h1:t/OGqzHBa5v6RHZwrDBJ2OirWc+4q/w2fTbLZwAKjTk=
246242
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.64.0 h1:RN3ifU8y4prNWeEnQp2kRRHz8UwonAEYZl8tUzHEXAk=
247243
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.64.0/go.mod h1:habDz3tEWiFANTo6oUE99EmaFUrCNYAAg3wiVmusm70=
248244
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.64.0 h1:ssfIgGNANqpVFCndZvcuyKbl0g+UAVcbBcqGkG28H0Y=
249245
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.64.0/go.mod h1:GQ/474YrbE4Jx8gZ4q5I4hrhUzM6UPzyrqJYV2AqPoQ=
250-
go.opentelemetry.io/otel v1.39.0 h1:8yPrr/S0ND9QEfTfdP9V+SiwT4E0G7Y5MO7p85nis48=
251-
go.opentelemetry.io/otel v1.39.0/go.mod h1:kLlFTywNWrFyEdH0oj2xK0bFYZtHRYUdv1NklR/tgc8=
252-
go.opentelemetry.io/otel/metric v1.39.0 h1:d1UzonvEZriVfpNKEVmHXbdf909uGTOQjA0HF0Ls5Q0=
253-
go.opentelemetry.io/otel/metric v1.39.0/go.mod h1:jrZSWL33sD7bBxg1xjrqyDjnuzTUB0x1nBERXd7Ftcs=
254-
go.opentelemetry.io/otel/sdk v1.39.0 h1:nMLYcjVsvdui1B/4FRkwjzoRVsMK8uL/cj0OyhKzt18=
255-
go.opentelemetry.io/otel/sdk v1.39.0/go.mod h1:vDojkC4/jsTJsE+kh+LXYQlbL8CgrEcwmt1ENZszdJE=
246+
go.opentelemetry.io/otel v1.40.0 h1:oA5YeOcpRTXq6NN7frwmwFR0Cn3RhTVZvXsP4duvCms=
247+
go.opentelemetry.io/otel v1.40.0/go.mod h1:IMb+uXZUKkMXdPddhwAHm6UfOwJyh4ct1ybIlV14J0g=
248+
go.opentelemetry.io/otel/metric v1.40.0 h1:rcZe317KPftE2rstWIBitCdVp89A2HqjkxR3c11+p9g=
249+
go.opentelemetry.io/otel/metric v1.40.0/go.mod h1:ib/crwQH7N3r5kfiBZQbwrTge743UDc7DTFVZrrXnqc=
250+
go.opentelemetry.io/otel/sdk v1.40.0 h1:KHW/jUzgo6wsPh9At46+h4upjtccTmuZCFAc9OJ71f8=
251+
go.opentelemetry.io/otel/sdk v1.40.0/go.mod h1:Ph7EFdYvxq72Y8Li9q8KebuYUr2KoeyHx0DRMKrYBUE=
256252
go.opentelemetry.io/otel/sdk/metric v1.39.0 h1:cXMVVFVgsIf2YL6QkRF4Urbr/aMInf+2WKg+sEJTtB8=
257253
go.opentelemetry.io/otel/sdk/metric v1.39.0/go.mod h1:xq9HEVH7qeX69/JnwEfp6fVq5wosJsY1mt4lLfYdVew=
258-
go.opentelemetry.io/otel/trace v1.39.0 h1:2d2vfpEDmCJ5zVYz7ijaJdOF59xLomrvj7bjt6/qCJI=
259-
go.opentelemetry.io/otel/trace v1.39.0/go.mod h1:88w4/PnZSazkGzz/w84VHpQafiU4EtqqlVdxWy+rNOA=
254+
go.opentelemetry.io/otel/trace v1.40.0 h1:WA4etStDttCSYuhwvEa8OP8I5EWu24lkOzp+ZYblVjw=
255+
go.opentelemetry.io/otel/trace v1.40.0/go.mod h1:zeAhriXecNGP/s2SEG3+Y8X9ujcJOTqQ5RgdEJcawiA=
260256
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
261257
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
262258
golang.org/x/crypto v0.47.0 h1:V6e3FRj+n4dbpw86FJ8Fv7XVOql7TEwpHapKoMJ/GO8=
@@ -332,8 +328,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac
332328
google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
333329
google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
334330
google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
335-
google.golang.org/grpc v1.78.0 h1:K1XZG/yGDJnzMdd/uZHAkVqJE+xIDOcmdSFZkBUicNc=
336-
google.golang.org/grpc v1.78.0/go.mod h1:I47qjTo4OKbMkjA/aOOwxDIiPSBofUtQUI5EfpWvW7U=
331+
google.golang.org/grpc v1.79.3 h1:sybAEdRIEtvcD68Gx7dmnwjZKlyfuc61Dyo9pGXXkKE=
332+
google.golang.org/grpc v1.79.3/go.mod h1:KmT0Kjez+0dde/v2j9vzwoAScgEPx/Bw1CYChhHLrHQ=
337333
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
338334
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
339335
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=

e2e_cleanup/main.go

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"cloud.google.com/go/bigquery"
1818
"cloud.google.com/go/pubsub/v2"
1919
pubsubpb "cloud.google.com/go/pubsub/v2/apiv1/pubsubpb"
20-
"github.com/snowflakedb/gosnowflake"
20+
"github.com/snowflakedb/gosnowflake/v2"
2121
"github.com/youmark/pkcs8"
2222
"google.golang.org/api/iterator"
2323
"google.golang.org/api/option"
@@ -178,15 +178,17 @@ func CleanupSF(ctx context.Context) {
178178
}
179179

180180
snowflakeConfig := gosnowflake.Config{
181-
Account: config.AccountId,
182-
User: config.Username,
183-
Authenticator: gosnowflake.AuthTypeJwt,
184-
PrivateKey: privateKey,
185-
Database: config.Database,
186-
Warehouse: config.Warehouse,
187-
Role: config.Role,
188-
RequestTimeout: time.Minute,
189-
DisableTelemetry: true,
181+
Account: config.AccountId,
182+
User: config.Username,
183+
Authenticator: gosnowflake.AuthTypeJwt,
184+
PrivateKey: privateKey,
185+
Database: config.Database,
186+
Warehouse: config.Warehouse,
187+
Role: config.Role,
188+
RequestTimeout: time.Minute,
189+
Params: map[string]*string{
190+
"CLIENT_TELEMETRY_ENABLED": new("false"),
191+
},
190192
}
191193

192194
snowflakeConfigDSN, err := gosnowflake.DSN(&snowflakeConfig)

flow/connectors/snowflake/qrep.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"github.com/aws/aws-sdk-go-v2/aws"
1111
"github.com/aws/aws-sdk-go-v2/service/s3"
1212
"github.com/jackc/pgx/v5/pgtype"
13-
"github.com/snowflakedb/gosnowflake"
13+
"github.com/snowflakedb/gosnowflake/v2"
1414

1515
"github.com/PeerDB-io/peerdb/flow/connectors/utils"
1616
"github.com/PeerDB-io/peerdb/flow/generated/protos"

flow/connectors/snowflake/qrep_avro_sync.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"time"
1111

1212
"github.com/hamba/avro/v2/ocf"
13-
_ "github.com/snowflakedb/gosnowflake"
13+
_ "github.com/snowflakedb/gosnowflake/v2"
1414

1515
"github.com/PeerDB-io/peerdb/flow/connectors/utils"
1616
"github.com/PeerDB-io/peerdb/flow/generated/protos"

flow/connectors/snowflake/snowflake.go

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"time"
1313

1414
"github.com/jackc/pgx/v5/pgtype"
15-
"github.com/snowflakedb/gosnowflake"
15+
"github.com/snowflakedb/gosnowflake/v2"
1616
"go.temporal.io/sdk/log"
1717
"golang.org/x/sync/errgroup"
1818

@@ -90,20 +90,19 @@ func NewSnowflakeConnector(
9090
return nil, err
9191
}
9292

93-
additionalParams := make(map[string]*string)
94-
additionalParams["CLIENT_SESSION_KEEP_ALIVE"] = new("true")
95-
9693
snowflakeConfig := gosnowflake.Config{
97-
Account: snowflakeProtoConfig.AccountId,
98-
User: snowflakeProtoConfig.Username,
99-
Authenticator: gosnowflake.AuthTypeJwt,
100-
PrivateKey: PrivateKeyRSA,
101-
Database: snowflakeProtoConfig.Database,
102-
Warehouse: snowflakeProtoConfig.Warehouse,
103-
Role: snowflakeProtoConfig.Role,
104-
RequestTimeout: time.Duration(snowflakeProtoConfig.QueryTimeout),
105-
DisableTelemetry: true,
106-
Params: additionalParams,
94+
Account: snowflakeProtoConfig.AccountId,
95+
User: snowflakeProtoConfig.Username,
96+
Authenticator: gosnowflake.AuthTypeJwt,
97+
PrivateKey: PrivateKeyRSA,
98+
Database: snowflakeProtoConfig.Database,
99+
Warehouse: snowflakeProtoConfig.Warehouse,
100+
Role: snowflakeProtoConfig.Role,
101+
RequestTimeout: time.Duration(snowflakeProtoConfig.QueryTimeout),
102+
Params: map[string]*string{
103+
"CLIENT_SESSION_KEEP_ALIVE": new("true"),
104+
"CLIENT_TELEMETRY_ENABLED": new("false"),
105+
},
107106
}
108107

109108
snowflakeConfigDSN, err := gosnowflake.DSN(&snowflakeConfig)

flow/go.mod

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ require (
5050
github.com/pingcap/tidb/pkg/parser v0.0.0-20260331182218-500f1607530b
5151
github.com/shopspring/decimal v1.4.0
5252
github.com/slack-go/slack v0.20.0
53-
github.com/snowflakedb/gosnowflake v1.19.0
53+
github.com/snowflakedb/gosnowflake/v2 v2.0.2
5454
github.com/stretchr/testify v1.11.1
5555
github.com/twmb/franz-go v1.20.7
5656
github.com/twmb/franz-go/pkg/kadm v1.17.2
@@ -249,7 +249,6 @@ require (
249249
github.com/segmentio/asm v1.2.1 // indirect
250250
github.com/shirou/gopsutil/v3 v3.24.5 // indirect
251251
github.com/shoenig/go-m1cpu v0.2.1 // indirect
252-
github.com/sirupsen/logrus v1.9.4 // indirect
253252
github.com/spiffe/go-spiffe/v2 v2.6.0 // indirect
254253
github.com/stretchr/objx v0.5.3 // indirect
255254
github.com/tiancaiamao/gp v0.0.0-20230126082955-4f9e4f1ed9b5 // indirect

flow/go.sum

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -619,12 +619,10 @@ github.com/shoenig/test v1.7.0/go.mod h1:UxJ6u/x2v/TNs/LoLxBNJRV9DiwBBKYxXSyczsB
619619
github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k=
620620
github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME=
621621
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
622-
github.com/sirupsen/logrus v1.9.4 h1:TsZE7l11zFCLZnZ+teH4Umoq5BhEIfIzfRDZ1Uzql2w=
623-
github.com/sirupsen/logrus v1.9.4/go.mod h1:ftWc9WdOfJ0a92nsE2jF5u5ZwH8Bv2zdeOC42RjbV2g=
624622
github.com/slack-go/slack v0.20.0 h1:gbDdbee8+Z2o+DWx05Spq3GzbrLLleiRwHUKs+hZLSU=
625623
github.com/slack-go/slack v0.20.0/go.mod h1:K81UmCivcYd/5Jmz8vLBfuyoZ3B4rQC2GHVXHteXiAE=
626-
github.com/snowflakedb/gosnowflake v1.19.0 h1:Oy/w5/hXiSJV09kgG9zpFZFjNRNvF5Cet7r6vzd87OQ=
627-
github.com/snowflakedb/gosnowflake v1.19.0/go.mod h1:7D4+cLepOWrerVsH+tevW3zdMJ5/WrEN7ZceAC6xBv0=
624+
github.com/snowflakedb/gosnowflake/v2 v2.0.2 h1:8UZo+v1T2Y9sgoPk3JYT3RatAUd9o6q6yjL40TyHluA=
625+
github.com/snowflakedb/gosnowflake/v2 v2.0.2/go.mod h1:c0hIqJ/dxgaMl7g1o8n4Ca3Mf5YCiiVx9igio/PNqC8=
628626
github.com/spf13/pflag v1.0.9 h1:9exaQaMOCwffKiiiYk6/BndUBv+iRViNW+4lEMi0PvY=
629627
github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
630628
github.com/spiffe/go-spiffe/v2 v2.6.0 h1:l+DolpxNWYgruGQVV0xsfeya3CsC7m8iBzDnMpsbLuo=

0 commit comments

Comments
 (0)