go.mod: drop github.com/norouter/norouter

Signed-off-by: Akihiro Suda <[email protected]>

Author: AkihiroSuda

go.mod

@@ -29,7 +29,6 @@ require (
 	github.com/mattn/go-shellwords v1.0.12
 	github.com/miekg/dns v1.1.54
 	github.com/mikefarah/yq/v4 v4.33.3
-	github.com/norouter/norouter v0.6.3
 	github.com/nxadm/tail v1.4.8
 	github.com/opencontainers/go-digest v1.0.0
 	github.com/sethvargo/go-password v0.2.0

go.sum

@@ -0,0 +1,81 @@
+// From https://raw.githubusercontent.com/norouter/norouter/v0.6.5/pkg/agent/bicopy/bicopy.go
+/*
+   Copyright (C) NoRouter authors.
+
+   Copyright (C) libnetwork authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package bicopy
+
+import (
+	"io"
+	"sync"
+
+	"github.com/sirupsen/logrus"
+)
+
+// Bicopy is from https://github.com/rootless-containers/rootlesskit/blob/v0.10.1/pkg/port/builtin/parent/tcp/tcp.go#L73-L104
+// (originally from libnetwork, Apache License 2.0)
+func Bicopy(x, y io.ReadWriter, quit <-chan struct{}) {
+	type closeReader interface {
+		CloseRead() error
+	}
+	type closeWriter interface {
+		CloseWrite() error
+	}
+	var wg sync.WaitGroup
+	var broker = func(to, from io.ReadWriter) {
+		if _, err := io.Copy(to, from); err != nil {
+			logrus.WithError(err).Debug("failed to call io.Copy")
+		}
+		if fromCR, ok := from.(closeReader); ok {
+			if err := fromCR.CloseRead(); err != nil {
+				logrus.WithError(err).Debug("failed to call CloseRead")
+			}
+		}
+		if toCW, ok := to.(closeWriter); ok {
+			if err := toCW.CloseWrite(); err != nil {
+				logrus.WithError(err).Debug("failed to call CloseWrite")
+			}
+		}
+		wg.Done()
+	}
+
+	wg.Add(2)
+	go broker(x, y)
+	go broker(y, x)
+	finish := make(chan struct{})
+	go func() {
+		wg.Wait()
+		close(finish)
+	}()
+
+	select {
+	case <-quit:
+	case <-finish:
+	}
+	if xCloser, ok := x.(io.Closer); ok {
+		if err := xCloser.Close(); err != nil {
+			logrus.WithError(err).Debug("failed to call xCloser.Close")
+		}
+	}
+	if yCloser, ok := y.(io.Closer); ok {
+		if err := yCloser.Close(); err != nil {
+			logrus.WithError(err).Debug("failed to call yCloser.Close")
+		}
+	}
+	<-finish
+	// TODO: return copied bytes
+}

pkg/bicopy/bicopy.go

@@ -0,0 +1,46 @@
+// From https://raw.githubusercontent.com/norouter/norouter/v0.6.5/cmd/norouter/editorcmd/editorcmd.go
+/*
+   Copyright (C) NoRouter authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package editorcmd
+
+import (
+	"os"
+	"os/exec"
+)
+
+// Detect detects a text editor command.
+// Returns an empty string when no editor is found.
+func Detect() string {
+	var candidates = []string{
+		os.Getenv("VISUAL"),
+		os.Getenv("EDITOR"),
+		"editor",
+		"vim",
+		"vi",
+		"emacs",
+	}
+	for _, f := range candidates {
+		if f == "" {
+			continue
+		}
+		x, err := exec.LookPath(f)
+		if err == nil {
+			return x
+		}
+	}
+	return ""
+}

pkg/editutil/editorcmd/editorcmd.go

@@ -8,9 +8,9 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/lima-vm/lima/pkg/editutil/editorcmd"
 	"github.com/lima-vm/lima/pkg/store/dirnames"
 	"github.com/lima-vm/lima/pkg/store/filenames"
-	"github.com/norouter/norouter/cmd/norouter/editorcmd"
 	"github.com/sirupsen/logrus"
 )
 

pkg/editutil/editutil.go

@@ -9,9 +9,9 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/lima-vm/lima/pkg/bicopy"
 	"github.com/lima-vm/lima/pkg/guestagent/api"
 	"github.com/lima-vm/sshocker/pkg/ssh"
-	"github.com/norouter/norouter/pkg/agent/bicopy"
 	"github.com/sirupsen/logrus"
 )