Skip to content

Commit

Permalink
chore: use field cluster.name as value but not "default" (#1495)
Browse files Browse the repository at this point in the history
  • Loading branch information
@ronething
ronething committed Dec 8, 2022
1 parent 931ab06 commit cc48ae9
Show file tree
Hide file tree
Showing 11 changed files with 61 additions and 61 deletions.
14 changes: 7 additions & 7 deletions pkg/apisix/consumer.go
View file
Expand Up @@ -44,7 +44,7 @@ func (r *consumerClient) Get(ctx context.Context, name string) (*v1.Consumer, er
log.Debugw("try to look up consumer",
zap.String("name", name),
zap.String("url", r.url),
zap.String("cluster", "default"),
zap.String("cluster", r.cluster.name),
)
consumer, err := r.cluster.cache.GetConsumer(name)
if err == nil {
Expand All @@ -71,13 +71,13 @@ func (r *consumerClient) Get(ctx context.Context, name string) (*v1.Consumer, er
log.Warnw("consumer not found",
zap.String("name", name),
zap.String("url", url),
zap.String("cluster", "default"),
zap.String("cluster", r.cluster.name),
)
} else {
log.Errorw("failed to get consumer from APISIX",
zap.String("name", name),
zap.String("url", url),
zap.String("cluster", "default"),
zap.String("cluster", r.cluster.name),
zap.Error(err),
)
}
Expand Down Expand Up @@ -106,7 +106,7 @@ func (r *consumerClient) Get(ctx context.Context, name string) (*v1.Consumer, er
// to APISIX.
func (r *consumerClient) List(ctx context.Context) ([]*v1.Consumer, error) {
log.Debugw("try to list consumers in APISIX",
zap.String("cluster", "default"),
zap.String("cluster", r.cluster.name),
zap.String("url", r.url),
)
consumerItems, err := r.cluster.listResource(ctx, r.url, "consumer")
Expand Down Expand Up @@ -140,7 +140,7 @@ func (r *consumerClient) Create(ctx context.Context, obj *v1.Consumer) (*v1.Cons
log.Debugw("try to create consumer",
zap.String("name", obj.Username),
zap.Any("plugins", obj.Plugins),
zap.String("cluster", "default"),
zap.String("cluster", r.cluster.name),
zap.String("url", r.url),
)

Expand Down Expand Up @@ -175,7 +175,7 @@ func (r *consumerClient) Create(ctx context.Context, obj *v1.Consumer) (*v1.Cons
func (r *consumerClient) Delete(ctx context.Context, obj *v1.Consumer) error {
log.Debugw("try to delete consumer",
zap.String("name", obj.Username),
zap.String("cluster", "default"),
zap.String("cluster", r.cluster.name),
zap.String("url", r.url),
)
if err := r.cluster.HasSynced(ctx); err != nil {
Expand All @@ -200,7 +200,7 @@ func (r *consumerClient) Update(ctx context.Context, obj *v1.Consumer) (*v1.Cons
log.Debugw("try to update consumer",
zap.String("name", obj.Username),
zap.Any("plugins", obj.Plugins),
zap.String("cluster", "default"),
zap.String("cluster", r.cluster.name),
zap.String("url", r.url),
)
if err := r.cluster.HasSynced(ctx); err != nil {
Expand Down
14 changes: 7 additions & 7 deletions pkg/apisix/global_rule.go
View file
Expand Up @@ -45,7 +45,7 @@ func (r *globalRuleClient) Get(ctx context.Context, name string) (*v1.GlobalRule
log.Debugw("try to look up global_rule",
zap.String("name", name),
zap.String("url", r.url),
zap.String("cluster", "default"),
zap.String("cluster", r.cluster.name),
)
rid := id.GenID(name)
globalRule, err := r.cluster.cache.GetGlobalRule(rid)
Expand Down Expand Up @@ -73,13 +73,13 @@ func (r *globalRuleClient) Get(ctx context.Context, name string) (*v1.GlobalRule
log.Warnw("global_rule not found",
zap.String("name", name),
zap.String("url", url),
zap.String("cluster", "default"),
zap.String("cluster", r.cluster.name),
)
} else {
log.Errorw("failed to get global_rule from APISIX",
zap.String("name", name),
zap.String("url", url),
zap.String("cluster", "default"),
zap.String("cluster", r.cluster.name),
zap.Error(err),
)
}
Expand Down Expand Up @@ -108,7 +108,7 @@ func (r *globalRuleClient) Get(ctx context.Context, name string) (*v1.GlobalRule
// to APISIX.
func (r *globalRuleClient) List(ctx context.Context) ([]*v1.GlobalRule, error) {
log.Debugw("try to list global_rules in APISIX",
zap.String("cluster", "default"),
zap.String("cluster", r.cluster.name),
zap.String("url", r.url),
)
globalRuleItems, err := r.cluster.listResource(ctx, r.url, "globalRule")
Expand Down Expand Up @@ -142,7 +142,7 @@ func (r *globalRuleClient) Create(ctx context.Context, obj *v1.GlobalRule) (*v1.
log.Debugw("try to create global_rule",
zap.String("id", obj.ID),
zap.Any("plugins", obj.Plugins),
zap.String("cluster", "default"),
zap.String("cluster", r.cluster.name),
zap.String("url", r.url),
)

Expand Down Expand Up @@ -177,7 +177,7 @@ func (r *globalRuleClient) Create(ctx context.Context, obj *v1.GlobalRule) (*v1.
func (r *globalRuleClient) Delete(ctx context.Context, obj *v1.GlobalRule) error {
log.Debugw("try to delete global_rule",
zap.String("id", obj.ID),
zap.String("cluster", "default"),
zap.String("cluster", r.cluster.name),
zap.String("url", r.url),
)
if err := r.cluster.HasSynced(ctx); err != nil {
Expand All @@ -202,7 +202,7 @@ func (r *globalRuleClient) Update(ctx context.Context, obj *v1.GlobalRule) (*v1.
log.Debugw("try to update global_rule",
zap.String("id", obj.ID),
zap.Any("plugins", obj.Plugins),
zap.String("cluster", "default"),
zap.String("cluster", r.cluster.name),
zap.String("url", r.url),
)
if err := r.cluster.HasSynced(ctx); err != nil {
Expand Down
2 changes: 1 addition & 1 deletion pkg/apisix/plugin.go
View file
Expand Up @@ -38,7 +38,7 @@ func newPluginClient(c *cluster) Plugin {
// List returns the names of all plugins.
func (p *pluginClient) List(ctx context.Context) ([]string, error) {
log.Debugw("try to list plugins' names in APISIX",
zap.String("cluster", "default"),
zap.String("cluster", p.cluster.name),
zap.String("url", p.url),
)
pluginList, err := p.cluster.getList(ctx, p.url+"?all=true", "plugin")
Expand Down
10 changes: 5 additions & 5 deletions pkg/apisix/plugin_metadata.go
View file
Expand Up @@ -40,7 +40,7 @@ func (r *pluginMetadataClient) Get(ctx context.Context, name string) (*v1.Plugin
log.Debugw("try to look up pluginMetadata",
zap.String("name", name),
zap.String("url", r.url),
zap.String("cluster", "default"),
zap.String("cluster", r.cluster.name),
)

// TODO Add mutex here to avoid dog-pile effect.
Expand All @@ -51,7 +51,7 @@ func (r *pluginMetadataClient) Get(ctx context.Context, name string) (*v1.Plugin
log.Errorw("failed to get pluginMetadata from APISIX",
zap.String("name", name),
zap.String("url", url),
zap.String("cluster", "default"),
zap.String("cluster", r.cluster.name),
zap.Error(err),
)
return nil, err
Expand All @@ -72,7 +72,7 @@ func (r *pluginMetadataClient) Get(ctx context.Context, name string) (*v1.Plugin

func (r *pluginMetadataClient) List(ctx context.Context) ([]*v1.PluginMetadata, error) {
log.Debugw("try to list pluginMetadatas in APISIX",
zap.String("cluster", "default"),
zap.String("cluster", r.cluster.name),
zap.String("url", r.url),
)
pluginMetadataItems, err := r.cluster.listResource(ctx, r.url, "pluginMetadata")
Expand Down Expand Up @@ -106,7 +106,7 @@ func (r *pluginMetadataClient) Delete(ctx context.Context, obj *v1.PluginMetadat
log.Debugw("try to delete pluginMetadata",
zap.String("name", obj.Name),
zap.Any("metadata", obj.Metadata),
zap.String("cluster", "default"),
zap.String("cluster", r.cluster.name),
zap.String("url", r.url),
)
if err := r.cluster.HasSynced(ctx); err != nil {
Expand All @@ -125,7 +125,7 @@ func (r *pluginMetadataClient) Update(ctx context.Context, obj *v1.PluginMetadat
log.Debugw("try to update pluginMetadata",
zap.String("name", obj.Name),
zap.Any("metadata", obj.Metadata),
zap.String("cluster", "default"),
zap.String("cluster", r.cluster.name),
zap.String("url", r.url),
)
if err := r.cluster.HasSynced(ctx); err != nil {
Expand Down
14 changes: 7 additions & 7 deletions pkg/apisix/pluginconfig.go
View file
Expand Up @@ -46,7 +46,7 @@ func (pc *pluginConfigClient) Get(ctx context.Context, name string) (*v1.PluginC
log.Debugw("try to look up pluginConfig",
zap.String("name", name),
zap.String("url", pc.url),
zap.String("cluster", "default"),
zap.String("cluster", pc.cluster.name),
)
rid := id.GenID(name)
pluginConfig, err := pc.cluster.cache.GetPluginConfig(rid)
Expand Down Expand Up @@ -74,13 +74,13 @@ func (pc *pluginConfigClient) Get(ctx context.Context, name string) (*v1.PluginC
log.Warnw("pluginConfig not found",
zap.String("name", name),
zap.String("url", url),
zap.String("cluster", "default"),
zap.String("cluster", pc.cluster.name),
)
} else {
log.Errorw("failed to get pluginConfig from APISIX",
zap.String("name", name),
zap.String("url", url),
zap.String("cluster", "default"),
zap.String("cluster", pc.cluster.name),
zap.Error(err),
)
}
Expand Down Expand Up @@ -109,7 +109,7 @@ func (pc *pluginConfigClient) Get(ctx context.Context, name string) (*v1.PluginC
// to APISIX.
func (pc *pluginConfigClient) List(ctx context.Context) ([]*v1.PluginConfig, error) {
log.Debugw("try to list pluginConfig in APISIX",
zap.String("cluster", "default"),
zap.String("cluster", pc.cluster.name),
zap.String("url", pc.url),
)
pluginConfigItems, err := pc.cluster.listResource(ctx, pc.url, "pluginConfig")
Expand Down Expand Up @@ -143,7 +143,7 @@ func (pc *pluginConfigClient) Create(ctx context.Context, obj *v1.PluginConfig)
log.Debugw("try to create pluginConfig",
zap.String("name", obj.Name),
zap.Any("plugins", obj.Plugins),
zap.String("cluster", "default"),
zap.String("cluster", pc.cluster.name),
zap.String("url", pc.url),
)

Expand Down Expand Up @@ -179,7 +179,7 @@ func (pc *pluginConfigClient) Delete(ctx context.Context, obj *v1.PluginConfig)
log.Debugw("try to delete pluginConfig",
zap.String("id", obj.ID),
zap.String("name", obj.Name),
zap.String("cluster", "default"),
zap.String("cluster", pc.cluster.name),
zap.String("url", pc.url),
)

Expand All @@ -206,7 +206,7 @@ func (pc *pluginConfigClient) Update(ctx context.Context, obj *v1.PluginConfig)
zap.String("id", obj.ID),
zap.String("name", obj.Name),
zap.Any("plugins", obj.Plugins),
zap.String("cluster", "default"),
zap.String("cluster", pc.cluster.name),
zap.String("url", pc.url),
)
if err := pc.cluster.HasSynced(ctx); err != nil {
Expand Down
14 changes: 7 additions & 7 deletions pkg/apisix/route.go
View file
Expand Up @@ -46,7 +46,7 @@ func (r *routeClient) Get(ctx context.Context, name string) (*v1.Route, error) {
log.Debugw("try to look up route",
zap.String("name", name),
zap.String("url", r.url),
zap.String("cluster", "default"),
zap.String("cluster", r.cluster.name),
)
rid := id.GenID(name)
route, err := r.cluster.cache.GetRoute(rid)
Expand Down Expand Up @@ -74,13 +74,13 @@ func (r *routeClient) Get(ctx context.Context, name string) (*v1.Route, error) {
log.Warnw("route not found",
zap.String("name", name),
zap.String("url", url),
zap.String("cluster", "default"),
zap.String("cluster", r.cluster.name),
)
} else {
log.Errorw("failed to get route from APISIX",
zap.String("name", name),
zap.String("url", url),
zap.String("cluster", "default"),
zap.String("cluster", r.cluster.name),
zap.Error(err),
)
}
Expand Down Expand Up @@ -109,7 +109,7 @@ func (r *routeClient) Get(ctx context.Context, name string) (*v1.Route, error) {
// to APISIX.
func (r *routeClient) List(ctx context.Context) ([]*v1.Route, error) {
log.Debugw("try to list routes in APISIX",
zap.String("cluster", "default"),
zap.String("cluster", r.cluster.name),
zap.String("url", r.url),
)
routeItems, err := r.cluster.listResource(ctx, r.url, "route")
Expand Down Expand Up @@ -143,7 +143,7 @@ func (r *routeClient) Create(ctx context.Context, obj *v1.Route) (*v1.Route, err
log.Debugw("try to create route",
zap.Strings("hosts", obj.Hosts),
zap.String("name", obj.Name),
zap.String("cluster", "default"),
zap.String("cluster", r.cluster.name),
zap.String("url", r.url),
)

Expand Down Expand Up @@ -179,7 +179,7 @@ func (r *routeClient) Delete(ctx context.Context, obj *v1.Route) error {
log.Debugw("try to delete route",
zap.String("id", obj.ID),
zap.String("name", obj.Name),
zap.String("cluster", "default"),
zap.String("cluster", r.cluster.name),
zap.String("url", r.url),
)
if err := r.cluster.HasSynced(ctx); err != nil {
Expand All @@ -204,7 +204,7 @@ func (r *routeClient) Update(ctx context.Context, obj *v1.Route) (*v1.Route, err
log.Debugw("try to update route",
zap.String("id", obj.ID),
zap.String("name", obj.Name),
zap.String("cluster", "default"),
zap.String("cluster", r.cluster.name),
zap.String("url", r.url),
)
if err := r.cluster.HasSynced(ctx); err != nil {
Expand Down
4 changes: 2 additions & 2 deletions pkg/apisix/schema.go
View file
Expand Up @@ -43,7 +43,7 @@ func (sc schemaClient) getSchema(ctx context.Context, name string) (*v1.Schema,
log.Debugw("try to look up schema",
zap.String("name", name),
zap.String("url", sc.url),
zap.String("cluster", "default"),
zap.String("cluster", sc.cluster.name),
)

sid := id.GenID(name)
Expand All @@ -69,7 +69,7 @@ func (sc schemaClient) getSchema(ctx context.Context, name string) (*v1.Schema,
log.Errorw("failed to get schema from APISIX",
zap.String("name", name),
zap.String("url", url),
zap.String("cluster", "default"),
zap.String("cluster", sc.cluster.name),
zap.Error(err),
)
return nil, err
Expand Down
14 changes: 7 additions & 7 deletions pkg/apisix/ssl.go
View file
Expand Up @@ -50,7 +50,7 @@ func (s *sslClient) Get(ctx context.Context, name string) (*v1.Ssl, error) {
log.Debugw("try to look up ssl",
zap.String("name", name),
zap.String("url", s.url),
zap.String("cluster", "default"),
zap.String("cluster", s.cluster.name),
)
sid := id.GenID(name)
ssl, err := s.cluster.cache.GetSSL(sid)
Expand All @@ -77,13 +77,13 @@ func (s *sslClient) Get(ctx context.Context, name string) (*v1.Ssl, error) {
log.Warnw("ssl not found",
zap.String("name", name),
zap.String("url", url),
zap.String("cluster", "default"),
zap.String("cluster", s.cluster.name),
)
} else {
log.Errorw("failed to get ssl from APISIX",
zap.String("name", name),
zap.String("url", url),
zap.String("cluster", "default"),
zap.String("cluster", s.cluster.name),
zap.Error(err),
)
}
Expand Down Expand Up @@ -111,7 +111,7 @@ func (s *sslClient) Get(ctx context.Context, name string) (*v1.Ssl, error) {
func (s *sslClient) List(ctx context.Context) ([]*v1.Ssl, error) {
log.Debugw("try to list ssl in APISIX",
zap.String("url", s.url),
zap.String("cluster", "default"),
zap.String("cluster", s.cluster.name),
)

sslItems, err := s.cluster.listResource(ctx, s.url, "ssl")
Expand Down Expand Up @@ -141,7 +141,7 @@ func (s *sslClient) List(ctx context.Context) ([]*v1.Ssl, error) {

func (s *sslClient) Create(ctx context.Context, obj *v1.Ssl) (*v1.Ssl, error) {
log.Debugw("try to create ssl",
zap.String("cluster", "default"),
zap.String("cluster", s.cluster.name),
zap.String("url", s.url),
zap.String("id", obj.ID),
)
Expand Down Expand Up @@ -175,7 +175,7 @@ func (s *sslClient) Create(ctx context.Context, obj *v1.Ssl) (*v1.Ssl, error) {
func (s *sslClient) Delete(ctx context.Context, obj *v1.Ssl) error {
log.Debugw("try to delete ssl",
zap.String("id", obj.ID),
zap.String("cluster", "default"),
zap.String("cluster", s.cluster.name),
zap.String("url", s.url),
)
if err := s.cluster.HasSynced(ctx); err != nil {
Expand All @@ -199,7 +199,7 @@ func (s *sslClient) Delete(ctx context.Context, obj *v1.Ssl) error {
func (s *sslClient) Update(ctx context.Context, obj *v1.Ssl) (*v1.Ssl, error) {
log.Debugw("try to update ssl",
zap.String("id", obj.ID),
zap.String("cluster", "default"),
zap.String("cluster", s.cluster.name),
zap.String("url", s.url),
)
if err := s.cluster.HasSynced(ctx); err != nil {
Expand Down

0 comments on commit cc48ae9

Please sign in to comment.