diff --git a/mixer/v1/config/client/client_config.pb.go b/mixer/v1/config/client/client_config.pb.go
index bb42caf9a0..f88aa49497 100644
--- a/mixer/v1/config/client/client_config.pb.go
+++ b/mixer/v1/config/client/client_config.pb.go
@@ -65,6 +65,8 @@ type ServiceConfig struct {
DisableReportCalls bool `protobuf:"varint,2,opt,name=disable_report_calls,json=disableReportCalls,proto3" json:"disable_report_calls,omitempty"`
// Send these attributes to Mixer in both Check and Report. This
// typically includes the "destination.service" attribute.
+ // In case of a per-route override, per-route attributes take precedence
+ // over the attributes supplied in the client configuration.
MixerAttributes *istio_mixer_v1.Attributes `protobuf:"bytes,3,opt,name=mixer_attributes,json=mixerAttributes" json:"mixer_attributes,omitempty"`
// HTTP API specifications to generate API attributes.
HttpApiSpec []*HTTPAPISpec `protobuf:"bytes,4,rep,name=http_api_spec,json=httpApiSpec" json:"http_api_spec,omitempty"`
@@ -75,6 +77,19 @@ type ServiceConfig struct {
// [mesh-level
// policy][istio.mixer.v1.config.client.TransportConfig.network_fail_policy].
NetworkFailPolicy *NetworkFailPolicy `protobuf:"bytes,7,opt,name=network_fail_policy,json=networkFailPolicy" json:"network_fail_policy,omitempty"`
+ // Default attributes to forward to upstream. This typically
+ // includes the "source.ip" and "source.uid" attributes.
+ // In case of a per-route override, per-route attributes take precedence
+ // over the attributes supplied in the client configuration.
+ //
+ // Forwarded attributes take precedence over the static Mixer attributes.
+ // The full order of application is as follows:
+ // 1. static Mixer attributes from the filter config;
+ // 2. static Mixer attributes from the route config;
+ // 3. forwarded attributes from the source filter config (if any);
+ // 4. forwarded attributes from the source route config (if any);
+ // 5. derived attributes from the request metadata.
+ ForwardAttributes *istio_mixer_v1.Attributes `protobuf:"bytes,8,opt,name=forward_attributes,json=forwardAttributes" json:"forward_attributes,omitempty"`
}
func (m *ServiceConfig) Reset() { *m = ServiceConfig{} }
@@ -285,6 +300,16 @@ func (m *ServiceConfig) MarshalTo(dAtA []byte) (int, error) {
}
i += n2
}
+ if m.ForwardAttributes != nil {
+ dAtA[i] = 0x42
+ i++
+ i = encodeVarintClientConfig(dAtA, i, uint64(m.ForwardAttributes.Size()))
+ n3, err := m.ForwardAttributes.MarshalTo(dAtA[i:])
+ if err != nil {
+ return 0, err
+ }
+ i += n3
+ }
return i, nil
}
@@ -337,21 +362,21 @@ func (m *TransportConfig) MarshalTo(dAtA []byte) (int, error) {
dAtA[i] = 0x22
i++
i = encodeVarintClientConfig(dAtA, i, uint64(m.NetworkFailPolicy.Size()))
- n3, err := m.NetworkFailPolicy.MarshalTo(dAtA[i:])
+ n4, err := m.NetworkFailPolicy.MarshalTo(dAtA[i:])
if err != nil {
return 0, err
}
- i += n3
+ i += n4
}
if m.StatsUpdateInterval != nil {
dAtA[i] = 0x2a
i++
i = encodeVarintClientConfig(dAtA, i, uint64(m.StatsUpdateInterval.Size()))
- n4, err := m.StatsUpdateInterval.MarshalTo(dAtA[i:])
+ n5, err := m.StatsUpdateInterval.MarshalTo(dAtA[i:])
if err != nil {
return 0, err
}
- i += n4
+ i += n5
}
if len(m.CheckCluster) > 0 {
dAtA[i] = 0x32
@@ -387,11 +412,11 @@ func (m *HttpClientConfig) MarshalTo(dAtA []byte) (int, error) {
dAtA[i] = 0xa
i++
i = encodeVarintClientConfig(dAtA, i, uint64(m.Transport.Size()))
- n5, err := m.Transport.MarshalTo(dAtA[i:])
+ n6, err := m.Transport.MarshalTo(dAtA[i:])
if err != nil {
return 0, err
}
- i += n5
+ i += n6
}
if len(m.ServiceConfigs) > 0 {
for k, _ := range m.ServiceConfigs {
@@ -413,11 +438,11 @@ func (m *HttpClientConfig) MarshalTo(dAtA []byte) (int, error) {
dAtA[i] = 0x12
i++
i = encodeVarintClientConfig(dAtA, i, uint64(v.Size()))
- n6, err := v.MarshalTo(dAtA[i:])
+ n7, err := v.MarshalTo(dAtA[i:])
if err != nil {
return 0, err
}
- i += n6
+ i += n7
}
}
}
@@ -431,21 +456,21 @@ func (m *HttpClientConfig) MarshalTo(dAtA []byte) (int, error) {
dAtA[i] = 0x22
i++
i = encodeVarintClientConfig(dAtA, i, uint64(m.MixerAttributes.Size()))
- n7, err := m.MixerAttributes.MarshalTo(dAtA[i:])
+ n8, err := m.MixerAttributes.MarshalTo(dAtA[i:])
if err != nil {
return 0, err
}
- i += n7
+ i += n8
}
if m.ForwardAttributes != nil {
dAtA[i] = 0x2a
i++
i = encodeVarintClientConfig(dAtA, i, uint64(m.ForwardAttributes.Size()))
- n8, err := m.ForwardAttributes.MarshalTo(dAtA[i:])
+ n9, err := m.ForwardAttributes.MarshalTo(dAtA[i:])
if err != nil {
return 0, err
}
- i += n8
+ i += n9
}
return i, nil
}
@@ -469,21 +494,21 @@ func (m *TcpClientConfig) MarshalTo(dAtA []byte) (int, error) {
dAtA[i] = 0xa
i++
i = encodeVarintClientConfig(dAtA, i, uint64(m.Transport.Size()))
- n9, err := m.Transport.MarshalTo(dAtA[i:])
+ n10, err := m.Transport.MarshalTo(dAtA[i:])
if err != nil {
return 0, err
}
- i += n9
+ i += n10
}
if m.MixerAttributes != nil {
dAtA[i] = 0x12
i++
i = encodeVarintClientConfig(dAtA, i, uint64(m.MixerAttributes.Size()))
- n10, err := m.MixerAttributes.MarshalTo(dAtA[i:])
+ n11, err := m.MixerAttributes.MarshalTo(dAtA[i:])
if err != nil {
return 0, err
}
- i += n10
+ i += n11
}
if m.DisableCheckCalls {
dAtA[i] = 0x18
@@ -509,21 +534,21 @@ func (m *TcpClientConfig) MarshalTo(dAtA []byte) (int, error) {
dAtA[i] = 0x2a
i++
i = encodeVarintClientConfig(dAtA, i, uint64(m.ConnectionQuotaSpec.Size()))
- n11, err := m.ConnectionQuotaSpec.MarshalTo(dAtA[i:])
+ n12, err := m.ConnectionQuotaSpec.MarshalTo(dAtA[i:])
if err != nil {
return 0, err
}
- i += n11
+ i += n12
}
if m.ReportInterval != nil {
dAtA[i] = 0x32
i++
i = encodeVarintClientConfig(dAtA, i, uint64(m.ReportInterval.Size()))
- n12, err := m.ReportInterval.MarshalTo(dAtA[i:])
+ n13, err := m.ReportInterval.MarshalTo(dAtA[i:])
if err != nil {
return 0, err
}
- i += n12
+ i += n13
}
return i, nil
}
@@ -575,6 +600,10 @@ func (m *ServiceConfig) Size() (n int) {
l = m.NetworkFailPolicy.Size()
n += 1 + l + sovClientConfig(uint64(l))
}
+ if m.ForwardAttributes != nil {
+ l = m.ForwardAttributes.Size()
+ n += 1 + l + sovClientConfig(uint64(l))
+ }
return n
}
@@ -706,6 +735,7 @@ func (this *ServiceConfig) String() string {
`HttpApiSpec:` + strings.Replace(fmt.Sprintf("%v", this.HttpApiSpec), "HTTPAPISpec", "HTTPAPISpec", 1) + `,`,
`QuotaSpec:` + strings.Replace(fmt.Sprintf("%v", this.QuotaSpec), "QuotaSpec", "QuotaSpec", 1) + `,`,
`NetworkFailPolicy:` + strings.Replace(fmt.Sprintf("%v", this.NetworkFailPolicy), "NetworkFailPolicy", "NetworkFailPolicy", 1) + `,`,
+ `ForwardAttributes:` + strings.Replace(fmt.Sprintf("%v", this.ForwardAttributes), "Attributes", "istio_mixer_v1.Attributes", 1) + `,`,
`}`,
}, "")
return s
@@ -1039,6 +1069,39 @@ func (m *ServiceConfig) Unmarshal(dAtA []byte) error {
return err
}
iNdEx = postIndex
+ case 8:
+ if wireType != 2 {
+ return fmt.Errorf("proto: wrong wireType = %d for field ForwardAttributes", wireType)
+ }
+ var msglen int
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowClientConfig
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ msglen |= (int(b) & 0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
+ if msglen < 0 {
+ return ErrInvalidLengthClientConfig
+ }
+ postIndex := iNdEx + msglen
+ if postIndex > l {
+ return io.ErrUnexpectedEOF
+ }
+ if m.ForwardAttributes == nil {
+ m.ForwardAttributes = &istio_mixer_v1.Attributes{}
+ }
+ if err := m.ForwardAttributes.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+ return err
+ }
+ iNdEx = postIndex
default:
iNdEx = preIndex
skippy, err := skipClientConfig(dAtA[iNdEx:])
@@ -1927,58 +1990,59 @@ func init() {
}
var fileDescriptorClientConfig = []byte{
- // 844 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xcd, 0x8e, 0xe2, 0x46,
- 0x10, 0xb6, 0xf9, 0xdb, 0xd0, 0x84, 0xbf, 0x66, 0x57, 0x62, 0x48, 0x64, 0x21, 0x56, 0xab, 0x90,
- 0xac, 0x62, 0x67, 0xc9, 0x25, 0xda, 0x43, 0x24, 0x60, 0x19, 0x2d, 0xca, 0xfe, 0x10, 0xcf, 0xcc,
- 0x25, 0x39, 0x58, 0x8d, 0x69, 0xa0, 0x85, 0xe3, 0xf6, 0xd8, 0x6d, 0x26, 0x73, 0xcb, 0x13, 0x44,
- 0x39, 0xe4, 0x9e, 0xeb, 0x1c, 0xf3, 0x18, 0x73, 0x9c, 0x63, 0x8e, 0x81, 0x5c, 0x72, 0x9c, 0x47,
- 0x88, 0xdc, 0xdd, 0xc0, 0xc0, 0x00, 0x23, 0xa4, 0xec, 0x89, 0x76, 0xd5, 0xf7, 0x55, 0x77, 0xd5,
- 0x57, 0x55, 0x02, 0x7c, 0xf1, 0x13, 0xf9, 0x19, 0xfb, 0xc6, 0xf4, 0x85, 0x61, 0x53, 0x77, 0x48,
- 0x46, 0x86, 0xed, 0x10, 0xec, 0x32, 0xf9, 0x63, 0x09, 0xa3, 0xee, 0xf9, 0x94, 0x51, 0xf8, 0x29,
- 0x09, 0x18, 0xa1, 0x3a, 0x67, 0xe8, 0xd3, 0x17, 0xba, 0x74, 0x0a, 0x68, 0xe5, 0xf1, 0x88, 0x8e,
- 0x28, 0x07, 0x1a, 0xd1, 0x49, 0x70, 0x2a, 0xda, 0x88, 0xd2, 0x91, 0x83, 0x0d, 0xfe, 0xd5, 0x0f,
- 0x87, 0xc6, 0x20, 0xf4, 0x11, 0x23, 0xd4, 0x95, 0xfe, 0xa3, 0xe5, 0xfd, 0x88, 0x31, 0x9f, 0xf4,
- 0x43, 0x86, 0x03, 0xe9, 0x7a, 0xb6, 0xe3, 0x69, 0xc8, 0x23, 0x56, 0xe0, 0x61, 0x5b, 0xc2, 0x6a,
- 0x3b, 0x60, 0xe7, 0x21, 0x65, 0x48, 0x60, 0x6a, 0xbf, 0xab, 0xa0, 0xf8, 0x0e, 0xb3, 0x0b, 0xea,
- 0x4f, 0x8e, 0x11, 0x71, 0x7a, 0xd4, 0x21, 0xf6, 0x25, 0x34, 0x41, 0xca, 0xe3, 0xa7, 0xb2, 0x5a,
- 0x55, 0xeb, 0xb9, 0xc6, 0x4b, 0x7d, 0x5f, 0x82, 0xfa, 0xbd, 0x00, 0xfa, 0xea, 0x68, 0xca, 0x48,
- 0xb5, 0xe7, 0x00, 0xdc, 0xb9, 0x21, 0x0b, 0xd2, 0xc7, 0xcd, 0xee, 0x1b, 0xeb, 0x7d, 0xaf, 0xf3,
- 0xae, 0xa0, 0xc0, 0x1c, 0x00, 0xfc, 0xb3, 0xfd, 0xe6, 0xfd, 0x49, 0xa7, 0xa0, 0xd6, 0xfe, 0x8c,
- 0x83, 0xec, 0x09, 0xf6, 0xa7, 0xc4, 0xc6, 0x6d, 0x7e, 0x15, 0xd4, 0x41, 0x69, 0x40, 0x02, 0xd4,
- 0x77, 0xb0, 0x65, 0x8f, 0xb1, 0x3d, 0xb1, 0x6c, 0xe4, 0x38, 0x01, 0x7f, 0xdf, 0x47, 0x66, 0x51,
- 0xba, 0xda, 0x91, 0xa7, 0x1d, 0x39, 0xe0, 0x57, 0xe0, 0xf1, 0x02, 0xef, 0x63, 0x8f, 0xfa, 0x4c,
- 0x12, 0x62, 0x9c, 0x00, 0xa5, 0xcf, 0xe4, 0x2e, 0xc1, 0xe8, 0x80, 0x02, 0xcf, 0xcf, 0x5a, 0xd5,
- 0xbb, 0x1c, 0xaf, 0xaa, 0xf5, 0x4c, 0xa3, 0xb2, 0x99, 0x7e, 0x73, 0x89, 0x30, 0xf3, 0xdc, 0xb8,
- 0x32, 0xc0, 0xb7, 0x20, 0x3b, 0x66, 0xcc, 0xb3, 0x16, 0x62, 0x94, 0x13, 0xd5, 0x78, 0x3d, 0xd3,
- 0xf8, 0x7c, 0x7f, 0x09, 0x5f, 0x9f, 0x9e, 0xf6, 0x9a, 0xbd, 0xee, 0x89, 0x87, 0x6d, 0x33, 0x13,
- 0xf1, 0x9b, 0x1e, 0x89, 0x3e, 0xe0, 0x31, 0x00, 0x5c, 0x2f, 0x11, 0x2b, 0xc9, 0x63, 0x7d, 0xb6,
- 0x3f, 0xd6, 0xf7, 0x11, 0x9e, 0x47, 0x4a, 0x9f, 0x2f, 0x8e, 0xd0, 0x02, 0x25, 0x57, 0xc8, 0x64,
- 0x0d, 0x11, 0x71, 0x2c, 0xa9, 0xef, 0x23, 0x9e, 0xa0, 0x71, 0xa0, 0xbe, 0x66, 0xd1, 0xdd, 0x34,
- 0xd5, 0xfe, 0x88, 0x83, 0xfc, 0xa9, 0x8f, 0xdc, 0x80, 0x57, 0x74, 0xa7, 0x68, 0xf6, 0x18, 0x6f,
- 0x17, 0xcd, 0x1e, 0xe3, 0xbb, 0x78, 0x91, 0xb4, 0xc0, 0xc7, 0xd6, 0xf0, 0x3c, 0x3d, 0x81, 0xbf,
- 0x2f, 0x72, 0x1f, 0x31, 0x7b, 0xcc, 0x65, 0xdb, 0x14, 0xb9, 0x15, 0x79, 0x76, 0x95, 0x21, 0xf1,
- 0x7f, 0x95, 0x01, 0xbe, 0x05, 0x4f, 0x02, 0x86, 0x58, 0x60, 0x85, 0xde, 0x00, 0x31, 0x6c, 0x11,
- 0x97, 0x61, 0x7f, 0x8a, 0x9c, 0x72, 0x92, 0x5f, 0x71, 0xa4, 0x8b, 0xb1, 0xd7, 0x17, 0x63, 0xaf,
- 0xbf, 0x92, 0x63, 0x6f, 0x96, 0x38, 0xef, 0x8c, 0xd3, 0xba, 0x92, 0x05, 0x9f, 0x82, 0xac, 0xac,
- 0x9c, 0x13, 0x06, 0x0c, 0xfb, 0xe5, 0x54, 0x55, 0xad, 0xa7, 0xcd, 0x8f, 0xb9, 0xb1, 0x2d, 0x6c,
- 0xf0, 0x19, 0xc8, 0x2d, 0x7a, 0x5c, 0xa2, 0x1e, 0x71, 0x54, 0x56, 0x58, 0x25, 0xac, 0xf6, 0x6b,
- 0x02, 0x14, 0x5e, 0x33, 0xe6, 0xb5, 0x79, 0x3a, 0x52, 0xa2, 0xef, 0x40, 0x9a, 0x2d, 0x54, 0xe3,
- 0xc2, 0x64, 0x1a, 0x5f, 0xee, 0x2f, 0xc3, 0x86, 0xc8, 0xe6, 0x8a, 0x0f, 0x27, 0x20, 0x1f, 0x88,
- 0xa9, 0x95, 0xfb, 0x31, 0x9a, 0xb7, 0xa8, 0x63, 0x5b, 0x0f, 0x74, 0xff, 0xc6, 0xab, 0xf4, 0xb5,
- 0xd9, 0x0f, 0x3a, 0x2e, 0xf3, 0x2f, 0xcd, 0x5c, 0xb0, 0x66, 0x84, 0xdf, 0x82, 0x4f, 0x06, 0x78,
- 0x88, 0x42, 0x87, 0x59, 0x03, 0x1c, 0x30, 0xe2, 0xf2, 0x32, 0x5a, 0x12, 0xc5, 0x7b, 0x20, 0x6d,
- 0x1e, 0x49, 0xc8, 0xab, 0x15, 0x42, 0xc6, 0xde, 0x3a, 0xef, 0x89, 0xc3, 0xe7, 0xbd, 0x0b, 0xe0,
- 0x90, 0xfa, 0x17, 0xc8, 0x1f, 0xdc, 0x0d, 0x94, 0x7c, 0x30, 0x50, 0x51, 0xb2, 0x56, 0xa6, 0x8a,
- 0x0b, 0x4a, 0x5b, 0x12, 0x87, 0x05, 0x10, 0x9f, 0x60, 0xb1, 0x8a, 0xd3, 0x66, 0x74, 0x84, 0x4d,
- 0x90, 0x9c, 0x22, 0x27, 0x14, 0x93, 0x91, 0x69, 0x3c, 0xdf, 0x5f, 0xdd, 0xb5, 0x98, 0xa6, 0x60,
- 0xbe, 0x8c, 0x7d, 0xa3, 0xd6, 0xae, 0xa2, 0x91, 0xb5, 0x3f, 0x60, 0x3f, 0x6c, 0x2b, 0x71, 0xec,
- 0xf0, 0x12, 0xef, 0xd8, 0xfd, 0xf1, 0x43, 0x77, 0x7f, 0x62, 0xe7, 0xee, 0xff, 0x11, 0x3c, 0xb1,
- 0xa9, 0xeb, 0x62, 0x9b, 0xb7, 0xd0, 0xda, 0xc2, 0x55, 0x0f, 0x59, 0xb8, 0xa5, 0x55, 0x94, 0xa5,
- 0x11, 0xb6, 0x40, 0x5e, 0x3e, 0x63, 0xb9, 0x0c, 0x52, 0x0f, 0x2d, 0x03, 0x39, 0xd0, 0x8b, 0x3d,
- 0xd0, 0x3a, 0xbb, 0x9e, 0x69, 0xca, 0xcd, 0x4c, 0x53, 0xfe, 0x9a, 0x69, 0xca, 0xed, 0x4c, 0x53,
- 0x7e, 0x99, 0x6b, 0xea, 0xd5, 0x5c, 0x53, 0xae, 0xe7, 0x9a, 0x7a, 0x33, 0xd7, 0xd4, 0xbf, 0xe7,
- 0x9a, 0xfa, 0xef, 0x5c, 0x53, 0x6e, 0xe7, 0x9a, 0xfa, 0xdb, 0x3f, 0x9a, 0xf2, 0xc3, 0x53, 0xf1,
- 0x64, 0x42, 0xa3, 0xbf, 0x05, 0xc6, 0xf6, 0xbf, 0x02, 0xfd, 0x14, 0xbf, 0xf9, 0xeb, 0xff, 0x02,
- 0x00, 0x00, 0xff, 0xff, 0x2d, 0xa8, 0x75, 0xef, 0xed, 0x08, 0x00, 0x00,
+ // 853 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xbd, 0x8f, 0xe2, 0x46,
+ 0x14, 0xb7, 0xf9, 0xba, 0x63, 0x08, 0x5f, 0xc3, 0x9d, 0xc4, 0x92, 0xc8, 0x42, 0x9c, 0x4e, 0x21,
+ 0x39, 0xc5, 0xce, 0x91, 0x26, 0xba, 0x22, 0x12, 0x70, 0xac, 0x0e, 0xe5, 0x3e, 0x88, 0x77, 0xaf,
+ 0x49, 0x0a, 0x6b, 0x30, 0x03, 0x8c, 0x70, 0x3c, 0x5e, 0x7b, 0xcc, 0x66, 0xbb, 0xfc, 0x05, 0x51,
+ 0x8a, 0xf4, 0x69, 0xf7, 0x4f, 0xd9, 0x72, 0xcb, 0x94, 0x81, 0x34, 0x29, 0xb7, 0x4f, 0x13, 0x79,
+ 0x66, 0x80, 0x85, 0x05, 0x56, 0x44, 0xb9, 0x8a, 0xf1, 0x7b, 0xbf, 0xf7, 0x66, 0xe6, 0xf7, 0xde,
+ 0xfb, 0x0d, 0xe0, 0xf3, 0x1f, 0xc9, 0x4f, 0xd8, 0x37, 0xa6, 0xcf, 0x0d, 0x9b, 0xba, 0x43, 0x32,
+ 0x32, 0x6c, 0x87, 0x60, 0x97, 0xc9, 0x1f, 0x4b, 0x18, 0x75, 0xcf, 0xa7, 0x8c, 0xc2, 0x4f, 0x48,
+ 0xc0, 0x08, 0xd5, 0x79, 0x84, 0x3e, 0x7d, 0xae, 0x4b, 0xa7, 0x80, 0x56, 0x1e, 0x8d, 0xe8, 0x88,
+ 0x72, 0xa0, 0x11, 0xad, 0x44, 0x4c, 0x45, 0x1b, 0x51, 0x3a, 0x72, 0xb0, 0xc1, 0xbf, 0xfa, 0xe1,
+ 0xd0, 0x18, 0x84, 0x3e, 0x62, 0x84, 0xba, 0xd2, 0x7f, 0xb4, 0xdc, 0x1f, 0x31, 0xe6, 0x93, 0x7e,
+ 0xc8, 0x70, 0x20, 0x5d, 0x4f, 0x77, 0x1c, 0x0d, 0x79, 0xc4, 0x0a, 0x3c, 0x6c, 0x4b, 0x58, 0x6d,
+ 0x07, 0xec, 0x2c, 0xa4, 0x0c, 0x09, 0x4c, 0xed, 0x37, 0x15, 0x14, 0xdf, 0x62, 0x76, 0x4e, 0xfd,
+ 0xc9, 0x31, 0x22, 0x4e, 0x8f, 0x3a, 0xc4, 0xbe, 0x80, 0x26, 0x48, 0x79, 0x7c, 0x55, 0x56, 0xab,
+ 0x6a, 0x3d, 0xd7, 0x78, 0xa1, 0xef, 0xbb, 0xa0, 0x7e, 0x27, 0x81, 0xbe, 0x5a, 0x9a, 0x32, 0x53,
+ 0xed, 0x19, 0x00, 0xb7, 0x76, 0xc8, 0x82, 0xf4, 0x71, 0xb3, 0xfb, 0xda, 0x7a, 0xd7, 0xeb, 0xbc,
+ 0x2d, 0x28, 0x30, 0x07, 0x00, 0xff, 0x6c, 0xbf, 0x7e, 0x77, 0xd2, 0x29, 0xa8, 0xb5, 0x7f, 0xe2,
+ 0x20, 0x7b, 0x82, 0xfd, 0x29, 0xb1, 0x71, 0x9b, 0x6f, 0x05, 0x75, 0x50, 0x1a, 0x90, 0x00, 0xf5,
+ 0x1d, 0x6c, 0xd9, 0x63, 0x6c, 0x4f, 0x2c, 0x1b, 0x39, 0x4e, 0xc0, 0xcf, 0xf7, 0xd0, 0x2c, 0x4a,
+ 0x57, 0x3b, 0xf2, 0xb4, 0x23, 0x07, 0xfc, 0x12, 0x3c, 0x5a, 0xe0, 0x7d, 0xec, 0x51, 0x9f, 0xc9,
+ 0x80, 0x18, 0x0f, 0x80, 0xd2, 0x67, 0x72, 0x97, 0x88, 0xe8, 0x80, 0x02, 0xbf, 0x9f, 0xb5, 0xe2,
+ 0xbb, 0x1c, 0xaf, 0xaa, 0xf5, 0x4c, 0xa3, 0xb2, 0x79, 0xfd, 0xe6, 0x12, 0x61, 0xe6, 0xb9, 0x71,
+ 0x65, 0x80, 0x6f, 0x40, 0x76, 0xcc, 0x98, 0x67, 0x2d, 0x8a, 0x51, 0x4e, 0x54, 0xe3, 0xf5, 0x4c,
+ 0xe3, 0xb3, 0xfd, 0x14, 0xbe, 0x3a, 0x3d, 0xed, 0x35, 0x7b, 0xdd, 0x13, 0x0f, 0xdb, 0x66, 0x26,
+ 0x8a, 0x6f, 0x7a, 0x24, 0xfa, 0x80, 0xc7, 0x00, 0xf0, 0x7a, 0x89, 0x5c, 0x49, 0x9e, 0xeb, 0xd3,
+ 0xfd, 0xb9, 0xbe, 0x8b, 0xf0, 0x3c, 0x53, 0xfa, 0x6c, 0xb1, 0x84, 0x16, 0x28, 0xb9, 0xa2, 0x4c,
+ 0xd6, 0x10, 0x11, 0xc7, 0x92, 0xf5, 0x7d, 0xc0, 0x2f, 0x68, 0x1c, 0x58, 0x5f, 0xb3, 0xe8, 0xde,
+ 0xe9, 0x99, 0x2e, 0x80, 0x43, 0xea, 0x9f, 0x23, 0x7f, 0x70, 0x9b, 0xc0, 0x87, 0xf7, 0x12, 0x58,
+ 0x94, 0x51, 0x2b, 0x53, 0xed, 0xf7, 0x38, 0xc8, 0x9f, 0xfa, 0xc8, 0x0d, 0x78, 0x71, 0x76, 0xd6,
+ 0xdf, 0x1e, 0xe3, 0xed, 0xf5, 0xb7, 0xc7, 0xf8, 0x36, 0x5e, 0xf0, 0x27, 0xf0, 0xb1, 0x35, 0x3c,
+ 0x67, 0x4a, 0xe0, 0xef, 0xf6, 0x4b, 0x1f, 0x31, 0x7b, 0xcc, 0x3b, 0x60, 0xb3, 0x5f, 0x5a, 0x91,
+ 0x67, 0x17, 0xa3, 0x89, 0xff, 0x8d, 0xd1, 0x37, 0xe0, 0x71, 0xc0, 0x10, 0x0b, 0xac, 0xd0, 0x1b,
+ 0x20, 0x86, 0x2d, 0xe2, 0x32, 0xec, 0x4f, 0x91, 0x53, 0x4e, 0xf2, 0x2d, 0x8e, 0x74, 0xa1, 0x20,
+ 0xfa, 0x42, 0x41, 0xf4, 0x97, 0x52, 0x41, 0xcc, 0x12, 0x8f, 0x7b, 0xcf, 0xc3, 0xba, 0x32, 0x0a,
+ 0x3e, 0x01, 0x59, 0xc9, 0x9c, 0x13, 0x06, 0x0c, 0xfb, 0xe5, 0x54, 0x55, 0xad, 0xa7, 0xcd, 0x8f,
+ 0xb8, 0xb1, 0x2d, 0x6c, 0xf0, 0x29, 0xc8, 0x2d, 0xc6, 0x45, 0xa2, 0x1e, 0x70, 0x54, 0x56, 0x58,
+ 0x25, 0xac, 0xf6, 0x4b, 0x02, 0x14, 0x5e, 0x31, 0xe6, 0xb5, 0xf9, 0x75, 0x64, 0x89, 0xbe, 0x05,
+ 0x69, 0xb6, 0xa8, 0x1a, 0x2f, 0x4c, 0xa6, 0xf1, 0xc5, 0x7e, 0x1a, 0x36, 0x8a, 0x6c, 0xae, 0xe2,
+ 0xe1, 0x04, 0xe4, 0x03, 0x21, 0x00, 0x52, 0x6a, 0xa3, 0xd1, 0x8d, 0x9a, 0xbf, 0x75, 0xcf, 0x20,
+ 0x6d, 0x9c, 0x4a, 0x5f, 0x93, 0x91, 0xa0, 0xe3, 0x32, 0xff, 0xc2, 0xcc, 0x05, 0x6b, 0x46, 0xf8,
+ 0x0d, 0xf8, 0x78, 0x80, 0x87, 0x28, 0x74, 0x98, 0x35, 0xc0, 0x01, 0x23, 0x2e, 0xa7, 0xd1, 0x92,
+ 0x28, 0xde, 0x03, 0x69, 0xf3, 0x48, 0x42, 0x5e, 0xae, 0x10, 0x32, 0xf7, 0x56, 0xe9, 0x48, 0x1c,
+ 0x2e, 0x1d, 0xdb, 0x47, 0x28, 0xf9, 0x1f, 0x46, 0xa8, 0xe2, 0x82, 0xd2, 0x96, 0x8b, 0xc3, 0x02,
+ 0x88, 0x4f, 0xb0, 0x50, 0xf5, 0xb4, 0x19, 0x2d, 0x61, 0x13, 0x24, 0xa7, 0xc8, 0x09, 0xc5, 0x64,
+ 0x64, 0x1a, 0xcf, 0xf6, 0xb3, 0xbb, 0x96, 0xd3, 0x14, 0x91, 0x2f, 0x62, 0x5f, 0xab, 0xb5, 0xcb,
+ 0x68, 0x64, 0xed, 0x0f, 0xd8, 0x0f, 0xdb, 0x28, 0x8e, 0x1d, 0x4e, 0xf1, 0x8e, 0x67, 0x24, 0x7e,
+ 0xe8, 0x33, 0x92, 0xd8, 0xf9, 0x8c, 0xfc, 0x00, 0x1e, 0xdb, 0xd4, 0x75, 0xb1, 0xcd, 0x5b, 0x68,
+ 0x4d, 0xbb, 0xd5, 0x43, 0xb4, 0xbb, 0xb4, 0xca, 0xb2, 0x34, 0xc2, 0x16, 0xc8, 0xcb, 0x63, 0x2c,
+ 0xc5, 0x20, 0x75, 0x9f, 0x18, 0xc8, 0x81, 0x5e, 0xe8, 0x40, 0xeb, 0xfd, 0xd5, 0x4c, 0x53, 0xae,
+ 0x67, 0x9a, 0xf2, 0xc7, 0x4c, 0x53, 0x6e, 0x66, 0x9a, 0xf2, 0xf3, 0x5c, 0x53, 0x2f, 0xe7, 0x9a,
+ 0x72, 0x35, 0xd7, 0xd4, 0xeb, 0xb9, 0xa6, 0xfe, 0x39, 0xd7, 0xd4, 0xbf, 0xe7, 0x9a, 0x72, 0x33,
+ 0xd7, 0xd4, 0x5f, 0xff, 0xd2, 0x94, 0xef, 0x9f, 0x88, 0x23, 0x13, 0x1a, 0xfd, 0xc3, 0x30, 0xb6,
+ 0xff, 0xab, 0xe8, 0xa7, 0xf8, 0xce, 0x5f, 0xfd, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x2c, 0xf7, 0x6c,
+ 0x81, 0x38, 0x09, 0x00, 0x00,
}
diff --git a/mixer/v1/config/client/client_config.proto b/mixer/v1/config/client/client_config.proto
index f7f80a0db4..2371e72624 100644
--- a/mixer/v1/config/client/client_config.proto
+++ b/mixer/v1/config/client/client_config.proto
@@ -60,6 +60,8 @@ message ServiceConfig {
// Send these attributes to Mixer in both Check and Report. This
// typically includes the "destination.service" attribute.
+ // In case of a per-route override, per-route attributes take precedence
+ // over the attributes supplied in the client configuration.
Attributes mixer_attributes = 3;
// HTTP API specifications to generate API attributes.
@@ -73,6 +75,20 @@ message ServiceConfig {
// [mesh-level
// policy][istio.mixer.v1.config.client.TransportConfig.network_fail_policy].
NetworkFailPolicy network_fail_policy = 7;
+
+ // Default attributes to forward to upstream. This typically
+ // includes the "source.ip" and "source.uid" attributes.
+ // In case of a per-route override, per-route attributes take precedence
+ // over the attributes supplied in the client configuration.
+ //
+ // Forwarded attributes take precedence over the static Mixer attributes.
+ // The full order of application is as follows:
+ // 1. static Mixer attributes from the filter config;
+ // 2. static Mixer attributes from the route config;
+ // 3. forwarded attributes from the source filter config (if any);
+ // 4. forwarded attributes from the source route config (if any);
+ // 5. derived attributes from the request metadata.
+ Attributes forward_attributes = 8;
}
// Defines the transport config on how to call Mixer.
diff --git a/mixer/v1/config/client/istio.mixer.v1.config.client.pb.html b/mixer/v1/config/client/istio.mixer.v1.config.client.pb.html
index 8bde2cee23..892f086818 100644
--- a/mixer/v1/config/client/istio.mixer.v1.config.client.pb.html
+++ b/mixer/v1/config/client/istio.mixer.v1.config.client.pb.html
@@ -735,7 +735,9 @@ ServiceConfig
istio.mixer.v1.Attributes |
Send these attributes to Mixer in both Check and Report. This
-typically includes the “destination.service” attribute.
+typically includes the “destination.service” attribute.
+In case of a per-route override, per-route attributes take precedence
+over the attributes supplied in the client configuration.
|
@@ -764,6 +766,25 @@ ServiceConfig
[mesh-level
policy][istio.mixer.v1.config.client.TransportConfig.networkfailpolicy].
+
+
+
+forwardAttributes |
+istio.mixer.v1.Attributes |
+
+ Default attributes to forward to upstream. This typically
+includes the “source.ip” and “source.uid” attributes.
+In case of a per-route override, per-route attributes take precedence
+over the attributes supplied in the client configuration.
+
+Forwarded attributes take precedence over the static Mixer attributes.
+The full order of application is as follows:
+1. static Mixer attributes from the filter config;
+2. static Mixer attributes from the route config;
+3. forwarded attributes from the source filter config (if any);
+4. forwarded attributes from the source route config (if any);
+5. derived attributes from the request metadata.
+
|
diff --git a/python/istio_api/mixer/v1/config/client/client_config_pb2.py b/python/istio_api/mixer/v1/config/client/client_config_pb2.py
index ab4ead5a7d..90e218de37 100644
--- a/python/istio_api/mixer/v1/config/client/client_config_pb2.py
+++ b/python/istio_api/mixer/v1/config/client/client_config_pb2.py
@@ -24,7 +24,7 @@
name='mixer/v1/config/client/client_config.proto',
package='istio.mixer.v1.config.client',
syntax='proto3',
- serialized_pb=_b('\n*mixer/v1/config/client/client_config.proto\x12\x1cistio.mixer.v1.config.client\x1a\x14gogoproto/gogo.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x19mixer/v1/attributes.proto\x1a%mixer/v1/config/client/api_spec.proto\x1a\"mixer/v1/config/client/quota.proto\"\x8c\x01\n\x11NetworkFailPolicy\x12J\n\x06policy\x18\x01 \x01(\x0e\x32:.istio.mixer.v1.config.client.NetworkFailPolicy.FailPolicy\"+\n\nFailPolicy\x12\r\n\tFAIL_OPEN\x10\x00\x12\x0e\n\nFAIL_CLOSE\x10\x01\"\xcd\x02\n\rServiceConfig\x12\x1b\n\x13\x64isable_check_calls\x18\x01 \x01(\x08\x12\x1c\n\x14\x64isable_report_calls\x18\x02 \x01(\x08\x12\x34\n\x10mixer_attributes\x18\x03 \x01(\x0b\x32\x1a.istio.mixer.v1.Attributes\x12@\n\rhttp_api_spec\x18\x04 \x03(\x0b\x32).istio.mixer.v1.config.client.HTTPAPISpec\x12;\n\nquota_spec\x18\x05 \x03(\x0b\x32\'.istio.mixer.v1.config.client.QuotaSpec\x12L\n\x13network_fail_policy\x18\x07 \x01(\x0b\x32/.istio.mixer.v1.config.client.NetworkFailPolicy\"\xa0\x02\n\x0fTransportConfig\x12\x1b\n\x13\x64isable_check_cache\x18\x01 \x01(\x08\x12\x1b\n\x13\x64isable_quota_cache\x18\x02 \x01(\x08\x12\x1c\n\x14\x64isable_report_batch\x18\x03 \x01(\x08\x12L\n\x13network_fail_policy\x18\x04 \x01(\x0b\x32/.istio.mixer.v1.config.client.NetworkFailPolicy\x12\x38\n\x15stats_update_interval\x18\x05 \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x15\n\rcheck_cluster\x18\x06 \x01(\t\x12\x16\n\x0ereport_cluster\x18\x07 \x01(\t\"\xa8\x03\n\x10HttpClientConfig\x12@\n\ttransport\x18\x01 \x01(\x0b\x32-.istio.mixer.v1.config.client.TransportConfig\x12[\n\x0fservice_configs\x18\x02 \x03(\x0b\x32\x42.istio.mixer.v1.config.client.HttpClientConfig.ServiceConfigsEntry\x12#\n\x1b\x64\x65\x66\x61ult_destination_service\x18\x03 \x01(\t\x12\x34\n\x10mixer_attributes\x18\x04 \x01(\x0b\x32\x1a.istio.mixer.v1.Attributes\x12\x36\n\x12\x66orward_attributes\x18\x05 \x01(\x0b\x32\x1a.istio.mixer.v1.Attributes\x1a\x62\n\x13ServiceConfigsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12:\n\x05value\x18\x02 \x01(\x0b\x32+.istio.mixer.v1.config.client.ServiceConfig:\x02\x38\x01\"\xc0\x02\n\x0fTcpClientConfig\x12@\n\ttransport\x18\x01 \x01(\x0b\x32-.istio.mixer.v1.config.client.TransportConfig\x12\x34\n\x10mixer_attributes\x18\x02 \x01(\x0b\x32\x1a.istio.mixer.v1.Attributes\x12\x1b\n\x13\x64isable_check_calls\x18\x03 \x01(\x08\x12\x1c\n\x14\x64isable_report_calls\x18\x04 \x01(\x08\x12\x46\n\x15\x63onnection_quota_spec\x18\x05 \x01(\x0b\x32\'.istio.mixer.v1.config.client.QuotaSpec\x12\x32\n\x0freport_interval\x18\x06 \x01(\x0b\x32\x19.google.protobuf.DurationB1Z#istio.io/api/mixer/v1/config/client\xc8\xe1\x1e\x00\xa8\xe2\x1e\x00\xf0\xe1\x1e\x00\x62\x06proto3')
+ serialized_pb=_b('\n*mixer/v1/config/client/client_config.proto\x12\x1cistio.mixer.v1.config.client\x1a\x14gogoproto/gogo.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x19mixer/v1/attributes.proto\x1a%mixer/v1/config/client/api_spec.proto\x1a\"mixer/v1/config/client/quota.proto\"\x8c\x01\n\x11NetworkFailPolicy\x12J\n\x06policy\x18\x01 \x01(\x0e\x32:.istio.mixer.v1.config.client.NetworkFailPolicy.FailPolicy\"+\n\nFailPolicy\x12\r\n\tFAIL_OPEN\x10\x00\x12\x0e\n\nFAIL_CLOSE\x10\x01\"\x85\x03\n\rServiceConfig\x12\x1b\n\x13\x64isable_check_calls\x18\x01 \x01(\x08\x12\x1c\n\x14\x64isable_report_calls\x18\x02 \x01(\x08\x12\x34\n\x10mixer_attributes\x18\x03 \x01(\x0b\x32\x1a.istio.mixer.v1.Attributes\x12@\n\rhttp_api_spec\x18\x04 \x03(\x0b\x32).istio.mixer.v1.config.client.HTTPAPISpec\x12;\n\nquota_spec\x18\x05 \x03(\x0b\x32\'.istio.mixer.v1.config.client.QuotaSpec\x12L\n\x13network_fail_policy\x18\x07 \x01(\x0b\x32/.istio.mixer.v1.config.client.NetworkFailPolicy\x12\x36\n\x12\x66orward_attributes\x18\x08 \x01(\x0b\x32\x1a.istio.mixer.v1.Attributes\"\xa0\x02\n\x0fTransportConfig\x12\x1b\n\x13\x64isable_check_cache\x18\x01 \x01(\x08\x12\x1b\n\x13\x64isable_quota_cache\x18\x02 \x01(\x08\x12\x1c\n\x14\x64isable_report_batch\x18\x03 \x01(\x08\x12L\n\x13network_fail_policy\x18\x04 \x01(\x0b\x32/.istio.mixer.v1.config.client.NetworkFailPolicy\x12\x38\n\x15stats_update_interval\x18\x05 \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x15\n\rcheck_cluster\x18\x06 \x01(\t\x12\x16\n\x0ereport_cluster\x18\x07 \x01(\t\"\xa8\x03\n\x10HttpClientConfig\x12@\n\ttransport\x18\x01 \x01(\x0b\x32-.istio.mixer.v1.config.client.TransportConfig\x12[\n\x0fservice_configs\x18\x02 \x03(\x0b\x32\x42.istio.mixer.v1.config.client.HttpClientConfig.ServiceConfigsEntry\x12#\n\x1b\x64\x65\x66\x61ult_destination_service\x18\x03 \x01(\t\x12\x34\n\x10mixer_attributes\x18\x04 \x01(\x0b\x32\x1a.istio.mixer.v1.Attributes\x12\x36\n\x12\x66orward_attributes\x18\x05 \x01(\x0b\x32\x1a.istio.mixer.v1.Attributes\x1a\x62\n\x13ServiceConfigsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12:\n\x05value\x18\x02 \x01(\x0b\x32+.istio.mixer.v1.config.client.ServiceConfig:\x02\x38\x01\"\xc0\x02\n\x0fTcpClientConfig\x12@\n\ttransport\x18\x01 \x01(\x0b\x32-.istio.mixer.v1.config.client.TransportConfig\x12\x34\n\x10mixer_attributes\x18\x02 \x01(\x0b\x32\x1a.istio.mixer.v1.Attributes\x12\x1b\n\x13\x64isable_check_calls\x18\x03 \x01(\x08\x12\x1c\n\x14\x64isable_report_calls\x18\x04 \x01(\x08\x12\x46\n\x15\x63onnection_quota_spec\x18\x05 \x01(\x0b\x32\'.istio.mixer.v1.config.client.QuotaSpec\x12\x32\n\x0freport_interval\x18\x06 \x01(\x0b\x32\x19.google.protobuf.DurationB1Z#istio.io/api/mixer/v1/config/client\xc8\xe1\x1e\x00\xa8\xe2\x1e\x00\xf0\xe1\x1e\x00\x62\x06proto3')
,
dependencies=[gogoproto_dot_gogo__pb2.DESCRIPTOR,google_dot_protobuf_dot_duration__pb2.DESCRIPTOR,mixer_dot_v1_dot_attributes__pb2.DESCRIPTOR,mixer_dot_v1_dot_config_dot_client_dot_api__spec__pb2.DESCRIPTOR,mixer_dot_v1_dot_config_dot_client_dot_quota__pb2.DESCRIPTOR,])
@@ -134,6 +134,13 @@
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
options=None, file=DESCRIPTOR),
+ _descriptor.FieldDescriptor(
+ name='forward_attributes', full_name='istio.mixer.v1.config.client.ServiceConfig.forward_attributes', index=6,
+ number=8, type=11, cpp_type=10, label=1,
+ has_default_value=False, default_value=None,
+ message_type=None, enum_type=None, containing_type=None,
+ is_extension=False, extension_scope=None,
+ options=None, file=DESCRIPTOR),
],
extensions=[
],
@@ -147,7 +154,7 @@
oneofs=[
],
serialized_start=376,
- serialized_end=709,
+ serialized_end=765,
)
@@ -219,8 +226,8 @@
extension_ranges=[],
oneofs=[
],
- serialized_start=712,
- serialized_end=1000,
+ serialized_start=768,
+ serialized_end=1056,
)
@@ -257,8 +264,8 @@
extension_ranges=[],
oneofs=[
],
- serialized_start=1329,
- serialized_end=1427,
+ serialized_start=1385,
+ serialized_end=1483,
)
_HTTPCLIENTCONFIG = _descriptor.Descriptor(
@@ -315,8 +322,8 @@
extension_ranges=[],
oneofs=[
],
- serialized_start=1003,
- serialized_end=1427,
+ serialized_start=1059,
+ serialized_end=1483,
)
@@ -381,8 +388,8 @@
extension_ranges=[],
oneofs=[
],
- serialized_start=1430,
- serialized_end=1750,
+ serialized_start=1486,
+ serialized_end=1806,
)
_NETWORKFAILPOLICY.fields_by_name['policy'].enum_type = _NETWORKFAILPOLICY_FAILPOLICY
@@ -391,6 +398,7 @@
_SERVICECONFIG.fields_by_name['http_api_spec'].message_type = mixer_dot_v1_dot_config_dot_client_dot_api__spec__pb2._HTTPAPISPEC
_SERVICECONFIG.fields_by_name['quota_spec'].message_type = mixer_dot_v1_dot_config_dot_client_dot_quota__pb2._QUOTASPEC
_SERVICECONFIG.fields_by_name['network_fail_policy'].message_type = _NETWORKFAILPOLICY
+_SERVICECONFIG.fields_by_name['forward_attributes'].message_type = mixer_dot_v1_dot_attributes__pb2._ATTRIBUTES
_TRANSPORTCONFIG.fields_by_name['network_fail_policy'].message_type = _NETWORKFAILPOLICY
_TRANSPORTCONFIG.fields_by_name['stats_update_interval'].message_type = google_dot_protobuf_dot_duration__pb2._DURATION
_HTTPCLIENTCONFIG_SERVICECONFIGSENTRY.fields_by_name['value'].message_type = _SERVICECONFIG