luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

ui: Add merge-central-config to relevant HTTP requests (#14604)

This commit is contained in:
John Cowen 2022-09-20 10:33:19 +01:00 committed by GitHub
parent 5b2d557db1
commit ce4e8faa59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/14604.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:feature
ui: Added support for central config merging
```

2
ui/packages/consul-ui/app/adapters/proxy.js
View File

@ -6,7 +6,7 @@ export default class ProxyAdapter extends Adapter {
throw new Error('You must specify an id'); throw new Error('You must specify an id');
} }
return request` return request`
GET /v1/catalog/connect/${id}?${{ dc }} GET /v1/catalog/connect/${id}?${{ dc, ['merge-central-config']: null }}
X-Request-ID: ${uri} X-Request-ID: ${uri}
X-Range: ${id} X-Range: ${id}

2
ui/packages/consul-ui/app/adapters/service-instance.js
View File

@ -21,7 +21,7 @@ export default class ServiceInstanceAdapter extends Adapter {
} }
return request` return request`
GET /v1/health/service/${id}?${{ dc }} GET /v1/health/service/${id}?${{ dc, ['merge-central-config']: null }}
X-Request-ID: ${uri} X-Request-ID: ${uri}
X-Range: ${id} X-Range: ${id}

4
ui/packages/consul-ui/app/adapters/service.js
View File

@ -33,7 +33,7 @@ export default class ServiceAdapter extends Adapter {
throw new Error('You must specify an id'); throw new Error('You must specify an id');
} }
return request` return request`
GET /v1/health/service/${id}?${{ dc }} GET /v1/health/service/${id}?${{ dc, ['merge-central-config']: null }}
X-Request-ID: ${uri} X-Request-ID: ${uri}
${{ ${{
@ -42,5 +42,5 @@ export default class ServiceAdapter extends Adapter {
index, index,
}} }}
`; `;
} }
} }

8
ui/packages/consul-ui/tests/acceptance/dc/services/instances/navigation.feature
View File

@ -46,13 +46,13 @@ Feature: dc / services / instances / navigation
Then the url should be /dc-1/services/service-0/instances Then the url should be /dc-1/services/service-0/instances
Then I see 3 instance models Then I see 3 instance models
When I click instance on the instances component When I click instance on the instances component
Then a GET request was made to "/v1/catalog/connect/service-0?dc=dc-1&ns=@namespace" Then a GET request was made to "/v1/catalog/connect/service-0?dc=dc-1&merge-central-config&ns=@namespace"
Then a GET request was made to "/v1/health/service/service-0-proxy?dc=dc-1&ns=@namespace" Then a GET request was made to "/v1/health/service/service-0-proxy?dc=dc-1&merge-central-config&ns=@namespace"
Then the url should be /dc-1/services/service-0/instances/node-0/service-a/health-checks Then the url should be /dc-1/services/service-0/instances/node-0/service-a/health-checks
And I click "[data-test-back]" And I click "[data-test-back]"
Then the url should be /dc-1/services/service-0/topology Then the url should be /dc-1/services/service-0/topology
And I click instances on the tabs And I click instances on the tabs
When I click instance on the instances component When I click instance on the instances component
Then a GET request was made to "/v1/catalog/connect/service-0?dc=dc-1&ns=@namespace" Then a GET request was made to "/v1/catalog/connect/service-0?dc=dc-1&merge-central-config&ns=@namespace"
Then a GET request was made to "/v1/health/service/service-0-proxy?dc=dc-1&ns=@namespace" Then a GET request was made to "/v1/health/service/service-0-proxy?dc=dc-1&merge-central-config&ns=@namespace"
Then the url should be /dc-1/services/service-0/instances/node-0/service-a/health-checks Then the url should be /dc-1/services/service-0/instances/node-0/service-a/health-checks

2
ui/packages/consul-ui/tests/integration/adapters/service-instance-test.js
View File

@ -14,7 +14,7 @@ module('Integration | Adapter | service-instance', function (hooks) {
const adapter = this.owner.lookup('adapter:service-instance'); const adapter = this.owner.lookup('adapter:service-instance');
const client = this.owner.lookup('service:client/http'); const client = this.owner.lookup('service:client/http');
const request = client.requestParams.bind(client); const request = client.requestParams.bind(client);
const expected = `GET /v1/health/service/${id}?dc=${dc}${ const expected = `GET /v1/health/service/${id}?dc=${dc}&merge-central-config${
shouldHaveNspace(nspace) ? `&ns=${nspace}` : `` shouldHaveNspace(nspace) ? `&ns=${nspace}` : ``
}`; }`;
let actual = adapter.requestForQueryRecord(request, { let actual = adapter.requestForQueryRecord(request, {

2
ui/packages/consul-ui/tests/integration/adapters/service-test.js
View File

@ -42,7 +42,7 @@ module('Integration | Adapter | service', function (hooks) {
const adapter = this.owner.lookup('adapter:service'); const adapter = this.owner.lookup('adapter:service');
const client = this.owner.lookup('service:client/http'); const client = this.owner.lookup('service:client/http');
const request = client.requestParams.bind(client); const request = client.requestParams.bind(client);
const expected = `GET /v1/health/service/${id}?dc=${dc}${ const expected = `GET /v1/health/service/${id}?dc=${dc}&merge-central-config${
shouldHaveNspace(nspace) ? `&ns=${nspace}` : `` shouldHaveNspace(nspace) ? `&ns=${nspace}` : ``
}`; }`;
let actual = adapter.requestForQueryRecord(request, { let actual = adapter.requestForQueryRecord(request, {