From d0aa634af4e41f044cf6d3ea69cd1f579c58c1a3 Mon Sep 17 00:00:00 2001 From: tavit ohanian Date: Tue, 10 Aug 2021 05:20:12 -0400 Subject: [PATCH] initial port --- cli/responseemitter.go | 2 +- cli/run.go | 2 +- cli/run_test.go | 2 +- doc.go | 2 +- examples/adder/cmd.go | 2 +- examples/adder/local/main.go | 2 +- go.mod | 6 +++--- go.sum | 18 ++---------------- http/client.go | 7 +++---- http/handler.go | 2 +- http/response.go | 2 +- http/response_test.go | 2 +- 12 files changed, 17 insertions(+), 32 deletions(-) diff --git a/cli/responseemitter.go b/cli/responseemitter.go index 0e69e7f..821aa8c 100644 --- a/cli/responseemitter.go +++ b/cli/responseemitter.go @@ -7,7 +7,7 @@ import ( "os" "sync" - cmds "github.com/ipfs/go-ipfs-cmds" + cmds "gitlab.dms3.io/dms3/public/go-dms3-cmds" ) var _ ResponseEmitter = &responseEmitter{} diff --git a/cli/run.go b/cli/run.go index 7465827..3aa3195 100644 --- a/cli/run.go +++ b/cli/run.go @@ -8,7 +8,7 @@ import ( "strings" "time" - cmds "github.com/ipfs/go-ipfs-cmds" + cmds "gitlab.dms3.io/dms3/public/go-dms3-cmds" ) // ExitError is the error used when a specific exit code needs to be returned. diff --git a/cli/run_test.go b/cli/run_test.go index 46a703d..176acb3 100644 --- a/cli/run_test.go +++ b/cli/run_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - cmds "github.com/ipfs/go-ipfs-cmds" + cmds "gitlab.dms3.io/dms3/public/go-dms3-cmds" ) var root = &cmds.Command{ diff --git a/doc.go b/doc.go index 34cf4c4..55e9af7 100644 --- a/doc.go +++ b/doc.go @@ -87,7 +87,7 @@ To get a better idea of what's going on, take a look at the examples at - https://github.com/ipfs/go-ipfs-cmds/tree/master/examples. + https://gitlab.dms3.io/dms3/public/go-dms3-cmds/tree/master/examples. */ package cmds diff --git a/examples/adder/cmd.go b/examples/adder/cmd.go index 8e79f4b..3f8aefe 100644 --- a/examples/adder/cmd.go +++ b/examples/adder/cmd.go @@ -7,7 +7,7 @@ import ( "strings" "time" - cmds "github.com/ipfs/go-ipfs-cmds" + cmds "gitlab.dms3.io/dms3/public/go-dms3-cmds" "gitlab.dms3.io/dms3/public/go-dms3-cmds/cli" ) diff --git a/examples/adder/local/main.go b/examples/adder/local/main.go index 19a981d..e1e8aba 100644 --- a/examples/adder/local/main.go +++ b/examples/adder/local/main.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - cmds "github.com/ipfs/go-ipfs-cmds" + cmds "gitlab.dms3.io/dms3/public/go-dms3-cmds" "gitlab.dms3.io/dms3/public/go-dms3-cmds/examples/adder" "gitlab.dms3.io/dms3/public/go-dms3-cmds/cli" diff --git a/go.mod b/go.mod index b3a47de..8aba9d2 100644 --- a/go.mod +++ b/go.mod @@ -4,9 +4,9 @@ go 1.15 require ( github.com/Kubuxu/go-os-helper v0.0.1 - gitlab.dms3.io/dms3/public/go-dms3-files v0.0.1 - gitlab.dms3.io/dms3/public/go-log v0.0.1 github.com/rs/cors v1.7.0 github.com/texttheater/golang-levenshtein v0.0.0-20180516184445-d188e65d659e - golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d + gitlab.dms3.io/dms3/public/go-dms3-files v0.0.1 + gitlab.dms3.io/dms3/public/go-log v0.0.1 + golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 ) diff --git a/go.sum b/go.sum index 25991c0..9fb6d49 100644 --- a/go.sum +++ b/go.sum @@ -8,24 +8,13 @@ github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8 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= -github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls= -github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/ipfs/go-ipfs-files v0.0.8 h1:8o0oFJkJ8UkO/ABl8T6ac6tKF3+NIpj67aAB6ZpusRg= -github.com/ipfs/go-ipfs-files v0.0.8/go.mod h1:wiN/jSG8FKyk7N0WyctKSvq3ljIa2NNTiZB55kpTdOs= -github.com/ipfs/go-log v1.0.4 h1:6nLQdX4W8P9yZZFH7mO+X/PzjN8Laozm/lMJ6esdgzY= -github.com/ipfs/go-log v1.0.4/go.mod h1:oDCg2FkjogeFOhqqb+N39l2RpTNPL6F/StPkB3kPgcs= -github.com/ipfs/go-log/v2 v2.0.5 h1:fL4YI+1g5V/b1Yxr1qAiXTMg1H8z9vx/VmJxBuQMHvU= -github.com/ipfs/go-log/v2 v2.0.5/go.mod h1:eZs4Xt4ZUJQFM3DlanGhy7TkwwawCZcSByscwkWG+dw= -github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/opentracing/opentracing-go v1.1.0 h1:pWlfV3Bxv7k65HYwkikxat0+s3pV4bsqf19k25Ur8rU= -github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= @@ -53,14 +42,12 @@ go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee h1:0mgffUl7nfd+FpvXMVz4IDEaUSmT1ysygQC7qYo7sG4= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= -go.uber.org/zap v1.14.1 h1:nYDKopTbvAPq/NrUVZwT15y2lpROBiLLyoRTbXOYWOo= -go.uber.org/zap v1.14.1/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc= go.uber.org/zap v1.16.0 h1:uFRZXykJGK9lLY4HtgSw44DnIcAM+kRBP7x5m+NpAOM= go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d h1:2+ZP7EfsZV7Vvmx3TIqSlSzATMkTAKqM14YGFPoSKjI= -golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs= golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= @@ -75,7 +62,6 @@ golang.org/x/sys v0.0.0-20190302025703-b6889370fb10/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= diff --git a/http/client.go b/http/client.go index 4994914..7b62db3 100644 --- a/http/client.go +++ b/http/client.go @@ -9,9 +9,8 @@ import ( "net/url" "strings" - cmds "github.com/ipfs/go-ipfs-cmds" - files "github.com/ipfs/go-ipfs-files" - "gitlab.dms3.io/dms3/public/go-dms3-cmds" + cmds "gitlab.dms3.io/dms3/public/go-dms3-cmds" + files "gitlab.dms3.io/dms3/public/go-dms3-files" ) const ( @@ -112,7 +111,7 @@ func (c *client) Execute(req *cmds.Request, re cmds.ResponseEmitter, env cmds.En // XXX: this runs the PreRun twice return c.fallback.Execute(req, re, env) } - err = fmt.Errorf("cannot connect to the api. Is the daemon running? To run as a standalone CLI command remove the api file in `$IPFS_PATH/api`") + err = fmt.Errorf("cannot connect to the api. Is the daemon running? To run as a standalone CLI command remove the api file in `$DMS3_PATH/api`") } return err } diff --git a/http/handler.go b/http/handler.go index 5a32017..0688904 100644 --- a/http/handler.go +++ b/http/handler.go @@ -119,7 +119,7 @@ func (h *handler) ServeHTTP(w http.ResponseWriter, r *http.Request) { default: setAllowHeader(w, h.cfg.AllowGet) http.Error(w, "405 - Method Not Allowed", http.StatusMethodNotAllowed) - log.Warnf("The IPFS API does not support %s requests.", r.Method) + log.Warnf("The DMS3 API does not support %s requests.", r.Method) return } diff --git a/http/response.go b/http/response.go index 1964dfc..ec9b86d 100644 --- a/http/response.go +++ b/http/response.go @@ -7,7 +7,7 @@ import ( "reflect" "strings" - cmds "github.com/ipfs/go-ipfs-cmds" + cmds "gitlab.dms3.io/dms3/public/go-dms3-cmds" ) var ( diff --git a/http/response_test.go b/http/response_test.go index 15781a2..48e0cdd 100644 --- a/http/response_test.go +++ b/http/response_test.go @@ -3,7 +3,7 @@ package http import ( "testing" - cmds "github.com/ipfs/go-ipfs-cmds" + cmds "gitlab.dms3.io/dms3/public/go-dms3-cmds" ) type testResponseType struct { -- GitLab