diff --git a/CHANGES.md b/CHANGES.md index c563796f..054db3fd 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -13,6 +13,7 @@ Release Notes. - Add the sub-command `instance get` to query single instance.(#134) - Add the sub-command `endpoint get` to query single endpoint info.(#134) - Change the GraphQL method to the v9 version according to the server version.(#134) +- Add `normal` field to Service entity.(#136) ### Bug Fixes diff --git a/assets/graphqls/metadata/v2/AllBrowserServices.graphql b/assets/graphqls/metadata/v2/AllBrowserServices.graphql index c477c82b..55fa09a5 100644 --- a/assets/graphqls/metadata/v2/AllBrowserServices.graphql +++ b/assets/graphqls/metadata/v2/AllBrowserServices.graphql @@ -17,6 +17,6 @@ query ($duration: Duration!) { result: getAllBrowserServices(duration: $duration) { - id name group shortName layers + id name group shortName layers normal } } diff --git a/assets/graphqls/metadata/v2/AllServices.graphql b/assets/graphqls/metadata/v2/AllServices.graphql index 6229982d..218940cb 100644 --- a/assets/graphqls/metadata/v2/AllServices.graphql +++ b/assets/graphqls/metadata/v2/AllServices.graphql @@ -17,6 +17,6 @@ query ($duration: Duration!) { result: getAllServices(duration: $duration) { - id name group shortName layers + id name group shortName layers normal } } diff --git a/assets/graphqls/metadata/v2/FindService.graphql b/assets/graphqls/metadata/v2/FindService.graphql index 8d895664..ab111f39 100644 --- a/assets/graphqls/metadata/v2/FindService.graphql +++ b/assets/graphqls/metadata/v2/FindService.graphql @@ -17,6 +17,6 @@ query findService($serviceName: String!) { result: findService(serviceName: $serviceName) { - id name group shortName layers + id name group shortName layers normal } } diff --git a/assets/graphqls/metadata/v2/ListService.graphql b/assets/graphqls/metadata/v2/ListService.graphql index d0fe6a25..0a131c50 100644 --- a/assets/graphqls/metadata/v2/ListService.graphql +++ b/assets/graphqls/metadata/v2/ListService.graphql @@ -17,6 +17,6 @@ query ($layer: String!) { result: listServices(layer: $layer) { - id name group shortName layers + id name group shortName layers normal } } diff --git a/assets/graphqls/metadata/v2/SearchBrowserService.graphql b/assets/graphqls/metadata/v2/SearchBrowserService.graphql index 7de17f1a..e1a908d9 100644 --- a/assets/graphqls/metadata/v2/SearchBrowserService.graphql +++ b/assets/graphqls/metadata/v2/SearchBrowserService.graphql @@ -17,6 +17,6 @@ query ($serviceCode: String!) { result: searchBrowserService(serviceCode: $serviceCode) { - id name group shortName layers + id name group shortName layers normal } } diff --git a/go.mod b/go.mod index 463d7527..1ba571c1 100644 --- a/go.mod +++ b/go.mod @@ -20,5 +20,5 @@ require ( gopkg.in/yaml.v2 v2.4.0 k8s.io/apimachinery v0.21.1 sigs.k8s.io/controller-runtime v0.7.0 - skywalking.apache.org/repo/goapi v0.0.0-20220105035505-48cad5270f49 + skywalking.apache.org/repo/goapi v0.0.0-20220121092418-9c455d0dda3f ) diff --git a/go.sum b/go.sum index b361ae87..626d8e7a 100644 --- a/go.sum +++ b/go.sum @@ -940,5 +940,5 @@ sigs.k8s.io/structured-merge-diff/v4 v4.1.0/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= -skywalking.apache.org/repo/goapi v0.0.0-20220105035505-48cad5270f49 h1:qg8EPR0uBCuxQ0ZLhFYhX8OjtzHKyD17ZMTHRifYcY4= -skywalking.apache.org/repo/goapi v0.0.0-20220105035505-48cad5270f49/go.mod h1:4KrWd+Oi4lkB+PtxZgIlf+3T6EECPru4fOWNMEHjxRk= +skywalking.apache.org/repo/goapi v0.0.0-20220121092418-9c455d0dda3f h1:i0cL/mhLt8xVO05SCKshkzWNUkXOkiW+zRIIuVWjPko= +skywalking.apache.org/repo/goapi v0.0.0-20220121092418-9c455d0dda3f/go.mod h1:4KrWd+Oi4lkB+PtxZgIlf+3T6EECPru4fOWNMEHjxRk= diff --git a/test/cases/8.8.1/expected/service-provider.yml b/test/cases/8.8.1/expected/service-provider.yml index 7b5669a1..c420818c 100644 --- a/test/cases/8.8.1/expected/service-provider.yml +++ b/test/cases/8.8.1/expected/service-provider.yml @@ -18,3 +18,4 @@ group: "" shortname: "" layers: [] + normal: null diff --git a/test/cases/8.8.1/expected/service.yml b/test/cases/8.8.1/expected/service.yml index 29e52a14..1b483c6f 100644 --- a/test/cases/8.8.1/expected/service.yml +++ b/test/cases/8.8.1/expected/service.yml @@ -19,9 +19,11 @@ group: "" shortname: "" layers: [] + normal: null - id: {{ b64enc "consumer" }}.1 name: consumer group: "" shortname: "" layers: [] + normal: null {{- end }} diff --git a/test/cases/9.0.0/docker-compose.yml b/test/cases/9.0.0/docker-compose.yml index d334b977..eafaf3a6 100644 --- a/test/cases/9.0.0/docker-compose.yml +++ b/test/cases/9.0.0/docker-compose.yml @@ -20,7 +20,7 @@ services: extends: file: ../../base/docker-compose.yml service: oap - image: ghcr.io/apache/skywalking/oap:e97b2d2165703c9d5bcdb0556134aa7cbd1382f5 + image: ghcr.io/apache/skywalking/oap:012d58a8fe29295b41246c20b399283fa9c1305b ports: - 12800 healthcheck: diff --git a/test/cases/9.0.0/expected/service-provider.yml b/test/cases/9.0.0/expected/service-provider.yml index e81ad75b..039edfe0 100644 --- a/test/cases/9.0.0/expected/service-provider.yml +++ b/test/cases/9.0.0/expected/service-provider.yml @@ -19,3 +19,4 @@ shortname: provider layers: - GENERAL + normal: true diff --git a/test/cases/9.0.0/expected/service.yml b/test/cases/9.0.0/expected/service.yml index b1b7cbfe..1e5895c3 100644 --- a/test/cases/9.0.0/expected/service.yml +++ b/test/cases/9.0.0/expected/service.yml @@ -20,10 +20,12 @@ shortname: provider layers: - GENERAL + normal: true - id: {{ b64enc "consumer" }}.1 name: consumer group: "" shortname: consumer layers: - GENERAL + normal: true {{- end }}