Skip to content

Commit 877a439

Browse files
CiriAllenCiriAllen
committed
remove used constant in adctypes and use constants in adctypes and sharedtypes
1 parent e0c2432 commit 877a439

File tree

8 files changed

+57
-101
lines changed

8 files changed

+57
-101
lines changed

‎api/adc/types.go‎

Lines changed: 6 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -30,54 +30,6 @@ import (
3030
"k8s.io/apimachinery/pkg/util/intstr"
3131
)
3232

33-
const (
34-
// HashOnVars means the hash scope is variable.
35-
HashOnVars = "vars"
36-
// HashOnVarsCombination means the hash scope is the
37-
// variable combination.
38-
HashOnVarsCombination = "vars_combinations"
39-
// HashOnHeader means the hash scope is HTTP request
40-
// headers.
41-
HashOnHeader = "header"
42-
// HashOnCookie means the hash scope is HTTP Cookie.
43-
HashOnCookie = "cookie"
44-
// HashOnConsumer means the hash scope is APISIX consumer.
45-
HashOnConsumer = "consumer"
46-
47-
// LbRoundRobin is the round robin load balancer.
48-
LBRoundRobin = "roundrobin"
49-
// LbConsistentHash is the consistent hash load balancer.
50-
LbConsistentHash = "chash"
51-
// LbEwma is the ewma load balancer.
52-
LbEwma = "ewma"
53-
// LbLeaseConn is the least connection load balancer.
54-
LbLeastConn = "least_conn"
55-
56-
// SchemeHTTP represents the HTTP protocol.
57-
SchemeHTTP = "http"
58-
// SchemeGRPC represents the GRPC protocol.
59-
SchemeGRPC = "grpc"
60-
// SchemeHTTPS represents the HTTPS protocol.
61-
SchemeHTTPS = "https"
62-
// SchemeGRPCS represents the GRPCS protocol.
63-
SchemeGRPCS = "grpcs"
64-
// SchemeTCP represents the TCP protocol.
65-
SchemeTCP = "tcp"
66-
// SchemeUDP represents the UDP protocol.
67-
SchemeUDP = "udp"
68-
69-
// DefaultUpstreamTimeout represents the default connect,
70-
// read and send timeout (in seconds) with upstreams.
71-
DefaultUpstreamTimeout = 60
72-
73-
// PassHostPass represents pass option for pass_host Upstream settings.
74-
PassHostPass = "pass"
75-
// PassHostPass represents node option for pass_host Upstream settings.
76-
PassHostNode = "node"
77-
// PassHostPass represents rewrite option for pass_host Upstream settings.
78-
PassHostRewrite = "rewrite"
79-
)
80-
8133
const (
8234
TypeRoute = "route"
8335
TypeService = "service"
@@ -393,11 +345,12 @@ const (
393345
type Scheme string
394346

395347
const (
396-
Grpc Scheme = "grpc"
397-
Grpcs Scheme = "grpcs"
398-
Kafka Scheme = "kafka"
399-
TLS Scheme = "tls"
400-
UDP Scheme = "udp"
348+
Grpc Scheme = "grpc"
349+
Grpcs Scheme = "grpcs"
350+
Kafka Scheme = "kafka"
351+
TLS Scheme = "tls"
352+
UDP Scheme = "udp"
353+
SchemeHTTP = "http"
401354
)
402355

403356
type UpstreamType string

‎internal/adc/cache/memdb.go‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -81,23 +81,23 @@ func (c *dbCache) Delete(obj any) error {
8181

8282
func (c *dbCache) InsertRoute(r *types.Route) error {
8383
route := r.DeepCopy()
84-
return c.insert("route", route)
84+
return c.insert(types.TypeRoute, route)
8585
}
8686

8787
func (c *dbCache) InsertSSL(ssl *types.SSL) error {
88-
return c.insert("ssl", ssl.DeepCopy())
88+
return c.insert(types.TypeSSL, ssl.DeepCopy())
8989
}
9090

9191
func (c *dbCache) InsertService(u *types.Service) error {
92-
return c.insert("service", u.DeepCopy())
92+
return c.insert(types.TypeService, u.DeepCopy())
9393
}
9494

9595
func (c *dbCache) InsertConsumer(consumer *types.Consumer) error {
96-
return c.insert("consumer", consumer.DeepCopy())
96+
return c.insert(types.TypeConsumer, consumer.DeepCopy())
9797
}
9898

9999
func (c *dbCache) InsertGlobalRule(globalRule *types.GlobalRuleItem) error {
100-
return c.insert("global_rule", globalRule.DeepCopy())
100+
return c.insert(types.TypeGlobalRule, globalRule.DeepCopy())
101101
}
102102

103103
func (c *dbCache) insert(table string, obj any) error {
@@ -111,39 +111,39 @@ func (c *dbCache) insert(table string, obj any) error {
111111
}
112112

113113
func (c *dbCache) GetRoute(id string) (*types.Route, error) {
114-
obj, err := c.get("route", id)
114+
obj, err := c.get(types.TypeRoute, id)
115115
if err != nil {
116116
return nil, err
117117
}
118118
return obj.(*types.Route).DeepCopy(), nil
119119
}
120120

121121
func (c *dbCache) GetSSL(id string) (*types.SSL, error) {
122-
obj, err := c.get("ssl", id)
122+
obj, err := c.get(types.TypeSSL, id)
123123
if err != nil {
124124
return nil, err
125125
}
126126
return obj.(*types.SSL).DeepCopy(), nil
127127
}
128128

129129
func (c *dbCache) GetService(id string) (*types.Service, error) {
130-
obj, err := c.get("service", id)
130+
obj, err := c.get(types.TypeService, id)
131131
if err != nil {
132132
return nil, err
133133
}
134134
return obj.(*types.Service).DeepCopy(), nil
135135
}
136136

137137
func (c *dbCache) GetConsumer(username string) (*types.Consumer, error) {
138-
obj, err := c.get("consumer", username)
138+
obj, err := c.get(types.TypeConsumer, username)
139139
if err != nil {
140140
return nil, err
141141
}
142142
return obj.(*types.Consumer).DeepCopy(), nil
143143
}
144144

145145
func (c *dbCache) GetGlobalRule(id string) (*types.GlobalRuleItem, error) {
146-
obj, err := c.get("global_rule", id)
146+
obj, err := c.get(types.TypeGlobalRule, id)
147147
if err != nil {
148148
return nil, err
149149
}
@@ -175,7 +175,7 @@ func (c *dbCache) get(table, id string) (any, error) {
175175
}
176176

177177
func (c *dbCache) ListRoutes(opts ...ListOption) ([]*types.Route, error) {
178-
raws, err := c.list("route", opts...)
178+
raws, err := c.list(types.TypeRoute, opts...)
179179
if err != nil {
180180
return nil, err
181181
}
@@ -187,7 +187,7 @@ func (c *dbCache) ListRoutes(opts ...ListOption) ([]*types.Route, error) {
187187
}
188188

189189
func (c *dbCache) ListSSL(opts ...ListOption) ([]*types.SSL, error) {
190-
raws, err := c.list("ssl", opts...)
190+
raws, err := c.list(types.TypeSSL, opts...)
191191
if err != nil {
192192
return nil, err
193193
}
@@ -199,7 +199,7 @@ func (c *dbCache) ListSSL(opts ...ListOption) ([]*types.SSL, error) {
199199
}
200200

201201
func (c *dbCache) ListServices(opts ...ListOption) ([]*types.Service, error) {
202-
raws, err := c.list("service", opts...)
202+
raws, err := c.list(types.TypeService, opts...)
203203
if err != nil {
204204
return nil, err
205205
}
@@ -211,7 +211,7 @@ func (c *dbCache) ListServices(opts ...ListOption) ([]*types.Service, error) {
211211
}
212212

213213
func (c *dbCache) ListConsumers(opts ...ListOption) ([]*types.Consumer, error) {
214-
raws, err := c.list("consumer", opts...)
214+
raws, err := c.list(types.TypeConsumer, opts...)
215215
if err != nil {
216216
return nil, err
217217
}
@@ -223,7 +223,7 @@ func (c *dbCache) ListConsumers(opts ...ListOption) ([]*types.Consumer, error) {
223223
}
224224

225225
func (c *dbCache) ListGlobalRules(opts ...ListOption) ([]*types.GlobalRuleItem, error) {
226-
raws, err := c.list("global_rule", opts...)
226+
raws, err := c.list(types.TypeGlobalRule, opts...)
227227
if err != nil {
228228
return nil, err
229229
}
@@ -257,23 +257,23 @@ func (c *dbCache) list(table string, opts ...ListOption) ([]any, error) {
257257
}
258258

259259
func (c *dbCache) DeleteRoute(r *types.Route) error {
260-
return c.delete("route", r)
260+
return c.delete(types.TypeRoute, r)
261261
}
262262

263263
func (c *dbCache) DeleteSSL(ssl *types.SSL) error {
264-
return c.delete("ssl", ssl)
264+
return c.delete(types.TypeSSL, ssl)
265265
}
266266

267267
func (c *dbCache) DeleteService(u *types.Service) error {
268-
return c.delete("service", u)
268+
return c.delete(types.TypeService, u)
269269
}
270270

271271
func (c *dbCache) DeleteConsumer(consumer *types.Consumer) error {
272-
return c.delete("consumer", consumer)
272+
return c.delete(types.TypeConsumer, consumer)
273273
}
274274

275275
func (c *dbCache) DeleteGlobalRule(globalRule *types.GlobalRuleItem) error {
276-
return c.delete("global_rule", globalRule)
276+
return c.delete(types.TypeGlobalRule, globalRule)
277277
}
278278

279279
func (c *dbCache) delete(table string, obj any) error {

‎internal/adc/client/client.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ func (c *Client) sync(ctx context.Context, task Task) error {
233233
pkgmetrics.RecordFileIODuration("prepare_sync_file", "failure", time.Since(fileIOStart).Seconds())
234234
return err
235235
}
236-
pkgmetrics.RecordFileIODuration("prepare_sync_file", "success", time.Since(fileIOStart).Seconds())
236+
pkgmetrics.RecordFileIODuration("prepare_sync_file", adctypes.StatusSuccess, time.Since(fileIOStart).Seconds())
237237
defer cleanup()
238238

239239
args := BuildADCExecuteArgs(syncFilePath, task.Labels, task.ResourceTypes)
@@ -249,7 +249,7 @@ func (c *Client) sync(ctx context.Context, task Task) error {
249249
err := c.executor.Execute(ctx, c.BackendMode, config, args)
250250
duration := time.Since(startTime).Seconds()
251251

252-
status := "success"
252+
status := adctypes.StatusSuccess
253253
if err != nil {
254254
status = "failure"
255255
log.Errorw("failed to execute adc command", zap.Error(err), zap.Any("config", config))

‎internal/controller/apisixroute_controller.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ func (r *ApisixRouteReconciler) validateHTTPBackend(tctx *provider.TranslateCont
427427
return nil
428428
}
429429

430-
if backend.ResolveGranularity == "service" && service.Spec.ClusterIP == "" {
430+
if backend.ResolveGranularity == apiv2.ResolveGranularityService && service.Spec.ClusterIP == "" {
431431
r.Log.Error(errors.New("service has no ClusterIP"), "Service", serviceNN, "ResolveGranularity", backend.ResolveGranularity)
432432
return nil
433433
}

‎internal/provider/apisix/provider.go‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -102,31 +102,31 @@ func (d *apisixProvider) Update(ctx context.Context, tctx *provider.TranslateCon
102102
switch t := obj.(type) {
103103
case *gatewayv1.HTTPRoute:
104104
result, err = d.translator.TranslateHTTPRoute(tctx, t.DeepCopy())
105-
resourceTypes = append(resourceTypes, "service")
105+
resourceTypes = append(resourceTypes, adctypes.TypeService)
106106
case *gatewayv1.Gateway:
107107
result, err = d.translator.TranslateGateway(tctx, t.DeepCopy())
108-
resourceTypes = append(resourceTypes, "global_rule", "ssl", "plugin_metadata")
108+
resourceTypes = append(resourceTypes, adctypes.TypeGlobalRule, adctypes.TypeSSL, adctypes.TypePluginMetadata)
109109
case *networkingv1.Ingress:
110110
result, err = d.translator.TranslateIngress(tctx, t.DeepCopy())
111-
resourceTypes = append(resourceTypes, "service", "ssl")
111+
resourceTypes = append(resourceTypes, adctypes.TypeService, adctypes.TypeSSL)
112112
case *v1alpha1.Consumer:
113113
result, err = d.translator.TranslateConsumerV1alpha1(tctx, t.DeepCopy())
114-
resourceTypes = append(resourceTypes, "consumer")
114+
resourceTypes = append(resourceTypes, adctypes.TypeConsumer)
115115
case *networkingv1.IngressClass:
116116
result, err = d.translator.TranslateIngressClass(tctx, t.DeepCopy())
117-
resourceTypes = append(resourceTypes, "global_rule", "plugin_metadata")
117+
resourceTypes = append(resourceTypes, adctypes.TypeGlobalRule, adctypes.TypePluginMetadata)
118118
case *apiv2.ApisixRoute:
119119
result, err = d.translator.TranslateApisixRoute(tctx, t.DeepCopy())
120-
resourceTypes = append(resourceTypes, "service")
120+
resourceTypes = append(resourceTypes, adctypes.TypeService)
121121
case *apiv2.ApisixGlobalRule:
122122
result, err = d.translator.TranslateApisixGlobalRule(tctx, t.DeepCopy())
123-
resourceTypes = append(resourceTypes, "global_rule")
123+
resourceTypes = append(resourceTypes, adctypes.TypeGlobalRule)
124124
case *apiv2.ApisixTls:
125125
result, err = d.translator.TranslateApisixTls(tctx, t.DeepCopy())
126-
resourceTypes = append(resourceTypes, "ssl")
126+
resourceTypes = append(resourceTypes, adctypes.TypeSSL)
127127
case *apiv2.ApisixConsumer:
128128
result, err = d.translator.TranslateApisixConsumer(tctx, t.DeepCopy())
129-
resourceTypes = append(resourceTypes, "consumer")
129+
resourceTypes = append(resourceTypes, adctypes.TypeConsumer)
130130
case *v1alpha1.GatewayProxy:
131131
return d.updateConfigForGatewayProxy(tctx, t)
132132
}
@@ -174,26 +174,26 @@ func (d *apisixProvider) Delete(ctx context.Context, obj client.Object) error {
174174
var labels map[string]string
175175
switch obj.(type) {
176176
case *gatewayv1.HTTPRoute, *apiv2.ApisixRoute:
177-
resourceTypes = append(resourceTypes, "service")
177+
resourceTypes = append(resourceTypes, adctypes.TypeService)
178178
labels = label.GenLabel(obj)
179179
case *gatewayv1.Gateway:
180180
// delete all resources
181181
case *networkingv1.Ingress:
182-
resourceTypes = append(resourceTypes, "service", "ssl")
182+
resourceTypes = append(resourceTypes, adctypes.TypeService, adctypes.TypeSSL)
183183
labels = label.GenLabel(obj)
184184
case *v1alpha1.Consumer:
185-
resourceTypes = append(resourceTypes, "consumer")
185+
resourceTypes = append(resourceTypes, adctypes.TypeConsumer)
186186
labels = label.GenLabel(obj)
187187
case *networkingv1.IngressClass:
188188
// delete all resources
189189
case *apiv2.ApisixGlobalRule:
190-
resourceTypes = append(resourceTypes, "global_rule")
190+
resourceTypes = append(resourceTypes, adctypes.TypeGlobalRule)
191191
labels = label.GenLabel(obj)
192192
case *apiv2.ApisixTls:
193-
resourceTypes = append(resourceTypes, "ssl")
193+
resourceTypes = append(resourceTypes, adctypes.TypeSSL)
194194
labels = label.GenLabel(obj)
195195
case *apiv2.ApisixConsumer:
196-
resourceTypes = append(resourceTypes, "consumer")
196+
resourceTypes = append(resourceTypes, adctypes.TypeConsumer)
197197
labels = label.GenLabel(obj)
198198
}
199199
nnk := utils.NamespacedNameKind(obj)

‎test/e2e/crds/v1alpha1/gatewayproxy.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import (
3030
"k8s.io/apimachinery/pkg/util/wait"
3131
"k8s.io/utils/ptr"
3232

33+
apiv2 "github.com/apache/apisix-ingress-controller/api/v2"
3334
"github.com/apache/apisix-ingress-controller/test/e2e/framework"
3435
"github.com/apache/apisix-ingress-controller/test/e2e/scaffold"
3536
)
@@ -167,7 +168,7 @@ spec:
167168
Expect(err).NotTo(HaveOccurred(), "forward pod: %s", pod.Name)
168169

169170
err = wait.PollUntilContextTimeout(context.Background(), time.Second, 30*time.Second, true, func(ctx context.Context) (done bool, err error) {
170-
resp := scaffold.NewClient("http", tunnel.Endpoint()).
171+
resp := scaffold.NewClient(apiv2.SchemeHTTP, tunnel.Endpoint()).
171172
GET("/get").WithHost("httpbin.org").Expect().Raw()
172173
return resp.StatusCode == http.StatusOK && resp.Header.Get("X-Pod-Hostname") == pod.GetName(), nil
173174
})

‎test/e2e/scaffold/adc.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import (
3131
"gopkg.in/yaml.v3"
3232

3333
adctypes "github.com/apache/apisix-ingress-controller/api/adc"
34+
apiv2 "github.com/apache/apisix-ingress-controller/api/v2"
3435
"github.com/apache/apisix-ingress-controller/internal/adc/translator"
3536
)
3637

@@ -44,7 +45,7 @@ func init() {
4445
if adc == "" {
4546
return
4647
}
47-
if strings.Contains(adc, "node") {
48+
if strings.Contains(adc, apiv2.PassHostNode) {
4849
parts := strings.Fields(adc)
4950
adcExec = parts[0]
5051
adcArgs = parts[1:]

0 commit comments

Comments
 (0)