Revert "ws-dameon: implement the SetupPairVeths function."

This reverts commit a960121.

Author: akosyakov

components/workspacekit/cmd/rings.go

@@ -495,18 +495,6 @@ var ring1Cmd = &cobra.Command{
 		//nolint:errcheck
 		defer slirpCmd.Process.Kill()
 
-		client, err = connectToInWorkspaceDaemonService(ctx)
-		if err != nil {
-			log.WithError(err).Error("cannot connect to daemon")
-			return
-		}
-		_, err = client.SetupPairVeths(ctx, &daemonapi.SetupPairVethsRequest{Pid: int64(cmd.Process.Pid)})
-		if err != nil {
-			log.WithError(err).Error("cannot setup pair of veths")
-			return
-		}
-		client.Close()
-
 		log.Info("signaling to child process")
 		_, err = msgutil.MarshalToWriter(ring2Conn, ringSyncMsg{
 			Stage:   1,

components/ws-daemon-api/go/mock/mock.go

@@ -22,7 +22,6 @@ interface IInWorkspaceServiceService extends grpc.ServiceDefinition<grpc.Untyped
     mountSysfs: IInWorkspaceServiceService_IMountSysfs;
     umountSysfs: IInWorkspaceServiceService_IUmountSysfs;
     teardown: IInWorkspaceServiceService_ITeardown;
-    setupPairVeths: IInWorkspaceServiceService_ISetupPairVeths;
 }
 
 interface IInWorkspaceServiceService_IPrepareForUserNS extends grpc.MethodDefinition<workspace_daemon_pb.PrepareForUserNSRequest, workspace_daemon_pb.PrepareForUserNSResponse> {
@@ -97,15 +96,6 @@ interface IInWorkspaceServiceService_ITeardown extends grpc.MethodDefinition<wor
     responseSerialize: grpc.serialize<workspace_daemon_pb.TeardownResponse>;
     responseDeserialize: grpc.deserialize<workspace_daemon_pb.TeardownResponse>;
 }
-interface IInWorkspaceServiceService_ISetupPairVeths extends grpc.MethodDefinition<workspace_daemon_pb.SetupPairVethsRequest, workspace_daemon_pb.SetupPairVethsResponse> {
-    path: "/iws.InWorkspaceService/SetupPairVeths";
-    requestStream: false;
-    responseStream: false;
-    requestSerialize: grpc.serialize<workspace_daemon_pb.SetupPairVethsRequest>;
-    requestDeserialize: grpc.deserialize<workspace_daemon_pb.SetupPairVethsRequest>;
-    responseSerialize: grpc.serialize<workspace_daemon_pb.SetupPairVethsResponse>;
-    responseDeserialize: grpc.deserialize<workspace_daemon_pb.SetupPairVethsResponse>;
-}
 
 export const InWorkspaceServiceService: IInWorkspaceServiceService;
 
@@ -118,7 +108,6 @@ export interface IInWorkspaceServiceServer extends grpc.UntypedServiceImplementa
     mountSysfs: grpc.handleUnaryCall<workspace_daemon_pb.MountProcRequest, workspace_daemon_pb.MountProcResponse>;
     umountSysfs: grpc.handleUnaryCall<workspace_daemon_pb.UmountProcRequest, workspace_daemon_pb.UmountProcResponse>;
     teardown: grpc.handleUnaryCall<workspace_daemon_pb.TeardownRequest, workspace_daemon_pb.TeardownResponse>;
-    setupPairVeths: grpc.handleUnaryCall<workspace_daemon_pb.SetupPairVethsRequest, workspace_daemon_pb.SetupPairVethsResponse>;
 }
 
 export interface IInWorkspaceServiceClient {
@@ -146,9 +135,6 @@ export interface IInWorkspaceServiceClient {
     teardown(request: workspace_daemon_pb.TeardownRequest, callback: (error: grpc.ServiceError | null, response: workspace_daemon_pb.TeardownResponse) => void): grpc.ClientUnaryCall;
     teardown(request: workspace_daemon_pb.TeardownRequest, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: workspace_daemon_pb.TeardownResponse) => void): grpc.ClientUnaryCall;
     teardown(request: workspace_daemon_pb.TeardownRequest, metadata: grpc.Metadata, options: Partial<grpc.CallOptions>, callback: (error: grpc.ServiceError | null, response: workspace_daemon_pb.TeardownResponse) => void): grpc.ClientUnaryCall;
-    setupPairVeths(request: workspace_daemon_pb.SetupPairVethsRequest, callback: (error: grpc.ServiceError | null, response: workspace_daemon_pb.SetupPairVethsResponse) => void): grpc.ClientUnaryCall;
-    setupPairVeths(request: workspace_daemon_pb.SetupPairVethsRequest, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: workspace_daemon_pb.SetupPairVethsResponse) => void): grpc.ClientUnaryCall;
-    setupPairVeths(request: workspace_daemon_pb.SetupPairVethsRequest, metadata: grpc.Metadata, options: Partial<grpc.CallOptions>, callback: (error: grpc.ServiceError | null, response: workspace_daemon_pb.SetupPairVethsResponse) => void): grpc.ClientUnaryCall;
 }
 
 export class InWorkspaceServiceClient extends grpc.Client implements IInWorkspaceServiceClient {
@@ -177,7 +163,4 @@ export class InWorkspaceServiceClient extends grpc.Client implements IInWorkspac
     public teardown(request: workspace_daemon_pb.TeardownRequest, callback: (error: grpc.ServiceError | null, response: workspace_daemon_pb.TeardownResponse) => void): grpc.ClientUnaryCall;
     public teardown(request: workspace_daemon_pb.TeardownRequest, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: workspace_daemon_pb.TeardownResponse) => void): grpc.ClientUnaryCall;
     public teardown(request: workspace_daemon_pb.TeardownRequest, metadata: grpc.Metadata, options: Partial<grpc.CallOptions>, callback: (error: grpc.ServiceError | null, response: workspace_daemon_pb.TeardownResponse) => void): grpc.ClientUnaryCall;
-    public setupPairVeths(request: workspace_daemon_pb.SetupPairVethsRequest, callback: (error: grpc.ServiceError | null, response: workspace_daemon_pb.SetupPairVethsResponse) => void): grpc.ClientUnaryCall;
-    public setupPairVeths(request: workspace_daemon_pb.SetupPairVethsRequest, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: workspace_daemon_pb.SetupPairVethsResponse) => void): grpc.ClientUnaryCall;
-    public setupPairVeths(request: workspace_daemon_pb.SetupPairVethsRequest, metadata: grpc.Metadata, options: Partial<grpc.CallOptions>, callback: (error: grpc.ServiceError | null, response: workspace_daemon_pb.SetupPairVethsResponse) => void): grpc.ClientUnaryCall;
 }

components/ws-daemon-api/go/workspace_daemon.pb.go

@@ -76,28 +76,6 @@ function deserialize_iws_PrepareForUserNSResponse(buffer_arg) {
   return workspace_daemon_pb.PrepareForUserNSResponse.deserializeBinary(new Uint8Array(buffer_arg));
 }
 
-function serialize_iws_SetupPairVethsRequest(arg) {
-  if (!(arg instanceof workspace_daemon_pb.SetupPairVethsRequest)) {
-    throw new Error('Expected argument of type iws.SetupPairVethsRequest');
-  }
-  return Buffer.from(arg.serializeBinary());
-}
-
-function deserialize_iws_SetupPairVethsRequest(buffer_arg) {
-  return workspace_daemon_pb.SetupPairVethsRequest.deserializeBinary(new Uint8Array(buffer_arg));
-}
-
-function serialize_iws_SetupPairVethsResponse(arg) {
-  if (!(arg instanceof workspace_daemon_pb.SetupPairVethsResponse)) {
-    throw new Error('Expected argument of type iws.SetupPairVethsResponse');
-  }
-  return Buffer.from(arg.serializeBinary());
-}
-
-function deserialize_iws_SetupPairVethsResponse(buffer_arg) {
-  return workspace_daemon_pb.SetupPairVethsResponse.deserializeBinary(new Uint8Array(buffer_arg));
-}
-
 function serialize_iws_TeardownRequest(arg) {
   if (!(arg instanceof workspace_daemon_pb.TeardownRequest)) {
     throw new Error('Expected argument of type iws.TeardownRequest');
@@ -279,18 +257,6 @@ teardown: {
     responseSerialize: serialize_iws_TeardownResponse,
     responseDeserialize: deserialize_iws_TeardownResponse,
   },
-  // Set up a pair of veths that interconnect the specified PID and the workspace container's network namename.
-setupPairVeths: {
-    path: '/iws.InWorkspaceService/SetupPairVeths',
-    requestStream: false,
-    responseStream: false,
-    requestType: workspace_daemon_pb.SetupPairVethsRequest,
-    responseType: workspace_daemon_pb.SetupPairVethsResponse,
-    requestSerialize: serialize_iws_SetupPairVethsRequest,
-    requestDeserialize: deserialize_iws_SetupPairVethsRequest,
-    responseSerialize: serialize_iws_SetupPairVethsResponse,
-    responseDeserialize: deserialize_iws_SetupPairVethsResponse,
-  },
 };
 
 exports.InWorkspaceServiceClient = grpc.makeGenericClientConstructor(InWorkspaceServiceService);

components/ws-daemon-api/go/workspace_daemon_grpc.pb.go

@@ -282,43 +282,6 @@ export namespace TeardownResponse {
     }
 }
 
-export class SetupPairVethsRequest extends jspb.Message {
-    getPid(): number;
-    setPid(value: number): SetupPairVethsRequest;
-
-    serializeBinary(): Uint8Array;
-    toObject(includeInstance?: boolean): SetupPairVethsRequest.AsObject;
-    static toObject(includeInstance: boolean, msg: SetupPairVethsRequest): SetupPairVethsRequest.AsObject;
-    static extensions: {[key: number]: jspb.ExtensionFieldInfo<jspb.Message>};
-    static extensionsBinary: {[key: number]: jspb.ExtensionFieldBinaryInfo<jspb.Message>};
-    static serializeBinaryToWriter(message: SetupPairVethsRequest, writer: jspb.BinaryWriter): void;
-    static deserializeBinary(bytes: Uint8Array): SetupPairVethsRequest;
-    static deserializeBinaryFromReader(message: SetupPairVethsRequest, reader: jspb.BinaryReader): SetupPairVethsRequest;
-}
-
-export namespace SetupPairVethsRequest {
-    export type AsObject = {
-        pid: number,
-    }
-}
-
-export class SetupPairVethsResponse extends jspb.Message {
-
-    serializeBinary(): Uint8Array;
-    toObject(includeInstance?: boolean): SetupPairVethsResponse.AsObject;
-    static toObject(includeInstance: boolean, msg: SetupPairVethsResponse): SetupPairVethsResponse.AsObject;
-    static extensions: {[key: number]: jspb.ExtensionFieldInfo<jspb.Message>};
-    static extensionsBinary: {[key: number]: jspb.ExtensionFieldBinaryInfo<jspb.Message>};
-    static serializeBinaryToWriter(message: SetupPairVethsResponse, writer: jspb.BinaryWriter): void;
-    static deserializeBinary(bytes: Uint8Array): SetupPairVethsResponse;
-    static deserializeBinaryFromReader(message: SetupPairVethsResponse, reader: jspb.BinaryReader): SetupPairVethsResponse;
-}
-
-export namespace SetupPairVethsResponse {
-    export type AsObject = {
-    }
-}
-
 export enum FSShiftMethod {
     SHIFTFS = 0,
     FUSE = 1,