diff --git a/api/golang/core/kurtosis_core_rpc_api_bindings/api_container_service.pb.go b/api/golang/core/kurtosis_core_rpc_api_bindings/api_container_service.pb.go index a0a48cd649..ebb3f041d2 100644 --- a/api/golang/core/kurtosis_core_rpc_api_bindings/api_container_service.pb.go +++ b/api/golang/core/kurtosis_core_rpc_api_bindings/api_container_service.pb.go @@ -3226,7 +3226,7 @@ type GetStarlarkRunResponse struct { MainFunctionName string `protobuf:"bytes,6,opt,name=main_function_name,json=mainFunctionName,proto3" json:"main_function_name,omitempty"` ExperimentalFeatures []KurtosisFeatureFlag `protobuf:"varint,7,rep,packed,name=experimental_features,json=experimentalFeatures,proto3,enum=api_container_api.KurtosisFeatureFlag" json:"experimental_features,omitempty"` RestartPolicy RestartPolicy `protobuf:"varint,8,opt,name=restart_policy,json=restartPolicy,proto3,enum=api_container_api.RestartPolicy" json:"restart_policy,omitempty"` - // The params that were used for the very first run of the script + // The params that were used on for the very first Starlark run in an APIC InitialSerializedParams *string `protobuf:"bytes,9,opt,name=initial_serialized_params,json=initialSerializedParams,proto3,oneof" json:"initial_serialized_params,omitempty"` } diff --git a/api/rust/src/api_container_api.rs b/api/rust/src/api_container_api.rs index 07d5f0791e..a3de2c65bc 100644 --- a/api/rust/src/api_container_api.rs +++ b/api/rust/src/api_container_api.rs @@ -687,7 +687,7 @@ pub struct GetStarlarkRunResponse { pub experimental_features: ::prost::alloc::vec::Vec, #[prost(enumeration = "RestartPolicy", tag = "8")] pub restart_policy: i32, - /// The params that were used for the very first run of the script + /// The params that were used on for the very first Starlark run in an APIC #[prost(string, optional, tag = "9")] pub initial_serialized_params: ::core::option::Option< ::prost::alloc::string::String, diff --git a/api/typescript/src/core/kurtosis_core_rpc_api_bindings/connect/api_container_service_pb.d.ts b/api/typescript/src/core/kurtosis_core_rpc_api_bindings/connect/api_container_service_pb.d.ts index a441b46ae0..de9778ca61 100644 --- a/api/typescript/src/core/kurtosis_core_rpc_api_bindings/connect/api_container_service_pb.d.ts +++ b/api/typescript/src/core/kurtosis_core_rpc_api_bindings/connect/api_container_service_pb.d.ts @@ -1816,7 +1816,7 @@ export declare class GetStarlarkRunResponse extends Message kurtosis_cloud.CancelPaymentSubscriptionArgs 17, // 28: kurtosis_cloud.KurtosisCloudBackendServer.UpdateAddress:input_type -> kurtosis_cloud.UpdateAddressArgs 44, // 29: kurtosis_cloud.KurtosisCloudBackendServer.GetInstances:input_type -> google.protobuf.Empty - 18, // 30: kurtosis_cloud.KurtosisCloudBackendServer.DeleteInstance:input_type -> kurtosis_cloud.DeleteInstanceRequest + 18, // 30: kurtosis_cloud.KurtosisCloudBackendServer.DeleteInstances:input_type -> kurtosis_cloud.DeleteInstancesRequest 21, // 31: kurtosis_cloud.KurtosisCloudBackendServer.ChangeActiveStatus:input_type -> kurtosis_cloud.ChangeUserActiveRequest 22, // 32: kurtosis_cloud.KurtosisCloudBackendServer.GetUser:input_type -> kurtosis_cloud.GetUserRequest 31, // 33: kurtosis_cloud.KurtosisCloudBackendServer.CheckPortAuthorization:input_type -> kurtosis_cloud.CheckPortAuthorizationRequest @@ -3401,7 +3415,7 @@ var file_kurtosis_backend_server_api_proto_depIdxs = []int32{ 44, // 48: kurtosis_cloud.KurtosisCloudBackendServer.CancelPaymentSubscription:output_type -> google.protobuf.Empty 44, // 49: kurtosis_cloud.KurtosisCloudBackendServer.UpdateAddress:output_type -> google.protobuf.Empty 20, // 50: kurtosis_cloud.KurtosisCloudBackendServer.GetInstances:output_type -> kurtosis_cloud.GetInstancesResponse - 19, // 51: kurtosis_cloud.KurtosisCloudBackendServer.DeleteInstance:output_type -> kurtosis_cloud.DeleteInstanceResponse + 19, // 51: kurtosis_cloud.KurtosisCloudBackendServer.DeleteInstances:output_type -> kurtosis_cloud.DeleteInstancesResponse 44, // 52: kurtosis_cloud.KurtosisCloudBackendServer.ChangeActiveStatus:output_type -> google.protobuf.Empty 23, // 53: kurtosis_cloud.KurtosisCloudBackendServer.GetUser:output_type -> kurtosis_cloud.GetUserResponse 44, // 54: kurtosis_cloud.KurtosisCloudBackendServer.CheckPortAuthorization:output_type -> google.protobuf.Empty @@ -3631,7 +3645,7 @@ func file_kurtosis_backend_server_api_proto_init() { } } file_kurtosis_backend_server_api_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DeleteInstanceRequest); i { + switch v := v.(*DeleteInstancesRequest); i { case 0: return &v.state case 1: @@ -3643,7 +3657,7 @@ func file_kurtosis_backend_server_api_proto_init() { } } file_kurtosis_backend_server_api_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DeleteInstanceResponse); i { + switch v := v.(*DeleteInstancesResponse); i { case 0: return &v.state case 1: @@ -3935,6 +3949,7 @@ func file_kurtosis_backend_server_api_proto_init() { file_kurtosis_backend_server_api_proto_msgTypes[6].OneofWrappers = []interface{}{} file_kurtosis_backend_server_api_proto_msgTypes[11].OneofWrappers = []interface{}{} file_kurtosis_backend_server_api_proto_msgTypes[16].OneofWrappers = []interface{}{} + file_kurtosis_backend_server_api_proto_msgTypes[17].OneofWrappers = []interface{}{} file_kurtosis_backend_server_api_proto_msgTypes[23].OneofWrappers = []interface{}{} file_kurtosis_backend_server_api_proto_msgTypes[26].OneofWrappers = []interface{}{} file_kurtosis_backend_server_api_proto_msgTypes[30].OneofWrappers = []interface{}{ diff --git a/cloud/api/golang/kurtosis_backend_server_rpc_api_bindings/kurtosis_backend_server_api_grpc.pb.go b/cloud/api/golang/kurtosis_backend_server_rpc_api_bindings/kurtosis_backend_server_api_grpc.pb.go index 13965a0b0e..5cabc31ed2 100644 --- a/cloud/api/golang/kurtosis_backend_server_rpc_api_bindings/kurtosis_backend_server_api_grpc.pb.go +++ b/cloud/api/golang/kurtosis_backend_server_rpc_api_bindings/kurtosis_backend_server_api_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v4.24.4 +// - protoc v4.25.2 // source: kurtosis_backend_server_api.proto package kurtosis_backend_server_rpc_api_bindings @@ -29,7 +29,7 @@ const ( KurtosisCloudBackendServer_CancelPaymentSubscription_FullMethodName = "/kurtosis_cloud.KurtosisCloudBackendServer/CancelPaymentSubscription" KurtosisCloudBackendServer_UpdateAddress_FullMethodName = "/kurtosis_cloud.KurtosisCloudBackendServer/UpdateAddress" KurtosisCloudBackendServer_GetInstances_FullMethodName = "/kurtosis_cloud.KurtosisCloudBackendServer/GetInstances" - KurtosisCloudBackendServer_DeleteInstance_FullMethodName = "/kurtosis_cloud.KurtosisCloudBackendServer/DeleteInstance" + KurtosisCloudBackendServer_DeleteInstances_FullMethodName = "/kurtosis_cloud.KurtosisCloudBackendServer/DeleteInstances" KurtosisCloudBackendServer_ChangeActiveStatus_FullMethodName = "/kurtosis_cloud.KurtosisCloudBackendServer/ChangeActiveStatus" KurtosisCloudBackendServer_GetUser_FullMethodName = "/kurtosis_cloud.KurtosisCloudBackendServer/GetUser" KurtosisCloudBackendServer_CheckPortAuthorization_FullMethodName = "/kurtosis_cloud.KurtosisCloudBackendServer/CheckPortAuthorization" @@ -56,7 +56,7 @@ type KurtosisCloudBackendServerClient interface { CancelPaymentSubscription(ctx context.Context, in *CancelPaymentSubscriptionArgs, opts ...grpc.CallOption) (*emptypb.Empty, error) UpdateAddress(ctx context.Context, in *UpdateAddressArgs, opts ...grpc.CallOption) (*emptypb.Empty, error) GetInstances(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*GetInstancesResponse, error) - DeleteInstance(ctx context.Context, in *DeleteInstanceRequest, opts ...grpc.CallOption) (*DeleteInstanceResponse, error) + DeleteInstances(ctx context.Context, in *DeleteInstancesRequest, opts ...grpc.CallOption) (*DeleteInstancesResponse, error) ChangeActiveStatus(ctx context.Context, in *ChangeUserActiveRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) GetUser(ctx context.Context, in *GetUserRequest, opts ...grpc.CallOption) (*GetUserResponse, error) CheckPortAuthorization(ctx context.Context, in *CheckPortAuthorizationRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) @@ -159,9 +159,9 @@ func (c *kurtosisCloudBackendServerClient) GetInstances(ctx context.Context, in return out, nil } -func (c *kurtosisCloudBackendServerClient) DeleteInstance(ctx context.Context, in *DeleteInstanceRequest, opts ...grpc.CallOption) (*DeleteInstanceResponse, error) { - out := new(DeleteInstanceResponse) - err := c.cc.Invoke(ctx, KurtosisCloudBackendServer_DeleteInstance_FullMethodName, in, out, opts...) +func (c *kurtosisCloudBackendServerClient) DeleteInstances(ctx context.Context, in *DeleteInstancesRequest, opts ...grpc.CallOption) (*DeleteInstancesResponse, error) { + out := new(DeleteInstancesResponse) + err := c.cc.Invoke(ctx, KurtosisCloudBackendServer_DeleteInstances_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -280,7 +280,7 @@ type KurtosisCloudBackendServerServer interface { CancelPaymentSubscription(context.Context, *CancelPaymentSubscriptionArgs) (*emptypb.Empty, error) UpdateAddress(context.Context, *UpdateAddressArgs) (*emptypb.Empty, error) GetInstances(context.Context, *emptypb.Empty) (*GetInstancesResponse, error) - DeleteInstance(context.Context, *DeleteInstanceRequest) (*DeleteInstanceResponse, error) + DeleteInstances(context.Context, *DeleteInstancesRequest) (*DeleteInstancesResponse, error) ChangeActiveStatus(context.Context, *ChangeUserActiveRequest) (*emptypb.Empty, error) GetUser(context.Context, *GetUserRequest) (*GetUserResponse, error) CheckPortAuthorization(context.Context, *CheckPortAuthorizationRequest) (*emptypb.Empty, error) @@ -325,8 +325,8 @@ func (UnimplementedKurtosisCloudBackendServerServer) UpdateAddress(context.Conte func (UnimplementedKurtosisCloudBackendServerServer) GetInstances(context.Context, *emptypb.Empty) (*GetInstancesResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetInstances not implemented") } -func (UnimplementedKurtosisCloudBackendServerServer) DeleteInstance(context.Context, *DeleteInstanceRequest) (*DeleteInstanceResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method DeleteInstance not implemented") +func (UnimplementedKurtosisCloudBackendServerServer) DeleteInstances(context.Context, *DeleteInstancesRequest) (*DeleteInstancesResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method DeleteInstances not implemented") } func (UnimplementedKurtosisCloudBackendServerServer) ChangeActiveStatus(context.Context, *ChangeUserActiveRequest) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method ChangeActiveStatus not implemented") @@ -535,20 +535,20 @@ func _KurtosisCloudBackendServer_GetInstances_Handler(srv interface{}, ctx conte return interceptor(ctx, in, info, handler) } -func _KurtosisCloudBackendServer_DeleteInstance_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(DeleteInstanceRequest) +func _KurtosisCloudBackendServer_DeleteInstances_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(DeleteInstancesRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(KurtosisCloudBackendServerServer).DeleteInstance(ctx, in) + return srv.(KurtosisCloudBackendServerServer).DeleteInstances(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: KurtosisCloudBackendServer_DeleteInstance_FullMethodName, + FullMethod: KurtosisCloudBackendServer_DeleteInstances_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(KurtosisCloudBackendServerServer).DeleteInstance(ctx, req.(*DeleteInstanceRequest)) + return srv.(KurtosisCloudBackendServerServer).DeleteInstances(ctx, req.(*DeleteInstancesRequest)) } return interceptor(ctx, in, info, handler) } @@ -795,8 +795,8 @@ var KurtosisCloudBackendServer_ServiceDesc = grpc.ServiceDesc{ Handler: _KurtosisCloudBackendServer_GetInstances_Handler, }, { - MethodName: "DeleteInstance", - Handler: _KurtosisCloudBackendServer_DeleteInstance_Handler, + MethodName: "DeleteInstances", + Handler: _KurtosisCloudBackendServer_DeleteInstances_Handler, }, { MethodName: "ChangeActiveStatus", diff --git a/cloud/api/golang/kurtosis_backend_server_rpc_api_bindings/kurtosis_backend_server_rpc_api_bindingsconnect/kurtosis_backend_server_api.connect.go b/cloud/api/golang/kurtosis_backend_server_rpc_api_bindings/kurtosis_backend_server_rpc_api_bindingsconnect/kurtosis_backend_server_api.connect.go index f166145487..5a597540d3 100644 --- a/cloud/api/golang/kurtosis_backend_server_rpc_api_bindings/kurtosis_backend_server_rpc_api_bindingsconnect/kurtosis_backend_server_api.connect.go +++ b/cloud/api/golang/kurtosis_backend_server_rpc_api_bindings/kurtosis_backend_server_rpc_api_bindingsconnect/kurtosis_backend_server_api.connect.go @@ -62,9 +62,9 @@ const ( // KurtosisCloudBackendServerGetInstancesProcedure is the fully-qualified name of the // KurtosisCloudBackendServer's GetInstances RPC. KurtosisCloudBackendServerGetInstancesProcedure = "/kurtosis_cloud.KurtosisCloudBackendServer/GetInstances" - // KurtosisCloudBackendServerDeleteInstanceProcedure is the fully-qualified name of the - // KurtosisCloudBackendServer's DeleteInstance RPC. - KurtosisCloudBackendServerDeleteInstanceProcedure = "/kurtosis_cloud.KurtosisCloudBackendServer/DeleteInstance" + // KurtosisCloudBackendServerDeleteInstancesProcedure is the fully-qualified name of the + // KurtosisCloudBackendServer's DeleteInstances RPC. + KurtosisCloudBackendServerDeleteInstancesProcedure = "/kurtosis_cloud.KurtosisCloudBackendServer/DeleteInstances" // KurtosisCloudBackendServerChangeActiveStatusProcedure is the fully-qualified name of the // KurtosisCloudBackendServer's ChangeActiveStatus RPC. KurtosisCloudBackendServerChangeActiveStatusProcedure = "/kurtosis_cloud.KurtosisCloudBackendServer/ChangeActiveStatus" @@ -112,7 +112,7 @@ type KurtosisCloudBackendServerClient interface { CancelPaymentSubscription(context.Context, *connect.Request[kurtosis_backend_server_rpc_api_bindings.CancelPaymentSubscriptionArgs]) (*connect.Response[emptypb.Empty], error) UpdateAddress(context.Context, *connect.Request[kurtosis_backend_server_rpc_api_bindings.UpdateAddressArgs]) (*connect.Response[emptypb.Empty], error) GetInstances(context.Context, *connect.Request[emptypb.Empty]) (*connect.Response[kurtosis_backend_server_rpc_api_bindings.GetInstancesResponse], error) - DeleteInstance(context.Context, *connect.Request[kurtosis_backend_server_rpc_api_bindings.DeleteInstanceRequest]) (*connect.Response[kurtosis_backend_server_rpc_api_bindings.DeleteInstanceResponse], error) + DeleteInstances(context.Context, *connect.Request[kurtosis_backend_server_rpc_api_bindings.DeleteInstancesRequest]) (*connect.Response[kurtosis_backend_server_rpc_api_bindings.DeleteInstancesResponse], error) ChangeActiveStatus(context.Context, *connect.Request[kurtosis_backend_server_rpc_api_bindings.ChangeUserActiveRequest]) (*connect.Response[emptypb.Empty], error) GetUser(context.Context, *connect.Request[kurtosis_backend_server_rpc_api_bindings.GetUserRequest]) (*connect.Response[kurtosis_backend_server_rpc_api_bindings.GetUserResponse], error) CheckPortAuthorization(context.Context, *connect.Request[kurtosis_backend_server_rpc_api_bindings.CheckPortAuthorizationRequest]) (*connect.Response[emptypb.Empty], error) @@ -183,9 +183,9 @@ func NewKurtosisCloudBackendServerClient(httpClient connect.HTTPClient, baseURL baseURL+KurtosisCloudBackendServerGetInstancesProcedure, opts..., ), - deleteInstance: connect.NewClient[kurtosis_backend_server_rpc_api_bindings.DeleteInstanceRequest, kurtosis_backend_server_rpc_api_bindings.DeleteInstanceResponse]( + deleteInstances: connect.NewClient[kurtosis_backend_server_rpc_api_bindings.DeleteInstancesRequest, kurtosis_backend_server_rpc_api_bindings.DeleteInstancesResponse]( httpClient, - baseURL+KurtosisCloudBackendServerDeleteInstanceProcedure, + baseURL+KurtosisCloudBackendServerDeleteInstancesProcedure, opts..., ), changeActiveStatus: connect.NewClient[kurtosis_backend_server_rpc_api_bindings.ChangeUserActiveRequest, emptypb.Empty]( @@ -258,7 +258,7 @@ type kurtosisCloudBackendServerClient struct { cancelPaymentSubscription *connect.Client[kurtosis_backend_server_rpc_api_bindings.CancelPaymentSubscriptionArgs, emptypb.Empty] updateAddress *connect.Client[kurtosis_backend_server_rpc_api_bindings.UpdateAddressArgs, emptypb.Empty] getInstances *connect.Client[emptypb.Empty, kurtosis_backend_server_rpc_api_bindings.GetInstancesResponse] - deleteInstance *connect.Client[kurtosis_backend_server_rpc_api_bindings.DeleteInstanceRequest, kurtosis_backend_server_rpc_api_bindings.DeleteInstanceResponse] + deleteInstances *connect.Client[kurtosis_backend_server_rpc_api_bindings.DeleteInstancesRequest, kurtosis_backend_server_rpc_api_bindings.DeleteInstancesResponse] changeActiveStatus *connect.Client[kurtosis_backend_server_rpc_api_bindings.ChangeUserActiveRequest, emptypb.Empty] getUser *connect.Client[kurtosis_backend_server_rpc_api_bindings.GetUserRequest, kurtosis_backend_server_rpc_api_bindings.GetUserResponse] checkPortAuthorization *connect.Client[kurtosis_backend_server_rpc_api_bindings.CheckPortAuthorizationRequest, emptypb.Empty] @@ -320,9 +320,9 @@ func (c *kurtosisCloudBackendServerClient) GetInstances(ctx context.Context, req return c.getInstances.CallUnary(ctx, req) } -// DeleteInstance calls kurtosis_cloud.KurtosisCloudBackendServer.DeleteInstance. -func (c *kurtosisCloudBackendServerClient) DeleteInstance(ctx context.Context, req *connect.Request[kurtosis_backend_server_rpc_api_bindings.DeleteInstanceRequest]) (*connect.Response[kurtosis_backend_server_rpc_api_bindings.DeleteInstanceResponse], error) { - return c.deleteInstance.CallUnary(ctx, req) +// DeleteInstances calls kurtosis_cloud.KurtosisCloudBackendServer.DeleteInstances. +func (c *kurtosisCloudBackendServerClient) DeleteInstances(ctx context.Context, req *connect.Request[kurtosis_backend_server_rpc_api_bindings.DeleteInstancesRequest]) (*connect.Response[kurtosis_backend_server_rpc_api_bindings.DeleteInstancesResponse], error) { + return c.deleteInstances.CallUnary(ctx, req) } // ChangeActiveStatus calls kurtosis_cloud.KurtosisCloudBackendServer.ChangeActiveStatus. @@ -393,7 +393,7 @@ type KurtosisCloudBackendServerHandler interface { CancelPaymentSubscription(context.Context, *connect.Request[kurtosis_backend_server_rpc_api_bindings.CancelPaymentSubscriptionArgs]) (*connect.Response[emptypb.Empty], error) UpdateAddress(context.Context, *connect.Request[kurtosis_backend_server_rpc_api_bindings.UpdateAddressArgs]) (*connect.Response[emptypb.Empty], error) GetInstances(context.Context, *connect.Request[emptypb.Empty]) (*connect.Response[kurtosis_backend_server_rpc_api_bindings.GetInstancesResponse], error) - DeleteInstance(context.Context, *connect.Request[kurtosis_backend_server_rpc_api_bindings.DeleteInstanceRequest]) (*connect.Response[kurtosis_backend_server_rpc_api_bindings.DeleteInstanceResponse], error) + DeleteInstances(context.Context, *connect.Request[kurtosis_backend_server_rpc_api_bindings.DeleteInstancesRequest]) (*connect.Response[kurtosis_backend_server_rpc_api_bindings.DeleteInstancesResponse], error) ChangeActiveStatus(context.Context, *connect.Request[kurtosis_backend_server_rpc_api_bindings.ChangeUserActiveRequest]) (*connect.Response[emptypb.Empty], error) GetUser(context.Context, *connect.Request[kurtosis_backend_server_rpc_api_bindings.GetUserRequest]) (*connect.Response[kurtosis_backend_server_rpc_api_bindings.GetUserResponse], error) CheckPortAuthorization(context.Context, *connect.Request[kurtosis_backend_server_rpc_api_bindings.CheckPortAuthorizationRequest]) (*connect.Response[emptypb.Empty], error) @@ -460,9 +460,9 @@ func NewKurtosisCloudBackendServerHandler(svc KurtosisCloudBackendServerHandler, svc.GetInstances, opts..., ) - kurtosisCloudBackendServerDeleteInstanceHandler := connect.NewUnaryHandler( - KurtosisCloudBackendServerDeleteInstanceProcedure, - svc.DeleteInstance, + kurtosisCloudBackendServerDeleteInstancesHandler := connect.NewUnaryHandler( + KurtosisCloudBackendServerDeleteInstancesProcedure, + svc.DeleteInstances, opts..., ) kurtosisCloudBackendServerChangeActiveStatusHandler := connect.NewUnaryHandler( @@ -541,8 +541,8 @@ func NewKurtosisCloudBackendServerHandler(svc KurtosisCloudBackendServerHandler, kurtosisCloudBackendServerUpdateAddressHandler.ServeHTTP(w, r) case KurtosisCloudBackendServerGetInstancesProcedure: kurtosisCloudBackendServerGetInstancesHandler.ServeHTTP(w, r) - case KurtosisCloudBackendServerDeleteInstanceProcedure: - kurtosisCloudBackendServerDeleteInstanceHandler.ServeHTTP(w, r) + case KurtosisCloudBackendServerDeleteInstancesProcedure: + kurtosisCloudBackendServerDeleteInstancesHandler.ServeHTTP(w, r) case KurtosisCloudBackendServerChangeActiveStatusProcedure: kurtosisCloudBackendServerChangeActiveStatusHandler.ServeHTTP(w, r) case KurtosisCloudBackendServerGetUserProcedure: @@ -610,8 +610,8 @@ func (UnimplementedKurtosisCloudBackendServerHandler) GetInstances(context.Conte return nil, connect.NewError(connect.CodeUnimplemented, errors.New("kurtosis_cloud.KurtosisCloudBackendServer.GetInstances is not implemented")) } -func (UnimplementedKurtosisCloudBackendServerHandler) DeleteInstance(context.Context, *connect.Request[kurtosis_backend_server_rpc_api_bindings.DeleteInstanceRequest]) (*connect.Response[kurtosis_backend_server_rpc_api_bindings.DeleteInstanceResponse], error) { - return nil, connect.NewError(connect.CodeUnimplemented, errors.New("kurtosis_cloud.KurtosisCloudBackendServer.DeleteInstance is not implemented")) +func (UnimplementedKurtosisCloudBackendServerHandler) DeleteInstances(context.Context, *connect.Request[kurtosis_backend_server_rpc_api_bindings.DeleteInstancesRequest]) (*connect.Response[kurtosis_backend_server_rpc_api_bindings.DeleteInstancesResponse], error) { + return nil, connect.NewError(connect.CodeUnimplemented, errors.New("kurtosis_cloud.KurtosisCloudBackendServer.DeleteInstances is not implemented")) } func (UnimplementedKurtosisCloudBackendServerHandler) ChangeActiveStatus(context.Context, *connect.Request[kurtosis_backend_server_rpc_api_bindings.ChangeUserActiveRequest]) (*connect.Response[emptypb.Empty], error) { diff --git a/cloud/api/protobuf/kurtosis_backend_server_api.proto b/cloud/api/protobuf/kurtosis_backend_server_api.proto index fd7d8ffa7b..cf5c719f14 100644 --- a/cloud/api/protobuf/kurtosis_backend_server_api.proto +++ b/cloud/api/protobuf/kurtosis_backend_server_api.proto @@ -20,7 +20,7 @@ service KurtosisCloudBackendServer { rpc CancelPaymentSubscription (CancelPaymentSubscriptionArgs) returns (google.protobuf.Empty) {}; rpc UpdateAddress(UpdateAddressArgs) returns (google.protobuf.Empty) {}; rpc GetInstances(google.protobuf.Empty) returns (GetInstancesResponse) {}; - rpc DeleteInstance(DeleteInstanceRequest) returns (DeleteInstanceResponse) {}; + rpc DeleteInstances(DeleteInstancesRequest) returns (DeleteInstancesResponse) {}; rpc ChangeActiveStatus(ChangeUserActiveRequest) returns (google.protobuf.Empty) {}; rpc GetUser(GetUserRequest) returns (GetUserResponse) {}; rpc CheckPortAuthorization(CheckPortAuthorizationRequest) returns(google.protobuf.Empty){ @@ -156,13 +156,18 @@ message UpdateAddressArgs { string country = 8; } -message DeleteInstanceRequest { - string instance_id = 1; - string ec2_id = 2; +message DeleteInstancesRequest { + repeated string instance_ids = 1; + + // must be system user to delete instances + string api_key = 2; + + // can optionally pass a status to only delete instances with a certain status, eg. configuring + optional string status = 3; } -message DeleteInstanceResponse { - string status = 1; +message DeleteInstancesResponse { + repeated string deleted_instances = 1; } message GetInstancesResponse { diff --git a/cloud/api/typescript/src/kurtosis_backend_server_api_connect.ts b/cloud/api/typescript/src/kurtosis_backend_server_api_connect.ts index 59efe3578f..d132d2a877 100644 --- a/cloud/api/typescript/src/kurtosis_backend_server_api_connect.ts +++ b/cloud/api/typescript/src/kurtosis_backend_server_api_connect.ts @@ -4,7 +4,7 @@ // @ts-nocheck import { Empty, MethodIdempotency, MethodKind } from "@bufbuild/protobuf"; -import { AddAliasRequest, CancelPaymentSubscriptionArgs, ChangeUserActiveRequest, CheckPortAuthorizationRequest, DeleteAliasRequest, DeleteInstanceRequest, DeleteInstanceResponse, GetCloudInstanceConfigArgs, GetCloudInstanceConfigResponse, GetInstancesResponse, GetOrCreateApiKeyRequest, GetOrCreateApiKeyResponse, GetOrCreateInstanceRequest, GetOrCreateInstanceResponse, GetOrCreatePaymentConfigArgs, GetOrCreatePaymentConfigResponse, GetPortsRequest, GetPortsResponse, GetUnlockedPortsRequest, GetUnlockedPortsResponse, GetUserRequest, GetUserResponse, IsNewKurtosisVersionAvailableRequest, IsNewKurtosisVersionAvailableResponse, LockPortRequest, RefreshDefaultPaymentMethodArgs, UnlockPortRequest, UpdateAddressArgs, UpgradeKurtosisVersionRequest } from "./kurtosis_backend_server_api_pb.js"; +import { AddAliasRequest, CancelPaymentSubscriptionArgs, ChangeUserActiveRequest, CheckPortAuthorizationRequest, DeleteAliasRequest, DeleteInstancesRequest, DeleteInstancesResponse, GetCloudInstanceConfigArgs, GetCloudInstanceConfigResponse, GetInstancesResponse, GetOrCreateApiKeyRequest, GetOrCreateApiKeyResponse, GetOrCreateInstanceRequest, GetOrCreateInstanceResponse, GetOrCreatePaymentConfigArgs, GetOrCreatePaymentConfigResponse, GetPortsRequest, GetPortsResponse, GetUnlockedPortsRequest, GetUnlockedPortsResponse, GetUserRequest, GetUserResponse, IsNewKurtosisVersionAvailableRequest, IsNewKurtosisVersionAvailableResponse, LockPortRequest, RefreshDefaultPaymentMethodArgs, UnlockPortRequest, UpdateAddressArgs, UpgradeKurtosisVersionRequest } from "./kurtosis_backend_server_api_pb.js"; /** * @generated from service kurtosis_cloud.KurtosisCloudBackendServer @@ -96,12 +96,12 @@ export const KurtosisCloudBackendServer = { kind: MethodKind.Unary, }, /** - * @generated from rpc kurtosis_cloud.KurtosisCloudBackendServer.DeleteInstance + * @generated from rpc kurtosis_cloud.KurtosisCloudBackendServer.DeleteInstances */ - deleteInstance: { - name: "DeleteInstance", - I: DeleteInstanceRequest, - O: DeleteInstanceResponse, + deleteInstances: { + name: "DeleteInstances", + I: DeleteInstancesRequest, + O: DeleteInstancesResponse, kind: MethodKind.Unary, }, /** diff --git a/cloud/api/typescript/src/kurtosis_backend_server_api_pb.ts b/cloud/api/typescript/src/kurtosis_backend_server_api_pb.ts index 9249b4463b..de27ed6510 100644 --- a/cloud/api/typescript/src/kurtosis_backend_server_api_pb.ts +++ b/cloud/api/typescript/src/kurtosis_backend_server_api_pb.ts @@ -1,4 +1,4 @@ -// @generated by protoc-gen-es v1.8.0 with parameter "target=ts" +// @generated by protoc-gen-es v1.3.1 with parameter "target=ts" // @generated from file kurtosis_backend_server_api.proto (package kurtosis_cloud, syntax proto3) /* eslint-disable */ // @ts-nocheck @@ -907,82 +907,92 @@ export class UpdateAddressArgs extends Message { } /** - * @generated from message kurtosis_cloud.DeleteInstanceRequest + * @generated from message kurtosis_cloud.DeleteInstancesRequest */ -export class DeleteInstanceRequest extends Message { +export class DeleteInstancesRequest extends Message { /** - * @generated from field: string instance_id = 1; + * @generated from field: repeated string instance_ids = 1; */ - instanceId = ""; + instanceIds: string[] = []; + + /** + * must be system user to delete instances + * + * @generated from field: string api_key = 2; + */ + apiKey = ""; /** - * @generated from field: string ec2_id = 2; + * can optionally pass a status to only delete instances with a certain status, eg. configuring + * + * @generated from field: optional string status = 3; */ - ec2Id = ""; + status?: string; - constructor(data?: PartialMessage) { + constructor(data?: PartialMessage) { super(); proto3.util.initPartial(data, this); } static readonly runtime: typeof proto3 = proto3; - static readonly typeName = "kurtosis_cloud.DeleteInstanceRequest"; + static readonly typeName = "kurtosis_cloud.DeleteInstancesRequest"; static readonly fields: FieldList = proto3.util.newFieldList(() => [ - { no: 1, name: "instance_id", kind: "scalar", T: 9 /* ScalarType.STRING */ }, - { no: 2, name: "ec2_id", kind: "scalar", T: 9 /* ScalarType.STRING */ }, + { no: 1, name: "instance_ids", kind: "scalar", T: 9 /* ScalarType.STRING */, repeated: true }, + { no: 2, name: "api_key", kind: "scalar", T: 9 /* ScalarType.STRING */ }, + { no: 3, name: "status", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true }, ]); - static fromBinary(bytes: Uint8Array, options?: Partial): DeleteInstanceRequest { - return new DeleteInstanceRequest().fromBinary(bytes, options); + static fromBinary(bytes: Uint8Array, options?: Partial): DeleteInstancesRequest { + return new DeleteInstancesRequest().fromBinary(bytes, options); } - static fromJson(jsonValue: JsonValue, options?: Partial): DeleteInstanceRequest { - return new DeleteInstanceRequest().fromJson(jsonValue, options); + static fromJson(jsonValue: JsonValue, options?: Partial): DeleteInstancesRequest { + return new DeleteInstancesRequest().fromJson(jsonValue, options); } - static fromJsonString(jsonString: string, options?: Partial): DeleteInstanceRequest { - return new DeleteInstanceRequest().fromJsonString(jsonString, options); + static fromJsonString(jsonString: string, options?: Partial): DeleteInstancesRequest { + return new DeleteInstancesRequest().fromJsonString(jsonString, options); } - static equals(a: DeleteInstanceRequest | PlainMessage | undefined, b: DeleteInstanceRequest | PlainMessage | undefined): boolean { - return proto3.util.equals(DeleteInstanceRequest, a, b); + static equals(a: DeleteInstancesRequest | PlainMessage | undefined, b: DeleteInstancesRequest | PlainMessage | undefined): boolean { + return proto3.util.equals(DeleteInstancesRequest, a, b); } } /** - * @generated from message kurtosis_cloud.DeleteInstanceResponse + * @generated from message kurtosis_cloud.DeleteInstancesResponse */ -export class DeleteInstanceResponse extends Message { +export class DeleteInstancesResponse extends Message { /** - * @generated from field: string status = 1; + * @generated from field: repeated string deleted_instances = 1; */ - status = ""; + deletedInstances: string[] = []; - constructor(data?: PartialMessage) { + constructor(data?: PartialMessage) { super(); proto3.util.initPartial(data, this); } static readonly runtime: typeof proto3 = proto3; - static readonly typeName = "kurtosis_cloud.DeleteInstanceResponse"; + static readonly typeName = "kurtosis_cloud.DeleteInstancesResponse"; static readonly fields: FieldList = proto3.util.newFieldList(() => [ - { no: 1, name: "status", kind: "scalar", T: 9 /* ScalarType.STRING */ }, + { no: 1, name: "deleted_instances", kind: "scalar", T: 9 /* ScalarType.STRING */, repeated: true }, ]); - static fromBinary(bytes: Uint8Array, options?: Partial): DeleteInstanceResponse { - return new DeleteInstanceResponse().fromBinary(bytes, options); + static fromBinary(bytes: Uint8Array, options?: Partial): DeleteInstancesResponse { + return new DeleteInstancesResponse().fromBinary(bytes, options); } - static fromJson(jsonValue: JsonValue, options?: Partial): DeleteInstanceResponse { - return new DeleteInstanceResponse().fromJson(jsonValue, options); + static fromJson(jsonValue: JsonValue, options?: Partial): DeleteInstancesResponse { + return new DeleteInstancesResponse().fromJson(jsonValue, options); } - static fromJsonString(jsonString: string, options?: Partial): DeleteInstanceResponse { - return new DeleteInstanceResponse().fromJsonString(jsonString, options); + static fromJsonString(jsonString: string, options?: Partial): DeleteInstancesResponse { + return new DeleteInstancesResponse().fromJsonString(jsonString, options); } - static equals(a: DeleteInstanceResponse | PlainMessage | undefined, b: DeleteInstanceResponse | PlainMessage | undefined): boolean { - return proto3.util.equals(DeleteInstanceResponse, a, b); + static equals(a: DeleteInstancesResponse | PlainMessage | undefined, b: DeleteInstancesResponse | PlainMessage | undefined): boolean { + return proto3.util.equals(DeleteInstancesResponse, a, b); } }