Compare commits
13 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| f858bc1697 | |||
| 76066fcc39 | |||
| 1844be2be3 | |||
| 132662b095 | |||
| 55965e295a | |||
| 3bd4bd31ff | |||
| 0c52f0f518 | |||
| 40ab38587c | |||
| e906efdb6c | |||
| e3f8352a73 | |||
| db07562c5a | |||
| 57f12d3563 | |||
| 2e40ca75c9 |
@@ -7,8 +7,8 @@ import (
|
|||||||
"github.com/go-redis/redis/v8"
|
"github.com/go-redis/redis/v8"
|
||||||
)
|
)
|
||||||
|
|
||||||
func NewBasketAPI(redis *redis.Client) *BasketAPI {
|
func NewBasketAPI(ua string, redis *redis.Client) *BasketAPI {
|
||||||
return &BasketAPI{NewHttpClient(redis)}
|
return &BasketAPI{NewHttpClient(ua, redis)}
|
||||||
}
|
}
|
||||||
|
|
||||||
type BasketAPI struct {
|
type BasketAPI struct {
|
||||||
@@ -18,7 +18,7 @@ type BasketAPI struct {
|
|||||||
func (a *BasketAPI) GetBasket(basketID string) (*def.GetBasketResponse, error) {
|
func (a *BasketAPI) GetBasket(basketID string) (*def.GetBasketResponse, error) {
|
||||||
req := &def.GetBasketRequest{BasketID: basketID}
|
req := &def.GetBasketRequest{BasketID: basketID}
|
||||||
res := new(def.GetBasketResponse)
|
res := new(def.GetBasketResponse)
|
||||||
if err := a.httpClient.SendGet("basket", "/api/v1/basket", req, res); err != nil {
|
if err := a.httpClient.SendGet("basket-svc", "/api/v1/basket", req, res); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -28,7 +28,7 @@ func (a *BasketAPI) GetBasket(basketID string) (*def.GetBasketResponse, error) {
|
|||||||
func (a *BasketAPI) GetBasketItems(basketID string) ([]*def.GetBasketItemsResponse, error) {
|
func (a *BasketAPI) GetBasketItems(basketID string) ([]*def.GetBasketItemsResponse, error) {
|
||||||
url := fmt.Sprintf("/api/v1/basket/%s/items", basketID)
|
url := fmt.Sprintf("/api/v1/basket/%s/items", basketID)
|
||||||
var res []*def.GetBasketItemsResponse
|
var res []*def.GetBasketItemsResponse
|
||||||
if err := a.httpClient.SendGet("basket", url, nil, &res); err != nil {
|
if err := a.httpClient.SendGet("basket-svc", url, nil, &res); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
13
api/http.go
13
api/http.go
@@ -10,16 +10,13 @@ import (
|
|||||||
"github.com/go-redis/redis/v8"
|
"github.com/go-redis/redis/v8"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
|
||||||
HEADER_USER_AGENT = "order-httpclient"
|
|
||||||
)
|
|
||||||
|
|
||||||
type HttpClient struct {
|
type HttpClient struct {
|
||||||
|
ua string
|
||||||
redis *redis.Client
|
redis *redis.Client
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewHttpClient(redis *redis.Client) *HttpClient {
|
func NewHttpClient(ua string, redis *redis.Client) *HttpClient {
|
||||||
return &HttpClient{redis}
|
return &HttpClient{ua, redis}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *HttpClient) SendGet(api, url string, data, out any) error {
|
func (c *HttpClient) SendGet(api, url string, data, out any) error {
|
||||||
@@ -67,7 +64,7 @@ func (c *HttpClient) sendRequest(api, url, method string, data any) (*http.Respo
|
|||||||
}
|
}
|
||||||
|
|
||||||
req.Header.Set("Content-Type", "application/json")
|
req.Header.Set("Content-Type", "application/json")
|
||||||
req.Header.Set("User-Agent", HEADER_USER_AGENT)
|
req.Header.Set("User-Agent", c.ua)
|
||||||
res, err := client.Do(req)
|
res, err := client.Do(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@@ -78,7 +75,7 @@ func (c *HttpClient) sendRequest(api, url, method string, data any) (*http.Respo
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (c *HttpClient) getApiUrl(api string) string {
|
func (c *HttpClient) getApiUrl(api string) string {
|
||||||
ctx, key, apiAddr := context.Background(), "internal__"+api+"_ips", api
|
ctx, key, apiAddr := context.Background(), "internal__"+api+"__ips", api
|
||||||
// FIXME: key name ^^
|
// FIXME: key name ^^
|
||||||
cmd := c.redis.LLen(ctx, key)
|
cmd := c.redis.LLen(ctx, key)
|
||||||
if cmd.Err() == nil {
|
if cmd.Err() == nil {
|
||||||
|
|||||||
@@ -7,8 +7,8 @@ import (
|
|||||||
"github.com/go-redis/redis/v8"
|
"github.com/go-redis/redis/v8"
|
||||||
)
|
)
|
||||||
|
|
||||||
func NewPricingAPI(redis *redis.Client) *PricingAPI {
|
func NewPricingAPI(ua string, redis *redis.Client) *PricingAPI {
|
||||||
return &PricingAPI{NewHttpClient(redis)}
|
return &PricingAPI{NewHttpClient(ua, redis)}
|
||||||
}
|
}
|
||||||
|
|
||||||
type PricingAPI struct {
|
type PricingAPI struct {
|
||||||
@@ -18,7 +18,7 @@ type PricingAPI struct {
|
|||||||
func (a *PricingAPI) GetProductPrice(productID int) (*def.ProductPriceResponse, error) {
|
func (a *PricingAPI) GetProductPrice(productID int) (*def.ProductPriceResponse, error) {
|
||||||
url := fmt.Sprintf("/api/v1/product/%d", productID)
|
url := fmt.Sprintf("/api/v1/product/%d", productID)
|
||||||
res := new(def.ProductPriceResponse)
|
res := new(def.ProductPriceResponse)
|
||||||
if err := a.httpClient.SendGet("pricing", url, nil, res); err != nil {
|
if err := a.httpClient.SendGet("pricing-svc", url, nil, res); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -151,10 +151,13 @@ func (s *Service) getTags() []string {
|
|||||||
"traefik.http.routers." + s.Name + ".entryPoints=https",
|
"traefik.http.routers." + s.Name + ".entryPoints=https",
|
||||||
"traefik.http.routers." + s.Name + ".tls=true",
|
"traefik.http.routers." + s.Name + ".tls=true",
|
||||||
"traefik.http.routers." + s.Name + ".service=" + s.Name,
|
"traefik.http.routers." + s.Name + ".service=" + s.Name,
|
||||||
"traefik.http.routers." + s.Name + ".middlewares=requestid,stripprefix_" + 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.scheme=http",
|
||||||
"traefik.http.services." + s.Name + ".loadbalancer.server.port=" + strconv.Itoa(s.port),
|
"traefik.http.services." + s.Name + ".loadbalancer.server.port=" + strconv.Itoa(s.port),
|
||||||
"traefik.http.services." + s.Name + ".loadbalancer.passhostheader=false",
|
"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.requestid.plugin.requestid.headerName=X-Request-ID",
|
||||||
"traefik.http.middlewares.stripprefix_" + s.Name + ".stripprefix.prefixes=" + s.pathPrefix,
|
"traefik.http.middlewares.stripprefix_" + s.Name + ".stripprefix.prefixes=" + s.pathPrefix,
|
||||||
"traefik.tls.certificates.certfile=/certs/client.cert",
|
"traefik.tls.certificates.certfile=/certs/client.cert",
|
||||||
|
|||||||
Reference in New Issue
Block a user