From 1d11ba57fdc499c0538db71c2477a265de5c571d Mon Sep 17 00:00:00 2001 From: Andy Kurnia Date: Sat, 24 Aug 2024 21:09:44 +0800 Subject: [PATCH 1/6] upgrade wolges-wasm to 07bc6e2733393b07f678d8ec37cc170f1df0e0ac --- liwords-ui/wolges-wasm-pkg/wolges_wasm_bg.js | 6 +++--- .../wolges-wasm-pkg/wolges_wasm_bg.wasm | Bin 315911 -> 316969 bytes .../wolges-wasm-pkg/wolges_wasm_bg.wasm.d.ts | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/liwords-ui/wolges-wasm-pkg/wolges_wasm_bg.js b/liwords-ui/wolges-wasm-pkg/wolges_wasm_bg.js index 799a7589c..c48bed335 100644 --- a/liwords-ui/wolges-wasm-pkg/wolges_wasm_bg.js +++ b/liwords-ui/wolges-wasm-pkg/wolges_wasm_bg.js @@ -84,7 +84,7 @@ function makeMutClosure(arg0, arg1, dtor, f) { return real; } function __wbg_adapter_16(arg0, arg1, arg2) { - wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h61cf9e5aacf0153b(arg0, arg1, addHeapObject(arg2)); + wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hd640bd04ecb855ec(arg0, arg1, addHeapObject(arg2)); } /** @@ -230,7 +230,7 @@ function handleError(f, args) { } } function __wbg_adapter_38(arg0, arg1, arg2, arg3) { - wasm.wasm_bindgen__convert__closures__invoke2_mut__h3409d2254e50f72c(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3)); + wasm.wasm_bindgen__convert__closures__invoke2_mut__h1805480ca7be13b8(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3)); } export function __wbindgen_string_new(arg0, arg1) { @@ -374,7 +374,7 @@ export function __wbindgen_throw(arg0, arg1) { throw new Error(getStringFromWasm0(arg0, arg1)); }; -export function __wbindgen_closure_wrapper313(arg0, arg1, arg2) { +export function __wbindgen_closure_wrapper317(arg0, arg1, arg2) { const ret = makeMutClosure(arg0, arg1, 67, __wbg_adapter_16); return addHeapObject(ret); }; diff --git a/liwords-ui/wolges-wasm-pkg/wolges_wasm_bg.wasm b/liwords-ui/wolges-wasm-pkg/wolges_wasm_bg.wasm index 89545fb89efad36428dbf6effbe27c3b49a0d62d..c1887779f391e54799951c79446eb9acfc1c1234 100644 GIT binary patch delta 35363 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%0AJfaYXPqW3reOv&c{q@FlnMW4I~dv%)q@4h&|NW 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 R`bYI9jZxj1HG0<@{s+n{2GRfk diff --git a/liwords-ui/wolges-wasm-pkg/wolges_wasm_bg.wasm.d.ts b/liwords-ui/wolges-wasm-pkg/wolges_wasm_bg.wasm.d.ts index 7138a8ecb..6e5b36b41 100644 --- a/liwords-ui/wolges-wasm-pkg/wolges_wasm_bg.wasm.d.ts +++ b/liwords-ui/wolges-wasm-pkg/wolges_wasm_bg.wasm.d.ts @@ -7,11 +7,11 @@ export function precache_klv(a: number, b: number, c: number, d: number): void; export function analyze(a: number, b: number): number; export function play_score(a: number, b: number, c: number): void; export const __wbindgen_export_0: WebAssembly.Table; -export function _dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h61cf9e5aacf0153b(a: number, b: number, c: number): void; +export function _dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hd640bd04ecb855ec(a: number, b: number, c: number): void; export function __wbindgen_malloc(a: number, b: number): number; export function __wbindgen_realloc(a: number, b: number, c: number, d: number): number; export function __wbindgen_add_to_stack_pointer(a: number): number; export function __wbindgen_free(a: number, b: number, c: number): void; export function __wbindgen_exn_store(a: number): void; -export function wasm_bindgen__convert__closures__invoke2_mut__h3409d2254e50f72c(a: number, b: number, c: number, d: number): void; +export function wasm_bindgen__convert__closures__invoke2_mut__h1805480ca7be13b8(a: number, b: number, c: number, d: number): void; export function __wbindgen_start(): void; From 2aa90d2ecd51e88edba512378cdfc94c579318c4 Mon Sep 17 00:00:00 2001 From: Andy Kurnia Date: Sat, 24 Aug 2024 21:14:52 +0800 Subject: [PATCH 2/6] upgrade go mods --- go.mod | 50 ++++++++++++++-------------- go.sum | 102 +++++++++++++++++++++++++++------------------------------ 2 files changed, 73 insertions(+), 79 deletions(-) diff --git a/go.mod b/go.mod index e48ae2746..c60343126 100644 --- a/go.mod +++ b/go.mod @@ -1,19 +1,19 @@ module github.com/woogles-io/liwords -go 1.22.2 +go 1.23.0 require ( connectrpc.com/connect v1.16.2 connectrpc.com/otelconnect v0.7.1 github.com/TwiN/go-away v1.6.13 github.com/aws/aws-sdk-go-v2 v1.30.4 - github.com/aws/aws-sdk-go-v2/config v1.27.28 - github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.12 - github.com/aws/aws-sdk-go-v2/service/ecs v1.45.1 - github.com/aws/aws-sdk-go-v2/service/lambda v1.58.0 - github.com/aws/aws-sdk-go-v2/service/s3 v1.60.0 + github.com/aws/aws-sdk-go-v2/config v1.27.30 + github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.14 + github.com/aws/aws-sdk-go-v2/service/ecs v1.45.2 + github.com/aws/aws-sdk-go-v2/service/lambda v1.58.1 + github.com/aws/aws-sdk-go-v2/service/s3 v1.60.1 github.com/aws/smithy-go v1.20.4 - github.com/domino14/macondo v0.9.6 + github.com/domino14/macondo v0.9.7 github.com/domino14/word-golib v0.2.0 github.com/exaring/otelpgx v0.6.2 github.com/go-redsync/redsync/v4 v4.13.0 @@ -34,15 +34,15 @@ require ( github.com/samber/lo v1.47.0 github.com/signalfx/splunk-otel-go/instrumentation/github.com/gomodule/redigo/splunkredigo v1.18.0 go.akshayshah.org/connectproto v0.6.0 - go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws v0.53.0 - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 - go.opentelemetry.io/otel v1.28.0 - go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0 - go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.28.0 - go.opentelemetry.io/otel/sdk v1.28.0 - go.opentelemetry.io/otel/sdk/metric v1.28.0 - go.opentelemetry.io/otel/trace v1.28.0 + go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws 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 v1.29.0 + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.29.0 + go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.29.0 + go.opentelemetry.io/otel/sdk v1.29.0 + go.opentelemetry.io/otel/sdk/metric v1.29.0 + go.opentelemetry.io/otel/trace v1.29.0 golang.org/x/crypto v0.26.0 google.golang.org/protobuf v1.34.2 gorm.io/datatypes v1.2.1 @@ -58,22 +58,22 @@ require ( github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect github.com/andybalholm/cascadia v1.3.2 // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.4 // indirect - github.com/aws/aws-sdk-go-v2/credentials v1.17.28 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.17.29 // indirect github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.12 // indirect github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.16 // indirect github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.16 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.16 // indirect - github.com/aws/aws-sdk-go-v2/service/dynamodb v1.34.5 // indirect + github.com/aws/aws-sdk-go-v2/service/dynamodb v1.34.6 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.4 // indirect github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.18 // indirect github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.9.17 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.18 // indirect github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.16 // indirect - github.com/aws/aws-sdk-go-v2/service/sqs v1.34.4 // indirect + github.com/aws/aws-sdk-go-v2/service/sqs v1.34.5 // indirect 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/aws-sdk-go-v2/service/sts v1.30.4 // indirect + github.com/aws/aws-sdk-go-v2/service/sts v1.30.5 // indirect github.com/cenkalti/backoff/v4 v4.3.0 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect @@ -104,7 +104,7 @@ require ( github.com/nats-io/nkeys v0.4.7 // indirect github.com/nats-io/nuid v1.0.1 // indirect github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect - github.com/pelletier/go-toml/v2 v2.2.2 // indirect + github.com/pelletier/go-toml/v2 v2.2.3 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/rs/xid v1.5.0 // indirect github.com/sagikazarmark/locafero v0.6.0 // indirect @@ -117,18 +117,18 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/spf13/viper v1.19.0 // indirect github.com/subosito/gotenv v1.6.0 // indirect - go.opentelemetry.io/otel/metric v1.28.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 - golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa // indirect + golang.org/x/exp v0.0.0-20240823005443-9b4947da3948 // indirect golang.org/x/net v0.28.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 gonum.org/v1/gonum v0.15.1 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240820151423-278611b39280 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240820151423-278611b39280 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240823204242-4ba0660f739c // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240823204242-4ba0660f739c // indirect google.golang.org/grpc v1.65.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index f431e41fe..3063abfef 100644 --- a/go.sum +++ b/go.sum @@ -20,14 +20,14 @@ github.com/aws/aws-sdk-go-v2 v1.30.4 h1:frhcagrVNrzmT95RJImMHgabt99vkXGslubDaDag github.com/aws/aws-sdk-go-v2 v1.30.4/go.mod h1:CT+ZPWXbYrci8chcARI3OmI/qgd+f6WtuLOoaIA8PR0= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.4 h1:70PVAiL15/aBMh5LThwgXdSQorVr91L127ttckI9QQU= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.4/go.mod h1:/MQxMqci8tlqDH+pjmoLu1i0tbWCUP1hhyMRuFxpQCw= -github.com/aws/aws-sdk-go-v2/config v1.27.28 h1:OTxWGW/91C61QlneCtnD62NLb4W616/NM1jA8LhJqbg= -github.com/aws/aws-sdk-go-v2/config v1.27.28/go.mod h1:uzVRVtJSU5EFv6Fu82AoVFKozJi2ZCY6WRCXj06rbvs= -github.com/aws/aws-sdk-go-v2/credentials v1.17.28 h1:m8+AHY/ND8CMHJnPoH7PJIRakWGa4gbfbxuY9TGTUXM= -github.com/aws/aws-sdk-go-v2/credentials v1.17.28/go.mod h1:6TF7dSc78ehD1SL6KpRIPKMA1GyyWflIkjqg+qmf4+c= +github.com/aws/aws-sdk-go-v2/config v1.27.30 h1:AQF3/+rOgeJBQP3iI4vojlPib5X6eeOYoa/af7OxAYg= +github.com/aws/aws-sdk-go-v2/config v1.27.30/go.mod h1:yxqvuubha9Vw8stEgNiStO+yZpP68Wm9hLmcm+R/Qk4= +github.com/aws/aws-sdk-go-v2/credentials v1.17.29 h1:CwGsupsXIlAFYuDVHv1nnK0wnxO0wZ/g1L8DSK/xiIw= +github.com/aws/aws-sdk-go-v2/credentials v1.17.29/go.mod h1:BPJ/yXV92ZVq6G8uYvbU0gSl8q94UB63nMT5ctNO38g= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.12 h1:yjwoSyDZF8Jth+mUk5lSPJCkMC0lMy6FaCD51jm6ayE= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.12/go.mod h1:fuR57fAgMk7ot3WcNQfb6rSEn+SUffl7ri+aa8uKysI= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.12 h1:i7cJ1izNlox4ka6cvbHPTztYGtbpW4Je/jyQIKOIU4A= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.12/go.mod h1:lHnam/4CTEVHaANZD54IrpE80VLK+lUU84WEeJ1FJ8M= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.14 h1:dQa4KkoEVgk3oLL9IeoW9qrXijyQ6lWa+DX6Vn32Lhw= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.14/go.mod h1:aRKW0B+zH8J6cz3FFiQ9JbUQc7UroLx6lwfvNqIsPOs= github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.16 h1:TNyt/+X43KJ9IJJMjKfa3bNTiZbUP7DeCxfbTROESwY= github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.16/go.mod h1:2DwJF39FlNAUiX5pAc0UNeiz16lK2t7IaFcm0LFHEgc= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.16 h1:jYfy8UPmd+6kJW5YhY0L1/KftReOGxI/4NtVSTh9O/I= @@ -36,10 +36,10 @@ github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 h1:VaRN3TlFdd6KxX1x3ILT5ynH6HvK github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1/go.mod h1:FbtygfRFze9usAadmnGJNc8KsP346kEe+y2/oyhGAGc= github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.16 h1:mimdLQkIX1zr8GIPY1ZtALdBQGxcASiBd2MOp8m/dMc= github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.16/go.mod h1:YHk6owoSwrIsok+cAH9PENCOGoH5PU2EllX4vLtSrsY= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.34.5 h1:Cm77yt+/CV7A6DglkENsWA3H1hq8+4ItJnFKrhxHkvg= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.34.5/go.mod h1:s2fYaueBuCnwv1XQn6T8TfShxJWusv5tWPMcL+GY6+g= -github.com/aws/aws-sdk-go-v2/service/ecs v1.45.1 h1:3ZgHR32WOV1SWQVBDwsuOm4e69AKL1XMGuc1LyJjJ50= -github.com/aws/aws-sdk-go-v2/service/ecs v1.45.1/go.mod h1:er8WHbgZAl17Dmu41ifKmUrV7JPpiQnRc+XSrnu4qR8= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.34.6 h1:LKZuRTlh8RszjuWcUwEDvCGwjx5olHPp6ZOepyZV5p8= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.34.6/go.mod h1:s2fYaueBuCnwv1XQn6T8TfShxJWusv5tWPMcL+GY6+g= +github.com/aws/aws-sdk-go-v2/service/ecs v1.45.2 h1:DSFxt4HBQjlgKNMyYdME9cbB11FFi7umpTGbqJaS9nw= +github.com/aws/aws-sdk-go-v2/service/ecs v1.45.2/go.mod h1:er8WHbgZAl17Dmu41ifKmUrV7JPpiQnRc+XSrnu4qR8= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.4 h1:KypMCbLPPHEmf9DgMGw51jMj77VfGPAN2Kv4cfhlfgI= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.4/go.mod h1:Vz1JQXliGcQktFTN/LN6uGppAIRoLBR2bMvIMP0gOjc= github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.18 h1:GckUnpm4EJOAio1c8o25a+b3lVfwVzC9gnSBqiiNmZM= @@ -50,18 +50,18 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.18 h1:tJ5RnkHC github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.18/go.mod h1:++NHzT+nAF7ZPrHPsA+ENvsXkOO8wEu+C6RXltAG4/c= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.16 h1:jg16PhLPUiHIj8zYIW6bqzeQSuHVEiWnGA0Brz5Xv2I= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.16/go.mod h1:Uyk1zE1VVdsHSU7096h/rwnXDzOzYQVl+FNPhPw7ShY= -github.com/aws/aws-sdk-go-v2/service/lambda v1.58.0 h1:wOEkZI80JvZg4ir8Jlq/YyzEbLzb2SDkMItBUy6FD10= -github.com/aws/aws-sdk-go-v2/service/lambda v1.58.0/go.mod h1:19OJBUjzuycsyPiTi8Gxx17XJjsF9Ck/cQeDGvsiics= -github.com/aws/aws-sdk-go-v2/service/s3 v1.60.0 h1:2QXGJvG19QwqXUvgcdoCOZPyLuvZf8LiXPCN4P53TdI= -github.com/aws/aws-sdk-go-v2/service/s3 v1.60.0/go.mod h1:BSPI0EfnYUuNHPS0uqIo5VrRwzie+Fp+YhQOUs16sKI= -github.com/aws/aws-sdk-go-v2/service/sqs v1.34.4 h1:FXPO72iKC5YmYNEANltl763bUj8A6qT20wx8Jwvxlsw= -github.com/aws/aws-sdk-go-v2/service/sqs v1.34.4/go.mod h1:7idt3XszF6sE9WPS1GqZRiDJOxw4oPtlRBXodWnCGjU= +github.com/aws/aws-sdk-go-v2/service/lambda v1.58.1 h1:AfTND9lcZ0i4QV0LwgiwonDbWm8YPr4iYJ28n/x+FAo= +github.com/aws/aws-sdk-go-v2/service/lambda v1.58.1/go.mod h1:19OJBUjzuycsyPiTi8Gxx17XJjsF9Ck/cQeDGvsiics= +github.com/aws/aws-sdk-go-v2/service/s3 v1.60.1 h1:mx2ucgtv+MWzJesJY9Ig/8AFHgoE5FwLXwUVgW/FGdI= +github.com/aws/aws-sdk-go-v2/service/s3 v1.60.1/go.mod h1:BSPI0EfnYUuNHPS0uqIo5VrRwzie+Fp+YhQOUs16sKI= +github.com/aws/aws-sdk-go-v2/service/sqs v1.34.5 h1:HYyVDOC2/PIg+3oBX1q0wtDU5kONki6lrgIG0afrBkY= +github.com/aws/aws-sdk-go-v2/service/sqs v1.34.5/go.mod h1:7idt3XszF6sE9WPS1GqZRiDJOxw4oPtlRBXodWnCGjU= github.com/aws/aws-sdk-go-v2/service/sso v1.22.5 h1:zCsFCKvbj25i7p1u94imVoO447I/sFv8qq+lGJhRN0c= github.com/aws/aws-sdk-go-v2/service/sso v1.22.5/go.mod h1:ZeDX1SnKsVlejeuz41GiajjZpRSWR7/42q/EyA/QEiM= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.5 h1:SKvPgvdvmiTWoi0GAJ7AsJfOz3ngVkD/ERbs5pUnHNI= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.5/go.mod h1:20sz31hv/WsPa3HhU3hfrIet2kxM4Pe0r20eBZ20Tac= -github.com/aws/aws-sdk-go-v2/service/sts v1.30.4 h1:iAckBT2OeEK/kBDyN/jDtpEExhjeeA/Im2q4X0rJZT8= -github.com/aws/aws-sdk-go-v2/service/sts v1.30.4/go.mod h1:vmSqFK+BVIwVpDAGZB3CoCXHzurt4qBE8lf+I/kRTh0= +github.com/aws/aws-sdk-go-v2/service/sts v1.30.5 h1:OMsEmCyz2i89XwRwPouAJvhj81wINh+4UK+k/0Yo/q8= +github.com/aws/aws-sdk-go-v2/service/sts v1.30.5/go.mod h1:vmSqFK+BVIwVpDAGZB3CoCXHzurt4qBE8lf+I/kRTh0= 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/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= @@ -85,8 +85,8 @@ github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKoh github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= -github.com/domino14/macondo v0.9.6 h1:MUHp/ZAqkHa7appBkNKtEPULJnZiJl2FxjvBtvm3Qjs= -github.com/domino14/macondo v0.9.6/go.mod h1:UuOlfHwkIRGrydhalYLweZnv0sKVdOwRwsjvjMtVlcU= +github.com/domino14/macondo v0.9.7 h1:YvjnPq3YVUb4LYcCzw3AxS7H5cjMEk6nrkR+bJz/07k= +github.com/domino14/macondo v0.9.7/go.mod h1:9JwmcdTFSetV9R5euUVFHM40oGCtPM4qwTcwEDvRhw0= github.com/domino14/word-golib v0.2.0 h1:qLNc0I6+DmoyyuMH35QovitjvSmUunJHtFKg9tGMjLo= github.com/domino14/word-golib v0.2.0/go.mod h1:3OMAtX5K/YA/9PQe02h2S7hPfDn6/ZKmrv8vMI2vQss= github.com/exaring/otelpgx v0.6.2 h1:z1ayuDusPITNOhzvmx3nLpFax+tv7Hu7mdrjtgW3ZeA= @@ -228,8 +228,8 @@ github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrB github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 h1:onHthvaw9LFnH4t2DcNVpwGmV9E1BkGknEliJkfwQj0= github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58/go.mod h1:DXv8WO4yhMYhSNPKjeNKa5WY9YCIEBRbNzFFPJbWO6Y= -github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM= -github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs= +github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M= +github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -269,14 +269,8 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An github.com/spf13/viper v1.19.0 h1:RWq5SEjt8o25SROyN3z2OrDB9l7RPd3lwTWU8EcEdcI= github.com/spf13/viper v1.19.0/go.mod h1:GQUN9bilAbhU/jgc1bKs99f/suXKeUMct8Adx5+Ntkg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/stvp/tempredis v0.0.0-20181119212430-b82af8480203 h1:QVqDTf3h2WHt08YuiTGPZLls0Wq99X9bWd0Q5ZSBesM= @@ -288,28 +282,28 @@ go.akshayshah.org/attest v1.0.0 h1:f66BDlh/xo2KjIfmtqOFlj5cpn6mvGrP1LXY3Tex4L0= go.akshayshah.org/attest v1.0.0/go.mod h1:PnWzcW5j9dkyGwTlBmUsYpPnHG0AUPrs1RQ+HrldWO0= go.akshayshah.org/connectproto v0.6.0 h1:tqmysQF2AfvUeYS03mRAAZTFpiQeXqhGIDnH1GO2D2U= go.akshayshah.org/connectproto v0.6.0/go.mod h1:uA9TR/6MhBlLn0fh8VXRyL26EKTJlimWao4jbz7JHbA= -go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws v0.53.0 h1:1B6+VGkx6SYIB3c2NxGCOscCDRn5MGZGBa+HakVOl1s= -go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws v0.53.0/go.mod h1:BwIY9dxFVSGry/WRhvUmpbvT9JFmBdDUcLHoHmPqy/s= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 h1:4K4tsIXefpVJtvA/8srF4V4y0akAoPHkIslgAkjixJA= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0/go.mod h1:jjdQuTGVsXV4vSs+CJ2qYDeDPf9yIJV23qlIzBm73Vg= -go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= -go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 h1:3Q/xZUyC1BBkualc9ROb4G8qkH90LXEIICcs5zv1OYY= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0/go.mod h1:s75jGIWA9OfCMzF0xr+ZgfrB5FEbbV7UuYo32ahUiFI= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0 h1:j9+03ymgYhPKmeXGk5Zu+cIZOlVzd9Zv7QIiyItjFBU= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0/go.mod h1:Y5+XiUG4Emn1hTfciPzGPJaSI+RpDts6BnCIir0SLqk= -go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.28.0 h1:BJee2iLkfRfl9lc7aFmBwkWxY/RI1RDdXepSF6y8TPE= -go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.28.0/go.mod h1:DIzlHs3DRscCIBU3Y9YSzPfScwnYnzfnCd4g8zA7bZc= +go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws v0.54.0 h1:By10h8DrrjRcZjy10wBEkRdwhe4kOFuNTfprm8RXQQk= +go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws v0.54.0/go.mod h1:EtfcBqee4PFJSl+TXvfhg8ADvLWGFXwwX7SYNHG/VGM= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 h1:TT4fX+nBOA/+LUkobKGW1ydGcn+G3vRw9+g5HwCphpk= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0/go.mod h1:L7UH0GbB0p47T4Rri3uHjbpCFYrVrwc1I25QhNPiGK8= +go.opentelemetry.io/otel v1.29.0 h1:PdomN/Al4q/lN6iBJEN3AwPvUiHPMlt93c8bqTG5Llw= +go.opentelemetry.io/otel v1.29.0/go.mod h1:N/WtXPs1CNCUEx+Agz5uouwCba+i+bJGFicT8SR4NP8= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.29.0 h1:dIIDULZJpgdiHz5tXrTgKIMLkus6jEFa7x5SOKcyR7E= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.29.0/go.mod h1:jlRVBe7+Z1wyxFSUs48L6OBQZ5JwH2Hg/Vbl+t9rAgI= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.29.0 h1:JAv0Jwtl01UFiyWZEMiJZBiTlv5A50zNs8lsthXqIio= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.29.0/go.mod h1:QNKLmUEAq2QUbPQUfvw4fmv0bgbK7UlOSFCnXyfvSNc= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.29.0 h1:WDdP9acbMYjbKIyJUhTvtzj601sVJOqgWdUxSdR/Ysc= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.29.0/go.mod h1:BLbf7zbNIONBLPwvFnwNHGj4zge8uTCM/UPIVW1Mq2I= go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.15.1 h1:2PunuO5SbkN5MhCbuHCd3tC6qrcaj+uDAkX/qBU5BAs= go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.15.1/go.mod h1:q8+Tha+5LThjeSU8BW93uUC5w5/+DnYHMKBMpRCsui0= -go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= -go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= -go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= -go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= -go.opentelemetry.io/otel/sdk/metric v1.28.0 h1:OkuaKgKrgAbYrrY0t92c+cC+2F6hsFNnCQArXCKlg08= -go.opentelemetry.io/otel/sdk/metric v1.28.0/go.mod h1:cWPjykihLAPvXKi4iZc1dpER3Jdq2Z0YLse3moQUCpg= -go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= -go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= +go.opentelemetry.io/otel/metric v1.29.0 h1:vPf/HFWTNkPu1aYeIsc98l4ktOQaL6LeSoeV2g+8YLc= +go.opentelemetry.io/otel/metric v1.29.0/go.mod h1:auu/QWieFVWx+DmQOUMgj0F8LHWdgalxXqvp7BII/W8= +go.opentelemetry.io/otel/sdk v1.29.0 h1:vkqKjk7gwhS8VaWb0POZKmIEDimRCMsopNYnriHyryo= +go.opentelemetry.io/otel/sdk v1.29.0/go.mod h1:pM8Dx5WKnvxLCb+8lG1PRNIDxu9g9b9g59Qr7hfAAok= +go.opentelemetry.io/otel/sdk/metric v1.29.0 h1:K2CfmJohnRgvZ9UAj2/FhIf/okdWcNdBwe1m8xFXiSY= +go.opentelemetry.io/otel/sdk/metric v1.29.0/go.mod h1:6zZLdCl2fkauYoZIOn/soQIDSWFmNSRcICarHfuhNJQ= +go.opentelemetry.io/otel/trace v1.29.0 h1:J/8ZNK4XgR7a21DZUAsbF8pZ5Jcw1VhACmnYt39JTi4= +go.opentelemetry.io/otel/trace v1.29.0/go.mod h1:eHl3w0sp3paPkYstJOmAimxhiFXPg+MMTlEh3nsQgWQ= go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeXrui0= go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= @@ -320,8 +314,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw= golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= -golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa h1:ELnwvuAXPNtPk1TJRuGkI9fDTwym6AYBu0qzT8AcHdI= -golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ= +golang.org/x/exp v0.0.0-20240823005443-9b4947da3948 h1:kx6Ds3MlpiUHKj7syVnbp57++8WpuKPcR5yjLBjvLEA= +golang.org/x/exp v0.0.0-20240823005443-9b4947da3948/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0= @@ -372,10 +366,10 @@ golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gonum.org/v1/gonum v0.15.1 h1:FNy7N6OUZVUaWG9pTiD+jlhdQ3lMP+/LcTpJ6+a8sQ0= gonum.org/v1/gonum v0.15.1/go.mod h1:eZTZuRFrzu5pcyjN5wJhcIhnUdNijYxX1T2IcrOGY0o= -google.golang.org/genproto/googleapis/api v0.0.0-20240820151423-278611b39280 h1:YDFM9oOjiFhaMAVgbDxfxW+66nRrsvzQzJ51wp3OxC0= -google.golang.org/genproto/googleapis/api v0.0.0-20240820151423-278611b39280/go.mod h1:fO8wJzT2zbQbAjbIoos1285VfEIYKDDY+Dt+WpTkh6g= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240820151423-278611b39280 h1:XQMA2e105XNlEZ8NRF0HqnUOZzP14sUSsgL09kpdNnU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240820151423-278611b39280/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= +google.golang.org/genproto/googleapis/api v0.0.0-20240823204242-4ba0660f739c h1:e0zB268kOca6FbuJkYUGxfwG4DKFZG/8DLyv9Zv66cE= +google.golang.org/genproto/googleapis/api v0.0.0-20240823204242-4ba0660f739c/go.mod h1:fO8wJzT2zbQbAjbIoos1285VfEIYKDDY+Dt+WpTkh6g= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240823204242-4ba0660f739c h1:Kqjm4WpoWvwhMPcrAczoTyMySQmYa9Wy2iL6Con4zn8= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240823204242-4ba0660f739c/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= From c70400e1583cc37743e89fec6138fd9a71aecf42 Mon Sep 17 00:00:00 2001 From: Andy Kurnia Date: Sat, 24 Aug 2024 21:19:20 +0800 Subject: [PATCH 3/6] use compatible jwt --- go.mod | 2 +- go.sum | 4 ++-- pkg/auth/service.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index c60343126..053326979 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/domino14/word-golib v0.2.0 github.com/exaring/otelpgx v0.6.2 github.com/go-redsync/redsync/v4 v4.13.0 - github.com/golang-jwt/jwt v3.2.2+incompatible + github.com/golang-jwt/jwt/v5 v5.2.1 github.com/golang-migrate/migrate/v4 v4.17.1 github.com/gomodule/redigo v1.9.2 github.com/google/uuid v1.6.0 diff --git a/go.sum b/go.sum index 3063abfef..f83bc3e83 100644 --- a/go.sum +++ b/go.sum @@ -125,8 +125,8 @@ github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqw github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= -github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= +github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk= +github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= github.com/golang-migrate/migrate/v4 v4.17.1 h1:4zQ6iqL6t6AiItphxJctQb3cFqWiSpMnX7wLTPnnYO4= github.com/golang-migrate/migrate/v4 v4.17.1/go.mod h1:m8hinFyWBn0SA4QKHuKh175Pm9wjmxj3S2Mia7dbXzM= github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 h1:au07oEsX2xN0ktxqI+Sida1w446QrXBRJ0nee3SNZlA= diff --git a/pkg/auth/service.go b/pkg/auth/service.go index 17e93578a..fce284556 100644 --- a/pkg/auth/service.go +++ b/pkg/auth/service.go @@ -8,7 +8,7 @@ import ( "time" "connectrpc.com/connect" - "github.com/golang-jwt/jwt" + "github.com/golang-jwt/jwt/v5" "github.com/lithammer/shortuuid" "github.com/rs/zerolog/log" From 138d850028f62e181a85c3517a9d6dd7ac083b6f Mon Sep 17 00:00:00 2001 From: Andy Kurnia Date: Sat, 24 Aug 2024 21:22:27 +0800 Subject: [PATCH 4/6] use compatible shortuuid --- go.mod | 2 +- go.sum | 5 +++-- pkg/auth/service.go | 2 +- pkg/bus/event_api.go | 2 +- pkg/bus/gameplay.go | 2 +- pkg/config/config.go | 2 +- pkg/cwgame/api.go | 2 +- pkg/entity/sought_game.go | 2 +- pkg/gameplay/game.go | 2 +- pkg/gameplay/meta_events_test.go | 2 +- pkg/integration/tournament_profile_test.go | 2 +- pkg/memento/service.go | 2 +- pkg/mod/automod_test.go | 2 +- pkg/puzzles/puzzle_generation.go | 2 +- pkg/puzzles/puzzle_test.go | 2 +- pkg/stores/game/db_test.go | 2 +- pkg/stores/puzzles/db.go | 2 +- pkg/stores/session/db.go | 2 +- pkg/stores/soughtgame/db_test.go | 2 +- pkg/stores/user/db.go | 2 +- pkg/tournament/service.go | 2 +- pkg/tournament/tournament.go | 2 +- pkg/user/services/s3_uploader.go | 2 +- 23 files changed, 25 insertions(+), 24 deletions(-) diff --git a/go.mod b/go.mod index 053326979..5dd95f883 100644 --- a/go.mod +++ b/go.mod @@ -24,7 +24,7 @@ require ( github.com/hashicorp/golang-lru v1.0.2 github.com/jackc/pgx/v5 v5.6.0 github.com/justinas/alice v1.2.0 - github.com/lithammer/shortuuid v3.0.0+incompatible + github.com/lithammer/shortuuid/v4 v4.0.0 github.com/mailgun/mailgun-go/v4 v4.15.0 github.com/matryer/is v1.4.1 github.com/mmcdole/gofeed v1.3.0 diff --git a/go.sum b/go.sum index f83bc3e83..246d2c8ed 100644 --- a/go.sum +++ b/go.sum @@ -138,6 +138,7 @@ github.com/gomodule/redigo v1.9.2/go.mod h1:KsU3hiK/Ay8U42qpaJk+kuNa3C+spxapWpM+ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 h1:asbCHRVmodnJTuQ3qamDwqVOIjwqUPTYmYuemVOx+Ys= @@ -180,8 +181,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= -github.com/lithammer/shortuuid v3.0.0+incompatible h1:NcD0xWW/MZYXEHa6ITy6kaXN5nwm/V115vj2YXfhS0w= -github.com/lithammer/shortuuid v3.0.0+incompatible/go.mod h1:FR74pbAuElzOUuenUHTK2Tciko1/vKuIKS9dSkDrA4w= +github.com/lithammer/shortuuid/v4 v4.0.0 h1:QRbbVkfgNippHOS8PXDkti4NaWeyYfcBTHtw7k08o4c= +github.com/lithammer/shortuuid/v4 v4.0.0/go.mod h1:Zs8puNcrvf2rV9rTH51ZLLcj7ZXqQI3lv67aw4KiB1Y= github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= github.com/mailgun/mailgun-go/v4 v4.15.0 h1:3NQU0r2XItJbyIZ21iBI9ps0+vPIMoGyI2XK7ZTN/DQ= diff --git a/pkg/auth/service.go b/pkg/auth/service.go index fce284556..141e5f86a 100644 --- a/pkg/auth/service.go +++ b/pkg/auth/service.go @@ -9,7 +9,7 @@ import ( "connectrpc.com/connect" "github.com/golang-jwt/jwt/v5" - "github.com/lithammer/shortuuid" + "github.com/lithammer/shortuuid/v4" "github.com/rs/zerolog/log" "github.com/woogles-io/liwords/pkg/apiserver" diff --git a/pkg/bus/event_api.go b/pkg/bus/event_api.go index 75bd02855..f0b2c5b4d 100644 --- a/pkg/bus/event_api.go +++ b/pkg/bus/event_api.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "github.com/lithammer/shortuuid" + "github.com/lithammer/shortuuid/v4" "github.com/rs/zerolog/log" "github.com/woogles-io/liwords/pkg/apiserver" "github.com/woogles-io/liwords/pkg/entity" diff --git a/pkg/bus/gameplay.go b/pkg/bus/gameplay.go index b17573c6c..b72d29db2 100644 --- a/pkg/bus/gameplay.go +++ b/pkg/bus/gameplay.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/lithammer/shortuuid" + "github.com/lithammer/shortuuid/v4" "github.com/rs/zerolog/log" "lukechampine.com/frand" diff --git a/pkg/config/config.go b/pkg/config/config.go index cc5d8135d..e60e5674f 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -5,7 +5,7 @@ import ( "errors" "net/http" - "github.com/lithammer/shortuuid" + "github.com/lithammer/shortuuid/v4" "github.com/namsral/flag" macondoconfig "github.com/domino14/macondo/config" diff --git a/pkg/cwgame/api.go b/pkg/cwgame/api.go index 205074d34..44b27cafe 100644 --- a/pkg/cwgame/api.go +++ b/pkg/cwgame/api.go @@ -11,7 +11,7 @@ import ( "strings" "unicode/utf8" - "github.com/lithammer/shortuuid" + "github.com/lithammer/shortuuid/v4" "github.com/rs/zerolog" "github.com/rs/zerolog/log" "github.com/samber/lo" diff --git a/pkg/entity/sought_game.go b/pkg/entity/sought_game.go index 12c0475cc..155c32d9c 100644 --- a/pkg/entity/sought_game.go +++ b/pkg/entity/sought_game.go @@ -10,7 +10,7 @@ import ( "github.com/domino14/macondo/board" "github.com/domino14/macondo/game" - "github.com/lithammer/shortuuid" + "github.com/lithammer/shortuuid/v4" pb "github.com/woogles-io/liwords/rpc/api/proto/ipc" ) diff --git a/pkg/gameplay/game.go b/pkg/gameplay/game.go index b2e3ce4f4..97cdbf838 100644 --- a/pkg/gameplay/game.go +++ b/pkg/gameplay/game.go @@ -12,7 +12,7 @@ import ( "github.com/domino14/macondo/turnplayer" "github.com/domino14/word-golib/tilemapping" - "github.com/lithammer/shortuuid" + "github.com/lithammer/shortuuid/v4" "google.golang.org/protobuf/proto" "github.com/rs/zerolog" diff --git a/pkg/gameplay/meta_events_test.go b/pkg/gameplay/meta_events_test.go index 29b09df36..0e759db70 100644 --- a/pkg/gameplay/meta_events_test.go +++ b/pkg/gameplay/meta_events_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/lithammer/shortuuid" + "github.com/lithammer/shortuuid/v4" "github.com/matryer/is" "github.com/rs/zerolog/log" "google.golang.org/protobuf/types/known/timestamppb" diff --git a/pkg/integration/tournament_profile_test.go b/pkg/integration/tournament_profile_test.go index 09897d897..30ad80ee4 100644 --- a/pkg/integration/tournament_profile_test.go +++ b/pkg/integration/tournament_profile_test.go @@ -10,7 +10,7 @@ import ( "time" "github.com/gomodule/redigo/redis" - "github.com/lithammer/shortuuid" + "github.com/lithammer/shortuuid/v4" "github.com/matryer/is" "github.com/nats-io/nats.go" "github.com/rs/zerolog/log" diff --git a/pkg/memento/service.go b/pkg/memento/service.go index 7cbeb14c4..8db8c612e 100644 --- a/pkg/memento/service.go +++ b/pkg/memento/service.go @@ -12,7 +12,7 @@ import ( "time" macondopb "github.com/domino14/macondo/gen/api/proto/macondo" - "github.com/lithammer/shortuuid" + "github.com/lithammer/shortuuid/v4" "github.com/rs/zerolog/log" "github.com/woogles-io/liwords/pkg/config" "github.com/woogles-io/liwords/pkg/entity/utilities" diff --git a/pkg/mod/automod_test.go b/pkg/mod/automod_test.go index 1ab626be2..a0dc0de81 100644 --- a/pkg/mod/automod_test.go +++ b/pkg/mod/automod_test.go @@ -11,7 +11,7 @@ import ( macondopb "github.com/domino14/macondo/gen/api/proto/macondo" "github.com/domino14/word-golib/tilemapping" "github.com/jackc/pgx/v5/pgxpool" - "github.com/lithammer/shortuuid" + "github.com/lithammer/shortuuid/v4" "github.com/matryer/is" "github.com/rs/zerolog/log" "github.com/woogles-io/liwords/pkg/apiserver" diff --git a/pkg/puzzles/puzzle_generation.go b/pkg/puzzles/puzzle_generation.go index fe77d2f8c..0b93afd9b 100644 --- a/pkg/puzzles/puzzle_generation.go +++ b/pkg/puzzles/puzzle_generation.go @@ -9,7 +9,7 @@ import ( _ "github.com/golang-migrate/migrate/v4/database/postgres" _ "github.com/golang-migrate/migrate/v4/source/file" - "github.com/lithammer/shortuuid" + "github.com/lithammer/shortuuid/v4" "github.com/rs/zerolog/log" "github.com/domino14/macondo/cross_set" diff --git a/pkg/puzzles/puzzle_test.go b/pkg/puzzles/puzzle_test.go index b2edd4120..b55b1a9c1 100644 --- a/pkg/puzzles/puzzle_test.go +++ b/pkg/puzzles/puzzle_test.go @@ -17,7 +17,7 @@ import ( "github.com/domino14/word-golib/tilemapping" "github.com/jackc/pgx/v5/pgtype" "github.com/jackc/pgx/v5/pgxpool" - "github.com/lithammer/shortuuid" + "github.com/lithammer/shortuuid/v4" "github.com/matryer/is" "github.com/rs/zerolog" "github.com/rs/zerolog/log" diff --git a/pkg/stores/game/db_test.go b/pkg/stores/game/db_test.go index 92783249f..c4ea786d7 100644 --- a/pkg/stores/game/db_test.go +++ b/pkg/stores/game/db_test.go @@ -7,7 +7,7 @@ import ( "os" "testing" - "github.com/lithammer/shortuuid" + "github.com/lithammer/shortuuid/v4" "github.com/matryer/is" "github.com/rs/zerolog/log" "google.golang.org/protobuf/encoding/protojson" diff --git a/pkg/stores/puzzles/db.go b/pkg/stores/puzzles/db.go index 01b2c2310..90f445668 100644 --- a/pkg/stores/puzzles/db.go +++ b/pkg/stores/puzzles/db.go @@ -10,7 +10,7 @@ import ( "github.com/jackc/pgx/v5" "github.com/jackc/pgx/v5/pgtype" "github.com/jackc/pgx/v5/pgxpool" - "github.com/lithammer/shortuuid" + "github.com/lithammer/shortuuid/v4" "github.com/rs/zerolog/log" commontest "github.com/woogles-io/liwords/pkg/common" "github.com/woogles-io/liwords/pkg/entity" diff --git a/pkg/stores/session/db.go b/pkg/stores/session/db.go index d51d1dd34..098b4832a 100644 --- a/pkg/stores/session/db.go +++ b/pkg/stores/session/db.go @@ -6,7 +6,7 @@ import ( "time" "github.com/jackc/pgx/v5/pgxpool" - "github.com/lithammer/shortuuid" + "github.com/lithammer/shortuuid/v4" "github.com/woogles-io/liwords/pkg/entity" "github.com/woogles-io/liwords/pkg/stores/common" diff --git a/pkg/stores/soughtgame/db_test.go b/pkg/stores/soughtgame/db_test.go index 1bf9a1018..2ce5a6f62 100644 --- a/pkg/stores/soughtgame/db_test.go +++ b/pkg/stores/soughtgame/db_test.go @@ -7,7 +7,7 @@ import ( "time" "github.com/jackc/pgx/v5/pgxpool" - "github.com/lithammer/shortuuid" + "github.com/lithammer/shortuuid/v4" "github.com/matryer/is" "github.com/woogles-io/liwords/pkg/common" "github.com/woogles-io/liwords/pkg/entity" diff --git a/pkg/stores/user/db.go b/pkg/stores/user/db.go index 6b183fe16..223a47c1c 100644 --- a/pkg/stores/user/db.go +++ b/pkg/stores/user/db.go @@ -10,7 +10,7 @@ import ( "github.com/jackc/pgx/v5" "github.com/jackc/pgx/v5/pgtype" "github.com/jackc/pgx/v5/pgxpool" - "github.com/lithammer/shortuuid" + "github.com/lithammer/shortuuid/v4" "github.com/rs/zerolog/log" "go.opentelemetry.io/otel" "google.golang.org/protobuf/types/known/timestamppb" diff --git a/pkg/tournament/service.go b/pkg/tournament/service.go index 4400b1c05..ba090d1ce 100644 --- a/pkg/tournament/service.go +++ b/pkg/tournament/service.go @@ -12,7 +12,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/lambda" "github.com/aws/aws-sdk-go-v2/service/lambda/types" - "github.com/lithammer/shortuuid" + "github.com/lithammer/shortuuid/v4" "github.com/rs/zerolog/log" "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" diff --git a/pkg/tournament/tournament.go b/pkg/tournament/tournament.go index 68260a940..f1b1412c6 100644 --- a/pkg/tournament/tournament.go +++ b/pkg/tournament/tournament.go @@ -13,7 +13,7 @@ import ( "strings" "time" - "github.com/lithammer/shortuuid" + "github.com/lithammer/shortuuid/v4" "github.com/rs/zerolog/log" "github.com/woogles-io/liwords/pkg/apiserver" "github.com/woogles-io/liwords/pkg/entity" diff --git a/pkg/user/services/s3_uploader.go b/pkg/user/services/s3_uploader.go index 2291bee32..64ca854c5 100644 --- a/pkg/user/services/s3_uploader.go +++ b/pkg/user/services/s3_uploader.go @@ -11,7 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/feature/s3/manager" "github.com/aws/aws-sdk-go-v2/service/s3" - "github.com/lithammer/shortuuid" + "github.com/lithammer/shortuuid/v4" ) const ( From 112524a6bb747db27ecf3800457ffd46aeea5c48 Mon Sep 17 00:00:00 2001 From: Andy Kurnia Date: Sat, 24 Aug 2024 21:26:06 +0800 Subject: [PATCH 5/6] goimports --- pkg/matching/matching_test.go | 3 ++- pkg/words/definition_nonunix.go | 1 + pkg/words/definition_unix.go | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkg/matching/matching_test.go b/pkg/matching/matching_test.go index 5b1607466..5651a896d 100644 --- a/pkg/matching/matching_test.go +++ b/pkg/matching/matching_test.go @@ -1,8 +1,9 @@ package matching import ( - "github.com/matryer/is" "testing" + + "github.com/matryer/is" ) func compareSlices(a []int, b []int) bool { diff --git a/pkg/words/definition_nonunix.go b/pkg/words/definition_nonunix.go index 52d79153f..124a8ed25 100644 --- a/pkg/words/definition_nonunix.go +++ b/pkg/words/definition_nonunix.go @@ -1,3 +1,4 @@ +//go:build !darwin && !linux // +build !darwin,!linux package words diff --git a/pkg/words/definition_unix.go b/pkg/words/definition_unix.go index d992e4665..75ae29b24 100644 --- a/pkg/words/definition_unix.go +++ b/pkg/words/definition_unix.go @@ -1,3 +1,4 @@ +//go:build darwin || linux // +build darwin linux package words From 71d727feecabc16666e47af3d57b0881aaad3335 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9sar=20Del=20Solar?= Date: Sat, 24 Aug 2024 17:43:48 -0400 Subject: [PATCH 6/6] upgrade macondo --- go.mod | 4 ++-- go.sum | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 5dd95f883..3fc2c61c7 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/lambda v1.58.1 github.com/aws/aws-sdk-go-v2/service/s3 v1.60.1 github.com/aws/smithy-go v1.20.4 - github.com/domino14/macondo v0.9.7 + github.com/domino14/macondo v0.9.8 github.com/domino14/word-golib v0.2.0 github.com/exaring/otelpgx v0.6.2 github.com/go-redsync/redsync/v4 v4.13.0 @@ -106,7 +106,7 @@ require ( github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect github.com/pelletier/go-toml/v2 v2.2.3 // indirect github.com/pkg/errors v0.9.1 // indirect - github.com/rs/xid v1.5.0 // indirect + github.com/rs/xid v1.6.0 // indirect github.com/sagikazarmark/locafero v0.6.0 // indirect github.com/sagikazarmark/slog-shim v0.1.0 // indirect github.com/signalfx/splunk-otel-go/instrumentation/internal v1.18.0 // indirect diff --git a/go.sum b/go.sum index 246d2c8ed..9bedcd6ad 100644 --- a/go.sum +++ b/go.sum @@ -85,8 +85,8 @@ github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKoh github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= -github.com/domino14/macondo v0.9.7 h1:YvjnPq3YVUb4LYcCzw3AxS7H5cjMEk6nrkR+bJz/07k= -github.com/domino14/macondo v0.9.7/go.mod h1:9JwmcdTFSetV9R5euUVFHM40oGCtPM4qwTcwEDvRhw0= +github.com/domino14/macondo v0.9.8 h1:YEyFjVwU1wA61z7xIoHELxedOqvSWiO3TwMi1u3fEM0= +github.com/domino14/macondo v0.9.8/go.mod h1:XMjv04A+0p3CLl7IvAwPC/y/tZwlDawSNXBO+hGb6UU= github.com/domino14/word-golib v0.2.0 h1:qLNc0I6+DmoyyuMH35QovitjvSmUunJHtFKg9tGMjLo= github.com/domino14/word-golib v0.2.0/go.mod h1:3OMAtX5K/YA/9PQe02h2S7hPfDn6/ZKmrv8vMI2vQss= github.com/exaring/otelpgx v0.6.2 h1:z1ayuDusPITNOhzvmx3nLpFax+tv7Hu7mdrjtgW3ZeA= @@ -243,8 +243,9 @@ github.com/redis/rueidis v1.0.19 h1:s65oWtotzlIFN8eMPhyYwxlwLR1lUdhza2KtWprKYSo= github.com/redis/rueidis v1.0.19/go.mod h1:8B+r5wdnjwK3lTFml5VtxjzGOQAC+5UmujoD12pDrEo= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= -github.com/rs/xid v1.5.0 h1:mKX4bl4iPYJtEIxp6CYiUuLQ/8DYMoz0PUdtGgMFRVc= github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= +github.com/rs/xid v1.6.0 h1:fV591PaemRlL6JfRxGDEPl69wICngIQ3shQtzfy2gxU= +github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0= github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8= github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= github.com/sagikazarmark/locafero v0.6.0 h1:ON7AQg37yzcRPU69mt7gwhFEBwxI6P9T4Qu3N51bwOk= @@ -380,9 +381,8 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntN gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=