From 8ba88b4dfca268bf156d7e2223ed3422cd25dd6a Mon Sep 17 00:00:00 2001 From: Brian Picciano Date: Thu, 20 Oct 2022 20:57:26 +0200 Subject: [PATCH] Use migrated and upgraded pmux --- README.md | 2 +- go-workspace/default.nix | 2 +- go-workspace/src/cmd/entrypoint/admin.go | 2 +- go-workspace/src/cmd/entrypoint/daemon.go | 2 +- go-workspace/src/cmd/entrypoint/daemon_util.go | 2 +- go-workspace/src/cmd/entrypoint/garage_util.go | 2 +- go-workspace/src/go.mod | 4 ++-- go-workspace/src/go.sum | 9 ++++----- 8 files changed, 12 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 97d7ff9..c09f864 100644 --- a/README.md +++ b/README.md @@ -100,7 +100,7 @@ Documentation for devs: * [Design Principles](docs/dev/design-principles.md) * [`cryptic-net daemon` process tree](docs/dev/daemon-process-tree.svg): Diagram - describing the [pmux](https://github.com/cryptic-io/pmux) process tree created + describing the [pmux](https://code.betamike.com/cryptic-io/pmux) process tree created by `cryptic-net daemon` at runtime. * [Rebuilding Documentation](docs/dev/rebuilding-documentation.md) diff --git a/go-workspace/default.nix b/go-workspace/default.nix index 04774c4..d3a3cb3 100644 --- a/go-workspace/default.nix +++ b/go-workspace/default.nix @@ -7,7 +7,7 @@ pname = "cryptic-net-" + (builtins.baseNameOf subPackage); version = "unstable"; src = ./src; - vendorSha256 = "sha256-UqMxbu/v/zDR4yJgUYiLs7HuHkvsZc/MJiWgw/8g+xk="; + vendorSha256 = "sha256-URmrK9Sd/5yhXrWxXZq05TS7aY7IWptQFMKfXKJY7Hc="; subPackages = [ subPackage ]; diff --git a/go-workspace/src/cmd/entrypoint/admin.go b/go-workspace/src/cmd/entrypoint/admin.go index 55c7115..34073f5 100644 --- a/go-workspace/src/cmd/entrypoint/admin.go +++ b/go-workspace/src/cmd/entrypoint/admin.go @@ -14,7 +14,7 @@ import ( "os" "strings" - "github.com/cryptic-io/pmux/pmuxlib" + "code.betamike.com/cryptic-io/pmux/pmuxlib" ) func randStr(l int) string { diff --git a/go-workspace/src/cmd/entrypoint/daemon.go b/go-workspace/src/cmd/entrypoint/daemon.go index a27d9f0..daf6c33 100644 --- a/go-workspace/src/cmd/entrypoint/daemon.go +++ b/go-workspace/src/cmd/entrypoint/daemon.go @@ -13,7 +13,7 @@ import ( "cryptic-net/bootstrap" "cryptic-net/garage" - "github.com/cryptic-io/pmux/pmuxlib" + "code.betamike.com/cryptic-io/pmux/pmuxlib" ) // The daemon sub-command deals with starting an actual cryptic-net daemon diff --git a/go-workspace/src/cmd/entrypoint/daemon_util.go b/go-workspace/src/cmd/entrypoint/daemon_util.go index 7509358..dae1473 100644 --- a/go-workspace/src/cmd/entrypoint/daemon_util.go +++ b/go-workspace/src/cmd/entrypoint/daemon_util.go @@ -10,7 +10,7 @@ import ( "os" "path/filepath" - "github.com/cryptic-io/pmux/pmuxlib" + "code.betamike.com/cryptic-io/pmux/pmuxlib" ) func copyBootstrapToDataDirAndReload(env crypticnet.Env, r io.Reader) (crypticnet.Env, error) { diff --git a/go-workspace/src/cmd/entrypoint/garage_util.go b/go-workspace/src/cmd/entrypoint/garage_util.go index b1f97cf..8811f24 100644 --- a/go-workspace/src/cmd/entrypoint/garage_util.go +++ b/go-workspace/src/cmd/entrypoint/garage_util.go @@ -11,7 +11,7 @@ import ( "strconv" "time" - "github.com/cryptic-io/pmux/pmuxlib" + "code.betamike.com/cryptic-io/pmux/pmuxlib" ) func waitForGarage(ctx context.Context, env crypticnet.Env) error { diff --git a/go-workspace/src/go.mod b/go-workspace/src/go.mod index 8f8eec7..6979fec 100644 --- a/go-workspace/src/go.mod +++ b/go-workspace/src/go.mod @@ -3,8 +3,8 @@ module cryptic-net go 1.17 require ( + code.betamike.com/cryptic-io/pmux v0.0.0-20221020185531-7a7868003822 github.com/adrg/xdg v0.4.0 - github.com/cryptic-io/pmux v0.0.0-20220630194257-a451ee620c83 github.com/imdario/mergo v0.3.12 github.com/minio/minio-go/v7 v7.0.28 github.com/nlepage/go-tarfs v1.1.0 @@ -12,7 +12,7 @@ require ( github.com/slackhq/nebula v1.6.1 github.com/spf13/pflag v1.0.5 golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29 - gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b + gopkg.in/yaml.v3 v3.0.1 ) require ( diff --git a/go-workspace/src/go.sum b/go-workspace/src/go.sum index 526945a..6e763ab 100644 --- a/go-workspace/src/go.sum +++ b/go-workspace/src/go.sum @@ -1,7 +1,7 @@ +code.betamike.com/cryptic-io/pmux v0.0.0-20221020185531-7a7868003822 h1:c7Eu2h8gXOpOfhC1LvSYLNfiSsWTyvdI1XVpUuqMFHE= +code.betamike.com/cryptic-io/pmux v0.0.0-20221020185531-7a7868003822/go.mod h1:cBuEN/rkaM/GH24uQroX/++qDmte+mLudDUqMt6XJWs= github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls= github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E= -github.com/cryptic-io/pmux v0.0.0-20220630194257-a451ee620c83 h1:0W4j4Rg0hMPyUpuvZuj1u9Gmgah9SSsfAUeNvTxo2BA= -github.com/cryptic-io/pmux v0.0.0-20220630194257-a451ee620c83/go.mod h1:fg/CCfMpcbqO7/iqLjoYskopsVO3JqdD3Oij83+YXSI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -100,7 +100,6 @@ gopkg.in/ini.v1 v1.57.0 h1:9unxIsFcTt4I55uWluz+UmL95q4kdJ0buvQ1ZIqVQww= gopkg.in/ini.v1 v1.57.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=