Compare commits

..

171 Commits

Author SHA1 Message Date
cbc4b21d62 Added baseURL prefix 2025-11-16 14:27:39 +01:00
11900eeecd Fixed req with insecured tls 2025-11-15 21:16:34 +01:00
4f9ef33ab1 Added baseURL for rest api clients 2025-11-15 20:57:30 +01:00
be77803d96 Added baseURL for rest api clients 2025-11-15 20:55:47 +01:00
4fbc0a35a7 REST API client update 2025-11-15 20:24:16 +01:00
ba94a1d17f Quick update to fit current api state 2025-11-15 18:31:37 +01:00
fb2ba22f72 Update: 2025-10-27 14:57:21 +01:00
dede386e8b Fixes 2025-10-27 13:54:11 +01:00
7fa00f323f Refactor of pgsql client 2025-10-26 20:29:09 +01:00
65105d6982 Restructured - new game changer 2025-10-26 19:20:59 +01:00
2ac68aed86 Added NoRowsInQuerySet func 2025-10-21 18:26:39 +02:00
bc1b0ff731 Added database package 2025-10-21 13:26:50 +02:00
e97a13d1e8 Updated golang version in go.mod 2025-10-21 13:24:09 +02:00
e0d270a2eb Removed useless packages 2025-10-21 13:23:58 +02:00
b829092503 Added WriteTimeout (100ms) 2025-10-12 19:20:48 +02:00
e16021ee49 Added Ping method to the logger class 2025-10-12 19:17:17 +02:00
69797a214f Added Ping method to the logger class 2025-10-12 17:53:37 +02:00
53e2d49e36 Fix .env file name 2025-10-12 16:38:46 +02:00
f2ab6a94d5 Update module names 2025-10-12 16:30:22 +02:00
1954182e1c Set .env* file names in order 2025-10-12 16:29:40 +02:00
b5852a3e61 Update dependencies 2025-10-11 20:52:27 +02:00
0456346b45 Update repo URL 2025-10-11 20:45:24 +02:00
e6b03fdd02 Removed useless tags 2025-04-26 12:36:34 +02:00
1018e24060 Updated TTL param 2025-04-26 12:05:55 +02:00
ebef6e138d Consul update 2024-12-24 18:15:48 +01:00
7bd8f754d8 Consul update 2024-12-24 18:10:41 +01:00
43574a1d1c Consul update 2024-12-24 18:04:55 +01:00
f130eaedd7 API Basket update 2024-12-24 17:59:01 +01:00
8394feaec7 Debug update 2024-12-24 17:51:02 +01:00
Piotr Biernat
68e6e3ef55 module update 2024-12-06 14:15:02 +01:00
Piotr Biernat
feff40bf55 update 2024-12-06 14:05:06 +01:00
eb1e8a9cb0 consul registration update 2024-07-21 21:11:34 +02:00
2c797164e0 consul registration update 2024-07-21 21:00:49 +02:00
7725e5dd65 debug fix 2024-07-20 20:12:29 +02:00
07c0cd6f2e debug fix 2024-07-20 19:59:12 +02:00
d29bd0810b debug fix 2024-07-20 19:55:33 +02:00
b62c0e5a8c debug fix 2024-07-20 19:03:21 +02:00
a9eb0d0732 debug fix 2024-07-20 18:19:56 +02:00
92b84685c9 routing fix 2024-07-20 17:30:37 +02:00
cd6e62e3bc debug fix 2024-07-20 16:17:13 +02:00
7cf2d91fd8 debug fix 2024-07-20 16:15:20 +02:00
936982731d debug fix 2024-07-20 16:11:06 +02:00
33759c87db debug fix 2024-07-20 15:56:59 +02:00
974f82e9be debug fix 2024-07-20 15:53:05 +02:00
d7dc75c18f debug fix 2024-07-20 15:45:49 +02:00
c62c63249c debug fix 2024-07-20 14:44:45 +02:00
6c290eb66b tls fix 2024-07-20 14:43:47 +02:00
31ce7fc48e tls fix 2024-07-20 14:42:16 +02:00
99957861dc fix ssl support 2024-07-20 14:24:38 +02:00
19d27b4ff6 add ssl support 2024-07-20 14:20:01 +02:00
7f2025ef6f add debug point 2024-07-20 14:18:08 +02:00
3afe78f9e3 fix in consul discovery 2024-07-19 17:06:39 +02:00
eb763ed49c fix in consul discovery 2024-07-19 16:52:54 +02:00
6537d79b19 fix in consul discovery 2024-07-19 16:48:08 +02:00
e55a2f42fe fix in consul discovery 2024-07-19 16:45:42 +02:00
82d68e91b8 fix in consul discovery 2024-07-19 16:41:37 +02:00
767eb5688c fix in consul discovery 2024-07-19 16:39:11 +02:00
37fa05402e fix in consul discovery 2024-07-19 16:30:04 +02:00
615281ae9a fix in consul discovery lib 2024-07-19 16:25:41 +02:00
42532b1d44 FIX Remove RetryIf plugin 2024-07-17 22:59:16 +02:00
1d4164711e FIX RetryIf plugin config 2024-07-17 22:46:28 +02:00
a50778380e Added RetryIf plugin with config 2024-07-17 22:39:49 +02:00
159bce1ff2 Added RetryIf plugin with config 2024-07-17 22:37:26 +02:00
22bc1e29a3 Fix: changed GetFullAddr() method: add debug point 2024-07-17 22:07:16 +02:00
4ce9064fbb Fix: changed GetFullAddr() method 2024-07-17 21:53:35 +02:00
75f7a75379 Fix: switch between domain or ip address for consul registering 2024-07-17 21:18:13 +02:00
398d7a2074 Fix in consul/discovery.go 2024-07-17 20:39:19 +02:00
b699008fa3 Fix for better unregistering? 2024-07-17 18:57:50 +02:00
b1f04badd5 Added healthcheck params in consul tags 2024-07-17 18:32:46 +02:00
f0b5e56e43 Added healthcheck params in consul tags 2024-07-17 18:27:21 +02:00
c644f42ea9 Fixed missing AUTH_HANDLER_URL env issue 2024-07-17 17:52:35 +02:00
941c5fdf92 Fixed missing AUTH_HANDLER_URL env issue 2024-07-17 17:48:24 +02:00
03de7082ab Try to fix consul middlewares 2024-07-17 17:15:39 +02:00
def22f26f1 Try to fix consul middlewares 2024-07-17 17:02:02 +02:00
fd37622ad6 Try to fix consul middlewares 2024-07-17 16:44:41 +02:00
96e08fce4c Try to fix consul middleware provider 2024-07-17 16:40:13 +02:00
0f8eda40ad Try to fix consul middleware provider 2024-07-17 16:32:26 +02:00
3285ee65da Try to fix consul middleware provider 2024-07-17 16:29:38 +02:00
47339bda36 Try to fix consul middleware provider 2024-07-17 16:26:31 +02:00
33269f9726 Try to fix consul middleware provider 2024-07-17 16:23:56 +02:00
5b5a8318a4 Fixed consul tags ordering 2024-07-17 16:20:02 +02:00
42b3a44364 Fixed consul tags ordering 2024-07-17 16:11:14 +02:00
20278f24b3 Fixed consul registered middlewares 2024-07-17 16:07:20 +02:00
ae49c9cdb8 Fixed consul registered middlewares 2024-07-17 16:03:46 +02:00
ea08da8d10 Fixed consul registered address 2024-07-17 15:34:55 +02:00
0aa6fc2aa3 Fixed consul registered tags 2024-07-17 15:22:30 +02:00
ab6189e855 Fixed consul registered address 2024-07-17 15:14:20 +02:00
1c244db6ea Fixed consul registered address 2024-07-17 15:09:37 +02:00
3394040a8c Fixed consul registered address 2024-07-17 15:07:09 +02:00
bc439fd4d2 revert consul router rules 2024-07-16 22:23:12 +02:00
16cfa5fead fix consul router rules 2024-07-16 22:17:51 +02:00
044c32e783 fix consul router rules 2024-07-16 21:53:59 +02:00
0d35173aab fix consul router rules 2024-07-16 21:47:58 +02:00
255c67ff92 fix consul tags 2024-07-16 21:39:53 +02:00
9dc85a1963 revert consul tags 2024-07-16 21:34:58 +02:00
91c27b30bf fix in consul register method 2024-07-16 19:13:40 +02:00
3ed094ff55 remove deprecated amqp mod, added official amqp mod 2024-07-16 18:54:28 +02:00
050aef8b7a remove deprecated amqp mod, added official amqp mod 2024-07-16 18:40:03 +02:00
420515f5b6 make error message more human readable 2024-07-16 18:19:49 +02:00
5dcd27e8b8 Update traefik router tag 2024-07-15 20:10:06 +02:00
0333862e3c error print fix 2024-05-30 17:19:16 +02:00
081e1edd24 go.mod update priv git url 2024-05-30 17:16:39 +02:00
c454307d56 consul fixes 2024-04-19 19:17:09 +02:00
359a89ba62 consul fixes 2024-04-19 19:01:16 +02:00
3b73091cfb consul fixes 2023-07-29 15:11:22 +02:00
c8beab76f1 consul fixes 2023-07-29 14:57:36 +02:00
599eaa3712 consul fixes 2023-07-29 13:47:51 +02:00
1de38fdfdf consul fixes 2023-07-26 23:19:17 +02:00
4d1f3644b0 consul fixes 2023-07-26 23:14:25 +02:00
71b3f13284 consul fixes 2023-07-08 17:18:19 +02:00
c64bc3fe6b consul fixes 2023-07-08 17:16:53 +02:00
016bddb5c4 register fix 2 2023-07-08 17:11:53 +02:00
98d85810f3 register fix 2 2023-07-08 13:02:13 +02:00
3fc1191f6e register fix 2 2023-07-08 02:22:28 +02:00
52793ac244 register fix 2 2023-07-06 23:02:05 +02:00
f8a1ae841d register fix 2 2023-07-06 21:49:12 +02:00
9d424742d6 register fix 2 2023-07-06 21:45:45 +02:00
a9b73a6536 register fix 2 2023-07-06 19:30:00 +02:00
95584eb407 register fix 2 2023-07-05 23:44:47 +02:00
ce7e2bc75a register fix 2 2023-07-05 23:37:55 +02:00
4bedc5d926 register fix 2 2023-07-05 23:35:17 +02:00
ea7f98f8bb register fix 2023-07-05 22:45:12 +02:00
bbdce9b25a register fix 2023-07-05 22:25:56 +02:00
1d75153698 consul register fix 2023-07-04 18:54:12 +02:00
c177133daf consul register fix 2023-07-04 18:46:00 +02:00
dad915f2ec consul register fix 2023-07-04 18:41:52 +02:00
54e4006d0d consul connect fixing 2023-07-04 00:02:23 +02:00
9cb590bf7a consul register as sidecar_service fix 2023-07-03 00:36:07 +02:00
70c41dab96 consul register as sidecar_service fix 2023-07-02 23:04:26 +02:00
99ac0a83c6 consul register as sidecar_service 2023-07-02 23:03:05 +02:00
30c45b4503 consul https temp fix 2023-07-02 22:38:13 +02:00
49f552bf68 consul register as sidecar_service 2023-07-02 22:30:53 +02:00
6f875cbb94 consul register as sidecar_service 2023-07-02 22:24:55 +02:00
f9331deec1 consul debug 2023-07-02 01:46:11 +02:00
c29bb94c3d consul debug 2023-07-02 01:32:45 +02:00
8d884eebda consul debug 2023-07-01 18:01:48 +02:00
2f022919ff consul debug 2023-07-01 17:57:30 +02:00
91eeb6f275 consul debug 2023-06-30 13:43:33 +02:00
dc34531c4f consul debug 2023-06-30 13:40:33 +02:00
12a241de81 consul debug 2023-06-30 13:37:06 +02:00
ef2567e0b6 consul: status - passing 2023-06-30 13:04:53 +02:00
bb410b3158 consul fix 2023-06-30 01:11:09 +02:00
7bbc717786 Debug 2023-06-29 15:59:27 +02:00
a1870e07b5 Debug 2023-06-29 15:27:36 +02:00
43c8dd3ad0 Debug 2023-06-29 15:24:59 +02:00
e57e43188c Recognization of ping request for consul 2023-06-29 15:18:35 +02:00
672a350f31 Recognization of ping request for consul 2023-06-29 15:15:03 +02:00
c01098b672 Now SVC must be working in full TLS mode 2023-06-29 15:06:12 +02:00
566cbbd31b Consul refactor 2023-06-29 14:34:25 +02:00
2375c2a23a Consul refactor 2023-06-29 14:25:08 +02:00
5451899e48 Consul refactor 2023-06-29 14:13:23 +02:00
6dd11c6441 Consul debug 2023-06-29 00:11:56 +02:00
045dd23a76 Consul debug 2023-06-29 00:03:06 +02:00
90e832af61 Consul debug 2023-06-28 23:52:34 +02:00
3d8c706835 Consul debug 2023-06-28 23:40:33 +02:00
a37f6209ff Consul debug 2023-06-28 23:34:45 +02:00
fc88125fe4 Consul debug 2023-06-28 23:22:15 +02:00
0aa79c7d35 Consul debug and clean 2023-06-28 23:07:10 +02:00
d484c0e3b0 Consul debug 2023-06-28 22:59:31 +02:00
7a35d1f44a Consul debug 2023-06-28 22:54:58 +02:00
7bfd048051 Consul debug 2023-06-28 22:50:16 +02:00
1433b69abe Moar HR 2023-06-28 16:37:18 +02:00
c49ec85b3b update config lib 2023-06-21 20:48:32 +02:00
bdac1d5bc9 update configl lib 2023-06-21 20:45:46 +02:00
8baf928a5b added config package 2023-06-21 20:38:51 +02:00
20b01eda68 update getTags() func 2023-06-21 20:33:09 +02:00
3685269236 Fixed traefik custom auth plugin config 2023-06-14 15:50:53 +02:00
2a6671654a Change forwardAuth plugin to my own auth(egommerce) version 2023-06-14 01:51:46 +02:00
3a42715b5d turn off Traefik forward auth plugin 2023-06-14 00:33:27 +02:00
222300d8e3 update 2023-04-10 16:03:02 +02:00
6c00fc98f5 update 2023-04-10 15:57:28 +02:00
17 changed files with 261 additions and 690 deletions

1
.gitignore vendored
View File

@@ -21,3 +21,4 @@
# Go workspace file # Go workspace file
go.work go.work
vendor/

View File

@@ -1,36 +0,0 @@
package api
import (
"fmt"
def "git.pbiernat.dev/egommerce/api-entities/http"
"github.com/go-redis/redis/v8"
)
func NewBasketAPI(ua string, redis *redis.Client) *BasketAPI {
return &BasketAPI{NewHttpClient(ua, redis)}
}
type BasketAPI struct {
httpClient *HttpClient
}
func (a *BasketAPI) GetBasket(basketID string) (*def.GetBasketResponse, error) {
req := &def.GetBasketRequest{BasketID: basketID}
res := new(def.GetBasketResponse)
if err := a.httpClient.SendGet("basket-svc", "/api/v1/basket", req, res); err != nil {
return nil, err
}
return res, nil
}
func (a *BasketAPI) GetBasketItems(basketID string) ([]*def.GetBasketItemsResponse, error) {
url := fmt.Sprintf("/api/v1/basket/%s/items", basketID)
var res []*def.GetBasketItemsResponse
if err := a.httpClient.SendGet("basket-svc", url, nil, &res); err != nil {
return nil, err
}
return res, nil
}

View File

@@ -1,95 +0,0 @@
package api
import (
"bytes"
"context"
"encoding/json"
"math/rand"
"net/http"
"github.com/go-redis/redis/v8"
)
type HttpClient struct {
ua string
redis *redis.Client
}
func NewHttpClient(ua string, redis *redis.Client) *HttpClient {
return &HttpClient{ua, redis}
}
func (c *HttpClient) SendGet(api, url string, data, out any) error {
res, err := c.sendRequest(api, url, http.MethodGet, data)
if err != nil {
return err
}
decoder := json.NewDecoder(res.Body)
err = decoder.Decode(&out)
if err != nil {
return err
}
return nil
}
func (c *HttpClient) SendPost(api, url string, data, out any) (any, error) {
res, err := c.sendRequest(api, url, http.MethodPost, data)
if err != nil {
return nil, err
}
decoder := json.NewDecoder(res.Body)
err = decoder.Decode(out)
if err != nil {
return nil, err
}
return out, nil
}
func (c *HttpClient) sendRequest(api, url, method string, data any) (*http.Response, error) {
apiUrl := c.getApiUrl(api) + url
client := &http.Client{}
json, err := json.Marshal(&data)
if err != nil {
return nil, err
}
req, err := http.NewRequest(method, apiUrl, bytes.NewBuffer(json))
if err != nil {
return nil, err
}
req.Header.Set("Content-Type", "application/json")
req.Header.Set("User-Agent", c.ua)
res, err := client.Do(req)
if err != nil {
return nil, err
}
// defer res.Body.Close()
return res, nil
}
func (c *HttpClient) getApiUrl(api string) string {
ctx, key, apiAddr := context.Background(), "internal__"+api+"__ips", api
// FIXME: key name ^^
cmd := c.redis.LLen(ctx, key)
if cmd.Err() == nil {
len := int(cmd.Val())
if len == 0 {
apiAddr = c.redis.LIndex(ctx, key, 0).Val()
} else {
apiAddr = c.redis.LIndex(ctx, key, int64(rand.Intn(len-0)+0)).Val()
}
}
if apiAddr == "" {
apiAddr = api // default api run on 80 int port
}
return "http://" + apiAddr
}

View File

@@ -1,26 +0,0 @@
package api
import (
"fmt"
def "git.pbiernat.dev/egommerce/api-entities/http"
"github.com/go-redis/redis/v8"
)
func NewPricingAPI(ua string, redis *redis.Client) *PricingAPI {
return &PricingAPI{NewHttpClient(ua, redis)}
}
type PricingAPI struct {
httpClient *HttpClient
}
func (a *PricingAPI) GetProductPrice(productID int) (*def.ProductPriceResponse, error) {
url := fmt.Sprintf("/api/v1/product/%d", productID)
res := new(def.ProductPriceResponse)
if err := a.httpClient.SendGet("pricing-svc", url, nil, res); err != nil {
return nil, err
}
return res, nil
}

38
api/rest/basket.go Normal file
View File

@@ -0,0 +1,38 @@
package api
import (
"fmt"
basket "git.ego.freeddns.org/egommerce/api-entities/basket/dto"
cnf "git.ego.freeddns.org/egommerce/go-api-pkg/config"
)
func NewBasketAPI() *BasketAPI {
return &BasketAPI{NewHttpClient(cnf.GetEnv("API_REST_BASKET", "basket-svc"))}
}
type BasketAPI struct {
httpClient *HttpClient
}
func (a *BasketAPI) GetBasket(basketID string) (*basket.GetBasketResponseDTO, error) {
req := &basket.GetBasketRequestDTO{BasketID: basketID}
res := new(basket.GetBasketResponseDTO)
if err := a.httpClient.SendGet("/api/v1/basket", req, res); err != nil {
return nil, err
}
return res, nil
}
func (a *BasketAPI) GetBasketItems(basketID string) ([]*basket.GetBasketItemsResponseDTO, error) {
url := fmt.Sprintf("/api/v1/basket/items")
req := basket.GetBasketItemsRequestDTO{BasketID: basketID}
var res []*basket.GetBasketItemsResponseDTO
if err := a.httpClient.SendGet(url, req, &res); err != nil {
return nil, err
}
return res, nil
}

80
api/rest/http.go Normal file
View File

@@ -0,0 +1,80 @@
package api
import (
"bytes"
"crypto/tls"
"encoding/json"
"fmt"
"net/http"
)
type HttpClient struct {
baseURL string
userAgent string
}
func NewHttpClient(baseURL string) *HttpClient {
return &HttpClient{baseURL: baseURL, userAgent: "internal-http-client"}
}
func (c *HttpClient) SendGet(url string, data, out any) error {
fmt.Printf("Sending req to: %s%s\n", c.baseURL, url)
res, err := c.sendRequest(url, http.MethodGet, data)
if err != nil {
return err
}
decoder := json.NewDecoder(res.Body)
err = decoder.Decode(&out)
if err != nil {
return err
}
return nil
}
func (c *HttpClient) SendPost(url string, data, out any) (any, error) {
res, err := c.sendRequest(url, http.MethodPost, data)
if err != nil {
return nil, err
}
decoder := json.NewDecoder(res.Body)
err = decoder.Decode(out)
if err != nil {
return nil, err
}
return out, nil
}
func (c *HttpClient) sendRequest(url, method string, data any) (*http.Response, error) {
apiUrl := c.baseURL + url
tr := &http.Transport{
TLSClientConfig: &tls.Config{InsecureSkipVerify: true}, // FIXME dev mode
}
// Create an HTTP client with the custom transport
client := &http.Client{Transport: tr} // FIXME dev mode
json, err := json.Marshal(&data)
if err != nil {
return nil, err
}
req, err := http.NewRequest(method, apiUrl, bytes.NewBuffer(json))
if err != nil {
return nil, err
}
req.Header.Set("Content-Type", "application/json")
req.Header.Set("User-Agent", c.userAgent)
res, err := client.Do(req)
if err != nil {
return nil, err
}
defer res.Body.Close()
return res, nil
}

26
api/rest/identity.go Normal file
View File

@@ -0,0 +1,26 @@
package api
import (
identity "git.ego.freeddns.org/egommerce/api-entities/identity/dto"
cnf "git.ego.freeddns.org/egommerce/go-api-pkg/config"
)
type IdentityAPI struct {
httpClient *HttpClient
}
func NewIdentityAPI() *IdentityAPI {
return &IdentityAPI{NewHttpClient(cnf.GetEnv("API_REST_IDENTITY", "identity-svc"))}
}
func (a *IdentityAPI) CheckAccess(url, srv string) (*identity.CheckAccessResponseDTO, error) {
req := &identity.CheckAccessRequestDTO{URL: url, Service: srv}
res := new(identity.CheckAccessResponseDTO)
// targetURL := fmt.Sprintf("/v1/access?url=%s&srv=%s", url, srv)
if err := a.httpClient.SendGet("/v1/access", req, res); err != nil {
return nil, err
}
return res, nil
}

26
api/rest/pricing.go Normal file
View File

@@ -0,0 +1,26 @@
package api
import (
"fmt"
pricing "git.ego.freeddns.org/egommerce/api-entities/pricing/dto"
cnf "git.ego.freeddns.org/egommerce/go-api-pkg/config"
)
func NewPricingAPI() *PricingAPI {
return &PricingAPI{NewHttpClient(cnf.GetEnv("API_REST_PRICING", "pricing-svc"))}
}
type PricingAPI struct {
httpClient *HttpClient
}
func (a *PricingAPI) GetProductPrice(productID int) (*pricing.ProductPriceResponseDTO, error) {
url := fmt.Sprintf("/api/v1/product/%d", productID)
res := new(pricing.ProductPriceResponseDTO)
if err := a.httpClient.SendGet(url, nil, res); err != nil {
return nil, err
}
return res, nil
}

View File

@@ -0,0 +1,28 @@
package postgresql
// Jackc/pgx helper
import (
"errors"
"github.com/jackc/pgx/v5"
"github.com/jackc/pgx/v5/pgconn"
)
func IsDuplicatedRow(err error) error {
var pgErr *pgconn.PgError
if errors.As(err, &pgErr) && pgErr.Code == "23505" {
return errors.New("duplicated row found")
}
return nil
}
func NoRowsInQuerySet(err error) error {
if err == pgx.ErrNoRows {
return errors.New("no rows found")
}
return nil
}

22
config/env.go Normal file
View File

@@ -0,0 +1,22 @@
package config
import (
"os"
"github.com/joho/godotenv"
)
var ErrLoadingEnvs error
func init() {
ErrLoadingEnvs = godotenv.Load()
}
func GetEnv(name string, defVal string) string {
env := os.Getenv(name)
if env == "" {
return defVal
}
return env
}

View File

@@ -1,166 +0,0 @@
package consul
import (
"fmt"
"net/http"
"strconv"
"time"
consul "github.com/hashicorp/consul/api"
)
type Service struct {
Name string
Address string
appID string
domain string
pathPrefix string
port int
ttl time.Duration
agent *consul.Agent
kv *consul.KV
catalog *consul.Catalog
}
var ErrServiceUnavailable = fmt.Errorf("Service is unavailable")
func NewService(servAddr, id, name, hostname, domain, pathPrefix string, appPort int) (*Service, error) {
s := new(Service)
s.Name = name
s.Address = hostname
s.appID = id
s.domain = domain
s.pathPrefix = pathPrefix
s.port = appPort
s.ttl = time.Second * 15
client, err := consul.NewClient(newClientConfig(servAddr))
if err != nil {
return nil, err
}
s.agent = client.Agent()
s.kv = client.KV()
s.catalog = client.Catalog()
return s, nil
}
func newClientConfig(serverAddr string) *consul.Config {
conf := consul.DefaultConfig()
conf.Address = serverAddr
return conf
}
func (s *Service) GetID() string {
return fmt.Sprintf("%s_%s", s.Name, s.appID)
}
func (s *Service) GetFullAddr() string {
return fmt.Sprintf("http://%s:%d/", s.Address, s.port)
}
func (s *Service) Register() error {
def := &consul.AgentServiceRegistration{
ID: s.GetID(),
Name: s.Name,
Address: s.Address,
Port: s.port,
Tags: s.getTags(),
Check: &consul.AgentServiceCheck{
TTL: s.ttl.String(),
DeregisterCriticalServiceAfter: "5s",
},
}
if err := s.agent.ServiceRegister(def); err != nil {
return err
}
go func(s *Service) { // startup register
ticker := time.NewTicker(time.Millisecond * 100)
for range ticker.C {
if ok, _ := s.healthCheck(); ok {
ticker.Stop()
}
}
}(s)
go func(s *Service) { // TTL
interval := s.ttl - time.Second*2 // 2 seconds overhead
ticker := time.NewTicker(interval)
for range ticker.C {
if _, err := s.healthCheck(); err != nil {
fmt.Printf("TTL Error: %v\n", err)
}
}
}(s)
return nil
}
func (s *Service) Unregister() error {
return s.agent.ServiceDeregister(s.GetID())
}
func (s *Service) KV() *consul.KV {
return s.kv
}
func (s *Service) Catalog() *consul.Catalog {
return s.catalog
}
func (s *Service) healthCheck() (bool, error) {
alive := func() bool {
client := &http.Client{}
healthUrl := s.GetFullAddr() + "health"
req, err := http.NewRequest(http.MethodGet, healthUrl, nil)
if err != nil {
return false
}
req.Header.Set("User-Agent", "Health Check")
resp, err := client.Do(req)
if err != nil {
return false
}
defer resp.Body.Close()
return resp.StatusCode == http.StatusOK
}()
if alive {
if err := s.agent.PassTTL("service:"+s.GetID(), "OK"); err != nil {
return false, err
}
return true, nil
}
if err := s.agent.FailTTL("service:"+s.GetID(), ErrServiceUnavailable.Error()); err != nil {
return false, err
}
return false, ErrServiceUnavailable
}
func (s *Service) getTags() []string {
tags := []string{
"traefik.enable=true",
"traefik.http.routers." + s.Name + ".rule=PathPrefix(`" + s.pathPrefix + "`)",
"traefik.http.routers." + s.Name + ".entryPoints=https",
"traefik.http.routers." + s.Name + ".tls=true",
"traefik.http.routers." + s.Name + ".service=" + s.Name,
"traefik.http.routers." + s.Name + ".middlewares=auth,requestid,stripprefix_" + s.Name,
"traefik.http.services." + s.Name + ".loadbalancer.server.scheme=http",
"traefik.http.services." + s.Name + ".loadbalancer.server.port=" + strconv.Itoa(s.port),
"traefik.http.services." + s.Name + ".loadbalancer.passhostheader=false",
"traefik.http.middlewares.auth.forwardauth.address=http://identity-svc/api/v1/traefik",
"traefik.http.middlewares.auth.forwardauth.authResponseHeaders=Set-Cookie, Server",
"traefik.http.middlewares.auth.forwardauth.trustForwardHeader=true",
"traefik.http.middlewares.requestid.plugin.requestid.headerName=X-Request-ID",
"traefik.http.middlewares.stripprefix_" + s.Name + ".stripprefix.prefixes=" + s.pathPrefix,
"traefik.tls.certificates.certfile=/certs/client.cert",
"traefik.tls.certificates.keyfile=/certs/client.key",
}
return tags
}

View File

@@ -1,17 +0,0 @@
package fluentd
import (
"strconv"
"strings"
)
func ParseAddr(addr string) (string, int, error) {
p := strings.Split(addr, ":")
fHost := p[0]
fPort, err := strconv.Atoi(p[1])
if err != nil {
return "", 0, err
}
return fHost, fPort, nil
}

View File

@@ -1,41 +0,0 @@
package fluentd
import (
"fmt"
"log"
"github.com/fluent/fluent-logger-golang/fluent"
)
type Logger struct {
fluent *fluent.Fluent
appName string
}
func NewLogger(appName, fHost string, fPort int) (*Logger, error) {
config := fluent.Config{
FluentHost: fHost,
FluentPort: fPort,
// WriteTimeout: -1,
}
fluent, err := fluent.New(config)
if err != nil {
return nil, err
}
return &Logger{fluent, appName}, nil
}
func (l *Logger) Log(format string, v ...any) {
mapData := map[string]string{
"message": fmt.Sprintf(format, v...),
}
err := l.fluent.Post(l.appName, mapData)
if err != nil {
log.Println("Error sending log: ", err)
}
}
func (l *Logger) Close() error {
return l.fluent.Close()
}

37
go.mod
View File

@@ -1,31 +1,20 @@
module git.pbiernat.dev/egommerce/go-api-pkg module git.ego.freeddns.org/egommerce/go-api-pkg
go 1.18 go 1.24
require github.com/joho/godotenv v1.5.1
require ( require (
github.com/fluent/fluent-logger-golang v1.9.0 github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/go-redis/redis/v8 v8.11.5 github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
github.com/hashicorp/consul/api v1.18.0
github.com/streadway/amqp v1.0.0
) )
require ( require (
github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da // indirect git.ego.freeddns.org/egommerce/api-entities v0.3.50
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/jackc/pgx/v5 v5.7.6
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/fatih/color v1.9.0 // indirect github.com/stretchr/testify v1.8.3 // indirect
github.com/hashicorp/go-cleanhttp v0.5.1 // indirect golang.org/x/crypto v0.37.0 // indirect
github.com/hashicorp/go-hclog v0.12.0 // indirect golang.org/x/text v0.24.0 // indirect
github.com/hashicorp/go-immutable-radix v1.0.0 // indirect
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
github.com/hashicorp/golang-lru v0.5.4 // indirect
github.com/hashicorp/serf v0.10.1 // indirect
github.com/mattn/go-colorable v0.1.6 // indirect
github.com/mattn/go-isatty v0.0.12 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/mapstructure v1.4.1 // indirect
github.com/philhofer/fwd v1.1.1 // indirect
github.com/tinylib/msgp v1.1.6 // indirect
golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
) )

201
go.sum
View File

@@ -1,180 +1,33 @@
github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= git.ego.freeddns.org/egommerce/api-entities v0.3.50 h1:3BYB+0gGSkXf4JlcYQtlLhe3goL5aL8A9M54LlzdlfM=
github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da h1:8GUt8eRujhVEGZFFEjBj46YV4rDjvGrNxb0KMWYkL2I= git.ego.freeddns.org/egommerce/api-entities v0.3.50/go.mod h1:D58YWJz0jvARi/7pNpDMzp00nfk9YLOj9zjcKRDHBhY=
github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY=
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
github.com/fatih/color v1.9.0 h1:8xPHl4/q1VyqGIPif1F+1V3Y3lSmrq01EabUW3CoW5s= github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/jackc/pgx/v5 v5.7.6 h1:rWQc5FwZSPX58r1OQmkuaNicxdmExaEz5A2DO2hUuTk=
github.com/fluent/fluent-logger-golang v1.9.0 h1:zUdY44CHX2oIUc7VTNZc+4m+ORuO/mldQDA7czhWXEg= github.com/jackc/pgx/v5 v5.7.6/go.mod h1:aruU7o91Tc2q2cFp5h4uP3f6ztExVpyVv88Xl/8Vl8M=
github.com/fluent/fluent-logger-golang v1.9.0/go.mod h1:2/HCT/jTy78yGyeNGQLGQsjF3zzzAuy6Xlk6FCMV5eU= github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo=
github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c h1:964Od4U6p2jUkFxvCydnIczKteheJEzHRToSGK3Bnlw=
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
github.com/hashicorp/consul/api v1.18.0 h1:R7PPNzTCeN6VuQNDwwhZWJvzCtGSrNpJqfb22h3yH9g=
github.com/hashicorp/consul/api v1.18.0/go.mod h1:owRRGJ9M5xReDC5nfT8FTJrNAPbT4NM6p/k+d03q2v4=
github.com/hashicorp/consul/sdk v0.13.0 h1:lce3nFlpv8humJL8rNrrGHYSKc3q+Kxfeg3Ii1m6ZWU=
github.com/hashicorp/consul/sdk v0.13.0/go.mod h1:0hs/l5fOVhJy/VdcoaNqUSi2AUs95eF5WKtv+EYIQqE=
github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA=
github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
github.com/hashicorp/go-cleanhttp v0.5.1 h1:dH3aiDG9Jvb5r5+bYHsikaOUIpcM0xvgMXVoDkXMzJM=
github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
github.com/hashicorp/go-hclog v0.12.0 h1:d4QkX8FRTYaKaCZBoXYY8zJX2BXjWxurN/GA2tkrmZM=
github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
github.com/hashicorp/go-immutable-radix v1.0.0 h1:AKDB1HM5PWEA7i4nhcpwOrO2byshxBjXVn/J/3+z5/0=
github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
github.com/hashicorp/go-msgpack v0.5.3 h1:zKjpN5BK/P5lMYrLmBHdBULWbJ0XpYR+7NGzqkZzoD4=
github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
github.com/hashicorp/go-multierror v1.1.0 h1:B9UzwGQJehnUY1yNrnwREHc3fGbC2xefo8g4TbElacI=
github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA=
github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc=
github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
github.com/hashicorp/go-sockaddr v1.0.2 h1:ztczhD1jLxIRjVejw8gFomI1BQZOe2WoVOu0SyteCQc=
github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A=
github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE=
github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
github.com/hashicorp/go-version v1.2.1 h1:zEfKbn2+PDgroKdiOzqiE8rsmLqU2uwi5PB5pBJ3TkI=
github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc=
github.com/hashicorp/memberlist v0.5.0 h1:EtYPN8DpAURiapus508I4n9CzHs2W+8NZGbmmR/prTM=
github.com/hashicorp/memberlist v0.5.0/go.mod h1:yvyXLpo0QaGE59Y7hDTsTzDD25JYBZ4mHgHUZ8lrOI0=
github.com/hashicorp/serf v0.10.1 h1:Z1H2J60yRKvfDYAOZLd2MU0ND4AH/WDz7xYHDWQsIPY=
github.com/hashicorp/serf v0.10.1/go.mod h1:yL2t6BqATOLGc5HF7qbFkTfXoPIY0WZdWHfEvMqbG+4=
github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
github.com/mattn/go-colorable v0.1.6 h1:6Su7aK7lXmJ/U79bYtBjLNaha4Fs1Rg9plHpcH+vvnE=
github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
github.com/miekg/dns v1.1.41 h1:WMszZWJG0XmzbK9FEmzH2TVcqYzFesusSIB41b8KHxY=
github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI=
github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI=
github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
github.com/mitchellh/mapstructure v1.4.1 h1:CpVNEelQCZBooIPDn+AR3NpivK/TIKU8bDxdASFVQag=
github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE=
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c h1:Lgl0gzECD8GnQ5QCWA8o6BtfL6mDH5rQgM4/fX3avOs=
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
github.com/philhofer/fwd v1.1.1 h1:GdGcTjf5RNAxwS4QLsiMzJYj5KEvPJD3Abr261yRQXQ=
github.com/philhofer/fwd v1.1.1/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU=
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=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I=
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
github.com/streadway/amqp v1.0.0 h1:kuuDrUJFZL1QYL9hUNuCxNObNzB0bV/ZG5jV3RWAQgo=
github.com/streadway/amqp v1.0.0/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw=
github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/tinylib/msgp v1.1.6 h1:i+SbKraHhnrf9M5MYmvQhFnbLhAXSDWF8WWsuyRdocw= github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY=
github.com/tinylib/msgp v1.1.6/go.mod h1:75BAfg2hauQhs3qedfdDZmWAPcFMAvJE5b9rGOMufyw= github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc=
golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= golang.org/x/sync v0.13.0 h1:AauUjRAJ9OSnvULf/ARrrVywoJDy0YS2AwQ98I37610=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8=
golang.org/x/net v0.0.0-20211216030914-fe4d6282115f h1:hEYJvxw1lSnWIl8X9ofsYMklzaDs90JI2az5YMd4fPM=
golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 h1:WIoqL4EROvwiPdUtaip4VcDdpZ4kha7wBWZrbVKCIZg=
golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20201022035929-9cf592e881e9/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
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.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= 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=

View File

@@ -1,26 +0,0 @@
package rabbitmq
import (
"log"
"github.com/streadway/amqp"
)
func Open(url string) (*amqp.Connection, *amqp.Channel, error) {
conn, err := amqp.Dial(url)
if err != nil {
return nil, nil, err
}
ch, err := conn.Channel()
if err != nil {
log.Printf("Failed to open a channel: %v\n", err)
return nil, nil, err
}
return conn, ch, nil
}
func Close(conn *amqp.Connection) error {
return conn.Close()
}

View File

@@ -1,85 +0,0 @@
package rabbitmq
import (
"bytes"
"encoding/json"
"fmt"
"log"
"github.com/streadway/amqp"
)
type Message map[string]interface{}
func Serialize(msg any) (string, error) {
var b bytes.Buffer
encoder := json.NewEncoder(&b)
err := encoder.Encode(msg)
return b.String(), err
}
func Deserialize(b []byte) (Message, error) {
var msg Message
buf := bytes.NewBuffer(b)
decoder := json.NewDecoder(buf)
err := decoder.Decode(&msg)
return msg, err
}
func NewExchange(chn *amqp.Channel, name string) error {
err := chn.ExchangeDeclare(
name,
"direct", // type
true, // durable
false, // auto-deleted
false, // internal
false, // no-wait
nil, // arguments
)
if err != nil {
return err
}
return nil
}
func Publish(chn *amqp.Channel, name, routingKey string, msg any) error {
jsonData, err := Serialize(msg)
if err != nil {
return err
}
msgBody := fmt.Sprintf(`{"event":"%T","data":%s}`, msg, jsonData)
chn.Publish(
name, // exchange name
routingKey, // routing key
false, // mandatory
false, // immediate
amqp.Publishing{
ContentType: "application/json",
Body: []byte(msgBody),
},
)
return nil
}
func BindQueueToExchange(chn *amqp.Channel, queueName, exchName, routingKey string) error {
err := chn.QueueBind(
queueName, // queue name
routingKey, // routing key
exchName, // exchange name
false,
nil,
)
if err != nil {
log.Printf("Failed to bind a queue: %s\n", queueName)
return err
}
return nil
}