From 0f18f49e93f46dcee26a289da5fe1cabb5dca443 Mon Sep 17 00:00:00 2001 From: Adam Janikowski <12255597+ajanikow@users.noreply.github.com> Date: Tue, 11 May 2021 21:16:58 +0200 Subject: [PATCH] [Cleanup] Regenerate assets (#725) --- .travis.yml | 3 +- Makefile | 14 ++--- dashboard/assets.go | 136 ++++++++++++++++++++++---------------------- go.mod | 13 +++-- go.sum | 24 ++++++++ 5 files changed, 107 insertions(+), 83 deletions(-) diff --git a/.travis.yml b/.travis.yml index 29bc038fd..4ef17c20a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,7 @@ language: go go: - - "1.13" - - "1.14" + - "1.16" go_import_path: github.com/arangodb/kube-arangodb diff --git a/Makefile b/Makefile index d3925a151..d1fe37e64 100644 --- a/Makefile +++ b/Makefile @@ -181,22 +181,22 @@ GOLANGCI_ENABLED=deadcode govet ineffassign staticcheck structcheck typecheck un .PHONY: license-verify license-verify: @echo ">> Verify license of files" - @go run github.com/google/addlicense -f "./tools/codegen/boilerplate.go.txt" -check $(SOURCES) + @$(GOPATH)/bin/addlicense -f "./tools/codegen/boilerplate.go.txt" -check $(SOURCES) .PHONY: fmt fmt: @echo ">> Ensuring style of files" - @go run golang.org/x/tools/cmd/goimports -w $(SOURCES) + @$(GOPATH)/bin/goimports -w $(SOURCES) .PHONY: license license: @echo ">> Ensuring license of files" - @go run github.com/google/addlicense -f "./tools/codegen/boilerplate.go.txt" $(SOURCES) + @$(GOPATH)/bin/addlicense -f "./tools/codegen/boilerplate.go.txt" $(SOURCES) .PHONY: fmt-verify fmt-verify: license-verify @echo ">> Verify files style" - @if [ X"$$(go run golang.org/x/tools/cmd/goimports -l $(SOURCES) | wc -l)" != X"0" ]; then echo ">> Style errors"; go run golang.org/x/tools/cmd/goimports -l $(SOURCES); exit 1; fi + @if [ X"$$($(GOPATH)/bin/goimports -l $(SOURCES) | wc -l)" != X"0" ]; then echo ">> Style errors"; $(GOPATH)/bin/goimports -l $(SOURCES); exit 1; fi .PHONY: linter linter: @@ -597,11 +597,11 @@ init: tools update-generated $(GHRELEASE) $(RELEASE) $(TESTBIN) $(BIN) vendor .PHONY: tools tools: update-vendor @echo ">> Fetching golangci-lint linter" - @go install github.com/golangci/golangci-lint/cmd/golangci-lint + @go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.40.0 @echo ">> Fetching goimports" - @go get -u golang.org/x/tools/cmd/goimports + @go get golang.org/x/tools/cmd/goimports@0bb7e5c47b1a31f85d4f173edc878a8e049764a5 @echo ">> Fetching license check" - @go get -u github.com/google/addlicense + @go get github.com/google/addlicense@6d92264d717064f28b32464f0f9693a5b4ef0239 .PHONY: vendor vendor: diff --git a/dashboard/assets.go b/dashboard/assets.go index 15659e407..edf9980dd 100644 --- a/dashboard/assets.go +++ b/dashboard/assets.go @@ -26,106 +26,106 @@ import ( "github.com/jessevdk/go-assets" ) -var _Assets716e7e2b8d7416845c3d9031bde05feb1fba0d38 = "
3&&void 0!==arguments[3]?arguments[3]:{};if(\"function\"!==typeof e&&\"string\"!==typeof e)throw new Error(\"createShorthand() Component must be a string or function.\");if(x()(n)||b()(n))return null;var a=m()(n),l=h()(n),u=p()(n),f=Object(k.isValidElement)(n),d=s()(n),v=a||l||c()(n);if(!u&&!f&&!d&&!v)return null;var y=r.defaultProps,g=void 0===y?{}:y,w=f&&n.props||d&&n||v&&t(n),j=r.overrideProps,C=void 0===j?{}:j;C=p()(C)?C(o()({},g,w)):C;var T=o()({},g,w,C);if(g.className||C.className||w.className){var _=O()(g.className,C.className,w.className);T.className=i()(_.split(\" \")).join(\" \")}if((g.style||C.style||w.style)&&(T.style=o()({},g.style,w.style,C.style)),x()(T.key)){var S=T.childKey,P=r.autoGenerateKey,N=void 0===P||P;x()(S)?N&&(a||l)&&(T.key=n):(T.key=\"function\"===typeof S?S(T):S,delete T.childKey)}return f?Object(k.cloneElement)(n,T):v||d?E.a.createElement(e,T):u?n(e,T,T.children):void 0}function C(e,t){if(\"function\"!==typeof e&&\"string\"!==typeof e)throw new Error(\"createShorthandFactory() Component must be a string or function.\");return function(n,r){return j(e,t,n,r)}}j.handledProps=[];C(\"div\",(function(e){return{children:e}})),C(\"iframe\",(function(e){return{src:e}})),C(\"img\",(function(e){return{src:e}}));var T=C(\"input\",(function(e){return{type:e}})),_=C(\"label\",(function(e){return{children:e}})),S=C(\"p\",(function(e){return{children:e}}))},function(e,t,n){var r=n(83),o=n(89),a=n(120),i=n(90),l=n(336),c=n(93),u=200;e.exports=function(e,t,n){var s=-1,f=o,p=e.length,d=!0,h=[],v=h;if(n)d=!1,f=a;else if(p>=u){var m=t?null:l(e);if(m)return c(m);d=!1,f=i,v=new r}else v=t?[]:h;e:for(;++s
1&&h.reverse(),C&&E