refactor: Replace 'reach' field with 'public' boolean in service registration and related components
This commit is contained in:
@@ -20,7 +20,6 @@ func TestServicesRegister(t *testing.T) {
|
||||
"address": "192.168.8.60:9001",
|
||||
"type": "http",
|
||||
},
|
||||
"reach": "internal",
|
||||
})
|
||||
|
||||
req := httptest.NewRequest("POST", "/api/v1/services", bytes.NewReader(body))
|
||||
@@ -57,7 +56,7 @@ func TestServicesRegister_TCPPassthrough(t *testing.T) {
|
||||
"type": "tcp-passthrough",
|
||||
},
|
||||
"subdomains": true,
|
||||
"reach": "public",
|
||||
"public": true,
|
||||
})
|
||||
|
||||
req := httptest.NewRequest("POST", "/api/v1/services", bytes.NewReader(body))
|
||||
@@ -107,7 +106,6 @@ func TestServicesGet(t *testing.T) {
|
||||
"domain": "get-test.example.com",
|
||||
"source": "test",
|
||||
"backend": map[string]any{"address": "127.0.0.1:9000", "type": "http"},
|
||||
"reach": "internal",
|
||||
})
|
||||
req := httptest.NewRequest("POST", "/api/v1/services", bytes.NewReader(body))
|
||||
w := httptest.NewRecorder()
|
||||
@@ -151,14 +149,13 @@ func TestServicesUpdate(t *testing.T) {
|
||||
"domain": "update-test.example.com",
|
||||
"source": "test",
|
||||
"backend": map[string]any{"address": "127.0.0.1:9000", "type": "http"},
|
||||
"reach": "internal",
|
||||
})
|
||||
req := httptest.NewRequest("POST", "/api/v1/services", bytes.NewReader(body))
|
||||
w := httptest.NewRecorder()
|
||||
api.ServicesRegister(w, req)
|
||||
|
||||
// Update reach to public
|
||||
update, _ := json.Marshal(map[string]any{"reach": "public"})
|
||||
// Update public to true
|
||||
update, _ := json.Marshal(map[string]any{"public": true})
|
||||
req = httptest.NewRequest("PATCH", "/api/v1/services/update-test.example.com", bytes.NewReader(update))
|
||||
req = mux.SetURLVars(req, map[string]string{"domain": "update-test.example.com"})
|
||||
w = httptest.NewRecorder()
|
||||
@@ -171,8 +168,8 @@ func TestServicesUpdate(t *testing.T) {
|
||||
var resp map[string]any
|
||||
json.Unmarshal(w.Body.Bytes(), &resp)
|
||||
svc := resp["service"].(map[string]any)
|
||||
if svc["reach"] != "public" {
|
||||
t.Errorf("expected reach=public, got %v", svc["reach"])
|
||||
if svc["public"] != true {
|
||||
t.Errorf("expected public=true, got %v", svc["public"])
|
||||
}
|
||||
}
|
||||
|
||||
@@ -184,7 +181,6 @@ func TestServicesDeregister(t *testing.T) {
|
||||
"domain": "delete-me.example.com",
|
||||
"source": "test",
|
||||
"backend": map[string]any{"address": "127.0.0.1:9000", "type": "http"},
|
||||
"reach": "internal",
|
||||
})
|
||||
req := httptest.NewRequest("POST", "/api/v1/services", bytes.NewReader(body))
|
||||
w := httptest.NewRecorder()
|
||||
@@ -216,7 +212,6 @@ func TestServicesRegister_Validation(t *testing.T) {
|
||||
// Missing domain
|
||||
body, _ := json.Marshal(map[string]any{
|
||||
"backend": map[string]any{"address": "127.0.0.1:80", "type": "http"},
|
||||
"reach": "internal",
|
||||
})
|
||||
req := httptest.NewRequest("POST", "/api/v1/services", bytes.NewReader(body))
|
||||
w := httptest.NewRecorder()
|
||||
|
||||
Reference in New Issue
Block a user