Update proxy SHA to latest. (istio#3278)

* Update proxy SHA to latest. * Update tests. * Fix format for mixer/template/sample/createinstance_test.go and mixer/template/sample/template.gen_test.go * Fix auth_test.go * Fix indentation.
zqzstar · Feb 8, 2018 · b0c080a · b0c080a
1 parent 46f6aa4
commit b0c080a
Show file tree

Hide file tree

Showing 12 changed files with 49 additions and 7 deletions.
diff --git a/istio.VERSION b/istio.VERSION
@@ -7,7 +7,7 @@ export MIXER_TAG="5253b6b574a98b209c0ef3d0d6e90c1b8d6a5c2a"
 export PILOT_HUB="gcr.io/istio-testing"
 export PILOT_TAG="3101ea9d82a5f83b699c2d3245b371a19fa6bef4"
 export ISTIOCTL_URL="https://storage.googleapis.com/istio-artifacts/pilot/3101ea9d82a5f83b699c2d3245b371a19fa6bef4/artifacts/istioctl"
-export PROXY_TAG="4a59a04196e99d30438d49fef5666fe68d49fc84"
+export PROXY_TAG="d90831cee93346204dbcc7e8dc27ec84e6b85bc1"
 export PROXY_DEBUG=""
 export ISTIO_NAMESPACE="istio-system"
 export PILOT_DEBIAN_URL="https://storage.googleapis.com/istio-artifacts/pilot/3101ea9d82a5f83b699c2d3245b371a19fa6bef4/artifacts/debs"

diff --git a/istio.deps b/istio.deps
@@ -11,20 +11,20 @@
 		"repoName": "proxy",
 		"prodBranch": "master",
 		"file": "pilot/docker/Dockerfile.proxy",
-		"lastStableSHA": "4a59a04196e99d30438d49fef5666fe68d49fc84"
+		"lastStableSHA": "d90831cee93346204dbcc7e8dc27ec84e6b85bc1"
 	},
 	{
 		"name": "/envoy-debug",
 		"repoName": "proxy",
 		"prodBranch": "master",
 		"file": "pilot/docker/Dockerfile.proxy_debug",
-		"lastStableSHA": "4a59a04196e99d30438d49fef5666fe68d49fc84"
+		"lastStableSHA": "d90831cee93346204dbcc7e8dc27ec84e6b85bc1"
 	},
 	{
 		"name": "PROXY_TAG",
 		"repoName": "proxy",
 		"prodBranch": "master",
 		"file": "istio.VERSION",
-		"lastStableSHA": "4a59a04196e99d30438d49fef5666fe68d49fc84"
+		"lastStableSHA": "d90831cee93346204dbcc7e8dc27ec84e6b85bc1"
 	}
 ]
diff --git a/mixer/test/client/auth/auth_test.go b/mixer/test/client/auth/auth_test.go
@@ -69,6 +69,7 @@ const checkAttributes = `
   "target.user": "target-user",
   "target.uid": "POD222",
   "target.namespace": "XYZ222",
+  "connection.mtls": false,
   "request.headers": {
      ":method": "GET",
      ":path": "/echo",
@@ -106,10 +107,13 @@ const reportAttributes = `
   "source.namespace": "XYZ11",
   "source.ip": "[127 0 0 1]",
   "source.port": "*",
+  "destination.ip": "[127 0 0 1]",
+  "destination.port": "*",
   "target.name": "target-name",
   "target.user": "target-user",
   "target.uid": "POD222",
   "target.namespace": "XYZ222",
+  "connection.mtls": false,
   "request.headers": {
      ":method": "GET",
      ":path": "/echo",
@@ -166,6 +170,7 @@ const FailedReportAttributes = `
   "target.user": "target-user",
   "target.uid": "POD222",
   "target.namespace": "XYZ222",
+  "connection.mtls": false,
   "request.headers": {
      ":method": "GET",
      ":path": "/echo",

diff --git a/mixer/test/client/check_report/check_report_test.go b/mixer/test/client/check_report/check_report_test.go
@@ -42,6 +42,7 @@ const checkAttributesOkGet = `
   "target.user": "target-user",
   "target.uid": "POD222",
   "target.namespace": "XYZ222",
+  "connection.mtls": false,
   "request.headers": {
      ":method": "GET",
      ":path": "/echo",
@@ -70,10 +71,13 @@ const reportAttributesOkGet = `
   "source.namespace": "XYZ11",
   "source.ip": "[127 0 0 1]",
   "source.port": "*",
+  "destination.ip": "[127 0 0 1]",
+  "destination.port": "*",
   "target.name": "target-name",
   "target.user": "target-user",
   "target.uid": "POD222",
   "target.namespace": "XYZ222",
+  "connection.mtls": false,
   "request.headers": {
      ":method": "GET",
      ":path": "/echo",
@@ -117,6 +121,7 @@ const checkAttributesOkPost = `
   "target.user": "target-user",
   "target.uid": "POD222",
   "target.namespace": "XYZ222",
+  "connection.mtls": false,
   "request.headers": {
      ":method": "POST",
      ":path": "/echo",
@@ -145,10 +150,13 @@ const reportAttributesOkPost = `
   "source.namespace": "XYZ11",
   "source.ip": "[127 0 0 1]",
   "source.port": "*",
+  "destination.ip": "[127 0 0 1]",
+	"destination.port": "*",
   "target.name": "target-name",
   "target.user": "target-user",
   "target.uid": "POD222",
   "target.namespace": "XYZ222",
+	"connection.mtls": false,
   "request.headers": {
      ":method": "POST",
      ":path": "/echo",

diff --git a/mixer/test/client/disable_tcp_check_calls/disable_tcp_check_calls_test.go b/mixer/test/client/disable_tcp_check_calls/disable_tcp_check_calls_test.go
@@ -33,6 +33,7 @@ const reportAttributesOkPost = `
   "target.namespace": "XYZ222",
   "destination.ip": "[127 0 0 1]",
   "destination.port": "*",
+	"connection.mtls": false,
   "connection.received.bytes": 178,
   "connection.received.bytes_total": 178,
   "connection.sent.bytes": 133,

diff --git a/mixer/test/client/env/attributes.go b/mixer/test/client/env/attributes.go
@@ -127,6 +127,16 @@ func Verify(b *attribute.MutableBag, expectedJSON string) error {
 			} else {
 				return fmt.Errorf("attribute %+v is expected", k)
 			}
+		case bool:
+			if val, ok := b.Get(k); ok {
+				vbool := bool(vv)
+				if val.(bool) != vbool {
+					return fmt.Errorf("attribute %+v value doesn't match. Actual %+v, expected %+v",
+						k, val.(bool), vbool)
+				}
+			} else {
+				return fmt.Errorf("attribute %+v is expected", k)
+			}
 		case map[string]interface{}:
 			if val, ok := b.Get(k); ok {
 				var err error

diff --git a/mixer/test/client/failed_request/failed_request_test.go b/mixer/test/client/failed_request/failed_request_test.go
@@ -47,6 +47,7 @@ const checkAttributesMixerFail = `
   "target.user": "target-user",
   "target.uid": "POD222",
   "target.namespace": "XYZ222",
+  "connection.mtls": false,
   "request.headers": {
      ":method": "GET",
      ":path": "/echo",
@@ -81,6 +82,7 @@ const reportAttributesMixerFail = `
   "target.user": "target-user",
   "target.uid": "POD222",
   "target.namespace": "XYZ222",
+  "connection.mtls": false,
   "request.headers": {
      ":method": "GET",
      ":path": "/echo",
@@ -121,10 +123,13 @@ const reportAttributesBackendFail = `
   "source.namespace": "XYZ11",
   "source.ip": "[127 0 0 1]",
   "source.port": "*",
+  "destination.ip": "[127 0 0 1]",
+  "destination.port": "*",
   "target.name": "target-name",
   "target.user": "target-user",
   "target.uid": "POD222",
   "target.namespace": "XYZ222",
+  "connection.mtls": false,
   "request.headers": {
      ":method": "GET",
      ":path": "/echo",

diff --git a/mixer/test/client/fault_inject/fault_inject_test.go b/mixer/test/client/fault_inject/fault_inject_test.go
@@ -40,6 +40,7 @@ const reportAttributes = `
   "target.user": "target-user",
   "target.uid": "POD222",
   "target.namespace": "XYZ222",
+  "connection.mtls": false,
   "request.headers": {
      ":method": "GET",
      ":path": "/echo",

diff --git a/mixer/test/client/report_batch/report_batch_test.go b/mixer/test/client/report_batch/report_batch_test.go
@@ -38,10 +38,13 @@ const reportAttributesOkGet = `
   "source.namespace": "XYZ11",
   "source.ip": "[127 0 0 1]",
   "source.port": "*",
+  "destination.ip": "[127 0 0 1]",
+  "destination.port": "*",
   "target.name": "target-name",
   "target.user": "target-user",
   "target.uid": "POD222",
   "target.namespace": "XYZ222",
+  "connection.mtls": false,
   "request.headers": {
      ":method": "GET",
      ":path": "/echo",
@@ -81,10 +84,13 @@ const reportAttributesOkPost1 = `
   "source.namespace": "XYZ11",
   "source.ip": "[127 0 0 1]",
   "source.port": "*",
+  "destination.ip": "[127 0 0 1]",
+  "destination.port": "*",
   "target.name": "target-name",
   "target.user": "target-user",
   "target.uid": "POD222",
   "target.namespace": "XYZ222",
+  "connection.mtls": false,
   "request.headers": {
      ":method": "POST",
      ":path": "/echo",
@@ -125,10 +131,13 @@ const reportAttributesOkPost2 = `
   "source.namespace": "XYZ11",
   "source.ip": "[127 0 0 1]",
   "source.port": "*",
+  "destination.ip": "[127 0 0 1]",
+  "destination.port": "*",
   "target.name": "target-name",
   "target.user": "target-user",
   "target.uid": "POD222",
   "target.namespace": "XYZ222",
+  "connection.mtls": false,
   "request.headers": {
      ":method": "POST",
      ":path": "/echo",

diff --git a/mixer/test/client/tcp_filter/tcp_filter_test.go b/mixer/test/client/tcp_filter/tcp_filter_test.go
@@ -31,7 +31,8 @@ const checkAttributesOkPost = `
   "source.ip": "[127 0 0 1]",
   "source.port": "*",
   "target.uid": "POD222",
-  "target.namespace": "XYZ222"
+  "target.namespace": "XYZ222",
+  "connection.mtls": false
 }
 `
 
@@ -47,6 +48,7 @@ const reportAttributesOkPost = `
   "target.namespace": "XYZ222",
   "destination.ip": "[127 0 0 1]",
   "destination.port": "*",
+  "connection.mtls": false,
   "connection.received.bytes": 178,
   "connection.received.bytes_total": 178,
   "connection.sent.bytes": 133,
@@ -65,6 +67,7 @@ const reportAttributesFailPost = `
   "source.port": "*",
   "target.uid": "POD222",
   "target.namespace": "XYZ222",
+  "connection.mtls": false,
   "connection.received.bytes": 0,
   "connection.received.bytes_total": 0,
   "connection.sent.bytes": 0,

diff --git a/pilot/docker/Dockerfile.proxy b/pilot/docker/Dockerfile.proxy
@@ -1,5 +1,5 @@
 # keep Dockerfile.proxy and Dockerfile.proxy_debug consistent for proxy sha
-FROM gcr.io/istio-testing/envoy:4a59a04196e99d30438d49fef5666fe68d49fc84
+FROM gcr.io/istio-testing/envoy:d90831cee93346204dbcc7e8dc27ec84e6b85bc1
 ADD pilot-agent /usr/local/bin/pilot-agent
 
 COPY envoy_pilot.json      /etc/istio/proxy/envoy_pilot.json

diff --git a/pilot/docker/Dockerfile.proxy_debug b/pilot/docker/Dockerfile.proxy_debug
@@ -1,5 +1,5 @@
 # keep Dockerfile.proxy and Dockerfile.proxy_debug consistent for proxy sha
-FROM gcr.io/istio-testing/envoy-debug:4a59a04196e99d30438d49fef5666fe68d49fc84
+FROM gcr.io/istio-testing/envoy-debug:d90831cee93346204dbcc7e8dc27ec84e6b85bc1
 ADD pilot-agent /usr/local/bin/pilot-agent
 
 COPY envoy_pilot.json      /etc/istio/proxy/envoy_pilot.json