From 241503d3da4cbcb9fb8df40609265a41ae7aacea Mon Sep 17 00:00:00 2001 From: Yangmin Zhu Date: Mon, 17 Sep 2018 14:23:25 -0700 Subject: [PATCH] Fix test fail caused by #8606 --- .../testdata/clustermultihostsfiltered.txt | 126 ++++++++++++------ .../envoy/clusters/testdata/clusters.json | 114 +++++++++++----- .../clusters/testdata/clustersnofiltered.txt | 126 ++++++++++++------ .../rbac_permissive_global_test.go | 3 + .../rbac_permissive_policy_test.go | 3 + 5 files changed, 252 insertions(+), 120 deletions(-) diff --git a/istioctl/pkg/writer/envoy/clusters/testdata/clustermultihostsfiltered.txt b/istioctl/pkg/writer/envoy/clusters/testdata/clustermultihostsfiltered.txt index ebcaf33643cd..0ea449be31d6 100644 --- a/istioctl/pkg/writer/envoy/clusters/testdata/clustermultihostsfiltered.txt +++ b/istioctl/pkg/writer/envoy/clusters/testdata/clustermultihostsfiltered.txt @@ -10,20 +10,34 @@ "portValue": 9080 } }, - "stats": { - "cx_active": { - "type": "GAUGE" - }, - "cx_connect_fail": {}, - "cx_total": {}, - "rq_active": { - "type": "GAUGE" - }, - "rq_error": {}, - "rq_success": {}, - "rq_timeout": {}, - "rq_total": {} - }, + "stats": [ + { + "type": "GAUGE", + "name": "cx_active" + }, + { + "name": "cx_connect_fail" + }, + { + "name": "cx_total" + }, + { + "type": "GAUGE", + "name": "rq_active" + }, + { + "name": "rq_error" + }, + { + "name": "rq_success" + }, + { + "name": "rq_timeout" + }, + { + "name": "rq_total" + } + ], "healthStatus": { "edsHealthStatus": "HEALTHY" } @@ -35,20 +49,34 @@ "portValue": 9080 } }, - "stats": { - "cx_active": { - "type": "GAUGE" - }, - "cx_connect_fail": {}, - "cx_total": {}, - "rq_active": { - "type": "GAUGE" - }, - "rq_error": {}, - "rq_success": {}, - "rq_timeout": {}, - "rq_total": {} - }, + "stats": [ + { + "type": "GAUGE", + "name": "cx_active" + }, + { + "name": "cx_connect_fail" + }, + { + "name": "cx_total" + }, + { + "type": "GAUGE", + "name": "rq_active" + }, + { + "name": "rq_error" + }, + { + "name": "rq_success" + }, + { + "name": "rq_timeout" + }, + { + "name": "rq_total" + } + ], "healthStatus": { "edsHealthStatus": "HEALTHY" } @@ -60,20 +88,34 @@ "portValue": 9080 } }, - "stats": { - "cx_active": { - "type": "GAUGE" - }, - "cx_connect_fail": {}, - "cx_total": {}, - "rq_active": { - "type": "GAUGE" - }, - "rq_error": {}, - "rq_success": {}, - "rq_timeout": {}, - "rq_total": {} - }, + "stats": [ + { + "type": "GAUGE", + "name": "cx_active" + }, + { + "name": "cx_connect_fail" + }, + { + "name": "cx_total" + }, + { + "type": "GAUGE", + "name": "rq_active" + }, + { + "name": "rq_error" + }, + { + "name": "rq_success" + }, + { + "name": "rq_timeout" + }, + { + "name": "rq_total" + } + ], "healthStatus": { "edsHealthStatus": "HEALTHY" } diff --git a/istioctl/pkg/writer/envoy/clusters/testdata/clusters.json b/istioctl/pkg/writer/envoy/clusters/testdata/clusters.json index 253e97683cfc..8c64990e3f7c 100644 --- a/istioctl/pkg/writer/envoy/clusters/testdata/clusters.json +++ b/istioctl/pkg/writer/envoy/clusters/testdata/clusters.json @@ -236,20 +236,34 @@ "portValue": 9080 } }, - "stats": { - "cx_active": { - "type": "GAUGE" + "stats": [ + { + "type": "GAUGE", + "name": "cx_active" }, - "cx_connect_fail": {}, - "cx_total": {}, - "rq_active": { - "type": "GAUGE" + { + "name": "cx_connect_fail" }, - "rq_error": {}, - "rq_success": {}, - "rq_timeout": {}, - "rq_total": {} - }, + { + "name": "cx_total" + }, + { + "type": "GAUGE", + "name": "rq_active" + }, + { + "name": "rq_error" + }, + { + "name": "rq_success" + }, + { + "name": "rq_timeout" + }, + { + "name": "rq_total" + } + ], "healthStatus": { "edsHealthStatus": "HEALTHY" } @@ -261,20 +275,34 @@ "portValue": 9080 } }, - "stats": { - "cx_active": { - "type": "GAUGE" + "stats": [ + { + "type": "GAUGE", + "name": "cx_active" }, - "cx_connect_fail": {}, - "cx_total": {}, - "rq_active": { - "type": "GAUGE" + { + "name": "cx_connect_fail" }, - "rq_error": {}, - "rq_success": {}, - "rq_timeout": {}, - "rq_total": {} - }, + { + "name": "cx_total" + }, + { + "type": "GAUGE", + "name": "rq_active" + }, + { + "name": "rq_error" + }, + { + "name": "rq_success" + }, + { + "name": "rq_timeout" + }, + { + "name": "rq_total" + } + ], "healthStatus": { "edsHealthStatus": "HEALTHY" } @@ -286,20 +314,34 @@ "portValue": 9080 } }, - "stats": { - "cx_active": { - "type": "GAUGE" + "stats": [ + { + "type": "GAUGE", + "name": "cx_active" }, - "cx_connect_fail": {}, - "cx_total": {}, - "rq_active": { - "type": "GAUGE" + { + "name": "cx_connect_fail" }, - "rq_error": {}, - "rq_success": {}, - "rq_timeout": {}, - "rq_total": {} - }, + { + "name": "cx_total" + }, + { + "type": "GAUGE", + "name": "rq_active" + }, + { + "name": "rq_error" + }, + { + "name": "rq_success" + }, + { + "name": "rq_timeout" + }, + { + "name": "rq_total" + } + ], "healthStatus": { "edsHealthStatus": "HEALTHY" } diff --git a/istioctl/pkg/writer/envoy/clusters/testdata/clustersnofiltered.txt b/istioctl/pkg/writer/envoy/clusters/testdata/clustersnofiltered.txt index 8ac4a952f760..c95e41bd85f8 100644 --- a/istioctl/pkg/writer/envoy/clusters/testdata/clustersnofiltered.txt +++ b/istioctl/pkg/writer/envoy/clusters/testdata/clustersnofiltered.txt @@ -235,20 +235,34 @@ "portValue": 9080 } }, - "stats": { - "cx_active": { - "type": "GAUGE" - }, - "cx_connect_fail": {}, - "cx_total": {}, - "rq_active": { - "type": "GAUGE" - }, - "rq_error": {}, - "rq_success": {}, - "rq_timeout": {}, - "rq_total": {} - }, + "stats": [ + { + "type": "GAUGE", + "name": "cx_active" + }, + { + "name": "cx_connect_fail" + }, + { + "name": "cx_total" + }, + { + "type": "GAUGE", + "name": "rq_active" + }, + { + "name": "rq_error" + }, + { + "name": "rq_success" + }, + { + "name": "rq_timeout" + }, + { + "name": "rq_total" + } + ], "healthStatus": { "edsHealthStatus": "HEALTHY" } @@ -260,20 +274,34 @@ "portValue": 9080 } }, - "stats": { - "cx_active": { - "type": "GAUGE" - }, - "cx_connect_fail": {}, - "cx_total": {}, - "rq_active": { - "type": "GAUGE" - }, - "rq_error": {}, - "rq_success": {}, - "rq_timeout": {}, - "rq_total": {} - }, + "stats": [ + { + "type": "GAUGE", + "name": "cx_active" + }, + { + "name": "cx_connect_fail" + }, + { + "name": "cx_total" + }, + { + "type": "GAUGE", + "name": "rq_active" + }, + { + "name": "rq_error" + }, + { + "name": "rq_success" + }, + { + "name": "rq_timeout" + }, + { + "name": "rq_total" + } + ], "healthStatus": { "edsHealthStatus": "HEALTHY" } @@ -285,20 +313,34 @@ "portValue": 9080 } }, - "stats": { - "cx_active": { - "type": "GAUGE" - }, - "cx_connect_fail": {}, - "cx_total": {}, - "rq_active": { - "type": "GAUGE" - }, - "rq_error": {}, - "rq_success": {}, - "rq_timeout": {}, - "rq_total": {} - }, + "stats": [ + { + "type": "GAUGE", + "name": "cx_active" + }, + { + "name": "cx_connect_fail" + }, + { + "name": "cx_total" + }, + { + "type": "GAUGE", + "name": "rq_active" + }, + { + "name": "rq_error" + }, + { + "name": "rq_success" + }, + { + "name": "rq_timeout" + }, + { + "name": "rq_total" + } + ], "healthStatus": { "edsHealthStatus": "HEALTHY" } diff --git a/mixer/test/client/rbac_permissive_global/rbac_permissive_global_test.go b/mixer/test/client/rbac_permissive_global/rbac_permissive_global_test.go index 00865d21d3aa..d7897f7ec396 100644 --- a/mixer/test/client/rbac_permissive_global/rbac_permissive_global_test.go +++ b/mixer/test/client/rbac_permissive_global/rbac_permissive_global_test.go @@ -28,8 +28,11 @@ const reportAttributes = ` "connection.mtls": false, "context.protocol": "http", "context.proxy_error_code": "*", + "context.reporter.uid" : "", "destination.ip": "[127 0 0 1]", + "destination.namespace" : "", "destination.port": "*", + "destination.uid": "", "mesh1.ip": "*", "mesh2.ip": "*", "mesh3.ip": "*", diff --git a/mixer/test/client/rbac_permissive_policy/rbac_permissive_policy_test.go b/mixer/test/client/rbac_permissive_policy/rbac_permissive_policy_test.go index 6e53c8729f8f..52758f183e15 100644 --- a/mixer/test/client/rbac_permissive_policy/rbac_permissive_policy_test.go +++ b/mixer/test/client/rbac_permissive_policy/rbac_permissive_policy_test.go @@ -27,6 +27,9 @@ const reportAttributes = ` "connection.mtls": false, "context.protocol": "http", "context.proxy_error_code": "*", + "context.reporter.uid" : "", + "destination.namespace" : "", + "destination.uid": "", "mesh1.ip": "*", "mesh2.ip": "*", "mesh3.ip": "*",