diff --git a/ocis-graph-explorer/.dockerignore b/graph-explorer/.dockerignore similarity index 100% rename from ocis-graph-explorer/.dockerignore rename to graph-explorer/.dockerignore diff --git a/ocis-graph-explorer/LICENSE b/graph-explorer/LICENSE similarity index 100% rename from ocis-graph-explorer/LICENSE rename to graph-explorer/LICENSE diff --git a/ocis-graph-explorer/Makefile b/graph-explorer/Makefile similarity index 87% rename from ocis-graph-explorer/Makefile rename to graph-explorer/Makefile index 2f79305c3..0808f548e 100644 --- a/ocis-graph-explorer/Makefile +++ b/graph-explorer/Makefile @@ -1,6 +1,6 @@ SHELL := bash -NAME := ocis-graph-explorer -IMPORT := github.com/owncloud/$(NAME) +NAME := graph-explorer +IMPORT := github.com/owncloud/ocis/$(NAME) BIN := bin DIST := dist @@ -45,6 +45,7 @@ ifndef DATE endif LDFLAGS += -s -w -X "$(IMPORT)/pkg/version.String=$(VERSION)" -X "$(IMPORT)/pkg/version.Date=$(DATE)" +DEBUG_LDFLAGS += -X "$(IMPORT)/pkg/version.String=$(VERSION)" -X "$(IMPORT)/pkg/version.Date=$(DATE)" GCFLAGS += all=-N -l .PHONY: all @@ -57,7 +58,11 @@ sync: .PHONY: clean clean: go clean -i ./... - rm -rf $(BIN) $(DIST) assets + rm -rf $(BIN) $(DIST) + +.PHONY: go-mod-tidy +go-mod-tidy: + @go mod tidy .PHONY: fmt fmt: @@ -76,7 +81,7 @@ lint: for PKG in $(PACKAGES); do go run golang.org/x/lint/golint -set_exit_status $$PKG || exit 1; done; .PHONY: generate -generate: assets +generate: go generate $(GENERATE) .PHONY: changelog @@ -87,6 +92,11 @@ changelog: test: go run github.com/haya14busa/goverage -v -coverprofile coverage.out $(PACKAGES) +.PHONY: go-coverage +go-coverage: + @if [ ! -f coverage.out ]; then $(MAKE) test &>/dev/null; fi; + @go tool cover -func coverage.out | tail -1 | grep -Eo "[0-9]+\.[0-9]+" + .PHONY: install install: $(SOURCES) go install -v -tags '$(TAGS)' -ldflags '$(LDFLAGS)' ./cmd/$(NAME) @@ -98,7 +108,7 @@ $(BIN)/$(EXECUTABLE): $(SOURCES) $(GOBUILD) -v -tags '$(TAGS)' -ldflags '$(LDFLAGS)' -o $@ ./cmd/$(NAME) $(BIN)/$(EXECUTABLE)-debug: $(SOURCES) - $(GOBUILD) -v -tags '$(TAGS)' -ldflags '$(LDFLAGS)' -gcflags '$(GCFLAGS)' -o $@ ./cmd/$(NAME) + $(GOBUILD) -v -tags '$(TAGS)' -ldflags '$(DEBUG_LDFLAGS)' -gcflags '$(GCFLAGS)' -o $@ ./cmd/$(NAME) .PHONY: release release: release-dirs release-linux release-windows release-darwin release-copy release-check @@ -130,9 +140,9 @@ release-check: .PHONY: release-finish release-finish: release-copy release-check -.PHONY: docs -docs: - cd docs; hugo +.PHONY: config-docs-generate +config-docs-generate: + go run github.com/owncloud/flaex >| ../docs/extensions/$(NAME)/configuration.md .PHONY: watch watch: @@ -176,6 +186,3 @@ watch: # .PHONY: protobuf # protobuf: $(GOPATH)/bin/protoc-gen-go $(GOPATH)/bin/protoc-gen-micro $(GOPATH)/bin/protoc-gen-microweb $(GOPATH)/bin/protoc-gen-swagger pkg/proto/v0/example.pb.go pkg/proto/v0/example.pb.micro.go pkg/proto/v0/example.pb.web.go pkg/proto/v0/example.swagger.json - -assets: - mkdir assets/ && curl -slL -o- https://github.com/owncloud/graph-explorer/releases/download/v1.7.10.3/release.tar.gz | tar xvzf - -C assets/ diff --git a/ocis-graph-explorer/changelog/CHANGELOG.tmpl b/graph-explorer/changelog/CHANGELOG.tmpl similarity index 100% rename from ocis-graph-explorer/changelog/CHANGELOG.tmpl rename to graph-explorer/changelog/CHANGELOG.tmpl diff --git a/ocis-graph-explorer/changelog/README.md b/graph-explorer/changelog/README.md similarity index 100% rename from ocis-graph-explorer/changelog/README.md rename to graph-explorer/changelog/README.md diff --git a/ocis-graph-explorer/changelog/TEMPLATE b/graph-explorer/changelog/TEMPLATE similarity index 100% rename from ocis-graph-explorer/changelog/TEMPLATE rename to graph-explorer/changelog/TEMPLATE diff --git a/ocis-graph-explorer/changelog/unreleased/.keep b/graph-explorer/changelog/unreleased/.keep similarity index 100% rename from ocis-graph-explorer/changelog/unreleased/.keep rename to graph-explorer/changelog/unreleased/.keep diff --git a/ocis-graph-explorer/changelog/unreleased/initial-release.md b/graph-explorer/changelog/unreleased/initial-release.md similarity index 100% rename from ocis-graph-explorer/changelog/unreleased/initial-release.md rename to graph-explorer/changelog/unreleased/initial-release.md diff --git a/ocis-graph-explorer/changelog/unreleased/use-alpine-latest.md b/graph-explorer/changelog/unreleased/use-alpine-latest.md similarity index 100% rename from ocis-graph-explorer/changelog/unreleased/use-alpine-latest.md rename to graph-explorer/changelog/unreleased/use-alpine-latest.md diff --git a/ocis-graph-explorer/cmd/ocis-graph-explorer/main.go b/graph-explorer/cmd/graph-explorer/main.go similarity index 66% rename from ocis-graph-explorer/cmd/ocis-graph-explorer/main.go rename to graph-explorer/cmd/graph-explorer/main.go index da3ec4dbd..f5a83bcd6 100644 --- a/ocis-graph-explorer/cmd/ocis-graph-explorer/main.go +++ b/graph-explorer/cmd/graph-explorer/main.go @@ -3,7 +3,7 @@ package main import ( "os" - "github.com/owncloud/ocis-graph-explorer/pkg/command" + "github.com/owncloud/ocis/graph-explorer/pkg/command" ) func main() { diff --git a/ocis-graph-explorer/config/example.json b/graph-explorer/config/example.json similarity index 100% rename from ocis-graph-explorer/config/example.json rename to graph-explorer/config/example.json diff --git a/ocis-graph-explorer/config/example.yml b/graph-explorer/config/example.yml similarity index 100% rename from ocis-graph-explorer/config/example.yml rename to graph-explorer/config/example.yml diff --git a/ocis-graph-explorer/docker/Dockerfile.linux.amd64 b/graph-explorer/docker/Dockerfile.linux.amd64 similarity index 100% rename from ocis-graph-explorer/docker/Dockerfile.linux.amd64 rename to graph-explorer/docker/Dockerfile.linux.amd64 diff --git a/ocis-graph-explorer/docker/Dockerfile.linux.arm b/graph-explorer/docker/Dockerfile.linux.arm similarity index 100% rename from ocis-graph-explorer/docker/Dockerfile.linux.arm rename to graph-explorer/docker/Dockerfile.linux.arm diff --git a/ocis-graph-explorer/docker/Dockerfile.linux.arm64 b/graph-explorer/docker/Dockerfile.linux.arm64 similarity index 100% rename from ocis-graph-explorer/docker/Dockerfile.linux.arm64 rename to graph-explorer/docker/Dockerfile.linux.arm64 diff --git a/ocis-graph-explorer/docker/manifest.tmpl b/graph-explorer/docker/manifest.tmpl similarity index 100% rename from ocis-graph-explorer/docker/manifest.tmpl rename to graph-explorer/docker/manifest.tmpl diff --git a/ocis-graph-explorer/docs/.gitignore b/graph-explorer/docs/.gitignore similarity index 100% rename from ocis-graph-explorer/docs/.gitignore rename to graph-explorer/docs/.gitignore diff --git a/ocis-graph-explorer/docs/archetypes/default.md b/graph-explorer/docs/archetypes/default.md similarity index 100% rename from ocis-graph-explorer/docs/archetypes/default.md rename to graph-explorer/docs/archetypes/default.md diff --git a/ocis-graph-explorer/docs/config.toml b/graph-explorer/docs/config.toml similarity index 100% rename from ocis-graph-explorer/docs/config.toml rename to graph-explorer/docs/config.toml diff --git a/ocis-graph-explorer/docs/content/about.md b/graph-explorer/docs/content/about.md similarity index 100% rename from ocis-graph-explorer/docs/content/about.md rename to graph-explorer/docs/content/about.md diff --git a/ocis-graph-explorer/docs/content/building.md b/graph-explorer/docs/content/building.md similarity index 100% rename from ocis-graph-explorer/docs/content/building.md rename to graph-explorer/docs/content/building.md diff --git a/ocis-graph-explorer/docs/content/getting-started.md b/graph-explorer/docs/content/getting-started.md similarity index 100% rename from ocis-graph-explorer/docs/content/getting-started.md rename to graph-explorer/docs/content/getting-started.md diff --git a/ocis-graph-explorer/docs/content/license.md b/graph-explorer/docs/content/license.md similarity index 100% rename from ocis-graph-explorer/docs/content/license.md rename to graph-explorer/docs/content/license.md diff --git a/ocis-graph-explorer/docs/layouts/_default/list.html b/graph-explorer/docs/layouts/_default/list.html similarity index 100% rename from ocis-graph-explorer/docs/layouts/_default/list.html rename to graph-explorer/docs/layouts/_default/list.html diff --git a/ocis-graph-explorer/docs/layouts/_default/single.html b/graph-explorer/docs/layouts/_default/single.html similarity index 100% rename from ocis-graph-explorer/docs/layouts/_default/single.html rename to graph-explorer/docs/layouts/_default/single.html diff --git a/ocis-graph-explorer/docs/layouts/index.html b/graph-explorer/docs/layouts/index.html similarity index 100% rename from ocis-graph-explorer/docs/layouts/index.html rename to graph-explorer/docs/layouts/index.html diff --git a/ocis-graph-explorer/docs/layouts/partials/style.html b/graph-explorer/docs/layouts/partials/style.html similarity index 100% rename from ocis-graph-explorer/docs/layouts/partials/style.html rename to graph-explorer/docs/layouts/partials/style.html diff --git a/ocis-graph-explorer/docs/static/styles.css b/graph-explorer/docs/static/styles.css similarity index 100% rename from ocis-graph-explorer/docs/static/styles.css rename to graph-explorer/docs/static/styles.css diff --git a/ocis-graph-explorer/docs/static/syntax.css b/graph-explorer/docs/static/syntax.css similarity index 100% rename from ocis-graph-explorer/docs/static/syntax.css rename to graph-explorer/docs/static/syntax.css diff --git a/ocis-graph-explorer/go.mod b/graph-explorer/go.mod similarity index 93% rename from ocis-graph-explorer/go.mod rename to graph-explorer/go.mod index 4744b4388..3c4757717 100644 --- a/ocis-graph-explorer/go.mod +++ b/graph-explorer/go.mod @@ -1,4 +1,4 @@ -module github.com/owncloud/ocis-graph-explorer +module github.com/owncloud/ocis/graph-explorer go 1.13 diff --git a/ocis-graph-explorer/go.sum b/graph-explorer/go.sum similarity index 98% rename from ocis-graph-explorer/go.sum rename to graph-explorer/go.sum index ab2396a00..130b17a4b 100644 --- a/ocis-graph-explorer/go.sum +++ b/graph-explorer/go.sum @@ -98,7 +98,9 @@ github.com/coreos/bbolt v1.3.3/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkE github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/etcd v3.3.17+incompatible h1:f/Z3EoDSx1yjaIjLQGo1diYUlQYSBrrAQ5vP8NjwXwo= github.com/coreos/etcd v3.3.17+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/etcd v3.3.18+incompatible h1:Zz1aXgDrFFi1nadh58tA9ktt06cmPTwNNP3dXwIq1lE= github.com/coreos/etcd v3.3.18+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/go-oidc v2.1.0+incompatible h1:sdJrfw8akMnCuUlaZU3tE/uYXFgfqom8DBE9so9EBsM= github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= @@ -302,6 +304,7 @@ github.com/micro/cli v0.2.0/go.mod h1:jRT9gmfVKWSS6pkKcXQ8YhUyj6bzwxK8Fp5b0Y7qNn github.com/micro/cli/v2 v2.1.1 h1:uFw0SMIKmGuyHIm8lXns/NOn7V62bM5y7DnlxUM+BEQ= github.com/micro/cli/v2 v2.1.1/go.mod h1:EguNh6DAoWKm9nmk+k/Rg0H3lQnDxqzu5x5srOtGtYg= github.com/micro/go-micro v1.16.0/go.mod h1:A0F58bHLh2m0LAI9QyhvmbN8c1cxhAZo3cM6s+iDsrM= +github.com/micro/go-micro v1.18.0 h1:gP70EZVHpJuUIT0YWth192JmlIci+qMOEByHm83XE9E= github.com/micro/go-micro v1.18.0/go.mod h1:klwUJL1gkdY1MHFyz+fFJXn52dKcty4hoe95Mp571AA= github.com/micro/go-micro/v2 v2.0.0 h1:bMx549RwJ9Yuiui8cDVlfYhVNP8I8KBJTMyLthEXpRw= github.com/micro/go-micro/v2 v2.0.0/go.mod h1:v7QP5UhKRt37ixjJe8DouWmg0/eE6dltr5h0idJ9BpE= @@ -332,6 +335,7 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRW github.com/namedotcom/go v0.0.0-20180403034216-08470befbe04/go.mod h1:5sN+Lt1CaY4wsPvgQH/jsuJi4XO2ssZbdsIizr4CVC8= github.com/nats-io/jwt v0.3.0 h1:xdnzwFETV++jNc4W1mw//qFyJGb2ABOombmZJQS4+Qo= github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg= +github.com/nats-io/jwt v0.3.2 h1:+RB5hMpXUUA2dfxuhBTEkMOrYmM+gKIZYS1KjSostMI= github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU= github.com/nats-io/nats-server/v2 v2.1.0/go.mod h1:r5y0WgCag0dTj/qiHkHrXAcKQ/f5GMOZaEGdoxxnJ4I= github.com/nats-io/nats-server/v2 v2.1.2 h1:i2Ly0B+1+rzNZHHWtD4ZwKi+OU5l+uQo1iDHZ2PmiIc= @@ -342,6 +346,7 @@ github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzE github.com/nats-io/nkeys v0.0.2/go.mod h1:dab7URMsZm6Z/jp9Z5UGa87Uutgc2mVpXLC4B7TDb/4= github.com/nats-io/nkeys v0.1.0 h1:qMd4+pRHgdr1nAClu+2h/2a5F2TmKcCzjCDazVgRoX4= github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= +github.com/nats-io/nkeys v0.1.3 h1:6JrEfig+HzTH85yxzhSVbjHRJv9cn0p6n3IngIcM5/k= github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= @@ -388,6 +393,7 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35 h1:J9b7z+QKAmPf4YLrFg6oQUotqHQeUNWwkvo7jZp1GLU= github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= @@ -425,10 +431,12 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= github.com/rs/zerolog v1.17.2 h1:RMRHFw2+wF7LO0QqtELQwo8hqSmqISyCJeFeAAuWcRo= github.com/rs/zerolog v1.17.2/go.mod h1:9nvC1axdVrAHcu/s9taAVfBuIdTZLVQmKQyvrUjF5+I= +github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/sacloud/libsacloud v1.26.1/go.mod h1:79ZwATmHLIFZIMd7sxA3LwzVy/B77uj3LDoToVTxDoQ= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= +github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= @@ -502,10 +510,12 @@ go.uber.org/multierr v1.2.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/ go.uber.org/multierr v1.3.0 h1:sFPn2GLc3poCkfrpIXGhBD2X0CMIo4Q/zSULXrj/+uc= go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= go.uber.org/ratelimit v0.0.0-20180316092928-c15da0234277/go.mod h1:2X8KaoNd1J0lZV+PxJk/5+DGbO/tpwLR1m++a7FnB/Y= +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.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.12.0 h1:dySoUQPFBGj6xwjmBzageVL8jGi8uxc6bEmJQjA06bw= go.uber.org/zap v1.12.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= +go.uber.org/zap v1.13.0 h1:nR6NoDBgAf67s68NhaXbsojM+2gxp3S1hWkHDl27pVU= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= golang.org/x/crypto v0.0.0-20180621125126-a49355c7e3f8/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -544,6 +554,7 @@ golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= 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/lint v0.0.0-20191125180803-fdd1cda4f05f h1:J5lckAjkw6qYlOZNj90mLYNTEKDvWeuc1yieZ8qUzUE= golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= @@ -579,6 +590,7 @@ golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa h1:F+8P+gmewFQYRk6JoLQLwjBCT golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -586,6 +598,7 @@ golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180622082034-63fc586f45fe/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -662,10 +675,12 @@ google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEt google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.14.0 h1:uMf5uLi4eQMRrMKhCplNik4U4H8Z6C1br3zOtAa/aDE= google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.6.1 h1:QzqyMA1tlu6CgqCDUtU9V+ZKhLFT2dkJuANu5QaxI3I= google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= @@ -712,6 +727,7 @@ gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ns1/ns1-go.v2 v2.0.0-20190730140822-b51389932cbc/go.mod h1:VV+3haRsgDiVLxyifmMBrBIuCWFBPYKbRssXB9z67Hw= gopkg.in/resty.v1 v1.9.1/go.mod h1:vo52Hzryw9PnPHcJfPsBiFW62XhNx5OczbV9y+IMpgc= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= +gopkg.in/square/go-jose.v2 v2.3.1 h1:SK5KegNXmKmqE342YYN2qPHEnUYeoMiXXl1poUlI+o4= gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/src-d/go-billy.v4 v4.3.2/go.mod h1:nDjArDMp+XMs1aFAESLRjfGSgfvoYN0hDfzEk0GjC98= gopkg.in/src-d/go-git-fixtures.v3 v3.5.0/go.mod h1:dLBcvytrw/TYZsNTWCnkNF2DSIlzWYqTe3rJR56Ac7g= diff --git a/ocis-graph-explorer/pkg/assets/assets.go b/graph-explorer/pkg/assets/assets.go similarity index 92% rename from ocis-graph-explorer/pkg/assets/assets.go rename to graph-explorer/pkg/assets/assets.go index fe9d27646..223ab0d07 100644 --- a/ocis-graph-explorer/pkg/assets/assets.go +++ b/graph-explorer/pkg/assets/assets.go @@ -4,8 +4,8 @@ import ( "net/http" "os" - "github.com/owncloud/ocis-graph-explorer/pkg/config" "github.com/owncloud/ocis-pkg/v2/log" + "github.com/owncloud/ocis/graph-explorer/pkg/config" ) //go:generate go run github.com/UnnoTed/fileb0x embed.yml diff --git a/ocis-graph-explorer/pkg/assets/dummy.go b/graph-explorer/pkg/assets/dummy.go similarity index 100% rename from ocis-graph-explorer/pkg/assets/dummy.go rename to graph-explorer/pkg/assets/dummy.go diff --git a/ocis-graph-explorer/pkg/assets/embed.go b/graph-explorer/pkg/assets/embed.go similarity index 100% rename from ocis-graph-explorer/pkg/assets/embed.go rename to graph-explorer/pkg/assets/embed.go diff --git a/ocis-graph-explorer/pkg/assets/embed.yml b/graph-explorer/pkg/assets/embed.yml similarity index 100% rename from ocis-graph-explorer/pkg/assets/embed.yml rename to graph-explorer/pkg/assets/embed.yml diff --git a/ocis-graph-explorer/pkg/assets/option.go b/graph-explorer/pkg/assets/option.go similarity index 93% rename from ocis-graph-explorer/pkg/assets/option.go rename to graph-explorer/pkg/assets/option.go index 3a7c0b21c..8facf6e4a 100644 --- a/ocis-graph-explorer/pkg/assets/option.go +++ b/graph-explorer/pkg/assets/option.go @@ -1,8 +1,8 @@ package assets import ( - "github.com/owncloud/ocis-graph-explorer/pkg/config" "github.com/owncloud/ocis-pkg/v2/log" + "github.com/owncloud/ocis/graph-explorer/pkg/config" ) // Option defines a single option function. diff --git a/ocis-graph-explorer/pkg/command/health.go b/graph-explorer/pkg/command/health.go similarity index 88% rename from ocis-graph-explorer/pkg/command/health.go rename to graph-explorer/pkg/command/health.go index b4151b8c0..d42302091 100644 --- a/ocis-graph-explorer/pkg/command/health.go +++ b/graph-explorer/pkg/command/health.go @@ -5,8 +5,8 @@ import ( "net/http" "github.com/micro/cli/v2" - "github.com/owncloud/ocis-graph-explorer/pkg/config" - "github.com/owncloud/ocis-graph-explorer/pkg/flagset" + "github.com/owncloud/ocis/graph-explorer/pkg/config" + "github.com/owncloud/ocis/graph-explorer/pkg/flagset" ) // Health is the entrypoint for the health command. diff --git a/ocis-graph-explorer/pkg/command/root.go b/graph-explorer/pkg/command/root.go similarity index 90% rename from ocis-graph-explorer/pkg/command/root.go rename to graph-explorer/pkg/command/root.go index 40934fb31..e2040f088 100644 --- a/ocis-graph-explorer/pkg/command/root.go +++ b/graph-explorer/pkg/command/root.go @@ -5,10 +5,10 @@ import ( "strings" "github.com/micro/cli/v2" - "github.com/owncloud/ocis-graph-explorer/pkg/config" - "github.com/owncloud/ocis-graph-explorer/pkg/flagset" - "github.com/owncloud/ocis-graph-explorer/pkg/version" "github.com/owncloud/ocis-pkg/v2/log" + "github.com/owncloud/ocis/graph-explorer/pkg/config" + "github.com/owncloud/ocis/graph-explorer/pkg/flagset" + "github.com/owncloud/ocis/graph-explorer/pkg/version" "github.com/spf13/viper" ) @@ -17,7 +17,7 @@ func Execute() error { cfg := config.New() app := &cli.App{ - Name: "ocis-graph-explorer", + Name: "graph-explorer", Version: version.String, Usage: "Serve Graph-Explorer for oCIS", Compiled: version.Compiled(), diff --git a/ocis-graph-explorer/pkg/command/server.go b/graph-explorer/pkg/command/server.go similarity index 94% rename from ocis-graph-explorer/pkg/command/server.go rename to graph-explorer/pkg/command/server.go index 9b2ad15ea..2694b2a77 100644 --- a/ocis-graph-explorer/pkg/command/server.go +++ b/graph-explorer/pkg/command/server.go @@ -14,11 +14,11 @@ import ( "github.com/oklog/run" openzipkin "github.com/openzipkin/zipkin-go" zipkinhttp "github.com/openzipkin/zipkin-go/reporter/http" - "github.com/owncloud/ocis-graph-explorer/pkg/config" - "github.com/owncloud/ocis-graph-explorer/pkg/flagset" - "github.com/owncloud/ocis-graph-explorer/pkg/metrics" - "github.com/owncloud/ocis-graph-explorer/pkg/server/debug" - "github.com/owncloud/ocis-graph-explorer/pkg/server/http" + "github.com/owncloud/ocis/graph-explorer/pkg/config" + "github.com/owncloud/ocis/graph-explorer/pkg/flagset" + "github.com/owncloud/ocis/graph-explorer/pkg/metrics" + "github.com/owncloud/ocis/graph-explorer/pkg/server/debug" + "github.com/owncloud/ocis/graph-explorer/pkg/server/http" "go.opencensus.io/stats/view" "go.opencensus.io/trace" ) diff --git a/ocis-graph-explorer/pkg/config/config.go b/graph-explorer/pkg/config/config.go similarity index 100% rename from ocis-graph-explorer/pkg/config/config.go rename to graph-explorer/pkg/config/config.go diff --git a/ocis-graph-explorer/pkg/flagset/flagset.go b/graph-explorer/pkg/flagset/flagset.go similarity index 98% rename from ocis-graph-explorer/pkg/flagset/flagset.go rename to graph-explorer/pkg/flagset/flagset.go index b60db1560..f8edfec2b 100644 --- a/ocis-graph-explorer/pkg/flagset/flagset.go +++ b/graph-explorer/pkg/flagset/flagset.go @@ -2,7 +2,7 @@ package flagset import ( "github.com/micro/cli/v2" - "github.com/owncloud/ocis-graph-explorer/pkg/config" + "github.com/owncloud/ocis/graph-explorer/pkg/config" ) // RootWithConfig applies cfg to the root flagset diff --git a/ocis-graph-explorer/pkg/metrics/metrics.go b/graph-explorer/pkg/metrics/metrics.go similarity index 100% rename from ocis-graph-explorer/pkg/metrics/metrics.go rename to graph-explorer/pkg/metrics/metrics.go diff --git a/ocis-graph-explorer/pkg/server/debug/option.go b/graph-explorer/pkg/server/debug/option.go similarity index 94% rename from ocis-graph-explorer/pkg/server/debug/option.go rename to graph-explorer/pkg/server/debug/option.go index bccd2bcaf..097a1486f 100644 --- a/ocis-graph-explorer/pkg/server/debug/option.go +++ b/graph-explorer/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis-graph-explorer/pkg/config" "github.com/owncloud/ocis-pkg/v2/log" + "github.com/owncloud/ocis/graph-explorer/pkg/config" ) // Option defines a single option function. diff --git a/ocis-graph-explorer/pkg/server/debug/server.go b/graph-explorer/pkg/server/debug/server.go similarity index 92% rename from ocis-graph-explorer/pkg/server/debug/server.go rename to graph-explorer/pkg/server/debug/server.go index c462f3a00..534979730 100644 --- a/ocis-graph-explorer/pkg/server/debug/server.go +++ b/graph-explorer/pkg/server/debug/server.go @@ -4,9 +4,9 @@ import ( "io" "net/http" - "github.com/owncloud/ocis-graph-explorer/pkg/config" - "github.com/owncloud/ocis-graph-explorer/pkg/version" "github.com/owncloud/ocis-pkg/v2/service/debug" + "github.com/owncloud/ocis/graph-explorer/pkg/config" + "github.com/owncloud/ocis/graph-explorer/pkg/version" ) // Server initializes the debug service and server. diff --git a/ocis-graph-explorer/pkg/server/http/option.go b/graph-explorer/pkg/server/http/option.go similarity index 93% rename from ocis-graph-explorer/pkg/server/http/option.go rename to graph-explorer/pkg/server/http/option.go index d5e65a2d4..fa0d09caa 100644 --- a/ocis-graph-explorer/pkg/server/http/option.go +++ b/graph-explorer/pkg/server/http/option.go @@ -4,9 +4,9 @@ import ( "context" "github.com/micro/cli/v2" - "github.com/owncloud/ocis-graph-explorer/pkg/config" - "github.com/owncloud/ocis-graph-explorer/pkg/metrics" "github.com/owncloud/ocis-pkg/v2/log" + "github.com/owncloud/ocis/graph-explorer/pkg/config" + "github.com/owncloud/ocis/graph-explorer/pkg/metrics" ) // Option defines a single option function. diff --git a/ocis-graph-explorer/pkg/server/http/server.go b/graph-explorer/pkg/server/http/server.go similarity index 90% rename from ocis-graph-explorer/pkg/server/http/server.go rename to graph-explorer/pkg/server/http/server.go index ccb4deb31..b1eca08eb 100644 --- a/ocis-graph-explorer/pkg/server/http/server.go +++ b/graph-explorer/pkg/server/http/server.go @@ -1,10 +1,10 @@ package http import ( - svc "github.com/owncloud/ocis-graph-explorer/pkg/service/v0" - "github.com/owncloud/ocis-graph-explorer/pkg/version" "github.com/owncloud/ocis-pkg/v2/middleware" "github.com/owncloud/ocis-pkg/v2/service/http" + svc "github.com/owncloud/ocis/graph-explorer/pkg/service/v0" + "github.com/owncloud/ocis/graph-explorer/pkg/version" ) // Server initializes the http service and server. diff --git a/ocis-graph-explorer/pkg/service/v0/instrument.go b/graph-explorer/pkg/service/v0/instrument.go similarity index 91% rename from ocis-graph-explorer/pkg/service/v0/instrument.go rename to graph-explorer/pkg/service/v0/instrument.go index 445552ae1..1a97f9046 100644 --- a/ocis-graph-explorer/pkg/service/v0/instrument.go +++ b/graph-explorer/pkg/service/v0/instrument.go @@ -3,7 +3,7 @@ package svc import ( "net/http" - "github.com/owncloud/ocis-graph-explorer/pkg/metrics" + "github.com/owncloud/ocis/graph-explorer/pkg/metrics" ) // NewInstrument returns a service that instruments metrics. diff --git a/ocis-graph-explorer/pkg/service/v0/logging.go b/graph-explorer/pkg/service/v0/logging.go similarity index 100% rename from ocis-graph-explorer/pkg/service/v0/logging.go rename to graph-explorer/pkg/service/v0/logging.go diff --git a/ocis-graph-explorer/pkg/service/v0/option.go b/graph-explorer/pkg/service/v0/option.go similarity index 94% rename from ocis-graph-explorer/pkg/service/v0/option.go rename to graph-explorer/pkg/service/v0/option.go index 98f60933c..85516bcfc 100644 --- a/ocis-graph-explorer/pkg/service/v0/option.go +++ b/graph-explorer/pkg/service/v0/option.go @@ -3,8 +3,8 @@ package svc import ( "net/http" - "github.com/owncloud/ocis-graph-explorer/pkg/config" "github.com/owncloud/ocis-pkg/v2/log" + "github.com/owncloud/ocis/graph-explorer/pkg/config" ) // Option defines a single option function. diff --git a/ocis-graph-explorer/pkg/service/v0/service.go b/graph-explorer/pkg/service/v0/service.go similarity index 95% rename from ocis-graph-explorer/pkg/service/v0/service.go rename to graph-explorer/pkg/service/v0/service.go index 6bc7febf7..25b52b192 100644 --- a/ocis-graph-explorer/pkg/service/v0/service.go +++ b/graph-explorer/pkg/service/v0/service.go @@ -7,9 +7,9 @@ import ( "strings" "github.com/go-chi/chi" - "github.com/owncloud/ocis-graph-explorer/pkg/assets" - "github.com/owncloud/ocis-graph-explorer/pkg/config" "github.com/owncloud/ocis-pkg/v2/log" + "github.com/owncloud/ocis/graph-explorer/pkg/assets" + "github.com/owncloud/ocis/graph-explorer/pkg/config" ) // Service defines the extension handlers. diff --git a/ocis-graph-explorer/pkg/service/v0/tracing.go b/graph-explorer/pkg/service/v0/tracing.go similarity index 100% rename from ocis-graph-explorer/pkg/service/v0/tracing.go rename to graph-explorer/pkg/service/v0/tracing.go diff --git a/ocis-graph-explorer/pkg/version/version.go b/graph-explorer/pkg/version/version.go similarity index 100% rename from ocis-graph-explorer/pkg/version/version.go rename to graph-explorer/pkg/version/version.go diff --git a/ocis-graph-explorer/reflex.conf b/graph-explorer/reflex.conf similarity index 100% rename from ocis-graph-explorer/reflex.conf rename to graph-explorer/reflex.conf diff --git a/ocis-graph-explorer/.codacy.yml b/ocis-graph-explorer/.codacy.yml deleted file mode 100644 index 855b4f298..000000000 --- a/ocis-graph-explorer/.codacy.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -exclude_paths: - - CHANGELOG.md - - changelog/** - - docs/** - - pkg/proto/** - -... diff --git a/ocis-graph-explorer/.drone.star b/ocis-graph-explorer/.drone.star deleted file mode 100644 index c1bba6419..000000000 --- a/ocis-graph-explorer/.drone.star +++ /dev/null @@ -1,654 +0,0 @@ -def main(ctx): - before = [ - testing(ctx), - ] - - stages = [ - docker(ctx, 'amd64'), - docker(ctx, 'arm64'), - docker(ctx, 'arm'), - binary(ctx, 'linux'), - binary(ctx, 'darwin'), - binary(ctx, 'windows'), - ] - - after = [ - manifest(ctx), - changelog(ctx), - readme(ctx), - badges(ctx), - website(ctx), - ] - - return before + stages + after - -def testing(ctx): - return { - 'kind': 'pipeline', - 'type': 'docker', - 'name': 'testing', - 'platform': { - 'os': 'linux', - 'arch': 'amd64', - }, - 'steps': [ - { - 'name': 'generate', - 'image': 'webhippie/golang:1.13', - 'pull': 'always', - 'commands': [ - 'make generate', - ], - 'volumes': [ - { - 'name': 'gopath', - 'path': '/srv/app', - }, - ], - }, - { - 'name': 'vet', - 'image': 'webhippie/golang:1.13', - 'pull': 'always', - 'commands': [ - 'make vet', - ], - 'volumes': [ - { - 'name': 'gopath', - 'path': '/srv/app', - }, - ], - }, - { - 'name': 'staticcheck', - 'image': 'webhippie/golang:1.13', - 'pull': 'always', - 'commands': [ - 'make staticcheck', - ], - 'volumes': [ - { - 'name': 'gopath', - 'path': '/srv/app', - }, - ], - }, - { - 'name': 'lint', - 'image': 'webhippie/golang:1.13', - 'pull': 'always', - 'commands': [ - 'make lint', - ], - 'volumes': [ - { - 'name': 'gopath', - 'path': '/srv/app', - }, - ], - }, - { - 'name': 'build', - 'image': 'webhippie/golang:1.13', - 'pull': 'always', - 'commands': [ - 'make build', - ], - 'volumes': [ - { - 'name': 'gopath', - 'path': '/srv/app', - }, - ], - }, - { - 'name': 'test', - 'image': 'webhippie/golang:1.13', - 'pull': 'always', - 'commands': [ - 'make test', - ], - 'volumes': [ - { - 'name': 'gopath', - 'path': '/srv/app', - }, - ], - }, - { - 'name': 'codacy', - 'image': 'plugins/codacy:1', - 'pull': 'always', - 'settings': { - 'token': { - 'from_secret': 'codacy_token', - }, - }, - }, - ], - 'volumes': [ - { - 'name': 'gopath', - 'temp': {}, - }, - ], - 'trigger': { - 'ref': [ - 'refs/heads/master', - 'refs/tags/**', - 'refs/pull/**', - ], - }, - } - -def docker(ctx, arch): - return { - 'kind': 'pipeline', - 'type': 'docker', - 'name': arch, - 'platform': { - 'os': 'linux', - 'arch': arch, - }, - 'steps': [ - { - 'name': 'generate', - 'image': 'webhippie/golang:1.13', - 'pull': 'always', - 'commands': [ - 'make generate', - ], - 'volumes': [ - { - 'name': 'gopath', - 'path': '/srv/app', - }, - ], - }, - { - 'name': 'build', - 'image': 'webhippie/golang:1.13', - 'pull': 'always', - 'commands': [ - 'make build', - ], - 'volumes': [ - { - 'name': 'gopath', - 'path': '/srv/app', - }, - ], - }, - { - 'name': 'dryrun', - 'image': 'plugins/docker:18.09', - 'pull': 'always', - 'settings': { - 'dry_run': True, - 'tags': 'linux-%s' % (arch), - 'dockerfile': 'docker/Dockerfile.linux.%s' % (arch), - 'repo': ctx.repo.slug, - }, - 'when': { - 'ref': { - 'include': [ - 'refs/pull/**', - ], - }, - }, - }, - { - 'name': 'docker', - 'image': 'plugins/docker:18.09', - 'pull': 'always', - 'settings': { - 'username': { - 'from_secret': 'docker_username', - }, - 'password': { - 'from_secret': 'docker_password', - }, - 'auto_tag': True, - 'auto_tag_suffix': 'linux-%s' % (arch), - 'dockerfile': 'docker/Dockerfile.linux.%s' % (arch), - 'repo': ctx.repo.slug, - }, - 'when': { - 'ref': { - 'exclude': [ - 'refs/pull/**', - ], - }, - }, - }, - ], - 'volumes': [ - { - 'name': 'gopath', - 'temp': {}, - }, - ], - 'depends_on': [ - 'testing', - ], - 'trigger': { - 'ref': [ - 'refs/heads/master', - 'refs/tags/**', - 'refs/pull/**', - ], - }, - } - -def binary(ctx, name): - if ctx.build.event == "tag": - settings = { - 'endpoint': { - 'from_secret': 's3_endpoint', - }, - 'access_key': { - 'from_secret': 'aws_access_key_id', - }, - 'secret_key': { - 'from_secret': 'aws_secret_access_key', - }, - 'bucket': { - 'from_secret': 's3_bucket', - }, - 'path_style': True, - 'strip_prefix': 'dist/release/', - 'source': 'dist/release/*', - 'target': '/ocis/%s/%s' % (ctx.repo.name.replace("ocis-", ""), ctx.build.ref.replace("refs/tags/v", "")), - } - else: - settings = { - 'endpoint': { - 'from_secret': 's3_endpoint', - }, - 'access_key': { - 'from_secret': 'aws_access_key_id', - }, - 'secret_key': { - 'from_secret': 'aws_secret_access_key', - }, - 'bucket': { - 'from_secret': 's3_bucket', - }, - 'path_style': True, - 'strip_prefix': 'dist/release/', - 'source': 'dist/release/*', - 'target': '/ocis/%s/testing' % (ctx.repo.name.replace("ocis-", "")), - } - - return { - 'kind': 'pipeline', - 'type': 'docker', - 'name': name, - 'platform': { - 'os': 'linux', - 'arch': 'amd64', - }, - 'steps': [ - { - 'name': 'generate', - 'image': 'webhippie/golang:1.13', - 'pull': 'always', - 'commands': [ - 'make generate', - ], - 'volumes': [ - { - 'name': 'gopath', - 'path': '/srv/app', - }, - ], - }, - { - 'name': 'build', - 'image': 'webhippie/golang:1.13', - 'pull': 'always', - 'commands': [ - 'make release-%s' % (name), - ], - 'volumes': [ - { - 'name': 'gopath', - 'path': '/srv/app', - }, - ], - }, - { - 'name': 'finish', - 'image': 'webhippie/golang:1.13', - 'pull': 'always', - 'commands': [ - 'make release-finish', - ], - 'volumes': [ - { - 'name': 'gopath', - 'path': '/srv/app', - }, - ], - }, - { - 'name': 'upload', - 'image': 'plugins/s3:1', - 'pull': 'always', - 'settings': settings, - 'when': { - 'ref': [ - 'refs/heads/master', - 'refs/tags/**', - ], - }, - }, - { - 'name': 'changelog', - 'image': 'toolhippie/calens:latest', - 'pull': 'always', - 'commands': [ - 'calens --version %s -o dist/CHANGELOG.md' % ctx.build.ref.replace("refs/tags/v", "").split("-")[0], - ], - 'when': { - 'ref': [ - 'refs/tags/**', - ], - }, - }, - { - 'name': 'release', - 'image': 'plugins/github-release:1', - 'pull': 'always', - 'settings': { - 'api_key': { - 'from_secret': 'github_token', - }, - 'files': [ - 'dist/release/*', - ], - 'title': ctx.build.ref.replace("refs/tags/", ""), - 'note': 'dist/CHANGELOG.md', - 'overwrite': True, - }, - 'when': { - 'ref': [ - 'refs/tags/**', - ], - }, - }, - ], - 'volumes': [ - { - 'name': 'gopath', - 'temp': {}, - }, - ], - 'depends_on': [ - 'testing', - ], - 'trigger': { - 'ref': [ - 'refs/heads/master', - 'refs/tags/**', - 'refs/pull/**', - ], - }, - } - -def manifest(ctx): - return { - 'kind': 'pipeline', - 'type': 'docker', - 'name': 'manifest', - 'platform': { - 'os': 'linux', - 'arch': 'amd64', - }, - 'steps': [ - { - 'name': 'execute', - 'image': 'plugins/manifest:1', - 'pull': 'always', - 'settings': { - 'username': { - 'from_secret': 'docker_username', - }, - 'password': { - 'from_secret': 'docker_password', - }, - 'spec': 'docker/manifest.tmpl', - 'auto_tag': True, - 'ignore_missing': True, - }, - }, - ], - 'depends_on': [ - 'amd64', - 'arm64', - 'arm', - 'linux', - 'darwin', - 'windows', - ], - 'trigger': { - 'ref': [ - 'refs/heads/master', - 'refs/tags/**', - ], - }, - } - -def changelog(ctx): - return { - 'kind': 'pipeline', - 'type': 'docker', - 'name': 'changelog', - 'platform': { - 'os': 'linux', - 'arch': 'amd64', - }, - 'clone': { - 'disable': True, - }, - 'steps': [ - { - 'name': 'clone', - 'image': 'plugins/git-action:1', - 'pull': 'always', - 'settings': { - 'actions': [ - 'clone', - ], - 'remote': 'https://github.com/%s' % (ctx.repo.slug), - 'branch': ctx.build.branch if ctx.build.event == 'pull_request' else 'master', - 'path': '/drone/src', - 'netrc_machine': 'github.com', - 'netrc_username': { - 'from_secret': 'github_username', - }, - 'netrc_password': { - 'from_secret': 'github_token', - }, - }, - }, - { - 'name': 'generate', - 'image': 'webhippie/golang:1.13', - 'pull': 'always', - 'commands': [ - 'make changelog', - ], - }, - { - 'name': 'output', - 'image': 'webhippie/golang:1.13', - 'pull': 'always', - 'commands': [ - 'cat CHANGELOG.md', - ], - }, - { - 'name': 'publish', - 'image': 'plugins/git-action:1', - 'pull': 'always', - 'settings': { - 'actions': [ - 'commit', - 'push', - ], - 'message': 'Automated changelog update [skip ci]', - 'branch': 'master', - 'author_email': 'devops@owncloud.com', - 'author_name': 'ownClouders', - 'netrc_machine': 'github.com', - 'netrc_username': { - 'from_secret': 'github_username', - }, - 'netrc_password': { - 'from_secret': 'github_token', - }, - }, - 'when': { - 'ref': { - 'exclude': [ - 'refs/pull/**', - ], - }, - }, - }, - ], - 'depends_on': [ - 'manifest', - ], - 'trigger': { - 'ref': [ - 'refs/heads/master', - 'refs/tags/**', - ], - }, - } - -def readme(ctx): - return { - 'kind': 'pipeline', - 'type': 'docker', - 'name': 'readme', - 'platform': { - 'os': 'linux', - 'arch': 'amd64', - }, - 'steps': [ - { - 'name': 'execute', - 'image': 'sheogorath/readme-to-dockerhub:latest', - 'pull': 'always', - 'environment': { - 'DOCKERHUB_USERNAME': { - 'from_secret': 'docker_username', - }, - 'DOCKERHUB_PASSWORD': { - 'from_secret': 'docker_password', - }, - 'DOCKERHUB_REPO_PREFIX': ctx.repo.namespace, - 'DOCKERHUB_REPO_NAME': ctx.repo.name, - 'SHORT_DESCRIPTION': 'Docker images for %s' % (ctx.repo.name), - 'README_PATH': 'README.md', - }, - }, - ], - 'depends_on': [ - 'changelog', - ], - 'trigger': { - 'ref': [ - 'refs/heads/master', - 'refs/tags/**', - ], - }, - } - -def badges(ctx): - return { - 'kind': 'pipeline', - 'type': 'docker', - 'name': 'badges', - 'platform': { - 'os': 'linux', - 'arch': 'amd64', - }, - 'steps': [ - { - 'name': 'execute', - 'image': 'plugins/webhook:1', - 'pull': 'always', - 'settings': { - 'urls': { - 'from_secret': 'microbadger_url', - }, - }, - }, - ], - 'depends_on': [ - 'readme', - ], - 'trigger': { - 'ref': [ - 'refs/heads/master', - 'refs/tags/**', - ], - }, - } - -def website(ctx): - return { - 'kind': 'pipeline', - 'type': 'docker', - 'name': 'website', - 'platform': { - 'os': 'linux', - 'arch': 'amd64', - }, - 'steps': [ - { - 'name': 'generate', - 'image': 'webhippie/hugo:latest', - 'pull': 'always', - 'commands': [ - 'make docs', - ], - }, - { - 'name': 'publish', - 'image': 'plugins/gh-pages:1', - 'pull': 'always', - 'settings': { - 'username': { - 'from_secret': 'github_username', - }, - 'password': { - 'from_secret': 'github_token', - }, - 'pages_directory': 'docs/public/', - 'temporary_base': 'tmp/', - }, - 'when': { - 'ref': { - 'exclude': [ - 'refs/pull/**', - ], - }, - }, - }, - ], - 'depends_on': [ - 'badges', - ], - 'trigger': { - 'ref': [ - 'refs/heads/master', - 'refs/pull/**', - ], - }, - } diff --git a/ocis-graph-explorer/.editorconfig b/ocis-graph-explorer/.editorconfig deleted file mode 100644 index 77129cd39..000000000 --- a/ocis-graph-explorer/.editorconfig +++ /dev/null @@ -1,35 +0,0 @@ -# http://editorconfig.org - -root = true - -[*] -charset = utf-8 -insert_final_newline = true -trim_trailing_whitespace = true - -[Makefile] -indent_style = tab -indent_size = 4 - -[*.go] -indent_style = tab -indent_size = 4 - -[*.starlark] -indent_style = space -indent_size = 2 - -[*.{yml,json}] -indent_style = space -indent_size = 2 - -[*.{js,vue}] -indent_style = space -indent_size = 2 - -[*.{css,less}] -indent_style = space -indent_size = 2 - -[*.md] -trim_trailing_whitespace = true diff --git a/ocis-graph-explorer/.github/config.yml b/ocis-graph-explorer/.github/config.yml deleted file mode 100644 index afeaa98e2..000000000 --- a/ocis-graph-explorer/.github/config.yml +++ /dev/null @@ -1,12 +0,0 @@ -# Configuration for update-docs - https://github.com/behaviorbot/update-docs - -# Comment to be posted to on PRs that don't update documentation -updateDocsComment: > - Thanks for opening this pull request! The maintainers of this repository would appreciate it if you would create a [changelog](https://github.com/owncloud/ocis-graph-explorer/blob/master/changelog/README.md) item based on your changes. -updateDocsWhiteList: - - Tests-only - - tests-only - - Tests-Only - -updateDocsTargetFiles: - - changelog/unreleased/ diff --git a/ocis-graph-explorer/.github/issue_template.md b/ocis-graph-explorer/.github/issue_template.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/ocis-graph-explorer/.github/pull_request_template.md b/ocis-graph-explorer/.github/pull_request_template.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/ocis-graph-explorer/.github/settings.yml b/ocis-graph-explorer/.github/settings.yml deleted file mode 100644 index 674614f53..000000000 --- a/ocis-graph-explorer/.github/settings.yml +++ /dev/null @@ -1,98 +0,0 @@ ---- -repository: - name: ocis-graph-explorer - description: ':atom_symbol: Serve Graph-Explorer for oCIS' - homepage: https://owncloud.github.io/ocis-graph-explorer/ - topics: reva, ocis - - private: false - has_issues: true - has_projects: false - has_wiki: false - has_downloads: false - - default_branch: master - - allow_squash_merge: true - allow_merge_commit: true - allow_rebase_merge: true - -labels: - - name: bug - color: d73a4a - description: Something isn't working - - name: documentation - color: 0075ca - description: Improvements or additions to documentation - - name: duplicate - color: cfd3d7 - description: This issue or pull request already exists - - name: enhancement - color: a2eeef - description: New feature or request - - name: good first issue - color: 7057ff - description: Good for newcomers - - name: help wanted - color: 008672 - description: Extra attention is needed - - name: invalid - color: e4e669 - description: This doesn't seem right - - name: question - color: d876e3 - description: Further information is requested - - name: wontfix - color: ffffff - description: This will not be worked on - - name: effort/trivial - color: c2e0c6 - description: Required effort to finish task - - name: effort/0.25d - color: c2e0c6 - description: Required effort to finish task - - name: effort/0.5d - color: c2e0c6 - description: Required effort to finish task - - name: effort/1d - color: c2e0c6 - description: Required effort to finish task - - name: effort/2d - color: c2e0c6 - description: Required effort to finish task - - name: effort/4d - color: c2e0c6 - description: Required effort to finish task - - name: effort/5d - color: c2e0c6 - description: Required effort to finish task - - name: effort/10d - color: c2e0c6 - description: Required effort to finish task - -teams: - - name: ci - permission: admin - - name: employees - permission: push - -branches: - - name: master - protection: - required_pull_request_reviews: - required_approving_review_count: 1 - dismiss_stale_reviews: false - require_code_owner_reviews: false - dismissal_restrictions: {} - required_status_checks: - strict: true - contexts: - - continuous-integration/drone/pr - enforce_admins: false - restrictions: - users: [] - teams: - - ci - - employees - -... diff --git a/ocis-graph-explorer/.gitignore b/ocis-graph-explorer/.gitignore deleted file mode 100644 index 6c72797ac..000000000 --- a/ocis-graph-explorer/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -coverage.out - -/bin -/dist - -/assets diff --git a/ocis-graph-explorer/CHANGELOG.md b/ocis-graph-explorer/CHANGELOG.md deleted file mode 100644 index 32e56ab9c..000000000 --- a/ocis-graph-explorer/CHANGELOG.md +++ /dev/null @@ -1,26 +0,0 @@ -# Changelog for unreleased - -The following sections list the changes for unreleased. - -## Summary - - * Fix #7: Build docker images with alpine:latest instead of alpine:edge - * Chg #3: Initial release of basic version - -## Details - - * Bugfix #7: Build docker images with alpine:latest instead of alpine:edge - - ARM builds were failing when built on alpine:edge, so we switched to alpine:latest instead. - - https://github.com/owncloud/ocis-graph-explorer/pull/7 - - * Change #3: Initial release of basic version - - Just prepared an initial basic version to serve Graph-Explorer for the ownCloud Infinite - Scale project. It just provides a minimal viable product to demonstrate the microservice - pattern. - - https://github.com/owncloud/ocis-graph-explorer/issues/3 - - diff --git a/ocis-graph-explorer/README.md b/ocis-graph-explorer/README.md deleted file mode 100644 index 741617c63..000000000 --- a/ocis-graph-explorer/README.md +++ /dev/null @@ -1,45 +0,0 @@ -# ownCloud Infinite Scale: Graph-Explorer - -[![Build Status](https://cloud.drone.io/api/badges/owncloud/ocis-graph-explorer/status.svg)](https://cloud.drone.io/owncloud/ocis-graph-explorer) -[![Gitter chat](https://badges.gitter.im/cs3org/reva.svg)](https://gitter.im/cs3org/reva) -[![Codacy Badge](https://api.codacy.com/project/badge/Grade/afe89eb0894848c5b67dc0343afd1df9)](https://www.codacy.com/app/owncloud/ocis-graph-explorer?utm_source=github.com&utm_medium=referral&utm_content=owncloud/ocis-graph-explorer&utm_campaign=Badge_Grade) -[![Go Doc](https://godoc.org/github.com/owncloud/ocis-graph-explorer?status.svg)](http://godoc.org/github.com/owncloud/ocis-graph-explorer) -[![Go Report](http://goreportcard.com/badge/github.com/owncloud/ocis-graph-explorer)](http://goreportcard.com/report/github.com/owncloud/ocis-graph-explorer) -[![](https://images.microbadger.com/badges/image/owncloud/ocis-graph-explorer.svg)](http://microbadger.com/images/owncloud/ocis-graph-explorer "Get your own image badge on microbadger.com") - -**This project is under heavy development, it's not in a working state yet!** - -## Install - -You can download prebuilt binaries from the GitHub releases or from our [download mirrors](http://download.owncloud.com/ocis/graph-explorer/). For instructions how to install this on your platform you should take a look at our [documentation](https://owncloud.github.io/ocis-graph-explorer/) - -## Development - -Make sure you have a working Go environment, for further reference or a guide take a look at the [install instructions](http://golang.org/doc/install.html). This project requires Go >= v1.12. For the frontend it's also required to have [NodeJS](https://nodejs.org/en/download/package-manager/) and [Yarn](https://yarnpkg.com/lang/en/docs/install/) installed. - -```console -git clone https://github.com/owncloud/ocis-graph-explorer.git -cd ocis-graph-explorer - -make generate build - -./bin/ocis-graph-explorer -h -``` - -## Security - -If you find a security issue please contact security@owncloud.com first. - -## Contributing - -Fork -> Patch -> Push -> Pull Request - -## License - -Apache-2.0 - -## Copyright - -```console -Copyright (c) 2019 ownCloud GmbH -```