Skip to content

Commit 324e684

Browse files
committed
remove hardcoding
1 parent 9e48671 commit 324e684

File tree

1 file changed

+21
-12
lines changed

1 file changed

+21
-12
lines changed

internal/provider/common/adcdebugserver.go

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,15 @@ import (
2828
"github.com/apache/apisix-ingress-controller/internal/types"
2929
)
3030

31+
const (
32+
consumers = "consumers"
33+
services = "services"
34+
routes = "routes"
35+
ssls = "ssls"
36+
globalrules = "globalrules"
37+
pluginmetadata = "pluginmetadata"
38+
)
39+
3140
type ResourceInfo struct {
3241
ID string
3342
Name string
@@ -161,7 +170,7 @@ func (asrv *ADCDebugProvider) showResources(w http.ResponseWriter, r *http.Reque
161170

162171
var resourceInfos []ResourceInfo
163172
switch resourceType {
164-
case "services":
173+
case services:
165174
for _, svc := range resources.Services {
166175
resourceInfos = append(resourceInfos, ResourceInfo{
167176
ID: svc.ID,
@@ -171,7 +180,7 @@ func (asrv *ADCDebugProvider) showResources(w http.ResponseWriter, r *http.Reque
171180
asrv.pathPrefix, configNameEncoded, url.QueryEscape(resourceType), url.QueryEscape(svc.ID)),
172181
})
173182
}
174-
case "consumers":
183+
case consumers:
175184
for _, consumer := range resources.Consumers {
176185
resourceInfos = append(resourceInfos, ResourceInfo{
177186
ID: consumer.Username,
@@ -181,7 +190,7 @@ func (asrv *ADCDebugProvider) showResources(w http.ResponseWriter, r *http.Reque
181190
asrv.pathPrefix, configNameEncoded, url.QueryEscape(resourceType), url.QueryEscape(consumer.Username)),
182191
})
183192
}
184-
case "ssls":
193+
case ssls:
185194
for _, ssl := range resources.SSLs {
186195
resourceInfos = append(resourceInfos, ResourceInfo{
187196
ID: ssl.ID,
@@ -191,7 +200,7 @@ func (asrv *ADCDebugProvider) showResources(w http.ResponseWriter, r *http.Reque
191200
asrv.pathPrefix, configNameEncoded, url.QueryEscape(resourceType), url.QueryEscape(ssl.ID)),
192201
})
193202
}
194-
case "globalrules":
203+
case globalrules:
195204
for key := range resources.GlobalRules {
196205
resourceInfos = append(resourceInfos, ResourceInfo{
197206
ID: key,
@@ -201,7 +210,7 @@ func (asrv *ADCDebugProvider) showResources(w http.ResponseWriter, r *http.Reque
201210
asrv.pathPrefix, configNameEncoded, url.QueryEscape(resourceType), url.QueryEscape(key)),
202211
})
203212
}
204-
case "pluginmetadata":
213+
case pluginmetadata:
205214
if resources.PluginMetadata != nil {
206215
resourceInfos = append(resourceInfos, ResourceInfo{
207216
ID: "pluginmetadata",
@@ -211,7 +220,7 @@ func (asrv *ADCDebugProvider) showResources(w http.ResponseWriter, r *http.Reque
211220
asrv.pathPrefix, configNameEncoded, url.QueryEscape(resourceType), "pluginmetadata"),
212221
})
213222
}
214-
case "routes":
223+
case routes:
215224
for _, svc := range resources.Services {
216225
for _, route := range svc.Routes {
217226
resourceInfos = append(resourceInfos, ResourceInfo{
@@ -264,32 +273,32 @@ func (asrv *ADCDebugProvider) showResourceDetail(w http.ResponseWriter, r *http.
264273

265274
var resource interface{}
266275
switch resourceType {
267-
case "services":
276+
case services:
268277
for _, svc := range resources.Services {
269278
if svc.ID == resourceID {
270279
resource = svc
271280
break
272281
}
273282
}
274-
case "consumers":
283+
case consumers:
275284
for _, consumer := range resources.Consumers {
276285
if consumer.Username == resourceID {
277286
resource = consumer
278287
break
279288
}
280289
}
281-
case "ssls":
290+
case ssls:
282291
for _, ssl := range resources.SSLs {
283292
if ssl.ID == resourceID {
284293
resource = ssl
285294
break
286295
}
287296
}
288-
case "globalrules":
297+
case globalrules:
289298
resource = resources.GlobalRules
290-
case "pluginmetadata":
299+
case pluginmetadata:
291300
resource = resources.PluginMetadata
292-
case "routes":
301+
case routes:
293302
for _, svc := range resources.Services {
294303
for _, route := range svc.Routes {
295304
if route.ID == resourceID {

0 commit comments

Comments
 (0)