Skip to content

K
k3s
Unverified Commit 0dcf19df authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #60268 from mikedanese/kmss

Automatic merge from submit-queue (batch tested with PRs 55637, 57461, 60268, 60290, 60210). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. kms: rename KMSService to KeyManagementService KMSService is redundant. Introduced in #55684 @kubernetes/sig-auth-api-reviews ```release-note NONE ```
parents e6c2a5de fc8ff61e
Show whitespace changes
Inline Side-by-side
Showing with 56 additions and 56 deletions
staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/grpc_service.go
View file @ 0dcf19df
...@@ -46,7 +46,7 @@ const ( ...@@ -46,7 +46,7 @@ const (
// The gRPC implementation for envelope.Service. // The gRPC implementation for envelope.Service.
type gRPCService struct { type gRPCService struct {
// gRPC client instance // gRPC client instance
kmsClient kmsapi.KMSServiceClient kmsClient kmsapi.KeyManagementServiceClient
connection *grpc.ClientConn connection *grpc.ClientConn
} }
...@@ -64,7 +64,7 @@ func NewGRPCService(endpoint string) (Service, error) { ...@@ -64,7 +64,7 @@ func NewGRPCService(endpoint string) (Service, error) {
return nil, fmt.Errorf("connect remote KMS provider %q failed, error: %v", addr, err) return nil, fmt.Errorf("connect remote KMS provider %q failed, error: %v", addr, err)
} }
kmsClient := kmsapi.NewKMSServiceClient(connection) kmsClient := kmsapi.NewKeyManagementServiceClient(connection)
err = checkAPIVersion(kmsClient) err = checkAPIVersion(kmsClient)
if err != nil { if err != nil {
...@@ -99,7 +99,7 @@ func parseEndpoint(endpoint string) (string, error) { ...@@ -99,7 +99,7 @@ func parseEndpoint(endpoint string) (string, error) {
// Check the KMS provider API version. // Check the KMS provider API version.
// Only matching kmsapiVersion is supported now. // Only matching kmsapiVersion is supported now.
func checkAPIVersion(kmsClient kmsapi.KMSServiceClient) error { func checkAPIVersion(kmsClient kmsapi.KeyManagementServiceClient) error {
ctx, cancel := context.WithTimeout(context.Background(), timeout) ctx, cancel := context.WithTimeout(context.Background(), timeout)
defer cancel() defer cancel()
......
staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/grpc_service_unix_test.go
View file @ 0dcf19df
...@@ -124,7 +124,7 @@ func startTestKMSProvider() (*grpc.Server, error) { ...@@ -124,7 +124,7 @@ func startTestKMSProvider() (*grpc.Server, error) {
} }
server := grpc.NewServer() server := grpc.NewServer()
kmsapi.RegisterKMSServiceServer(server, &base64Server{}) kmsapi.RegisterKeyManagementServiceServer(server, &base64Server{})
go server.Serve(listener) go server.Serve(listener)
return server, nil return server, nil
} }
......
staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/v1beta1/service.pb.go
View file @ 0dcf19df
...@@ -209,9 +209,9 @@ var _ grpc.ClientConn ...@@ -209,9 +209,9 @@ var _ grpc.ClientConn
// is compatible with the grpc package it is being compiled against. // is compatible with the grpc package it is being compiled against.
const _ = grpc.SupportPackageIsVersion4 const _ = grpc.SupportPackageIsVersion4
// Client API for KMSService service // Client API for KeyManagementService service
type KMSServiceClient interface { type KeyManagementServiceClient interface {
// Version returns the runtime name and runtime version of the KMS provider. // Version returns the runtime name and runtime version of the KMS provider.
Version(ctx context.Context, in *VersionRequest, opts ...grpc.CallOption) (*VersionResponse, error) Version(ctx context.Context, in *VersionRequest, opts ...grpc.CallOption) (*VersionResponse, error)
// Execute decryption operation in KMS provider. // Execute decryption operation in KMS provider.
...@@ -220,44 +220,44 @@ type KMSServiceClient interface { ...@@ -220,44 +220,44 @@ type KMSServiceClient interface {
Encrypt(ctx context.Context, in *EncryptRequest, opts ...grpc.CallOption) (*EncryptResponse, error) Encrypt(ctx context.Context, in *EncryptRequest, opts ...grpc.CallOption) (*EncryptResponse, error)
} }
type kMSServiceClient struct { type keyManagementServiceClient struct {
cc *grpc.ClientConn cc *grpc.ClientConn
} }
func NewKMSServiceClient(cc *grpc.ClientConn) KMSServiceClient { func NewKeyManagementServiceClient(cc *grpc.ClientConn) KeyManagementServiceClient {
return &kMSServiceClient{cc} return &keyManagementServiceClient{cc}
} }
func (c *kMSServiceClient) Version(ctx context.Context, in *VersionRequest, opts ...grpc.CallOption) (*VersionResponse, error) { func (c *keyManagementServiceClient) Version(ctx context.Context, in *VersionRequest, opts ...grpc.CallOption) (*VersionResponse, error) {
out := new(VersionResponse) out := new(VersionResponse)
err := grpc.Invoke(ctx, "/v1beta1.KMSService/Version", in, out, c.cc, opts...) err := grpc.Invoke(ctx, "/v1beta1.KeyManagementService/Version", in, out, c.cc, opts...)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return out, nil return out, nil
} }
func (c *kMSServiceClient) Decrypt(ctx context.Context, in *DecryptRequest, opts ...grpc.CallOption) (*DecryptResponse, error) { func (c *keyManagementServiceClient) Decrypt(ctx context.Context, in *DecryptRequest, opts ...grpc.CallOption) (*DecryptResponse, error) {
out := new(DecryptResponse) out := new(DecryptResponse)
err := grpc.Invoke(ctx, "/v1beta1.KMSService/Decrypt", in, out, c.cc, opts...) err := grpc.Invoke(ctx, "/v1beta1.KeyManagementService/Decrypt", in, out, c.cc, opts...)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return out, nil return out, nil
} }
func (c *kMSServiceClient) Encrypt(ctx context.Context, in *EncryptRequest, opts ...grpc.CallOption) (*EncryptResponse, error) { func (c *keyManagementServiceClient) Encrypt(ctx context.Context, in *EncryptRequest, opts ...grpc.CallOption) (*EncryptResponse, error) {
out := new(EncryptResponse) out := new(EncryptResponse)
err := grpc.Invoke(ctx, "/v1beta1.KMSService/Encrypt", in, out, c.cc, opts...) err := grpc.Invoke(ctx, "/v1beta1.KeyManagementService/Encrypt", in, out, c.cc, opts...)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return out, nil return out, nil
} }
// Server API for KMSService service // Server API for KeyManagementService service
type KMSServiceServer interface { type KeyManagementServiceServer interface {
// Version returns the runtime name and runtime version of the KMS provider. // Version returns the runtime name and runtime version of the KMS provider.
Version(context.Context, *VersionRequest) (*VersionResponse, error) Version(context.Context, *VersionRequest) (*VersionResponse, error)
// Execute decryption operation in KMS provider. // Execute decryption operation in KMS provider.
...@@ -266,79 +266,79 @@ type KMSServiceServer interface { ...@@ -266,79 +266,79 @@ type KMSServiceServer interface {
Encrypt(context.Context, *EncryptRequest) (*EncryptResponse, error) Encrypt(context.Context, *EncryptRequest) (*EncryptResponse, error)
} }
func RegisterKMSServiceServer(s *grpc.Server, srv KMSServiceServer) { func RegisterKeyManagementServiceServer(s *grpc.Server, srv KeyManagementServiceServer) {
s.RegisterService(&_KMSService_serviceDesc, srv) s.RegisterService(&_KeyManagementService_serviceDesc, srv)
} }
func _KMSService_Version_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { func _KeyManagementService_Version_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(VersionRequest) in := new(VersionRequest)
if err := dec(in); err != nil { if err := dec(in); err != nil {
return nil, err return nil, err
} }
if interceptor == nil { if interceptor == nil {
return srv.(KMSServiceServer).Version(ctx, in) return srv.(KeyManagementServiceServer).Version(ctx, in)
} }
info := &grpc.UnaryServerInfo{ info := &grpc.UnaryServerInfo{
Server: srv, Server: srv,
FullMethod: "/v1beta1.KMSService/Version", FullMethod: "/v1beta1.KeyManagementService/Version",
} }
handler := func(ctx context.Context, req interface{}) (interface{}, error) { handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(KMSServiceServer).Version(ctx, req.(*VersionRequest)) return srv.(KeyManagementServiceServer).Version(ctx, req.(*VersionRequest))
} }
return interceptor(ctx, in, info, handler) return interceptor(ctx, in, info, handler)
} }
func _KMSService_Decrypt_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { func _KeyManagementService_Decrypt_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(DecryptRequest) in := new(DecryptRequest)
if err := dec(in); err != nil { if err := dec(in); err != nil {
return nil, err return nil, err
} }
if interceptor == nil { if interceptor == nil {
return srv.(KMSServiceServer).Decrypt(ctx, in) return srv.(KeyManagementServiceServer).Decrypt(ctx, in)
} }
info := &grpc.UnaryServerInfo{ info := &grpc.UnaryServerInfo{
Server: srv, Server: srv,
FullMethod: "/v1beta1.KMSService/Decrypt", FullMethod: "/v1beta1.KeyManagementService/Decrypt",
} }
handler := func(ctx context.Context, req interface{}) (interface{}, error) { handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(KMSServiceServer).Decrypt(ctx, req.(*DecryptRequest)) return srv.(KeyManagementServiceServer).Decrypt(ctx, req.(*DecryptRequest))
} }
return interceptor(ctx, in, info, handler) return interceptor(ctx, in, info, handler)
} }
func _KMSService_Encrypt_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { func _KeyManagementService_Encrypt_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(EncryptRequest) in := new(EncryptRequest)
if err := dec(in); err != nil { if err := dec(in); err != nil {
return nil, err return nil, err
} }
if interceptor == nil { if interceptor == nil {
return srv.(KMSServiceServer).Encrypt(ctx, in) return srv.(KeyManagementServiceServer).Encrypt(ctx, in)
} }
info := &grpc.UnaryServerInfo{ info := &grpc.UnaryServerInfo{
Server: srv, Server: srv,
FullMethod: "/v1beta1.KMSService/Encrypt", FullMethod: "/v1beta1.KeyManagementService/Encrypt",
} }
handler := func(ctx context.Context, req interface{}) (interface{}, error) { handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(KMSServiceServer).Encrypt(ctx, req.(*EncryptRequest)) return srv.(KeyManagementServiceServer).Encrypt(ctx, req.(*EncryptRequest))
} }
return interceptor(ctx, in, info, handler) return interceptor(ctx, in, info, handler)
} }
var _KMSService_serviceDesc = grpc.ServiceDesc{ var _KeyManagementService_serviceDesc = grpc.ServiceDesc{
ServiceName: "v1beta1.KMSService", ServiceName: "v1beta1.KeyManagementService",
HandlerType: (*KMSServiceServer)(nil), HandlerType: (*KeyManagementServiceServer)(nil),
Methods: []grpc.MethodDesc{ Methods: []grpc.MethodDesc{
{ {
MethodName: "Version", MethodName: "Version",
Handler: _KMSService_Version_Handler, Handler: _KeyManagementService_Version_Handler,
}, },
{ {
MethodName: "Decrypt", MethodName: "Decrypt",
Handler: _KMSService_Decrypt_Handler, Handler: _KeyManagementService_Decrypt_Handler,
}, },
{ {
MethodName: "Encrypt", MethodName: "Encrypt",
Handler: _KMSService_Encrypt_Handler, Handler: _KeyManagementService_Encrypt_Handler,
}, },
}, },
Streams: []grpc.StreamDesc{}, Streams: []grpc.StreamDesc{},
...@@ -348,23 +348,23 @@ var _KMSService_serviceDesc = grpc.ServiceDesc{ ...@@ -348,23 +348,23 @@ var _KMSService_serviceDesc = grpc.ServiceDesc{
func init() { proto.RegisterFile("service.proto", fileDescriptorService) } func init() { proto.RegisterFile("service.proto", fileDescriptorService) }
var fileDescriptorService = []byte{ var fileDescriptorService = []byte{
// 279 bytes of a gzipped FileDescriptorProto // 287 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x52, 0xcd, 0x4a, 0xc4, 0x30, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x52, 0xcd, 0x4a, 0xc4, 0x30,
0x10, 0xde, 0xae, 0xb8, 0xc5, 0xb1, 0xb6, 0x10, 0x44, 0x8b, 0x27, 0xcd, 0x65, 0xd5, 0x43, 0x61, 0x10, 0xde, 0xae, 0xb8, 0xc5, 0xb1, 0xb6, 0x10, 0x16, 0x2d, 0x9e, 0x34, 0x97, 0x55, 0x0f, 0x85,
0xf5, 0x2e, 0x22, 0x7a, 0x12, 0x3d, 0x74, 0xc1, 0xab, 0x74, 0xcb, 0x80, 0x01, 0x9b, 0xc6, 0x24, 0xd5, 0xbb, 0x88, 0xe8, 0x49, 0xf4, 0x50, 0xc1, 0xab, 0x64, 0xcb, 0xa0, 0x05, 0x9b, 0xc6, 0x24,
0x5b, 0xf1, 0x1d, 0x7d, 0x28, 0xb1, 0x99, 0xd6, 0xb4, 0x22, 0xee, 0x71, 0x26, 0xdf, 0xdf, 0xcc, 0x5b, 0xd9, 0x17, 0xf5, 0x79, 0xc4, 0x66, 0x5a, 0xd3, 0x15, 0x71, 0x8f, 0x33, 0x99, 0xef, 0x6f,
0x04, 0xf6, 0x0c, 0xea, 0x46, 0x94, 0x98, 0x29, 0x5d, 0xdb, 0x9a, 0x85, 0xcd, 0x62, 0x85, 0xb6, 0x26, 0xb0, 0x67, 0x50, 0x37, 0x65, 0x81, 0x99, 0xd2, 0xb5, 0xad, 0x59, 0xd8, 0xcc, 0x17, 0x68,
0x58, 0xf0, 0x73, 0x88, 0x9f, 0x50, 0x1b, 0x51, 0xcb, 0x1c, 0xdf, 0xd6, 0x68, 0x2c, 0x4b, 0x21, 0xc5, 0x9c, 0x9f, 0x41, 0xfc, 0x84, 0xda, 0x94, 0xb5, 0xcc, 0xf1, 0x7d, 0x89, 0xc6, 0xb2, 0x14,
0x6c, 0x5c, 0x27, 0x0d, 0x8e, 0x83, 0xd3, 0x9d, 0xbc, 0x2b, 0xf9, 0x3b, 0x24, 0x3d, 0xd6, 0xa8, 0xc2, 0xc6, 0x75, 0xd2, 0xe0, 0x28, 0x38, 0xd9, 0xc9, 0xbb, 0x92, 0x7f, 0x40, 0xd2, 0xcf, 0x1a,
0x5a, 0x1a, 0xfc, 0x1b, 0xcc, 0x4e, 0x20, 0xd2, 0x6b, 0x69, 0x45, 0x85, 0xcf, 0xb2, 0xa8, 0x30, 0x55, 0x4b, 0x83, 0x7f, 0x0f, 0xb3, 0x63, 0x88, 0xf4, 0x52, 0xda, 0xb2, 0xc2, 0x67, 0x29, 0x2a,
0x9d, 0xb6, 0xcf, 0xbb, 0xd4, 0x7b, 0x2c, 0x2a, 0x64, 0x73, 0x48, 0x3a, 0x48, 0x27, 0xb2, 0xd5, 0x4c, 0xc7, 0xed, 0xf3, 0x2e, 0xf5, 0x1e, 0x44, 0x85, 0x6c, 0x06, 0x49, 0x37, 0xd2, 0x91, 0x6c,
0xa2, 0x62, 0x6a, 0x93, 0x1b, 0xbf, 0x81, 0xf8, 0x16, 0x4b, 0xfd, 0xa1, 0xec, 0xbf, 0x21, 0xd9, 0xb5, 0x53, 0x31, 0xb5, 0x49, 0x8d, 0x5f, 0x43, 0x7c, 0x83, 0x85, 0x5e, 0x29, 0xfb, 0xaf, 0x49,
0x01, 0xcc, 0x4a, 0xa1, 0x5e, 0x50, 0xb7, 0x8e, 0x51, 0x4e, 0x15, 0x9f, 0x43, 0xd2, 0x6b, 0x50, 0xb6, 0x0f, 0x93, 0xa2, 0x54, 0xaf, 0xa8, 0x5b, 0xc5, 0x28, 0xa7, 0x8a, 0xcf, 0x20, 0xe9, 0x39,
0xf8, 0x7d, 0xd8, 0x56, 0xaf, 0x85, 0x70, 0x12, 0x51, 0xee, 0x0a, 0x7e, 0x0d, 0xf1, 0x9d, 0xdc, 0xc8, 0xfc, 0x14, 0xb6, 0xd5, 0x9b, 0x28, 0x1d, 0x45, 0x94, 0xbb, 0x82, 0x5f, 0x41, 0x7c, 0x2b,
0xd0, 0xac, 0x57, 0x98, 0xfa, 0x0a, 0x67, 0x90, 0xf4, 0x0a, 0x64, 0xf5, 0x93, 0x2a, 0xf0, 0x53, 0x37, 0x14, 0xeb, 0x19, 0xc6, 0x3e, 0xc3, 0x29, 0x24, 0x3d, 0x03, 0x49, 0xfd, 0xb8, 0x0a, 0x7c,
0x5d, 0x7c, 0x06, 0x00, 0xf7, 0x0f, 0xcb, 0xa5, 0x3b, 0x0e, 0xbb, 0x82, 0x90, 0x66, 0x66, 0x87, 0x57, 0xe7, 0x9f, 0x01, 0x4c, 0xef, 0x70, 0x75, 0x2f, 0xa4, 0x78, 0xc1, 0x0a, 0xa5, 0x7d, 0x74,
0x19, 0x9d, 0x28, 0x1b, 0xde, 0xe7, 0x28, 0xfd, 0xfd, 0xe0, 0x4c, 0xf8, 0xe4, 0x9b, 0x4f, 0x43, 0x67, 0x62, 0x97, 0x10, 0x52, 0x7a, 0x76, 0x90, 0xd1, 0xb1, 0xb2, 0xe1, 0xa5, 0x0e, 0xd3, 0xdf,
0x7a, 0xfc, 0xe1, 0xea, 0x3c, 0xfe, 0x68, 0x1f, 0x8e, 0x4f, 0xc9, 0x3d, 0xfe, 0x70, 0x1b, 0x1e, 0x0f, 0x4e, 0x8e, 0x8f, 0xbe, 0xf1, 0x14, 0xd7, 0xc3, 0x0f, 0x97, 0xe8, 0xe1, 0xd7, 0x36, 0xe3,
0x7f, 0x34, 0x24, 0x9f, 0xac, 0x66, 0xed, 0xef, 0xba, 0xfc, 0x0a, 0x00, 0x00, 0xff, 0xff, 0x28, 0xf0, 0x94, 0xc1, 0xc3, 0x0f, 0xf7, 0xe2, 0xe1, 0xd7, 0xe2, 0xf2, 0xd1, 0x62, 0xd2, 0xfe, 0xb3,
0x69, 0xfc, 0xea, 0x6e, 0x02, 0x00, 0x00, 0x8b, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x33, 0x8d, 0x09, 0xe1, 0x78, 0x02, 0x00, 0x00,
} }
staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/v1beta1/service.proto
View file @ 0dcf19df
...@@ -4,7 +4,7 @@ syntax = "proto3"; ...@@ -4,7 +4,7 @@ syntax = "proto3";
package v1beta1; package v1beta1;
// This service defines the public APIs for remote KMS provider. // This service defines the public APIs for remote KMS provider.
service KMSService { service KeyManagementService {
// Version returns the runtime name and runtime version of the KMS provider. // Version returns the runtime name and runtime version of the KMS provider.
rpc Version(VersionRequest) returns (VersionResponse) {} rpc Version(VersionRequest) returns (VersionResponse) {}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment