Merge pull request #5597 from rohit-nayak-ps/embed-vtctld-assets

Embed vtctld assets

Makefile

@@ -37,6 +37,12 @@ ifdef VT_EXTRA_BUILD_FLAGS
 export EXTRA_BUILD_FLAGS := $(VT_EXTRA_BUILD_FLAGS)
 endif
 
+# This target needs to be manually run every time any file within web/vtctld2/app is modified to regenerate rice-box.go
+embed_static: 
+ cd go/vt/vtctld
+ go run github.com/GeertJohan/go.rice/rice embed-go
+ go build .
+
 build_web:
  echo $$(date): Building web artifacts
  cd web/vtctld2 && ng build -prod

examples/compose/docker-compose.beginners.yml

@@ -37,8 +37,6 @@ services:
  command: ["sh", "-c", " $$VTROOT/bin/vtctld \
  $TOPOLOGY_FLAGS \
  -cell $CELL \
- -web_dir $$VTROOT/web/vtctld \
- -web_dir2 $$VTROOT/web/vtctld2/app \
  -workflow_manager_init \
  -workflow_manager_use_election \
  -service_map 'grpc-vtctl' \

examples/compose/vtcompose/vtcompose.go

@@ -466,8 +466,6 @@ func generateVtctld() string {
  command: ["sh", "-c", " $$VTROOT/bin/vtctld \
  %[3]s \
  -cell %[4]s \
- -web_dir $$VTROOT/web/vtctld \
- -web_dir2 $$VTROOT/web/vtctld2/app \
  -workflow_manager_init \
  -workflow_manager_use_election \
  -service_map 'grpc-vtctl' \

examples/demo/run.py

@@ -56,7 +56,6 @@ def start_vitess():
  '--port', '12345',
  '--proto_topo', text_format.MessageToString(topology,
  as_one_line=True),
- '--web_dir', os.path.join(vttop, 'web/vtctld'),
  '--schema_dir', os.path.join(vttop, 'examples/demo/schema'),
  '--mysql_server_bind_address', '0.0.0.0']
  sp = subprocess.Popen(args, stdin=subprocess.PIPE, stdout=subprocess.PIPE)

examples/kubernetes/vtctld-controller-template.yaml

@@ -41,8 +41,6 @@ spec:
  chown -R vitess /vt &&
  su -p -c "/vt/bin/vtctld
  -cell {{cell}}
- -web_dir $VTROOT/web/vtctld
- -web_dir2 $VTROOT/web/vtctld2/app
  -workflow_manager_init
  -workflow_manager_use_election
  -log_dir $VTDATAROOT/tmp

examples/local/vtctld-up.sh

@@ -36,8 +36,6 @@ echo "Starting vtctld..."
 $VTROOT/bin/vtctld \
  $TOPOLOGY_FLAGS \
  -cell $cell \
- -web_dir $VTROOT/web/vtctld \
- -web_dir2 $VTROOT/web/vtctld2/app \
  -workflow_manager_init \
  -workflow_manager_use_election \
  -service_map 'grpc-vtctl' \

go.mod

@@ -5,31 +5,35 @@ go 1.12
 require (
  cloud.google.com/go v0.45.1
  github.com/Bowery/prompt v0.0.0-20190419144237-972d0ceb96f5 // indirect
+ github.com/GeertJohan/go.rice v1.0.0
  github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878 // indirect
  github.com/aws/aws-sdk-go v0.0.0-20180223184012-ebef4262e06a
  github.com/boltdb/bolt v1.3.1 // indirect
+ github.com/bombsimon/wsl v1.2.8 // indirect
  github.com/cespare/xxhash/v2 v2.1.1
  github.com/cockroachdb/cmux v0.0.0-20170110192607-30d10be49292 // indirect
  github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd // indirect
- github.com/coreos/etcd v0.0.0-20170626015032-703663d1f6ed
+ github.com/coreos/etcd v3.3.10+incompatible
  github.com/coreos/go-semver v0.3.0 // indirect
  github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f // indirect
- github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
  github.com/dchest/safefile v0.0.0-20151022103144-855e8d98f185 // indirect
- github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
  github.com/evanphx/json-patch v4.5.0+incompatible
- github.com/ghodss/yaml v0.0.0-20161207003320-04f313413ffd // indirect
+ github.com/go-critic/go-critic v0.4.0 // indirect
  github.com/go-ini/ini v1.12.0 // indirect
+ github.com/gogo/protobuf v1.3.1 // indirect
  github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
  github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 // indirect
  github.com/golang/mock v1.3.1
  github.com/golang/protobuf v1.3.2
  github.com/golang/snappy v0.0.0-20170215233205-553a64147049
+ github.com/golangci/gocyclo v0.0.0-20180528144436-0a533e8fa43d // indirect
+ github.com/golangci/golangci-lint v1.21.0 // indirect
+ github.com/golangci/revgrep v0.0.0-20180812185044-276a5c0a1039 // indirect
  github.com/google/shlex v0.0.0-20181106134648-c34317bd91bf // indirect
- github.com/gorilla/websocket v0.0.0-20160912153041-2d1e4548da23
+ github.com/gorilla/websocket v1.4.0
+ github.com/gostaticanalysis/analysisutil v0.0.3 // indirect
  github.com/grpc-ecosystem/go-grpc-middleware v1.1.0
  github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
- github.com/grpc-ecosystem/grpc-gateway v0.0.0-20161128002007-199c40a060d1 // indirect
  github.com/hashicorp/consul v1.4.0
  github.com/hashicorp/go-msgpack v0.5.5 // indirect
  github.com/hashicorp/go-rootcerts v0.0.0-20160503143440-6bb64b370b90 // indirect
@@ -38,49 +42,55 @@ require (
  github.com/hashicorp/memberlist v0.1.4 // indirect
  github.com/hashicorp/serf v0.0.0-20161207011743-d3a67ab21bc8 // indirect
  github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8 // indirect
- github.com/jonboulle/clockwork v0.1.0 // indirect
- github.com/klauspost/compress v0.0.0-20180801095237-b50017755d44 // indirect
- github.com/klauspost/cpuid v1.2.0 // indirect
  github.com/klauspost/crc32 v1.2.0 // indirect
  github.com/klauspost/pgzip v1.2.0
- github.com/kr/pretty v0.1.0 // indirect
+ github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
  github.com/krishicks/yaml-patch v0.0.10
+ github.com/mattn/go-isatty v0.0.11 // indirect
  github.com/mattn/go-runewidth v0.0.1 // indirect
  github.com/minio/minio-go v0.0.0-20190131015406-c8a261de75c1
  github.com/mitchellh/go-testing-interface v1.0.0 // indirect
- github.com/mitchellh/mapstructure v1.1.2 // indirect
+ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+ github.com/modern-go/reflect2 v1.0.1 // indirect
  github.com/olekukonko/tablewriter v0.0.0-20160115111002-cca8bbc07984
  github.com/opentracing-contrib/go-grpc v0.0.0-20180928155321-4b5a12d3ff02
  github.com/opentracing/opentracing-go v1.1.0
- github.com/pborman/uuid v0.0.0-20160824210600-b984ec7fa9ff
+ github.com/pborman/uuid v1.2.0
+ github.com/pelletier/go-toml v1.6.0 // indirect
  github.com/pires/go-proxyproto v0.0.0-20191211124218-517ecdf5bb2b
  github.com/pkg/errors v0.8.1
  github.com/prometheus/client_golang v1.1.0
  github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 // indirect
  github.com/prometheus/common v0.7.0
  github.com/prometheus/procfs v0.0.5 // indirect
  github.com/satori/go.uuid v0.0.0-20160713180306-0aa62d5ddceb // indirect
+ github.com/securego/gosec v0.0.0-20191217083152-cb4f343eaff1 // indirect
+ github.com/spf13/afero v1.2.2 // indirect
+ github.com/spf13/cast v1.3.1 // indirect
+ github.com/spf13/jwalterweatherman v1.1.0 // indirect
+ github.com/spf13/viper v1.6.1 // indirect
  github.com/stretchr/testify v1.4.0
  github.com/tchap/go-patricia v0.0.0-20160729071656-dd168db6051b
  github.com/uber-go/atomic v1.4.0 // indirect
  github.com/uber/jaeger-client-go v2.16.0+incompatible
  github.com/uber/jaeger-lib v2.0.0+incompatible // indirect
  github.com/ugorji/go v1.1.7 // indirect
- github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
+ github.com/uudashr/gocognit v1.0.1 // indirect
  github.com/z-division/go-zookeeper v0.0.0-20190128072838-6d7457066b9b
- golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472
+ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550
  golang.org/x/lint v0.0.0-20190409202823-959b441ac422
  golang.org/x/net v0.0.0-20190926025831-c00fd9afed17
  golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
- golang.org/x/sys v0.0.0-20190926180325-855e68c8590b // indirect
+ golang.org/x/sys v0.0.0-20191218084908-4a24b4065292 // indirect
  golang.org/x/text v0.3.2
  golang.org/x/time v0.0.0-20190308202827-9d24e82272b4
- golang.org/x/tools v0.0.0-20190830154057-c17b040389b9
+ golang.org/x/tools v0.0.0-20191219041853-979b82bfef62
  google.golang.org/api v0.9.0
  google.golang.org/genproto v0.0.0-20190926190326-7ee9db18f195 // indirect
  google.golang.org/grpc v1.24.0
  gopkg.in/asn1-ber.v1 v1.0.0-20150924051756-4e86f4367175 // indirect
- gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
  gopkg.in/ldap.v2 v2.5.0
- honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc
+ honnef.co/go/tools v0.0.1-2019.2.3
+ mvdan.cc/unparam v0.0.0-20191111180625-960b1ec0f2c2 // indirect
+ sourcegraph.com/sqs/pbtypes v1.0.0 // indirect
 )