refactor(go-libs): Move to dedicated repository (#1709)

formancehq · Sep 20, 2024 · 51dd4ba · 51dd4ba
1 parent eec86ea
commit 51dd4ba
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 27 deletions.
diff --git a/Earthfile b/Earthfile
@@ -8,7 +8,6 @@ FROM core+base-image
 
 sources:
     WORKDIR src
-    DO stack+INCLUDE_GO_LIBS --LOCATION libs/go-libs
     WORKDIR /src/ee/search
     COPY go.* .
     COPY --dir pkg cmd .

diff --git a/cmd/init_mapping.go b/cmd/init_mapping.go
@@ -1,9 +1,9 @@
 package cmd
 
 import (
+	"github.com/formancehq/go-libs/aws/iam"
+	"github.com/formancehq/go-libs/service"
 	"github.com/formancehq/search/pkg/searchengine"
-	"github.com/formancehq/stack/libs/go-libs/aws/iam"
-	"github.com/formancehq/stack/libs/go-libs/service"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )

diff --git a/cmd/root.go b/cmd/root.go
@@ -2,7 +2,7 @@ package cmd
 
 import (
 	_ "github.com/bombsimon/logrusr/v3"
-	"github.com/formancehq/stack/libs/go-libs/service"
+	"github.com/formancehq/go-libs/service"
 	"github.com/spf13/cobra"
 )
 

diff --git a/cmd/serve.go b/cmd/serve.go
@@ -6,24 +6,25 @@ import (
 	"net/http"
 	"os"
 
+	"github.com/opensearch-project/opensearch-go"
+
 	"github.com/aws/aws-sdk-go-v2/config"
 
+	"github.com/formancehq/go-libs/api"
+	"github.com/formancehq/go-libs/auth"
+	"github.com/formancehq/go-libs/aws/iam"
+	"github.com/formancehq/go-libs/health"
+	"github.com/formancehq/go-libs/httpclient"
+	"github.com/formancehq/go-libs/httpserver"
+	"github.com/formancehq/go-libs/licence"
+	"github.com/formancehq/go-libs/logging"
+	"github.com/formancehq/go-libs/otlp"
+	"github.com/formancehq/go-libs/otlp/otlptraces"
+	"github.com/formancehq/go-libs/service"
 	"github.com/formancehq/search/pkg/searchengine"
 	"github.com/formancehq/search/pkg/searchhttp"
-	"github.com/formancehq/stack/libs/go-libs/api"
-	"github.com/formancehq/stack/libs/go-libs/auth"
-	"github.com/formancehq/stack/libs/go-libs/aws/iam"
-	"github.com/formancehq/stack/libs/go-libs/health"
-	"github.com/formancehq/stack/libs/go-libs/httpclient"
-	"github.com/formancehq/stack/libs/go-libs/httpserver"
-	"github.com/formancehq/stack/libs/go-libs/licence"
-	"github.com/formancehq/stack/libs/go-libs/logging"
-	"github.com/formancehq/stack/libs/go-libs/otlp"
-	"github.com/formancehq/stack/libs/go-libs/otlp/otlptraces"
-	"github.com/formancehq/stack/libs/go-libs/service"
 	"github.com/gorilla/handlers"
 	"github.com/gorilla/mux"
-	"github.com/opensearch-project/opensearch-go"
 	"github.com/opensearch-project/opensearch-go/opensearchtransport"
 	requestsigner "github.com/opensearch-project/opensearch-go/v2/signer/awsv2"
 	"github.com/pkg/errors"

diff --git a/cmd/update_mapping.go b/cmd/update_mapping.go
@@ -1,9 +1,9 @@
 package cmd
 
 import (
+	"github.com/formancehq/go-libs/aws/iam"
+	"github.com/formancehq/go-libs/service"
 	"github.com/formancehq/search/pkg/searchengine"
-	"github.com/formancehq/stack/libs/go-libs/aws/iam"
-	"github.com/formancehq/stack/libs/go-libs/service"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )

diff --git a/go.mod b/go.mod
@@ -7,7 +7,7 @@ toolchain go1.22.6
 require (
 	github.com/aquasecurity/esquery v0.2.0
 	github.com/bombsimon/logrusr/v3 v3.1.0
-	github.com/formancehq/stack/libs/go-libs v0.0.0-20230221161632-e6dc6a89a85e
+	github.com/formancehq/go-libs v1.5.0
 	github.com/gorilla/handlers v1.5.1
 	github.com/gorilla/mux v1.8.0
 	github.com/opensearch-project/opensearch-go v1.1.0
@@ -109,6 +109,4 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
-replace github.com/formancehq/stack/libs/go-libs => ../../libs/go-libs
-
 replace github.com/formancehq/ledger => ../../components/ledger
diff --git a/go.sum b/go.sum
@@ -85,6 +85,8 @@ github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga
 github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
 github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
 github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
+github.com/formancehq/go-libs v1.5.0 h1:jOVET378uquKvQBnSaS8ClLFbk7fB1Lhy4xM0+RK74o=
+github.com/formancehq/go-libs v1.5.0/go.mod h1:rnvi4Au1DCNephaBEVzcv64BZEEksXiyKjwo/wHG51Y=
 github.com/go-chi/chi/v5 v5.1.0 h1:acVI1TYaD+hhedDJ3r54HyA6sExp3HfXq7QWEEY/xMw=
 github.com/go-chi/chi/v5 v5.1.0/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=

diff --git a/pkg/searchhttp/cursor.go b/pkg/searchhttp/cursor.go
@@ -5,7 +5,7 @@ import (
 	"encoding/base64"
 	"encoding/json"
 
-	"github.com/formancehq/stack/libs/go-libs/bun/bunpaginate"
+	"github.com/formancehq/go-libs/bun/bunpaginate"
 
 	"github.com/formancehq/search/pkg/searchengine"
 )

diff --git a/pkg/searchhttp/http.go b/pkg/searchhttp/http.go
@@ -9,12 +9,12 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/formancehq/stack/libs/go-libs/bun/bunpaginate"
+	"github.com/formancehq/go-libs/bun/bunpaginate"
 
 	"github.com/aquasecurity/esquery"
+	"github.com/formancehq/go-libs/api"
+	"github.com/formancehq/go-libs/logging"
 	"github.com/formancehq/search/pkg/searchengine"
-	"github.com/formancehq/stack/libs/go-libs/api"
-	"github.com/formancehq/stack/libs/go-libs/logging"
 	"github.com/pkg/errors"
 	"github.com/tidwall/gjson"
 )

diff --git a/pkg/searchhttp/http_test.go b/pkg/searchhttp/http_test.go
@@ -9,13 +9,13 @@ import (
 	"testing"
 	"time"
 
-	"github.com/formancehq/stack/libs/go-libs/bun/bunpaginate"
+	"github.com/formancehq/go-libs/bun/bunpaginate"
 
 	"github.com/aquasecurity/esquery"
+	"github.com/formancehq/go-libs/api"
 	search "github.com/formancehq/search/pkg"
 	"github.com/formancehq/search/pkg/es"
 	"github.com/formancehq/search/pkg/searchengine"
-	"github.com/formancehq/stack/libs/go-libs/api"
 	"github.com/stretchr/testify/require"
 )