diff --git a/api/metric.swagger.json b/api/metric.swagger.json index 20d6fa3..3f2cd1a 100644 --- a/api/metric.swagger.json +++ b/api/metric.swagger.json @@ -11,5 +11,39 @@ "application/json" ], "paths": {}, - "definitions": {} + "definitions": { + "protobufAny": { + "type": "object", + "properties": { + "type_url": { + "type": "string" + }, + "value": { + "type": "string", + "format": "byte" + } + } + }, + "runtimeError": { + "type": "object", + "properties": { + "error": { + "type": "string" + }, + "code": { + "type": "integer", + "format": "int32" + }, + "message": { + "type": "string" + }, + "details": { + "type": "array", + "items": { + "$ref": "#/definitions/protobufAny" + } + } + } + } + } } diff --git a/api/namespace.pb.go b/api/namespace.pb.go index 1b114ff..52b8e42 100644 --- a/api/namespace.pb.go +++ b/api/namespace.pb.go @@ -140,11 +140,11 @@ var fileDescriptor_ecb1e126f615f5dd = []byte{ // Reference imports to suppress errors if they are not otherwise used. var _ context.Context -var _ grpc.ClientConn +var _ grpc.ClientConnInterface // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -const _ = grpc.SupportPackageIsVersion4 +const _ = grpc.SupportPackageIsVersion6 // NamespaceServiceClient is the client API for NamespaceService service. // @@ -154,10 +154,10 @@ type NamespaceServiceClient interface { } type namespaceServiceClient struct { - cc *grpc.ClientConn + cc grpc.ClientConnInterface } -func NewNamespaceServiceClient(cc *grpc.ClientConn) NamespaceServiceClient { +func NewNamespaceServiceClient(cc grpc.ClientConnInterface) NamespaceServiceClient { return &namespaceServiceClient{cc} } diff --git a/api/namespace.swagger.json b/api/namespace.swagger.json index 1cbd51f..447ff85 100644 --- a/api/namespace.swagger.json +++ b/api/namespace.swagger.json @@ -20,6 +20,12 @@ "schema": { "$ref": "#/definitions/apiListNamespacesResponse" } + }, + "default": { + "description": "An unexpected error response", + "schema": { + "$ref": "#/definitions/runtimeError" + } } }, "tags": [ @@ -51,6 +57,39 @@ "type": "string" } } + }, + "protobufAny": { + "type": "object", + "properties": { + "type_url": { + "type": "string" + }, + "value": { + "type": "string", + "format": "byte" + } + } + }, + "runtimeError": { + "type": "object", + "properties": { + "error": { + "type": "string" + }, + "code": { + "type": "integer", + "format": "int32" + }, + "message": { + "type": "string" + }, + "details": { + "type": "array", + "items": { + "$ref": "#/definitions/protobufAny" + } + } + } } } } diff --git a/api/secret.pb.go b/api/secret.pb.go index 33e683c..011d07f 100644 --- a/api/secret.pb.go +++ b/api/secret.pb.go @@ -333,7 +333,8 @@ func (m *DeleteSecretRequest) GetName() string { type DeleteSecretKeyRequest struct { Namespace string `protobuf:"bytes,1,opt,name=namespace,proto3" json:"namespace,omitempty"` - Secret *Secret `protobuf:"bytes,2,opt,name=secret,proto3" json:"secret,omitempty"` + SecretName string `protobuf:"bytes,2,opt,name=secretName,proto3" json:"secretName,omitempty"` + Key string `protobuf:"bytes,3,opt,name=key,proto3" json:"key,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -371,11 +372,18 @@ func (m *DeleteSecretKeyRequest) GetNamespace() string { return "" } -func (m *DeleteSecretKeyRequest) GetSecret() *Secret { +func (m *DeleteSecretKeyRequest) GetSecretName() string { if m != nil { - return m.Secret + return m.SecretName } - return nil + return "" +} + +func (m *DeleteSecretKeyRequest) GetKey() string { + if m != nil { + return m.Key + } + return "" } type DeleteSecretKeyResponse struct { @@ -705,59 +713,61 @@ func init() { func init() { proto.RegisterFile("secret.proto", fileDescriptor_6acf428160d7a216) } var fileDescriptor_6acf428160d7a216 = []byte{ - // 677 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0x5f, 0x4f, 0xd4, 0x40, - 0x10, 0x4f, 0x0f, 0x38, 0xb8, 0xe1, 0x8c, 0xb8, 0x9c, 0x50, 0xca, 0x69, 0x8e, 0x25, 0x26, 0x80, - 0x49, 0xcb, 0x1d, 0x0f, 0x20, 0x2f, 0xc6, 0x08, 0xe1, 0x01, 0x9f, 0x4a, 0x34, 0x26, 0xc6, 0xc4, - 0xe5, 0x6e, 0x24, 0x0d, 0xd0, 0xd6, 0xee, 0x96, 0x78, 0x51, 0x12, 0x63, 0xe2, 0x27, 0xc0, 0x6f, - 0xe6, 0x57, 0xf0, 0x73, 0x18, 0xd3, 0xdd, 0x6d, 0xaf, 0xc7, 0x15, 0x28, 0xfe, 0x79, 0xdb, 0xd9, - 0xdf, 0xee, 0xfc, 0x66, 0x7e, 0x33, 0x3b, 0x0b, 0x75, 0x8e, 0xdd, 0x08, 0x85, 0x1d, 0x46, 0x81, - 0x08, 0xc8, 0x18, 0x0b, 0x3d, 0x6b, 0xf1, 0x28, 0x08, 0x8e, 0x4e, 0xd0, 0x91, 0x5b, 0x87, 0xf1, - 0x7b, 0x07, 0x4f, 0x43, 0xd1, 0x57, 0x27, 0xac, 0xa6, 0x06, 0x59, 0xe8, 0x39, 0xcc, 0xf7, 0x03, - 0xc1, 0x84, 0x17, 0xf8, 0x5c, 0xa1, 0xf4, 0x2d, 0x98, 0xcf, 0x7a, 0xbd, 0x03, 0xe9, 0x72, 0x1f, - 0xfb, 0xaf, 0xd8, 0x49, 0x8c, 0x2e, 0x7e, 0x88, 0x91, 0x0b, 0xd2, 0x84, 0x9a, 0xcf, 0x4e, 0x91, - 0x87, 0xac, 0x8b, 0xa6, 0xd1, 0x32, 0x56, 0x6a, 0xee, 0x60, 0x83, 0x2c, 0x43, 0x55, 0x45, 0x62, - 0x56, 0x5a, 0xc6, 0xca, 0x74, 0x67, 0xda, 0x66, 0xa1, 0x67, 0x2b, 0x4f, 0xae, 0x86, 0xe8, 0x26, - 0x2c, 0x14, 0xb8, 0xe7, 0x61, 0xe0, 0x73, 0x24, 0x16, 0x4c, 0x79, 0x3e, 0xc7, 0x48, 0x60, 0x4f, - 0xba, 0x9f, 0x72, 0x33, 0x9b, 0xee, 0xc1, 0xac, 0xba, 0xb5, 0xfb, 0xd1, 0xe3, 0x82, 0x97, 0x0b, - 0x89, 0xc0, 0x78, 0x62, 0xc8, 0x80, 0x6a, 0xae, 0x5c, 0x53, 0x1b, 0x1a, 0xc3, 0x8e, 0x34, 0xf9, - 0x1c, 0x54, 0x51, 0xee, 0x68, 0x6a, 0x6d, 0xd1, 0x77, 0xb0, 0xf8, 0x32, 0xec, 0x31, 0x81, 0xff, - 0x4d, 0x93, 0x2d, 0x68, 0x16, 0x33, 0xe8, 0xc8, 0x4c, 0x98, 0x8c, 0x25, 0x9e, 0xaa, 0x92, 0x9a, - 0x89, 0x28, 0x3b, 0x78, 0x82, 0xe9, 0xcd, 0x3f, 0x17, 0xe5, 0x0d, 0xcc, 0xe5, 0x1d, 0xed, 0x63, - 0xff, 0x1f, 0xe6, 0xb7, 0x01, 0xf3, 0x23, 0xce, 0x07, 0xa9, 0xf5, 0x24, 0x94, 0xa5, 0xa6, 0x4d, - 0xba, 0x0e, 0x8d, 0xe1, 0xd4, 0x6e, 0xbc, 0xd1, 0x01, 0xf2, 0xc2, 0xe3, 0x42, 0x9d, 0x2f, 0xd7, - 0x20, 0xd4, 0x85, 0xd9, 0xa1, 0x3b, 0x9a, 0xa4, 0x01, 0x13, 0xdd, 0x20, 0xf6, 0x85, 0xbc, 0x30, - 0xe1, 0x2a, 0x83, 0x3c, 0x82, 0x49, 0x95, 0x11, 0x37, 0x2b, 0xad, 0xb1, 0xcb, 0xd9, 0xa6, 0x18, - 0x7d, 0x0d, 0xb3, 0xcf, 0x23, 0x64, 0xb7, 0x2b, 0x4a, 0x29, 0x21, 0x77, 0x60, 0x66, 0x0f, 0xc5, - 0xdf, 0xd6, 0xfa, 0x8b, 0x01, 0x55, 0xe5, 0x23, 0x83, 0x8d, 0x01, 0x4c, 0x56, 0x61, 0xbc, 0xc7, - 0x04, 0xd3, 0x29, 0xde, 0xcf, 0xc5, 0x61, 0xef, 0x30, 0xc1, 0x76, 0x7d, 0x11, 0xf5, 0x5d, 0x79, - 0xc4, 0xda, 0x84, 0x5a, 0xb6, 0x45, 0x66, 0x60, 0xec, 0x18, 0xfb, 0xda, 0x55, 0xb2, 0x4c, 0x54, - 0x3c, 0x4b, 0x1a, 0x59, 0xb3, 0x2b, 0x63, 0xbb, 0xb2, 0x65, 0x74, 0x7e, 0x4d, 0xc2, 0x1d, 0xe5, - 0xf3, 0x00, 0xa3, 0x33, 0xaf, 0x8b, 0x84, 0x43, 0x3d, 0x2f, 0x1a, 0x31, 0x25, 0x6f, 0x81, 0x8e, - 0xd6, 0x9c, 0xad, 0xe6, 0x97, 0x9d, 0x0e, 0x37, 0x7b, 0x37, 0x19, 0x6e, 0xb4, 0xfd, 0xf5, 0xc7, - 0xcf, 0x8b, 0xca, 0x63, 0xba, 0x94, 0x0c, 0x36, 0xee, 0x9c, 0xb5, 0x0f, 0x51, 0xb0, 0xb6, 0xf3, - 0x29, 0x13, 0xe3, 0xdc, 0xd1, 0x15, 0xda, 0xd6, 0x7a, 0x92, 0xcf, 0x50, 0xcf, 0x8f, 0x02, 0x4d, - 0x5a, 0x30, 0x66, 0xac, 0x85, 0x02, 0x44, 0xf5, 0x0a, 0xdd, 0x94, 0xbc, 0x6d, 0xe2, 0xdc, 0xc8, - 0xab, 0xf6, 0xce, 0x1d, 0x35, 0x58, 0x08, 0x83, 0x5a, 0x56, 0x4d, 0xa2, 0x74, 0xbe, 0x5c, 0x5d, - 0x2b, 0xdf, 0x06, 0x74, 0x5d, 0x32, 0xad, 0x91, 0x95, 0xb2, 0x4c, 0xe4, 0x18, 0xa6, 0x73, 0xed, - 0x4d, 0xe6, 0xa5, 0xb7, 0xd1, 0x47, 0x62, 0x99, 0xa3, 0x80, 0xce, 0x6e, 0x55, 0x72, 0x2e, 0x93, - 0x9b, 0x55, 0x25, 0x31, 0xd4, 0xf3, 0x2f, 0x56, 0xab, 0x59, 0x30, 0x9f, 0xb4, 0x9a, 0x45, 0xcf, - 0x3b, 0xcd, 0x71, 0xad, 0x7c, 0x8e, 0xdf, 0x0c, 0xb8, 0x7b, 0x69, 0xbc, 0x90, 0xc5, 0x11, 0x82, - 0xc1, 0x44, 0xb3, 0x9a, 0xc5, 0xe0, 0x70, 0x39, 0xd7, 0xca, 0x94, 0x53, 0x7f, 0xbc, 0x2a, 0x8e, - 0x0b, 0x03, 0xee, 0x8d, 0x7c, 0x6d, 0xe4, 0x81, 0x24, 0xbb, 0xea, 0x47, 0xb5, 0x1e, 0x5e, 0x05, - 0xeb, 0x68, 0x9e, 0xca, 0x68, 0x9e, 0xd0, 0xdb, 0x46, 0x93, 0xb5, 0xf8, 0x77, 0x03, 0x1a, 0x45, - 0x9f, 0x0b, 0x69, 0x49, 0xe6, 0x6b, 0x7e, 0x36, 0x6b, 0xe9, 0x9a, 0x13, 0xc3, 0x62, 0x75, 0x6e, - 0x1b, 0xde, 0x61, 0x55, 0x3e, 0xde, 0x8d, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x17, 0x5e, 0xfe, - 0xaa, 0xbc, 0x08, 0x00, 0x00, + // 713 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0x4f, 0x4f, 0xdb, 0x4a, + 0x10, 0x97, 0x13, 0x08, 0x64, 0xc8, 0xd3, 0xe3, 0x2d, 0x79, 0x60, 0x4c, 0x1e, 0x0a, 0x8b, 0x9e, + 0x04, 0x54, 0xb2, 0x49, 0x38, 0xf0, 0xa7, 0x87, 0x0a, 0x15, 0xc4, 0x81, 0xaa, 0x07, 0xa3, 0x56, + 0xbd, 0x54, 0xea, 0x92, 0x4c, 0xa9, 0x15, 0xb0, 0xdd, 0xec, 0x06, 0x35, 0xa2, 0x91, 0xaa, 0x9e, + 0x7a, 0xeb, 0x81, 0x7e, 0xb3, 0x7e, 0x85, 0x7e, 0x90, 0xca, 0xbb, 0x6b, 0xc7, 0x21, 0x06, 0x4c, + 0xab, 0xde, 0x3c, 0xf3, 0xf3, 0xce, 0x6f, 0xe6, 0x37, 0xb3, 0xb3, 0x50, 0xe1, 0xd8, 0xea, 0xa2, + 0xb0, 0xc3, 0x6e, 0x20, 0x02, 0x52, 0x64, 0xa1, 0x67, 0x2d, 0x9d, 0x05, 0xc1, 0xd9, 0x39, 0x3a, + 0xd2, 0x75, 0xda, 0x7b, 0xeb, 0xe0, 0x45, 0x28, 0xfa, 0xea, 0x0f, 0xab, 0xa6, 0x41, 0x16, 0x7a, + 0x0e, 0xf3, 0xfd, 0x40, 0x30, 0xe1, 0x05, 0x3e, 0x57, 0x28, 0x7d, 0x0d, 0xe6, 0x7e, 0xbb, 0x7d, + 0x22, 0x43, 0x1e, 0x63, 0xff, 0x25, 0x3b, 0xef, 0xa1, 0x8b, 0xef, 0x7b, 0xc8, 0x05, 0xa9, 0x41, + 0xd9, 0x67, 0x17, 0xc8, 0x43, 0xd6, 0x42, 0xd3, 0xa8, 0x1b, 0x6b, 0x65, 0x77, 0xe8, 0x20, 0xab, + 0x50, 0x52, 0x99, 0x98, 0x85, 0xba, 0xb1, 0x36, 0xd3, 0x9c, 0xb1, 0x59, 0xe8, 0xd9, 0x2a, 0x92, + 0xab, 0x21, 0xba, 0x0d, 0x8b, 0x19, 0xe1, 0x79, 0x18, 0xf8, 0x1c, 0x89, 0x05, 0xd3, 0x9e, 0xcf, + 0xb1, 0x2b, 0xb0, 0x2d, 0xc3, 0x4f, 0xbb, 0x89, 0x4d, 0x8f, 0x60, 0x4e, 0x9d, 0x3a, 0xfc, 0xe0, + 0x71, 0xc1, 0xf3, 0xa5, 0x44, 0x60, 0x22, 0x32, 0x64, 0x42, 0x65, 0x57, 0x7e, 0x53, 0x1b, 0xaa, + 0xa3, 0x81, 0x34, 0xf9, 0x3c, 0x94, 0x50, 0x7a, 0x34, 0xb5, 0xb6, 0xe8, 0x1b, 0x58, 0x7a, 0x11, + 0xb6, 0x99, 0xc0, 0x3f, 0xa6, 0xc9, 0x0e, 0xd4, 0xb2, 0x19, 0x74, 0x66, 0x26, 0x4c, 0xf5, 0x24, + 0x1e, 0xab, 0x12, 0x9b, 0x91, 0x28, 0x07, 0x78, 0x8e, 0xf1, 0xc9, 0x5f, 0x17, 0xe5, 0x1d, 0xcc, + 0xa7, 0x03, 0x1d, 0x63, 0x3f, 0x5f, 0xac, 0x65, 0x00, 0x55, 0xc4, 0xf3, 0x61, 0xc4, 0x94, 0x87, + 0xcc, 0x42, 0xb1, 0x83, 0x7d, 0xb3, 0x28, 0x81, 0xe8, 0x93, 0x6e, 0xc1, 0xc2, 0x18, 0xd3, 0xb0, + 0xce, 0xb6, 0x84, 0x92, 0x3a, 0xb5, 0x49, 0x37, 0xa1, 0x3a, 0x5a, 0xe7, 0xbd, 0x27, 0x9a, 0x40, + 0x9e, 0x79, 0x5c, 0xa8, 0xff, 0xf3, 0x4d, 0x0b, 0x75, 0x61, 0x6e, 0xe4, 0x8c, 0x26, 0xa9, 0xc2, + 0x64, 0x2b, 0xe8, 0xf9, 0x42, 0x1e, 0x98, 0x74, 0x95, 0x41, 0xfe, 0x87, 0x29, 0x55, 0x27, 0x37, + 0x0b, 0xf5, 0xe2, 0xcd, 0xd6, 0xc6, 0x18, 0x7d, 0x05, 0x73, 0x4f, 0xbb, 0xc8, 0x1e, 0xd6, 0xa1, + 0x5c, 0x53, 0x73, 0x00, 0xb3, 0x47, 0x28, 0x7e, 0xb7, 0xf1, 0x9f, 0x0c, 0x28, 0xa9, 0x18, 0x09, + 0x6c, 0x0c, 0x61, 0xb2, 0x0e, 0x13, 0x6d, 0x26, 0x98, 0x2e, 0xf1, 0xdf, 0x54, 0x1e, 0xf6, 0x01, + 0x13, 0xec, 0xd0, 0x17, 0xdd, 0xbe, 0x2b, 0x7f, 0xb1, 0xb6, 0xa1, 0x9c, 0xb8, 0xe2, 0xbe, 0x1b, + 0x49, 0xdf, 0x23, 0x15, 0x2f, 0xa3, 0xa9, 0xd6, 0xec, 0xca, 0xd8, 0x2b, 0xec, 0x18, 0xcd, 0x2f, + 0xd3, 0xf0, 0x97, 0x8a, 0x79, 0x82, 0xdd, 0x4b, 0xaf, 0x85, 0x84, 0x43, 0x25, 0x2d, 0x1a, 0x31, + 0x25, 0x6f, 0x86, 0x8e, 0xd6, 0xbc, 0xad, 0x96, 0x99, 0x1d, 0x6f, 0x3a, 0xfb, 0x30, 0xda, 0x74, + 0xb4, 0xf1, 0xf9, 0xfb, 0x8f, 0xeb, 0xc2, 0x23, 0xba, 0x12, 0x6d, 0x39, 0xee, 0x5c, 0x36, 0x4e, + 0x51, 0xb0, 0x86, 0x73, 0x95, 0x88, 0x31, 0x70, 0x74, 0x87, 0xf6, 0xb4, 0x9e, 0xe4, 0x23, 0x54, + 0xd2, 0x7b, 0x41, 0x93, 0x66, 0xec, 0x1c, 0x6b, 0x31, 0x03, 0x51, 0xb3, 0x42, 0xb7, 0x25, 0x6f, + 0x83, 0x38, 0xf7, 0xf2, 0x2a, 0xdf, 0xc0, 0x51, 0x5b, 0x86, 0x30, 0x28, 0x27, 0xdd, 0x24, 0x4a, + 0xe7, 0x9b, 0xdd, 0xb5, 0xd2, 0x63, 0x40, 0x37, 0x25, 0xd3, 0x06, 0x59, 0xcb, 0xcb, 0x44, 0x3a, + 0x30, 0x93, 0x1a, 0x6f, 0xb2, 0x20, 0xa3, 0x8d, 0x5f, 0x12, 0xcb, 0x1c, 0x07, 0x74, 0x75, 0xeb, + 0x92, 0x73, 0x95, 0xdc, 0xaf, 0x2a, 0xe9, 0x41, 0x25, 0x7d, 0x63, 0xb5, 0x9a, 0x19, 0xcb, 0x4a, + 0xab, 0x99, 0x75, 0xbd, 0xe3, 0x1a, 0x37, 0xf2, 0xd7, 0xf8, 0xd5, 0x80, 0xbf, 0x6f, 0xac, 0x17, + 0xb2, 0x34, 0x46, 0x30, 0x5c, 0x6f, 0x56, 0x2d, 0x1b, 0xd4, 0x09, 0xec, 0xcb, 0x04, 0x1e, 0x6f, + 0xec, 0xe6, 0x48, 0x60, 0xb8, 0xf5, 0x06, 0x4e, 0x07, 0xfb, 0xdc, 0xb9, 0xea, 0x60, 0x7f, 0x40, + 0xae, 0x0d, 0xf8, 0x67, 0xec, 0xc5, 0x23, 0xff, 0x49, 0xda, 0xdb, 0x1e, 0x5a, 0x6b, 0xf9, 0x36, + 0x58, 0xe7, 0xf5, 0x44, 0xe6, 0xb5, 0x4b, 0x9d, 0xdc, 0x79, 0xd9, 0x52, 0x9f, 0x64, 0xd8, 0xbf, + 0x19, 0x50, 0xcd, 0x7a, 0x73, 0x48, 0x5d, 0x32, 0xdf, 0xf1, 0xe0, 0x59, 0x2b, 0x77, 0xfc, 0x31, + 0x7a, 0x0b, 0x9a, 0x0f, 0x4d, 0xef, 0xb4, 0x24, 0xaf, 0xf1, 0xd6, 0xcf, 0x00, 0x00, 0x00, 0xff, + 0xff, 0xac, 0x8a, 0x1f, 0x01, 0xd3, 0x08, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. var _ context.Context -var _ grpc.ClientConn +var _ grpc.ClientConnInterface // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -const _ = grpc.SupportPackageIsVersion4 +const _ = grpc.SupportPackageIsVersion6 // SecretServiceClient is the client API for SecretService service. // @@ -774,10 +784,10 @@ type SecretServiceClient interface { } type secretServiceClient struct { - cc *grpc.ClientConn + cc grpc.ClientConnInterface } -func NewSecretServiceClient(cc *grpc.ClientConn) SecretServiceClient { +func NewSecretServiceClient(cc grpc.ClientConnInterface) SecretServiceClient { return &secretServiceClient{cc} } diff --git a/api/secret.pb.gw.go b/api/secret.pb.gw.go index e2080b6..f58bbc8 100644 --- a/api/secret.pb.gw.go +++ b/api/secret.pb.gw.go @@ -383,10 +383,6 @@ func local_request_SecretService_DeleteSecret_0(ctx context.Context, marshaler r } -var ( - filter_SecretService_DeleteSecretKey_0 = &utilities.DoubleArray{Encoding: map[string]int{"namespace": 0, "secret": 1, "name": 2}, Base: []int{1, 1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 3, 2, 4}} -) - func request_SecretService_DeleteSecretKey_0(ctx context.Context, marshaler runtime.Marshaler, client SecretServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq DeleteSecretKeyRequest var metadata runtime.ServerMetadata @@ -409,22 +405,26 @@ func request_SecretService_DeleteSecretKey_0(ctx context.Context, marshaler runt return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "namespace", err) } - val, ok = pathParams["secret.name"] + val, ok = pathParams["secretName"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "secret.name") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "secretName") } - err = runtime.PopulateFieldFromPath(&protoReq, "secret.name", val) + protoReq.SecretName, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "secret.name", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "secretName", err) } - if err := req.ParseForm(); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + val, ok = pathParams["key"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "key") } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_SecretService_DeleteSecretKey_0); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + + protoReq.Key, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "key", err) } msg, err := client.DeleteSecretKey(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) @@ -454,19 +454,26 @@ func local_request_SecretService_DeleteSecretKey_0(ctx context.Context, marshale return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "namespace", err) } - val, ok = pathParams["secret.name"] + val, ok = pathParams["secretName"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "secret.name") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "secretName") } - err = runtime.PopulateFieldFromPath(&protoReq, "secret.name", val) + protoReq.SecretName, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "secret.name", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "secretName", err) } - if err := runtime.PopulateQueryParameters(&protoReq, req.URL.Query(), filter_SecretService_DeleteSecretKey_0); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + val, ok = pathParams["key"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "key") + } + + protoReq.Key, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "key", err) } msg, err := server.DeleteSecretKey(ctx, &protoReq) @@ -1037,7 +1044,7 @@ var ( pattern_SecretService_DeleteSecret_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"apis", "v1beta1", "namespace", "secrets", "name"}, "", runtime.AssumeColonVerbOpt(true))) - pattern_SecretService_DeleteSecretKey_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"apis", "v1beta1", "namespace", "secrets", "secret.name"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_SecretService_DeleteSecretKey_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 2, 2, 3, 1, 0, 4, 1, 5, 4, 2, 5, 1, 0, 4, 1, 5, 6}, []string{"apis", "v1beta1", "namespace", "secrets", "secretName", "keys", "key"}, "", runtime.AssumeColonVerbOpt(true))) pattern_SecretService_AddSecretKeyValue_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"apis", "v1beta1", "namespace", "secrets", "secret.name"}, "", runtime.AssumeColonVerbOpt(true))) diff --git a/api/secret.swagger.json b/api/secret.swagger.json index e89680a..cfd4dbf 100644 --- a/api/secret.swagger.json +++ b/api/secret.swagger.json @@ -20,6 +20,12 @@ "schema": { "$ref": "#/definitions/apiListSecretsResponse" } + }, + "default": { + "description": "An unexpected error response", + "schema": { + "$ref": "#/definitions/runtimeError" + } } }, "parameters": [ @@ -42,6 +48,12 @@ "schema": { "properties": {} } + }, + "default": { + "description": "An unexpected error response", + "schema": { + "$ref": "#/definitions/runtimeError" + } } }, "parameters": [ @@ -74,6 +86,12 @@ "schema": { "$ref": "#/definitions/apiSecret" } + }, + "default": { + "description": "An unexpected error response", + "schema": { + "$ref": "#/definitions/runtimeError" + } } }, "parameters": [ @@ -102,6 +120,12 @@ "schema": { "$ref": "#/definitions/apiDeleteSecretResponse" } + }, + "default": { + "description": "An unexpected error response", + "schema": { + "$ref": "#/definitions/runtimeError" + } } }, "parameters": [ @@ -132,6 +156,12 @@ "schema": { "$ref": "#/definitions/apiSecretExistsResponse" } + }, + "default": { + "description": "An unexpected error response", + "schema": { + "$ref": "#/definitions/runtimeError" + } } }, "parameters": [ @@ -154,34 +184,6 @@ } }, "/apis/v1beta1/{namespace}/secrets/{secret.name}": { - "delete": { - "operationId": "DeleteSecretKey", - "responses": { - "200": { - "description": "A successful response.", - "schema": { - "$ref": "#/definitions/apiDeleteSecretKeyResponse" - } - } - }, - "parameters": [ - { - "name": "namespace", - "in": "path", - "required": true, - "type": "string" - }, - { - "name": "secret.name", - "in": "path", - "required": true, - "type": "string" - } - ], - "tags": [ - "SecretService" - ] - }, "post": { "operationId": "AddSecretKeyValue", "responses": { @@ -190,6 +192,12 @@ "schema": { "$ref": "#/definitions/apiAddSecretKeyValueResponse" } + }, + "default": { + "description": "An unexpected error response", + "schema": { + "$ref": "#/definitions/runtimeError" + } } }, "parameters": [ @@ -226,6 +234,12 @@ "schema": { "$ref": "#/definitions/apiUpdateSecretKeyValueResponse" } + }, + "default": { + "description": "An unexpected error response", + "schema": { + "$ref": "#/definitions/runtimeError" + } } }, "parameters": [ @@ -246,6 +260,48 @@ "SecretService" ] } + }, + "/apis/v1beta1/{namespace}/secrets/{secretName}/keys/{key}": { + "delete": { + "operationId": "DeleteSecretKey", + "responses": { + "200": { + "description": "A successful response.", + "schema": { + "$ref": "#/definitions/apiDeleteSecretKeyResponse" + } + }, + "default": { + "description": "An unexpected error response", + "schema": { + "$ref": "#/definitions/runtimeError" + } + } + }, + "parameters": [ + { + "name": "namespace", + "in": "path", + "required": true, + "type": "string" + }, + { + "name": "secretName", + "in": "path", + "required": true, + "type": "string" + }, + { + "name": "key", + "in": "path", + "required": true, + "type": "string" + } + ], + "tags": [ + "SecretService" + ] + } } }, "definitions": { @@ -322,6 +378,39 @@ "format": "boolean" } } + }, + "protobufAny": { + "type": "object", + "properties": { + "type_url": { + "type": "string" + }, + "value": { + "type": "string", + "format": "byte" + } + } + }, + "runtimeError": { + "type": "object", + "properties": { + "error": { + "type": "string" + }, + "code": { + "type": "integer", + "format": "int32" + }, + "message": { + "type": "string" + }, + "details": { + "type": "array", + "items": { + "$ref": "#/definitions/protobufAny" + } + } + } } } } diff --git a/api/workflow.pb.go b/api/workflow.pb.go index 6dbf5d2..fd9f8e3 100644 --- a/api/workflow.pb.go +++ b/api/workflow.pb.go @@ -853,11 +853,11 @@ var fileDescriptor_892c7f566756b0be = []byte{ // Reference imports to suppress errors if they are not otherwise used. var _ context.Context -var _ grpc.ClientConn +var _ grpc.ClientConnInterface // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -const _ = grpc.SupportPackageIsVersion4 +const _ = grpc.SupportPackageIsVersion6 // WorkflowServiceClient is the client API for WorkflowService service. // @@ -882,10 +882,10 @@ type WorkflowServiceClient interface { } type workflowServiceClient struct { - cc *grpc.ClientConn + cc grpc.ClientConnInterface } -func NewWorkflowServiceClient(cc *grpc.ClientConn) WorkflowServiceClient { +func NewWorkflowServiceClient(cc grpc.ClientConnInterface) WorkflowServiceClient { return &workflowServiceClient{cc} } diff --git a/api/workflow.swagger.json b/api/workflow.swagger.json index a70f3bc..a7fd910 100644 --- a/api/workflow.swagger.json +++ b/api/workflow.swagger.json @@ -20,6 +20,12 @@ "schema": { "$ref": "#/definitions/apiListWorkflowTemplatesResponse" } + }, + "default": { + "description": "An unexpected error response", + "schema": { + "$ref": "#/definitions/runtimeError" + } } }, "parameters": [ @@ -42,6 +48,12 @@ "schema": { "$ref": "#/definitions/apiWorkflowTemplate" } + }, + "default": { + "description": "An unexpected error response", + "schema": { + "$ref": "#/definitions/runtimeError" + } } }, "parameters": [ @@ -74,6 +86,12 @@ "schema": { "$ref": "#/definitions/apiWorkflowTemplate" } + }, + "default": { + "description": "An unexpected error response", + "schema": { + "$ref": "#/definitions/runtimeError" + } } }, "parameters": [ @@ -111,6 +129,12 @@ "schema": { "$ref": "#/definitions/apiArchiveWorkflowTemplateResponse" } + }, + "default": { + "description": "An unexpected error response", + "schema": { + "$ref": "#/definitions/runtimeError" + } } }, "parameters": [ @@ -141,6 +165,12 @@ "schema": { "$ref": "#/definitions/apiListWorkflowTemplateVersionsResponse" } + }, + "default": { + "description": "An unexpected error response", + "schema": { + "$ref": "#/definitions/runtimeError" + } } }, "parameters": [ @@ -171,6 +201,12 @@ "schema": { "$ref": "#/definitions/apiWorkflowTemplate" } + }, + "default": { + "description": "An unexpected error response", + "schema": { + "$ref": "#/definitions/runtimeError" + } } }, "parameters": [ @@ -208,6 +244,12 @@ "schema": { "$ref": "#/definitions/apiWorkflowTemplate" } + }, + "default": { + "description": "An unexpected error response", + "schema": { + "$ref": "#/definitions/runtimeError" + } } }, "parameters": [ @@ -246,6 +288,12 @@ "schema": { "$ref": "#/definitions/apiWorkflowTemplate" } + }, + "default": { + "description": "An unexpected error response", + "schema": { + "$ref": "#/definitions/runtimeError" + } } }, "parameters": [ @@ -291,6 +339,12 @@ "schema": { "$ref": "#/definitions/apiListWorkflowsResponse" } + }, + "default": { + "description": "An unexpected error response", + "schema": { + "$ref": "#/definitions/runtimeError" + } } }, "parameters": [ @@ -340,6 +394,12 @@ "schema": { "$ref": "#/definitions/apiWorkflow" } + }, + "default": { + "description": "An unexpected error response", + "schema": { + "$ref": "#/definitions/runtimeError" + } } }, "parameters": [ @@ -372,6 +432,12 @@ "schema": { "$ref": "#/definitions/apiWorkflow" } + }, + "default": { + "description": "An unexpected error response", + "schema": { + "$ref": "#/definitions/runtimeError" + } } }, "parameters": [ @@ -400,7 +466,22 @@ "200": { "description": "A successful response.(streaming responses)", "schema": { - "$ref": "#/x-stream-definitions/apiLogEntry" + "type": "object", + "properties": { + "result": { + "$ref": "#/definitions/apiLogEntry" + }, + "error": { + "$ref": "#/definitions/runtimeStreamError" + } + }, + "title": "Stream result of apiLogEntry" + } + }, + "default": { + "description": "An unexpected error response", + "schema": { + "$ref": "#/definitions/runtimeError" } } }, @@ -444,6 +525,12 @@ "schema": { "$ref": "#/definitions/apiGetWorkflowMetricsResponse" } + }, + "default": { + "description": "An unexpected error response", + "schema": { + "$ref": "#/definitions/runtimeError" + } } }, "parameters": [ @@ -480,6 +567,12 @@ "schema": { "$ref": "#/definitions/apiWorkflow" } + }, + "default": { + "description": "An unexpected error response", + "schema": { + "$ref": "#/definitions/runtimeError" + } } }, "parameters": [ @@ -510,6 +603,12 @@ "schema": { "properties": {} } + }, + "default": { + "description": "An unexpected error response", + "schema": { + "$ref": "#/definitions/runtimeError" + } } }, "parameters": [ @@ -538,7 +637,22 @@ "200": { "description": "A successful response.(streaming responses)", "schema": { - "$ref": "#/x-stream-definitions/apiWorkflow" + "type": "object", + "properties": { + "result": { + "$ref": "#/definitions/apiWorkflow" + }, + "error": { + "$ref": "#/definitions/runtimeStreamError" + } + }, + "title": "Stream result of apiWorkflow" + } + }, + "default": { + "description": "An unexpected error response", + "schema": { + "$ref": "#/definitions/runtimeError" } } }, @@ -752,6 +866,27 @@ } } }, + "runtimeError": { + "type": "object", + "properties": { + "error": { + "type": "string" + }, + "code": { + "type": "integer", + "format": "int32" + }, + "message": { + "type": "string" + }, + "details": { + "type": "array", + "items": { + "$ref": "#/definitions/protobufAny" + } + } + } + }, "runtimeStreamError": { "type": "object", "properties": { @@ -777,31 +912,5 @@ } } } - }, - "x-stream-definitions": { - "apiLogEntry": { - "type": "object", - "properties": { - "result": { - "$ref": "#/definitions/apiLogEntry" - }, - "error": { - "$ref": "#/definitions/runtimeStreamError" - } - }, - "title": "Stream result of apiLogEntry" - }, - "apiWorkflow": { - "type": "object", - "properties": { - "result": { - "$ref": "#/definitions/apiWorkflow" - }, - "error": { - "$ref": "#/definitions/runtimeStreamError" - } - }, - "title": "Stream result of apiWorkflow" - } } } diff --git a/api/workflow_template.swagger.json b/api/workflow_template.swagger.json index c161cb1..715dd49 100644 --- a/api/workflow_template.swagger.json +++ b/api/workflow_template.swagger.json @@ -11,5 +11,39 @@ "application/json" ], "paths": {}, - "definitions": {} + "definitions": { + "protobufAny": { + "type": "object", + "properties": { + "type_url": { + "type": "string" + }, + "value": { + "type": "string", + "format": "byte" + } + } + }, + "runtimeError": { + "type": "object", + "properties": { + "error": { + "type": "string" + }, + "code": { + "type": "integer", + "format": "int32" + }, + "message": { + "type": "string" + }, + "details": { + "type": "array", + "items": { + "$ref": "#/definitions/protobufAny" + } + } + } + } + } }