diff --git a/pb/edge_client_pb/edge_client.pb.go b/pb/edge_client_pb/edge_client.pb.go index 8b76b5d8..3972fd6a 100644 --- a/pb/edge_client_pb/edge_client.pb.go +++ b/pb/edge_client_pb/edge_client.pb.go @@ -202,6 +202,7 @@ const ( HeaderId_XgressAddress HeaderId = 1030 HeaderId_InspectRequestedValues HeaderId = 1031 HeaderId_SupportsPostureChecks HeaderId = 1032 + HeaderId_StructuredError HeaderId = 1033 ) // Enum value maps for HeaderId. @@ -242,6 +243,7 @@ var ( 1030: "XgressAddress", 1031: "InspectRequestedValues", 1032: "SupportsPostureChecks", + 1033: "StructuredError", } HeaderId_value = map[string]int32{ "ZER0": 0, @@ -279,6 +281,7 @@ var ( "XgressAddress": 1030, "InspectRequestedValues": 1031, "SupportsPostureChecks": 1032, + "StructuredError": 1033, } ) @@ -324,6 +327,7 @@ const ( Error_InvalidPrecedence Error = 9 Error_InvalidCost Error = 10 Error_EncryptionDataMissing Error = 11 + Error_InvalidApiSessionType Error = 12 ) // Enum value maps for Error. @@ -341,6 +345,7 @@ var ( 9: "InvalidPrecedence", 10: "InvalidCost", 11: "EncryptionDataMissing", + 12: "InvalidApiSessionType", } Error_value = map[string]int32{ "OK": 0, @@ -355,6 +360,7 @@ var ( "InvalidPrecedence": 9, "InvalidCost": 10, "EncryptionDataMissing": 11, + "InvalidApiSessionType": 12, } ) @@ -1937,7 +1943,7 @@ var file_edge_client_proto_rawDesc = []byte{ 0x65, 0x73, 0x74, 0x54, 0x79, 0x70, 0x65, 0x10, 0xe1, 0xcb, 0x06, 0x12, 0x25, 0x0a, 0x1f, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x6f, 0x73, 0x74, 0x75, 0x72, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x54, 0x79, 0x70, 0x65, 0x10, 0xe2, - 0xcb, 0x06, 0x2a, 0x9d, 0x05, 0x0a, 0x08, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x49, 0x64, 0x12, + 0xcb, 0x06, 0x2a, 0xb3, 0x05, 0x0a, 0x08, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x49, 0x64, 0x12, 0x08, 0x0a, 0x04, 0x5a, 0x45, 0x52, 0x30, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x04, 0x55, 0x55, 0x49, 0x44, 0x10, 0x80, 0x01, 0x12, 0x0b, 0x0a, 0x06, 0x43, 0x6f, 0x6e, 0x6e, 0x49, 0x64, 0x10, 0xe8, 0x07, 0x12, 0x08, 0x0a, 0x03, 0x53, 0x65, 0x71, 0x10, 0xe9, 0x07, 0x12, 0x11, 0x0a, 0x0c, 0x53, @@ -1979,38 +1985,41 @@ var file_edge_client_proto_rawDesc = []byte{ 0x70, 0x65, 0x63, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x65, 0x64, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x10, 0x87, 0x08, 0x12, 0x1a, 0x0a, 0x15, 0x53, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x50, 0x6f, 0x73, 0x74, 0x75, 0x72, 0x65, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x10, - 0x88, 0x08, 0x2a, 0x86, 0x02, 0x0a, 0x05, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x06, 0x0a, 0x02, - 0x4f, 0x4b, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, - 0x10, 0x01, 0x12, 0x15, 0x0a, 0x11, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x41, 0x70, 0x69, - 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x10, 0x02, 0x12, 0x12, 0x0a, 0x0e, 0x49, 0x6e, 0x76, - 0x61, 0x6c, 0x69, 0x64, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x10, 0x03, 0x12, 0x14, 0x0a, - 0x10, 0x57, 0x72, 0x6f, 0x6e, 0x67, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, - 0x65, 0x10, 0x04, 0x12, 0x1f, 0x0a, 0x1b, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x45, 0x64, - 0x67, 0x65, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x46, 0x6f, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, - 0x6f, 0x6e, 0x10, 0x05, 0x12, 0x12, 0x0a, 0x0e, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x53, - 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x10, 0x06, 0x12, 0x17, 0x0a, 0x13, 0x54, 0x75, 0x6e, 0x6e, - 0x65, 0x6c, 0x69, 0x6e, 0x67, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x10, - 0x07, 0x12, 0x15, 0x0a, 0x11, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x54, 0x65, 0x72, 0x6d, - 0x69, 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x10, 0x08, 0x12, 0x15, 0x0a, 0x11, 0x49, 0x6e, 0x76, 0x61, - 0x6c, 0x69, 0x64, 0x50, 0x72, 0x65, 0x63, 0x65, 0x64, 0x65, 0x6e, 0x63, 0x65, 0x10, 0x09, 0x12, - 0x0f, 0x0a, 0x0b, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x43, 0x6f, 0x73, 0x74, 0x10, 0x0a, - 0x12, 0x19, 0x0a, 0x15, 0x45, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x61, - 0x74, 0x61, 0x4d, 0x69, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x10, 0x0b, 0x2a, 0x38, 0x0a, 0x0f, 0x50, - 0x72, 0x65, 0x63, 0x65, 0x64, 0x65, 0x6e, 0x63, 0x65, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x0b, - 0x0a, 0x07, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x52, - 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x10, 0x01, 0x12, 0x0a, 0x0a, 0x06, 0x46, 0x61, 0x69, - 0x6c, 0x65, 0x64, 0x10, 0x02, 0x2a, 0x57, 0x0a, 0x04, 0x46, 0x6c, 0x61, 0x67, 0x12, 0x08, 0x0a, - 0x04, 0x5a, 0x45, 0x52, 0x4f, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x46, 0x49, 0x4e, 0x10, 0x01, - 0x12, 0x0e, 0x0a, 0x0a, 0x54, 0x52, 0x41, 0x43, 0x45, 0x5f, 0x55, 0x55, 0x49, 0x44, 0x10, 0x02, - 0x12, 0x0d, 0x0a, 0x09, 0x4d, 0x55, 0x4c, 0x54, 0x49, 0x50, 0x41, 0x52, 0x54, 0x10, 0x04, 0x12, - 0x0a, 0x0a, 0x06, 0x53, 0x54, 0x52, 0x45, 0x41, 0x4d, 0x10, 0x08, 0x12, 0x11, 0x0a, 0x0d, 0x4d, - 0x55, 0x4c, 0x54, 0x49, 0x50, 0x41, 0x52, 0x54, 0x5f, 0x4d, 0x53, 0x47, 0x10, 0x10, 0x42, 0x4b, - 0x0a, 0x17, 0x6f, 0x72, 0x67, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x7a, 0x69, 0x74, 0x69, 0x2e, 0x65, - 0x64, 0x67, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x5a, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, - 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x70, 0x65, 0x6e, 0x7a, 0x69, 0x74, 0x69, 0x2f, 0x73, - 0x64, 0x6b, 0x2d, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2f, 0x70, 0x62, 0x2f, 0x65, 0x64, 0x67, - 0x65, 0x5f, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, + 0x88, 0x08, 0x12, 0x14, 0x0a, 0x0f, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x75, 0x72, 0x65, 0x64, + 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0x89, 0x08, 0x2a, 0xa1, 0x02, 0x0a, 0x05, 0x45, 0x72, 0x72, + 0x6f, 0x72, 0x12, 0x06, 0x0a, 0x02, 0x4f, 0x4b, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x49, 0x6e, + 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x10, 0x01, 0x12, 0x15, 0x0a, 0x11, 0x49, 0x6e, 0x76, 0x61, + 0x6c, 0x69, 0x64, 0x41, 0x70, 0x69, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x10, 0x02, 0x12, + 0x12, 0x0a, 0x0e, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, + 0x6e, 0x10, 0x03, 0x12, 0x14, 0x0a, 0x10, 0x57, 0x72, 0x6f, 0x6e, 0x67, 0x53, 0x65, 0x73, 0x73, + 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x10, 0x04, 0x12, 0x1f, 0x0a, 0x1b, 0x49, 0x6e, 0x76, + 0x61, 0x6c, 0x69, 0x64, 0x45, 0x64, 0x67, 0x65, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x46, 0x6f, + 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x10, 0x05, 0x12, 0x12, 0x0a, 0x0e, 0x49, 0x6e, + 0x76, 0x61, 0x6c, 0x69, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x10, 0x06, 0x12, 0x17, + 0x0a, 0x13, 0x54, 0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x69, 0x6e, 0x67, 0x4e, 0x6f, 0x74, 0x45, 0x6e, + 0x61, 0x62, 0x6c, 0x65, 0x64, 0x10, 0x07, 0x12, 0x15, 0x0a, 0x11, 0x49, 0x6e, 0x76, 0x61, 0x6c, + 0x69, 0x64, 0x54, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x10, 0x08, 0x12, 0x15, + 0x0a, 0x11, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x50, 0x72, 0x65, 0x63, 0x65, 0x64, 0x65, + 0x6e, 0x63, 0x65, 0x10, 0x09, 0x12, 0x0f, 0x0a, 0x0b, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, + 0x43, 0x6f, 0x73, 0x74, 0x10, 0x0a, 0x12, 0x19, 0x0a, 0x15, 0x45, 0x6e, 0x63, 0x72, 0x79, 0x70, + 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x61, 0x74, 0x61, 0x4d, 0x69, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x10, + 0x0b, 0x12, 0x19, 0x0a, 0x15, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x41, 0x70, 0x69, 0x53, + 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x10, 0x0c, 0x2a, 0x38, 0x0a, 0x0f, + 0x50, 0x72, 0x65, 0x63, 0x65, 0x64, 0x65, 0x6e, 0x63, 0x65, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, + 0x0b, 0x0a, 0x07, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, + 0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x10, 0x01, 0x12, 0x0a, 0x0a, 0x06, 0x46, 0x61, + 0x69, 0x6c, 0x65, 0x64, 0x10, 0x02, 0x2a, 0x57, 0x0a, 0x04, 0x46, 0x6c, 0x61, 0x67, 0x12, 0x08, + 0x0a, 0x04, 0x5a, 0x45, 0x52, 0x4f, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x46, 0x49, 0x4e, 0x10, + 0x01, 0x12, 0x0e, 0x0a, 0x0a, 0x54, 0x52, 0x41, 0x43, 0x45, 0x5f, 0x55, 0x55, 0x49, 0x44, 0x10, + 0x02, 0x12, 0x0d, 0x0a, 0x09, 0x4d, 0x55, 0x4c, 0x54, 0x49, 0x50, 0x41, 0x52, 0x54, 0x10, 0x04, + 0x12, 0x0a, 0x0a, 0x06, 0x53, 0x54, 0x52, 0x45, 0x41, 0x4d, 0x10, 0x08, 0x12, 0x11, 0x0a, 0x0d, + 0x4d, 0x55, 0x4c, 0x54, 0x49, 0x50, 0x41, 0x52, 0x54, 0x5f, 0x4d, 0x53, 0x47, 0x10, 0x10, 0x42, + 0x4b, 0x0a, 0x17, 0x6f, 0x72, 0x67, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x7a, 0x69, 0x74, 0x69, 0x2e, + 0x65, 0x64, 0x67, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x5a, 0x30, 0x67, 0x69, 0x74, 0x68, + 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x70, 0x65, 0x6e, 0x7a, 0x69, 0x74, 0x69, 0x2f, + 0x73, 0x64, 0x6b, 0x2d, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2f, 0x70, 0x62, 0x2f, 0x65, 0x64, + 0x67, 0x65, 0x5f, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pb/edge_client_pb/edge_client.proto b/pb/edge_client_pb/edge_client.proto index a818ec2e..adb2ada5 100644 --- a/pb/edge_client_pb/edge_client.proto +++ b/pb/edge_client_pb/edge_client.proto @@ -85,6 +85,7 @@ enum HeaderId { XgressAddress = 1030; InspectRequestedValues = 1031; SupportsPostureChecks = 1032; + StructuredError = 1033; } enum Error { @@ -100,6 +101,7 @@ enum Error { InvalidPrecedence = 9; InvalidCost = 10; EncryptionDataMissing = 11; + InvalidApiSessionType = 12; } enum PrecedenceValue { diff --git a/ziti/edge/messages.go b/ziti/edge/messages.go index d836ced3..5f4d15b3 100644 --- a/ziti/edge/messages.go +++ b/ziti/edge/messages.go @@ -112,20 +112,22 @@ const ( XgressAddressHeader = int32(edge_client_pb.HeaderId_XgressAddress) InspectRequestValuesHeader = int32(edge_client_pb.HeaderId_InspectRequestedValues) SupportsPostureChecksHeader = int32(edge_client_pb.HeaderId_SupportsPostureChecks) + StructuredError = int32(edge_client_pb.HeaderId_StructuredError) ) const ( - ErrorCodeInternal = int32(edge_client_pb.Error_Internal) - ErrorCodeInvalidApiSession = int32(edge_client_pb.Error_InvalidApiSession) - ErrorCodeInvalidSession = int32(edge_client_pb.Error_InvalidSession) - ErrorCodeWrongSessionType = int32(edge_client_pb.Error_WrongSessionType) - ErrorCodeInvalidEdgeRouterForSession = int32(edge_client_pb.Error_InvalidEdgeRouterForSession) - ErrorCodeInvalidService = int32(edge_client_pb.Error_InvalidService) - ErrorCodeTunnelingNotEnabled = int32(edge_client_pb.Error_TunnelingNotEnabled) - ErrorCodeInvalidTerminator = int32(edge_client_pb.Error_InvalidTerminator) - ErrorCodeInvalidPrecedence = int32(edge_client_pb.Error_InvalidPrecedence) - ErrorCodeInvalidCost = int32(edge_client_pb.Error_InvalidCost) - ErrorCodeEncryptionDataMissing = int32(edge_client_pb.Error_EncryptionDataMissing) + ErrorCodeInternal = uint32(edge_client_pb.Error_Internal) + ErrorCodeInvalidApiSession = uint32(edge_client_pb.Error_InvalidApiSession) + ErrorCodeInvalidSession = uint32(edge_client_pb.Error_InvalidSession) + ErrorCodeWrongSessionType = uint32(edge_client_pb.Error_WrongSessionType) + ErrorCodeInvalidEdgeRouterForSession = uint32(edge_client_pb.Error_InvalidEdgeRouterForSession) + ErrorCodeInvalidService = uint32(edge_client_pb.Error_InvalidService) + ErrorCodeTunnelingNotEnabled = uint32(edge_client_pb.Error_TunnelingNotEnabled) + ErrorCodeInvalidTerminator = uint32(edge_client_pb.Error_InvalidTerminator) + ErrorCodeInvalidPrecedence = uint32(edge_client_pb.Error_InvalidPrecedence) + ErrorCodeInvalidCost = uint32(edge_client_pb.Error_InvalidCost) + ErrorCodeEncryptionDataMissing = uint32(edge_client_pb.Error_EncryptionDataMissing) + ErrorCodeInvalidApiSessionType = uint32(edge_client_pb.Error_InvalidApiSessionType) ) const ( diff --git a/ziti/sdkinfo/build_info.go b/ziti/sdkinfo/build_info.go index f5373663..d96606d5 100644 --- a/ziti/sdkinfo/build_info.go +++ b/ziti/sdkinfo/build_info.go @@ -20,5 +20,5 @@ package sdkinfo const ( - Version = "v1.3.0" + Version = "v1.3.1" )