chore(RDGRS-662): Remove reference update and add replace (#23)

* chore(RDGRS-662): remove reference updates and add replace * adding replace
OutSystems · Aug 16, 2024 · ff5be03 · ff5be03
1 parent 699d811
commit ff5be03
Show file tree

Hide file tree

Showing 25 changed files with 67 additions and 65 deletions.
diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@ BUILD=$(shell git rev-parse HEAD)
 DIRBASE=./build
 DIR=${DIRBASE}/${VERSION}/${BUILD}/bin
 
-LDFLAGS=-ldflags "-s -w ${XBUILD} -buildid=${BUILD} -X github.com/OutSystems/chisel/share.BuildVersion=${VERSION}"
+LDFLAGS=-ldflags "-s -w ${XBUILD} -buildid=${BUILD} -X github.com/jpillora/chisel/share.BuildVersion=${VERSION}"
 
 GOFILES=`go list ./...`
 GOFILESNOTEST=`go list ./... | grep -v test`

diff --git a/client/client.go b/client/client.go
@@ -17,12 +17,12 @@ import (
 	"time"
 
 	"github.com/gorilla/websocket"
-	chshare "github.com/OutSystems/chisel/share"
-	"github.com/OutSystems/chisel/share/ccrypto"
-	"github.com/OutSystems/chisel/share/cio"
-	"github.com/OutSystems/chisel/share/cnet"
-	"github.com/OutSystems/chisel/share/settings"
-	"github.com/OutSystems/chisel/share/tunnel"
+	chshare "github.com/jpillora/chisel/share"
+	"github.com/jpillora/chisel/share/ccrypto"
+	"github.com/jpillora/chisel/share/cio"
+	"github.com/jpillora/chisel/share/cnet"
+	"github.com/jpillora/chisel/share/settings"
+	"github.com/jpillora/chisel/share/tunnel"
 
 	"golang.org/x/crypto/ssh"
 	"golang.org/x/net/proxy"

diff --git a/client/client_connect.go b/client/client_connect.go
@@ -10,10 +10,10 @@ import (
 
 	"github.com/gorilla/websocket"
 	"github.com/jpillora/backoff"
-	chshare "github.com/OutSystems/chisel/share"
-	"github.com/OutSystems/chisel/share/cnet"
-	"github.com/OutSystems/chisel/share/cos"
-	"github.com/OutSystems/chisel/share/settings"
+	chshare "github.com/jpillora/chisel/share"
+	"github.com/jpillora/chisel/share/cnet"
+	"github.com/jpillora/chisel/share/cos"
+	"github.com/jpillora/chisel/share/settings"
 	"golang.org/x/crypto/ssh"
 )
 

diff --git a/client/client_test.go b/client/client_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/OutSystems/chisel/share/ccrypto"
+	"github.com/jpillora/chisel/share/ccrypto"
 	"golang.org/x/crypto/ssh"
 )
 

diff --git a/example/reverse-tunneling-authenticated.md b/example/reverse-tunneling-authenticated.md
@@ -63,7 +63,7 @@ version: '3'
 
 services:
   chisel:
-    image: OutSystems/chisel
+    image: jpillora/chisel
     restart: unless-stopped
     container_name: chisel
     # ⬇️ Pass CLI arguments one at a time in an array, as required by Docker compose.

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/OutSystems/chisel
+module github.com/jpillora/chisel
 
 go 1.21
 
@@ -21,3 +21,5 @@ require (
 	golang.org/x/sys v0.12.0 // indirect
 	golang.org/x/text v0.13.0 // indirect
 )
+
+replace github.com/jpillora/chisel => ../chisel
diff --git a/main.go b/main.go
@@ -12,12 +12,12 @@ import (
 	"strings"
 	"time"
 
-	chclient "github.com/OutSystems/chisel/client"
-	chserver "github.com/OutSystems/chisel/server"
-	chshare "github.com/OutSystems/chisel/share"
-	"github.com/OutSystems/chisel/share/ccrypto"
-	"github.com/OutSystems/chisel/share/cos"
-	"github.com/OutSystems/chisel/share/settings"
+	chclient "github.com/jpillora/chisel/client"
+	chserver "github.com/jpillora/chisel/server"
+	chshare "github.com/jpillora/chisel/share"
+	"github.com/jpillora/chisel/share/ccrypto"
+	"github.com/jpillora/chisel/share/cos"
+	"github.com/jpillora/chisel/share/settings"
 )
 
 var help = `
@@ -30,7 +30,7 @@ var help = `
     client - runs chisel in client mode
 
   Read more:
-    https://github.com/OustSystems/chisel
+    https://github.com/jpillora/chisel
 
 `
 
@@ -83,7 +83,7 @@ var commonHelp = `
     ` + chshare.BuildVersion + ` (` + runtime.Version() + `)
 
   Read more:
-    https://github.com/OutSystems/chisel
+    https://github.com/jpillora/chisel
 
 `
 

diff --git a/server/server.go b/server/server.go
@@ -12,11 +12,11 @@ import (
 	"time"
 
 	"github.com/gorilla/websocket"
-	chshare "github.com/OutSystems/chisel/share"
-	"github.com/OutSystems/chisel/share/ccrypto"
-	"github.com/OutSystems/chisel/share/cio"
-	"github.com/OutSystems/chisel/share/cnet"
-	"github.com/OutSystems/chisel/share/settings"
+	chshare "github.com/jpillora/chisel/share"
+	"github.com/jpillora/chisel/share/ccrypto"
+	"github.com/jpillora/chisel/share/cio"
+	"github.com/jpillora/chisel/share/cnet"
+	"github.com/jpillora/chisel/share/settings"
 	"github.com/jpillora/requestlog"
 	"golang.org/x/crypto/ssh"
 )

diff --git a/server/server_handler.go b/server/server_handler.go
@@ -6,10 +6,10 @@ import (
 	"sync/atomic"
 	"time"
 
-	chshare "github.com/OutSystems/chisel/share"
-	"github.com/OutSystems/chisel/share/cnet"
-	"github.com/OutSystems/chisel/share/settings"
-	"github.com/OutSystems/chisel/share/tunnel"
+	chshare "github.com/jpillora/chisel/share"
+	"github.com/jpillora/chisel/share/cnet"
+	"github.com/jpillora/chisel/share/settings"
+	"github.com/jpillora/chisel/share/tunnel"
 	"golang.org/x/crypto/ssh"
 	"golang.org/x/sync/errgroup"
 )

diff --git a/server/server_listen.go b/server/server_listen.go
@@ -10,7 +10,7 @@ import (
 	"os/user"
 	"path/filepath"
 
-	"github.com/OutSystems/chisel/share/settings"
+	"github.com/jpillora/chisel/share/settings"
 	"golang.org/x/crypto/acme/autocert"
 )
 

diff --git a/share/cnet/meter.go b/share/cnet/meter.go
@@ -6,7 +6,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/OutSystems/chisel/share/cio"
+	"github.com/jpillora/chisel/share/cio"
 	"github.com/jpillora/sizestr"
 )
 

diff --git a/share/compat.go b/share/compat.go
@@ -3,12 +3,12 @@ package chshare
 //this file exists to maintain backwards compatibility
 
 import (
-	"github.com/OutSystems/chisel/share/ccrypto"
-	"github.com/OutSystems/chisel/share/cio"
-	"github.com/OutSystems/chisel/share/cnet"
-	"github.com/OutSystems/chisel/share/cos"
-	"github.com/OutSystems/chisel/share/settings"
-	"github.com/OutSystems/chisel/share/tunnel"
+	"github.com/jpillora/chisel/share/ccrypto"
+	"github.com/jpillora/chisel/share/cio"
+	"github.com/jpillora/chisel/share/cnet"
+	"github.com/jpillora/chisel/share/cos"
+	"github.com/jpillora/chisel/share/settings"
+	"github.com/jpillora/chisel/share/tunnel"
 )
 
 const (

diff --git a/share/settings/users.go b/share/settings/users.go
@@ -9,7 +9,7 @@ import (
 	"sync"
 
 	"github.com/fsnotify/fsnotify"
-	"github.com/OutSystems/chisel/share/cio"
+	"github.com/jpillora/chisel/share/cio"
 )
 
 type Users struct {

diff --git a/share/tunnel/tunnel.go b/share/tunnel/tunnel.go
@@ -11,9 +11,9 @@ import (
 	"time"
 
 	"github.com/armon/go-socks5"
-	"github.com/OutSystems/chisel/share/cio"
-	"github.com/OutSystems/chisel/share/cnet"
-	"github.com/OutSystems/chisel/share/settings"
+	"github.com/jpillora/chisel/share/cio"
+	"github.com/jpillora/chisel/share/cnet"
+	"github.com/jpillora/chisel/share/settings"
 	"golang.org/x/crypto/ssh"
 	"golang.org/x/sync/errgroup"
 )

diff --git a/share/tunnel/tunnel_in_proxy.go b/share/tunnel/tunnel_in_proxy.go
@@ -6,8 +6,8 @@ import (
 	"net"
 	"sync"
 
-	"github.com/OutSystems/chisel/share/cio"
-	"github.com/OutSystems/chisel/share/settings"
+	"github.com/jpillora/chisel/share/cio"
+	"github.com/jpillora/chisel/share/settings"
 	"github.com/jpillora/sizestr"
 	"golang.org/x/crypto/ssh"
 )

diff --git a/share/tunnel/tunnel_in_proxy_udp.go b/share/tunnel/tunnel_in_proxy_udp.go
@@ -11,8 +11,8 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/OutSystems/chisel/share/cio"
-	"github.com/OutSystems/chisel/share/settings"
+	"github.com/jpillora/chisel/share/cio"
+	"github.com/jpillora/chisel/share/settings"
 	"github.com/jpillora/sizestr"
 	"golang.org/x/crypto/ssh"
 	"golang.org/x/sync/errgroup"

diff --git a/share/tunnel/tunnel_out_ssh.go b/share/tunnel/tunnel_out_ssh.go
@@ -6,9 +6,9 @@ import (
 	"net"
 	"strings"
 
-	"github.com/OutSystems/chisel/share/cio"
-	"github.com/OutSystems/chisel/share/cnet"
-	"github.com/OutSystems/chisel/share/settings"
+	"github.com/jpillora/chisel/share/cio"
+	"github.com/jpillora/chisel/share/cnet"
+	"github.com/jpillora/chisel/share/settings"
 	"github.com/jpillora/sizestr"
 	"golang.org/x/crypto/ssh"
 )

diff --git a/share/tunnel/tunnel_out_ssh_udp.go b/share/tunnel/tunnel_out_ssh_udp.go
@@ -8,8 +8,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/OutSystems/chisel/share/cio"
-	"github.com/OutSystems/chisel/share/settings"
+	"github.com/jpillora/chisel/share/cio"
+	"github.com/jpillora/chisel/share/settings"
 )
 
 func (t *Tunnel) handleUDP(l *cio.Logger, rwc io.ReadWriteCloser, hostPort string) error {

diff --git a/test/bench/main.go b/test/bench/main.go
@@ -25,7 +25,7 @@ import (
 	"path"
 	"strconv"
 
-	"github.com/OutSystems/chisel/share/cnet"
+	"github.com/jpillora/chisel/share/cnet"
 
 	"time"
 )

diff --git a/test/e2e/auth_test.go b/test/e2e/auth_test.go
@@ -3,8 +3,8 @@ package e2e_test
 import (
 	"testing"
 
-	chclient "github.com/OutSystems/chisel/client"
-	chserver "github.com/OutSystems/chisel/server"
+	chclient "github.com/jpillora/chisel/client"
+	chserver "github.com/jpillora/chisel/server"
 )
 
 //TODO tests for:

diff --git a/test/e2e/base_test.go b/test/e2e/base_test.go
@@ -3,8 +3,8 @@ package e2e_test
 import (
 	"testing"
 
-	chclient "github.com/OutSystems/chisel/client"
-	chserver "github.com/OutSystems/chisel/server"
+	chclient "github.com/jpillora/chisel/client"
+	chserver "github.com/jpillora/chisel/server"
 )
 
 func TestBase(t *testing.T) {

diff --git a/test/e2e/cert_utils_test.go b/test/e2e/cert_utils_test.go
@@ -18,8 +18,8 @@ import (
 	"path"
 	"time"
 
-	chclient "github.com/OutSystems/chisel/client"
-	chserver "github.com/OutSystems/chisel/server"
+	chclient "github.com/jpillora/chisel/client"
+	chserver "github.com/jpillora/chisel/server"
 )
 
 type tlsConfig struct {

diff --git a/test/e2e/setup_test.go b/test/e2e/setup_test.go
@@ -10,8 +10,8 @@ import (
 	"testing"
 	"time"
 
-	chclient "github.com/OutSystems/chisel/client"
-	chserver "github.com/OutSystems/chisel/server"
+	chclient "github.com/jpillora/chisel/client"
+	chserver "github.com/jpillora/chisel/server"
 )
 
 const debug = true

diff --git a/test/e2e/tls_test.go b/test/e2e/tls_test.go
@@ -4,8 +4,8 @@ import (
 	"path"
 	"testing"
 
-	chclient "github.com/OutSystems/chisel/client"
-	chserver "github.com/OutSystems/chisel/server"
+	chclient "github.com/jpillora/chisel/client"
+	chserver "github.com/jpillora/chisel/server"
 )
 
 func TestTLS(t *testing.T) {

diff --git a/test/e2e/udp_test.go b/test/e2e/udp_test.go
@@ -6,8 +6,8 @@ import (
 	"testing"
 	"time"
 
-	chclient "github.com/OutSystems/chisel/client"
-	chserver "github.com/OutSystems/chisel/server"
+	chclient "github.com/jpillora/chisel/client"
+	chserver "github.com/jpillora/chisel/server"
 	"golang.org/x/sync/errgroup"
 )