From b0ebb37d7dc7b6d01e50e7acce5572c894974584 Mon Sep 17 00:00:00 2001 From: "Ach.Vani Ardiansyah" Date: Tue, 21 Jan 2025 05:53:12 +0700 Subject: [PATCH 1/2] feature : move client package from supabase to pkg --- pkg/{supabase => }/client/client.go | 0 pkg/{supabase => }/client/client_test.go | 2 +- pkg/{supabase => }/client/net/client.go | 0 pkg/supabase/drivers/cloud/admin/user.go | 2 +- pkg/supabase/drivers/cloud/cloud.go | 2 +- pkg/supabase/drivers/local/meta/function.go | 2 +- pkg/supabase/drivers/local/meta/meta.go | 2 +- pkg/supabase/drivers/local/meta/policy.go | 2 +- pkg/supabase/drivers/local/meta/role.go | 2 +- pkg/supabase/drivers/local/meta/table.go | 2 +- pkg/supabase/supabase.go | 2 +- rpc.go | 2 +- 12 files changed, 10 insertions(+), 10 deletions(-) rename pkg/{supabase => }/client/client.go (100%) rename pkg/{supabase => }/client/client_test.go (95%) rename pkg/{supabase => }/client/net/client.go (100%) diff --git a/pkg/supabase/client/client.go b/pkg/client/client.go similarity index 100% rename from pkg/supabase/client/client.go rename to pkg/client/client.go diff --git a/pkg/supabase/client/client_test.go b/pkg/client/client_test.go similarity index 95% rename from pkg/supabase/client/client_test.go rename to pkg/client/client_test.go index 1b4088aa..02e84fdf 100644 --- a/pkg/supabase/client/client_test.go +++ b/pkg/client/client_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/sev-2/raiden/pkg/supabase/client" + "github.com/sev-2/raiden/pkg/client" "github.com/stretchr/testify/assert" "github.com/valyala/fasthttp" ) diff --git a/pkg/supabase/client/net/client.go b/pkg/client/net/client.go similarity index 100% rename from pkg/supabase/client/net/client.go rename to pkg/client/net/client.go diff --git a/pkg/supabase/drivers/cloud/admin/user.go b/pkg/supabase/drivers/cloud/admin/user.go index 3fdd26b7..54461ecc 100644 --- a/pkg/supabase/drivers/cloud/admin/user.go +++ b/pkg/supabase/drivers/cloud/admin/user.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/sev-2/raiden" - "github.com/sev-2/raiden/pkg/supabase/client/net" + "github.com/sev-2/raiden/pkg/client/net" "github.com/sev-2/raiden/pkg/supabase/objects" ) diff --git a/pkg/supabase/drivers/cloud/cloud.go b/pkg/supabase/drivers/cloud/cloud.go index 114b2a3b..5a541f8d 100644 --- a/pkg/supabase/drivers/cloud/cloud.go +++ b/pkg/supabase/drivers/cloud/cloud.go @@ -7,8 +7,8 @@ import ( "strings" "github.com/sev-2/raiden" + "github.com/sev-2/raiden/pkg/client/net" "github.com/sev-2/raiden/pkg/logger" - "github.com/sev-2/raiden/pkg/supabase/client/net" "github.com/sev-2/raiden/pkg/supabase/objects" ) diff --git a/pkg/supabase/drivers/local/meta/function.go b/pkg/supabase/drivers/local/meta/function.go index bb344495..2e0a09a6 100644 --- a/pkg/supabase/drivers/local/meta/function.go +++ b/pkg/supabase/drivers/local/meta/function.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/sev-2/raiden" - "github.com/sev-2/raiden/pkg/supabase/client/net" + "github.com/sev-2/raiden/pkg/client/net" "github.com/sev-2/raiden/pkg/supabase/objects" "github.com/sev-2/raiden/pkg/supabase/query" "github.com/sev-2/raiden/pkg/supabase/query/sql" diff --git a/pkg/supabase/drivers/local/meta/meta.go b/pkg/supabase/drivers/local/meta/meta.go index cbcfc165..4ece3597 100644 --- a/pkg/supabase/drivers/local/meta/meta.go +++ b/pkg/supabase/drivers/local/meta/meta.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/sev-2/raiden" + "github.com/sev-2/raiden/pkg/client/net" "github.com/sev-2/raiden/pkg/logger" - "github.com/sev-2/raiden/pkg/supabase/client/net" ) var MetaLogger = logger.HcLog().Named("supabase.meta") diff --git a/pkg/supabase/drivers/local/meta/policy.go b/pkg/supabase/drivers/local/meta/policy.go index 407c70bd..5ccf6aa0 100644 --- a/pkg/supabase/drivers/local/meta/policy.go +++ b/pkg/supabase/drivers/local/meta/policy.go @@ -6,7 +6,7 @@ import ( "github.com/lib/pq" "github.com/sev-2/raiden" - "github.com/sev-2/raiden/pkg/supabase/client/net" + "github.com/sev-2/raiden/pkg/client/net" "github.com/sev-2/raiden/pkg/supabase/objects" "github.com/sev-2/raiden/pkg/supabase/query" "github.com/sev-2/raiden/pkg/supabase/query/sql" diff --git a/pkg/supabase/drivers/local/meta/role.go b/pkg/supabase/drivers/local/meta/role.go index a7721ca3..ec87c5e8 100644 --- a/pkg/supabase/drivers/local/meta/role.go +++ b/pkg/supabase/drivers/local/meta/role.go @@ -5,7 +5,7 @@ import ( "github.com/lib/pq" "github.com/sev-2/raiden" - "github.com/sev-2/raiden/pkg/supabase/client/net" + "github.com/sev-2/raiden/pkg/client/net" "github.com/sev-2/raiden/pkg/supabase/objects" "github.com/sev-2/raiden/pkg/supabase/query" "github.com/sev-2/raiden/pkg/supabase/query/sql" diff --git a/pkg/supabase/drivers/local/meta/table.go b/pkg/supabase/drivers/local/meta/table.go index cf186048..4ea496f0 100644 --- a/pkg/supabase/drivers/local/meta/table.go +++ b/pkg/supabase/drivers/local/meta/table.go @@ -9,7 +9,7 @@ import ( "sync" "github.com/sev-2/raiden" - "github.com/sev-2/raiden/pkg/supabase/client/net" + "github.com/sev-2/raiden/pkg/client/net" "github.com/sev-2/raiden/pkg/supabase/objects" "github.com/sev-2/raiden/pkg/supabase/query" "github.com/sev-2/raiden/pkg/supabase/query/sql" diff --git a/pkg/supabase/supabase.go b/pkg/supabase/supabase.go index 3cd188ef..b5fddb45 100644 --- a/pkg/supabase/supabase.go +++ b/pkg/supabase/supabase.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/go-hclog" "github.com/sev-2/raiden" + "github.com/sev-2/raiden/pkg/client/net" "github.com/sev-2/raiden/pkg/logger" - "github.com/sev-2/raiden/pkg/supabase/client/net" "github.com/sev-2/raiden/pkg/supabase/drivers/cloud" "github.com/sev-2/raiden/pkg/supabase/drivers/cloud/admin" "github.com/sev-2/raiden/pkg/supabase/drivers/local/meta" diff --git a/rpc.go b/rpc.go index cb5aa7ce..15b87be2 100644 --- a/rpc.go +++ b/rpc.go @@ -11,8 +11,8 @@ import ( "regexp" "strings" + "github.com/sev-2/raiden/pkg/client/net" "github.com/sev-2/raiden/pkg/logger" - "github.com/sev-2/raiden/pkg/supabase/client/net" "github.com/sev-2/raiden/pkg/utils" "github.com/valyala/fasthttp" ) From 9e9417b5a681724bab941638c9b8428be6f77e83 Mon Sep 17 00:00:00 2001 From: "Ach.Vani Ardiansyah" Date: Wed, 22 Jan 2025 14:47:14 +0700 Subject: [PATCH 2/2] feature(client) fix unused variable --- pkg/client/client.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkg/client/client.go b/pkg/client/client.go index b12d5236..72b96840 100644 --- a/pkg/client/client.go +++ b/pkg/client/client.go @@ -45,7 +45,8 @@ type DefaultResponse struct { func getClient() Client { maxIdleConnDuration := time.Hour * 1 - return &fasthttp.Client{ + + httpClientInstance = &fasthttp.Client{ ReadTimeout: DefaultTimeout, WriteTimeout: DefaultTimeout, MaxIdleConnDuration: maxIdleConnDuration, @@ -58,6 +59,8 @@ func getClient() Client { DNSCacheDuration: time.Hour, }).Dial, } + + return httpClientInstance } func SetClient(c Client) {