diff --git a/api/Gopkg.lock b/api/Gopkg.lock deleted file mode 100644 index b3fcc56..0000000 --- a/api/Gopkg.lock +++ /dev/null @@ -1,181 +0,0 @@ -# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. - - -[[projects]] - digest = "1:5c3894b2aa4d6bead0ceeea6831b305d62879c871780e7b76296ded1b004bc57" - name = "cloud.google.com/go" - packages = ["compute/metadata"] - pruneopts = "UT" - revision = "64a2037ec6be8a4b0c1d1f706ed35b428b989239" - version = "v0.26.0" - -[[projects]] - branch = "master" - digest = "1:9769b231d8f5ff406a012aa7f293e45ed69d11617832a1c3c7b8c6ce1558a2a1" - name = "github.com/adtac/go-akismet" - packages = ["akismet"] - pruneopts = "UT" - revision = "0ca9e1023047c869ecd4bd3c20780511597a4a77" - -[[projects]] - digest = "1:15042ad3498153684d09f393bbaec6b216c8eec6d61f63dff711de7d64ed8861" - name = "github.com/golang/protobuf" - packages = ["proto"] - pruneopts = "UT" - revision = "b4deda0973fb4c70b50d226b1af49f3da59f5265" - version = "v1.1.0" - -[[projects]] - branch = "master" - digest = "1:d03d0fae6a7a80e89c540787a69ab6e0d3b773fdb3303c0b3d96a15490c6ef32" - name = "github.com/gomodule/oauth1" - packages = ["oauth"] - pruneopts = "UT" - revision = "9a59ed3b0a84f454c260f2f8f82918223fc5630f" - -[[projects]] - digest = "1:c79fb010be38a59d657c48c6ba1d003a8aa651fa56b579d959d74573b7dff8e1" - name = "github.com/gorilla/context" - packages = ["."] - pruneopts = "UT" - revision = "08b5f424b9271eedf6f9f0ce86cb9396ed337a42" - version = "v1.1.1" - -[[projects]] - digest = "1:664d37ea261f0fc73dd17f4a1f5f46d01fbb0b0d75f6375af064824424109b7d" - name = "github.com/gorilla/handlers" - packages = ["."] - pruneopts = "UT" - revision = "7e0847f9db758cdebd26c149d0ae9d5d0b9c98ce" - version = "v1.4.0" - -[[projects]] - digest = "1:e73f5b0152105f18bc131fba127d9949305c8693f8a762588a82a48f61756f5f" - name = "github.com/gorilla/mux" - packages = ["."] - pruneopts = "UT" - revision = "e3702bed27f0d39777b0b37b664b6280e8ef8fbf" - version = "v1.6.2" - -[[projects]] - digest = "1:37ce7d7d80531b227023331002c0d42b4b4b291a96798c82a049d03a54ba79e4" - name = "github.com/lib/pq" - packages = [ - ".", - "oid", - ] - pruneopts = "UT" - revision = "90697d60dd844d5ef6ff15135d0203f65d2f53b8" - -[[projects]] - digest = "1:9fb8ccf24ca918be80e6129761cf232de0c142537f8d9eeb7a3a779a7f38fdd4" - name = "github.com/lunny/html2md" - packages = ["."] - pruneopts = "UT" - revision = "13aaeeae9fb293668db3ef1e145064684735f3ce" - -[[projects]] - digest = "1:a1f5a38c6c82d8f1e8a7b9fb9ea8b125b17188cdfb38f2cd08055ff9b51f5ec4" - name = "github.com/microcosm-cc/bluemonday" - packages = ["."] - pruneopts = "UT" - revision = "dafebb5b6ff2861a0d69af64991e10866c19be85" - version = "v1.0.0" - -[[projects]] - digest = "1:5b3b29ce0e569f62935d9541dff2e16cc09df981ebde48e82259076a73a3d0c7" - name = "github.com/op/go-logging" - packages = ["."] - pruneopts = "UT" - revision = "b2cb9fa56473e98db8caba80237377e83fe44db5" - version = "v1" - -[[projects]] - digest = "1:8bc629776d035c003c7814d4369521afe67fdb8efc4b5f66540d29343b98cf23" - name = "github.com/russross/blackfriday" - packages = ["."] - pruneopts = "UT" - revision = "55d61fa8aa702f59229e6cff85793c22e580eaf5" - version = "v1.5.1" - -[[projects]] - branch = "master" - digest = "1:1ecf2a49df33be51e757d0033d5d51d5f784f35f68e5a38f797b2d3f03357d71" - name = "golang.org/x/crypto" - packages = [ - "bcrypt", - "blowfish", - ] - pruneopts = "UT" - revision = "de0752318171da717af4ce24d0a2e8626afaeb11" - -[[projects]] - branch = "master" - digest = "1:aa58645c149c9c3b62dc7ff51460602a88fc7b887633f2546fcdde27c91e6f03" - name = "golang.org/x/net" - packages = [ - "context", - "context/ctxhttp", - "html", - "html/atom", - ] - pruneopts = "UT" - revision = "c39426892332e1bb5ec0a434a079bf82f5d30c54" - -[[projects]] - branch = "master" - digest = "1:341ceeee37101c62dae441691406bf4ecc71bbeb7b424417879fe88d9f88f487" - name = "golang.org/x/oauth2" - packages = [ - ".", - "github", - "gitlab", - "google", - "internal", - "jws", - "jwt", - ] - pruneopts = "UT" - revision = "3d292e4d0cdc3a0113e6d207bb137145ef1de42f" - -[[projects]] - digest = "1:c8907869850adaa8bd7631887948d0684f3787d0912f1c01ab72581a6c34432e" - name = "google.golang.org/appengine" - packages = [ - ".", - "internal", - "internal/app_identity", - "internal/base", - "internal/datastore", - "internal/log", - "internal/modules", - "internal/remote_api", - "internal/urlfetch", - "urlfetch", - ] - pruneopts = "UT" - revision = "b1f26356af11148e710935ed1ac8a7f5702c7612" - version = "v1.1.0" - -[solve-meta] - analyzer-name = "dep" - analyzer-version = 1 - input-imports = [ - "github.com/adtac/go-akismet/akismet", - "github.com/gomodule/oauth1/oauth", - "github.com/gorilla/handlers", - "github.com/gorilla/mux", - "github.com/lib/pq", - "github.com/lunny/html2md", - "github.com/microcosm-cc/bluemonday", - "github.com/op/go-logging", - "github.com/russross/blackfriday", - "golang.org/x/crypto/bcrypt", - "golang.org/x/net/html", - "golang.org/x/oauth2", - "golang.org/x/oauth2/github", - "golang.org/x/oauth2/gitlab", - "golang.org/x/oauth2/google", - ] - solver-name = "gps-cdcl" - solver-version = 1 diff --git a/api/Gopkg.toml b/api/Gopkg.toml deleted file mode 100644 index 1d6dcac..0000000 --- a/api/Gopkg.toml +++ /dev/null @@ -1,45 +0,0 @@ -[[constraint]] - name = "github.com/gorilla/handlers" - version = "1.4.0" - -[[constraint]] - name = "github.com/gorilla/mux" - version = "1.6.2" - -[[constraint]] - # unfortunately, lib/pq doesn't have semver-ed releases yet - # TODO: don't use revisions, use a proper version once this is solved: - # https://github.com/lib/pq/issues/637 - name = "github.com/lib/pq" - revision = "90697d60dd844d5ef6ff15135d0203f65d2f53b8" - -[[constraint]] - # html2md doesn't have semver-ed releases yet either - # TODO: use a version once this is solved: - # https://github.com/lunny/html2md/issues/8 - name = "github.com/lunny/html2md" - revision = "13aaeeae9fb293668db3ef1e145064684735f3ce" - -[[constraint]] - name = "github.com/microcosm-cc/bluemonday" - version = "1.0.0" - -[[constraint]] - name = "github.com/op/go-logging" - version = "1.0.0" - -[[constraint]] - name = "golang.org/x/crypto" - branch = "master" - -[[constraint]] - name = "golang.org/x/oauth2" - branch = "master" - -[[constraint]] - name = "github.com/russross/blackfriday" - version = "1.5.1" - -[prune] - go-tests = true - unused-packages = true diff --git a/api/Makefile b/api/Makefile index b0de4c9..04d7acb 100644 --- a/api/Makefile +++ b/api/Makefile @@ -25,15 +25,14 @@ clean: # later down the line). devel-go: - dep ensure - go build -v -o $(GO_DEVEL_BUILD_BINARY) + GO111MODULE=on go mod vendor + GO111MODULE=on go build -mod=vendor -v -o $(GO_DEVEL_BUILD_BINARY) prod-go: - dep ensure - go build -v -o $(GO_PROD_BUILD_BINARY) + GO111MODULE=on go mod vendor + GO111MODULE=on go build -mod=vendor -v -o $(GO_PROD_BUILD_BINARY) test-go: - dep ensure go test -v . $(shell mkdir -p $(GO_DEVEL_BUILD_DIR) $(GO_PROD_BUILD_DIR)) diff --git a/api/go.mod b/api/go.mod new file mode 100644 index 0000000..ca8fca6 --- /dev/null +++ b/api/go.mod @@ -0,0 +1,22 @@ +module gitlab.com/commento/commento/api + +go 1.12 + +require ( + cloud.google.com/go v0.26.0 // indirect + github.com/adtac/go-akismet v0.0.0-20181220032308-0ca9e1023047 + github.com/golang/protobuf v1.1.0 // indirect + github.com/gomodule/oauth1 v0.0.0-20181215000758-9a59ed3b0a84 + github.com/gorilla/context v1.1.1 // indirect + github.com/gorilla/handlers v1.4.0 + github.com/gorilla/mux v1.6.2 + github.com/lib/pq v0.0.0-20180523175426-90697d60dd84 + github.com/lunny/html2md v0.0.0-20180317074532-13aaeeae9fb2 + github.com/microcosm-cc/bluemonday v1.0.0 + github.com/op/go-logging v0.0.0-20160211212156-b2cb9fa56473 + github.com/russross/blackfriday v1.5.1 + golang.org/x/crypto v0.0.0-20180808211826-de0752318171 + golang.org/x/net v0.0.0-20180811021610-c39426892332 + golang.org/x/oauth2 v0.0.0-20180724155351-3d292e4d0cdc + google.golang.org/appengine v1.1.0 // indirect +) diff --git a/api/go.sum b/api/go.sum new file mode 100644 index 0000000..b090ba4 --- /dev/null +++ b/api/go.sum @@ -0,0 +1,32 @@ +cloud.google.com/go v0.26.0 h1:e0WKqKTd5BnrG8aKH3J3h+QvEIQtSUcf2n5UZ5ZgLtQ= +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +github.com/adtac/go-akismet v0.0.0-20181220032308-0ca9e1023047 h1:ZC99vhH6LlWY7bstM3JhEZl1c0a0DWZPFe7+hvRwTlc= +github.com/adtac/go-akismet v0.0.0-20181220032308-0ca9e1023047/go.mod h1:DU/mtPMgEDGGfgxGATXm2Br5+F7JOClQj9nHVKZMlns= +github.com/golang/protobuf v1.1.0 h1:0iH4Ffd/meGoXqF2lSAhZHt8X+cPgkfn/cb6Cce5Vpc= +github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/gomodule/oauth1 v0.0.0-20181215000758-9a59ed3b0a84 h1:NlNEdePx7QY9Z4rds4EIe1dvUT8Ao1PZgLS80S5YTbU= +github.com/gomodule/oauth1 v0.0.0-20181215000758-9a59ed3b0a84/go.mod h1:4r/a8/3RkhMBxJQWL5qzbOEcaQmNPIkNoI7P8sXeI08= +github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8= +github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= +github.com/gorilla/handlers v1.4.0 h1:XulKRWSQK5uChr4pEgSE4Tc/OcmnU9GJuSwdog/tZsA= +github.com/gorilla/handlers v1.4.0/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ= +github.com/gorilla/mux v1.6.2 h1:Pgr17XVTNXAk3q/r4CpKzC5xBM/qW1uVLV+IhRZpIIk= +github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= +github.com/lib/pq v0.0.0-20180523175426-90697d60dd84 h1:it29sI2IM490luSc3RAhp5WuCYnc6RtbfLVAB7nmC5M= +github.com/lib/pq v0.0.0-20180523175426-90697d60dd84/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lunny/html2md v0.0.0-20180317074532-13aaeeae9fb2 h1:eShptbR1fYhyKFFrjdSY1QuW6ymkTLlgyNEeZMchy3s= +github.com/lunny/html2md v0.0.0-20180317074532-13aaeeae9fb2/go.mod h1:lUUaVYlpAQ1Oo6vIZfec6CXQZjOvFZLyqaR8Dl7m+hk= +github.com/microcosm-cc/bluemonday v1.0.0 h1:dr58SIfmOwOVr+m4Ye1xLWv8Dk9OFwXAtYnbJSmJ65k= +github.com/microcosm-cc/bluemonday v1.0.0/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4= +github.com/op/go-logging v0.0.0-20160211212156-b2cb9fa56473 h1:J1QZwDXgZ4dJD2s19iqR9+U00OWM2kDzbf1O/fmvCWg= +github.com/op/go-logging v0.0.0-20160211212156-b2cb9fa56473/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= +github.com/russross/blackfriday v1.5.1 h1:B8ZN6pD4PVofmlDCDUdELeYrbsVIDM/bpjW3v3zgcRc= +github.com/russross/blackfriday v1.5.1/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= +golang.org/x/crypto v0.0.0-20180808211826-de0752318171 h1:vYogbvSFj2YXcjQxFHu/rASSOt9sLytpCaSkiwQ135I= +golang.org/x/crypto v0.0.0-20180808211826-de0752318171/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/net v0.0.0-20180811021610-c39426892332 h1:efGso+ep0DjyCBJPjvoz0HI6UldX4Md2F1rZFe1ir0E= +golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/oauth2 v0.0.0-20180724155351-3d292e4d0cdc h1:3ElrZeO6IBP+M8kgu5YFwRo92Gqr+zBg3aooYQ6ziqU= +golang.org/x/oauth2 v0.0.0-20180724155351-3d292e4d0cdc/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +google.golang.org/appengine v1.1.0 h1:igQkv0AAhEIvTEpD5LIpAfav2eeVO9HBTjvKHVJPRSs= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=