Gateway: Updated dependencies and removed cluster config

welcomer-gateway/cmd/main.go

@@ -33,7 +33,6 @@ func main() {
 
 	stanAddress := flag.String("stanAddress", os.Getenv("STAN_ADDRESS"), "NATs streaming Address")
 	stanChannel := flag.String("stanChannel", os.Getenv("STAN_CHANNEL"), "NATs streaming Channel")
-	stanCluster := flag.String("stanCluster", os.Getenv("STAN_CLUSTER"), "NATs streaming Cluster")
 	jetstreamClientName := flag.String("jetstreamClientName", "welcomer-gateway", "NATs client name")
 
 	dryRun := flag.Bool("dryRun", false, "When true, will close after setting up the app")
@@ -80,7 +79,6 @@ func main() {
 
 	if err = jetstreamClient.Connect(ctx, *jetstreamClientName, map[string]interface{}{
 		"Address": *stanAddress,
-		"Cluster": *stanCluster,
 		"Channel": *stanChannel,
 	}); err != nil {
 		panic(fmt.Sprintf(`jetstreamClient.Connect(): %v`, err.Error()))

welcomer-gateway/go.mod

@@ -6,8 +6,8 @@ toolchain go1.22.0
 
 require (
 	github.com/WelcomerTeam/Discord v0.0.0-20240512183153-c1cea3c12cb0
-	github.com/WelcomerTeam/Sandwich v0.0.0-20240512190355-7bf51cdfead1
-	github.com/WelcomerTeam/Sandwich-Daemon v0.0.0-20240512185213-73615e5ec7cd
+	github.com/WelcomerTeam/Sandwich v0.0.0-20240512213401-91f7d6f764f8
+	github.com/WelcomerTeam/Sandwich-Daemon v0.0.0-20240512203318-371766fc1709
 	github.com/WelcomerTeam/Welcomer/welcomer-core v0.0.0
 	github.com/gofrs/uuid v4.4.0+incompatible
 	github.com/jackc/pgx/v4 v4.18.3

welcomer-gateway/go.sum

@@ -8,8 +8,16 @@ github.com/WelcomerTeam/Mustachvulate v1.2.1-0.20231218130351-adad26f1e96e h1:mW
 github.com/WelcomerTeam/Mustachvulate v1.2.1-0.20231218130351-adad26f1e96e/go.mod h1:c/W03KVWDF5u14gvSsfS7pfK6BRth+09iidC57eoYZ0=
 github.com/WelcomerTeam/Sandwich v0.0.0-20240512190355-7bf51cdfead1 h1:IhlPcQucppXz0aWb3SRARma5bwIytymWjbdkqirKZb4=
 github.com/WelcomerTeam/Sandwich v0.0.0-20240512190355-7bf51cdfead1/go.mod h1:pxWznMRKrligKNjmakOGP1fmOXRm/6Wlju+PUobrAyk=
+github.com/WelcomerTeam/Sandwich v0.0.0-20240512204502-10195c51942a h1:4XgfVcco4zpluY85+VgC2mrJv2lR3ch2Gy4EZlJvLlc=
+github.com/WelcomerTeam/Sandwich v0.0.0-20240512204502-10195c51942a/go.mod h1:wB5XJhFgzBwqXPNXRhfoPUsL3bkMZ2MclysRYoDNMHc=
+github.com/WelcomerTeam/Sandwich v0.0.0-20240512210128-93084c9cac17 h1:lq4WQO8+6MOltzmZnBwxCMYQYU+Y/xIK322j/6Doa34=
+github.com/WelcomerTeam/Sandwich v0.0.0-20240512210128-93084c9cac17/go.mod h1:wB5XJhFgzBwqXPNXRhfoPUsL3bkMZ2MclysRYoDNMHc=
+github.com/WelcomerTeam/Sandwich v0.0.0-20240512213401-91f7d6f764f8 h1:elIJ1zJSfN1xVCq6LMuL32QrbOe5RvB6AsBVnRK9cIY=
+github.com/WelcomerTeam/Sandwich v0.0.0-20240512213401-91f7d6f764f8/go.mod h1:wB5XJhFgzBwqXPNXRhfoPUsL3bkMZ2MclysRYoDNMHc=
 github.com/WelcomerTeam/Sandwich-Daemon v0.0.0-20240512185213-73615e5ec7cd h1:PJS2p7wo0Rjwhzd1Iy8m7k136ey36hosW5ctmgDxuYs=
 github.com/WelcomerTeam/Sandwich-Daemon v0.0.0-20240512185213-73615e5ec7cd/go.mod h1:MtdHh1ANitVt+l1VNF9xF4bFl1Sxryj+zbauW8oOUSY=
+github.com/WelcomerTeam/Sandwich-Daemon v0.0.0-20240512203318-371766fc1709 h1:44VBdyygmKCYhsn/sptloeo67IHdI7h28T8aTj5Xaw4=
+github.com/WelcomerTeam/Sandwich-Daemon v0.0.0-20240512203318-371766fc1709/go.mod h1:MtdHh1ANitVt+l1VNF9xF4bFl1Sxryj+zbauW8oOUSY=
 github.com/WelcomerTeam/Subway v0.0.0-20240512192535-eedc5ea26d74 h1:crIraqES3LVSlvdSwYq8FL2to+DfvtPeQ6ul1TMvhdU=
 github.com/WelcomerTeam/Subway v0.0.0-20240512192535-eedc5ea26d74/go.mod h1:+EEpEEGrVcTqa6Rm5xZGqsLL76E3A97r6P4QmzOl8c8=
 github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so=
@@ -48,6 +56,7 @@ github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm4
 github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/hashicorp/golang-lru v1.0.2 h1:dV3g9Z/unq5DpblPpw+Oqcv4dU/1omnb4Ok8iPY6p1c=
 github.com/hashicorp/golang-lru v1.0.2/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
+github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0=
 github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo=
 github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
 github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8=
@@ -68,6 +77,7 @@ github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65 h1:DadwsjnMwFjfWc9y5W
 github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65/go.mod h1:5R2h2EEX+qri8jOWMbJCtaPWkrrNc7OHwsp2TCqp7ak=
 github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
 github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
+github.com/jackc/pgproto3 v1.1.0 h1:FYYE4yRw+AgI8wXIinMlNjBbp/UitDJwfj5LqqewP1A=
 github.com/jackc/pgproto3 v1.1.0/go.mod h1:eR5FA3leWg7p9aeAqi37XOTgTIbkABlvcPB3E5rlc78=
 github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod h1:bhq50y+xrl9n5mRYyCBFKkpRVTLYJVWeCc+mEAI3yXA=
 github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg=

welcomer-gateway/run.sh

@@ -1 +1 @@
-go run cmd/main.go --proxyDebug --stanClientName welcomer-gateway-dev
+go run cmd/main.go --proxyDebug