From 96f34d66c6597182100fcb36e7f2040567c57dd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Garc=C3=ADa=20Crespo?= Date: Fri, 29 Sep 2023 13:04:25 +0000 Subject: [PATCH] Add various updates - Migrate to ghcr.io container registry - Publish images labels with full version - Use non-root image in Docker image - Use embed instead of packr to embed assets - Update Go to 1.21 and module deps - Drop API schema publishing functionality --- .github/workflows/release.yml | 34 ++- .gitignore | 1 - .goreleaser.yml | 26 +- .vscode/settings.json | 4 +- Dockerfile | 10 +- Dockerfile.release | 5 +- Makefile | 14 +- cmd/cmd.go | 15 +- cmd/edit.go | 1 + cmd/version.go | 2 +- design/resources.go | 10 +- go.mod | 43 +-- go.sum | 308 ++++------------------ internal/api/api.go | 23 +- internal/api/app/contexts.go | 6 +- internal/api/app/controllers.go | 112 +------- internal/api/app/hrefs.go | 6 +- internal/api/app/media_types.go | 6 +- internal/api/app/test/schema_testing.go | 11 - internal/api/app/test/swagger_testing.go | 11 - internal/api/app/test/web_testing.go | 6 +- internal/api/app/test/workflow_testing.go | 6 +- internal/api/app/user_types.go | 6 +- internal/constants/constants.go | 8 - internal/graph/encoding/decode.go | 13 +- internal/graph/workflow.go | 5 +- internal/graph/workflow_test.go | 4 +- internal/version/version.go | 2 +- main.go | 2 - public/assets.go | 8 + public/schema/schema.json | 1 - public/swagger/swagger.json | 1 - public/swagger/swagger.yaml | 218 --------------- web/js/client/js/client.js | 8 +- 34 files changed, 189 insertions(+), 747 deletions(-) delete mode 100644 internal/api/app/test/schema_testing.go delete mode 100644 internal/api/app/test/swagger_testing.go delete mode 100644 internal/constants/constants.go create mode 100644 public/assets.go delete mode 100644 public/schema/schema.json delete mode 100644 public/swagger/swagger.json delete mode 100644 public/swagger/swagger.yaml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1bc404d..391c52b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,32 +1,42 @@ +name: GoReleaser on: push: tags: - 'v*' -name: GoReleaser +permissions: + contents: write + packages: write jobs: release: name: Release runs-on: ubuntu-latest steps: - name: Check out code - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: + show-progress: false fetch-depth: 0 - - name: Fetch all tags - run: git fetch origin +refs/tags/*:refs/tags/* - name: Install Go - uses: actions/setup-go@v1 + uses: actions/setup-go@v4 + with: + go-version-file: go.mod + - name: Log in to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + - name: Log in to the GitHub Container Registry + uses: docker/login-action@v3 with: - go-version: 1.15.x - - name: Install Docker credentials - run: | - docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }} - docker login -u qubot -p ${{ secrets.GITHUB_TOKEN }} docker.pkg.github.com + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Run GoReleaser - uses: goreleaser/goreleaser-action@v1 + uses: goreleaser/goreleaser-action@v5 with: + distribution: goreleaser version: latest args: release env: - GITHUB_TOKEN: ${{ secrets.QUBOT_GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} if: success() diff --git a/.gitignore b/.gitignore index efe4a36..dc7a7a3 100644 --- a/.gitignore +++ b/.gitignore @@ -5,5 +5,4 @@ /web/node_modules *.swp -*-packr.go *.log diff --git a/.goreleaser.yml b/.goreleaser.yml index 498d861..fb48cef 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -3,8 +3,7 @@ project_name: amflow before: hooks: - make clean - - make deps - - make prebuild + - make frontend builds: - ldflags: @@ -24,13 +23,24 @@ checksum: dockers: - goos: linux goarch: amd64 + dockerfile: Dockerfile.release image_templates: - "artefactual/amflow:latest" - "artefactual/amflow:v{{ .Major }}" - - "docker.pkg.github.com/artefactual-labs/amflow/amflow:latest" - - "docker.pkg.github.com/artefactual-labs/amflow/amflow:v{{ .Major }}" - dockerfile: Dockerfile.release + - "artefactual/amflow:{{ .Tag }}" + - "ghcr.io/artefactual-labs/amflow/amflow:latest" + - "ghcr.io/artefactual-labs/amflow/amflow:v{{ .Major }}" + - "ghcr.io/artefactual-labs/amflow/amflow:{{ .Tag }}" build_flag_templates: - - "--label=org.label-schema.schema-version=1.0" - - "--label=org.label-schema.version={{.Version}}" - - "--label=org.label-schema.name={{.ProjectName}}" + - "--pull" + - "--platform=linux/amd64" + - "--label=org.opencontainers.image.title={{.ProjectName}}" + - "--label=org.opencontainers.image.vendor=Artefactual Systems Inc." + - "--label=org.opencontainers.image.description=amflow {{.Tag}}" + - "--label=org.opencontainers.image.url=https://github.com/artefactual-labs/amflow" + - "--label=org.opencontainers.image.documentation=https://github.com/artefactual-labs/amflow/blob/main/README.md" + - "--label=org.opencontainers.image.source=https://github.com/artefactual-labs/amflow" + - "--label=org.opencontainers.image.licenses=Apache-2.0" + - "--label=org.opencontainers.image.version={{.Version}}" + - "--label=org.opencontainers.image.revision={{.FullCommit}}" + - "--label=org.opencontainers.image.created={{.Date}}" diff --git a/.vscode/settings.json b/.vscode/settings.json index 2cc8864..db3e749 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -4,8 +4,6 @@ "dist": true, "public/assets": true, "web/.cache": true, - "web/node_modules": true, - "packrd": true, - "**/*-packr.go": true + "web/node_modules": true } } diff --git a/Dockerfile b/Dockerfile index 9995680..351b008 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,19 +1,17 @@ -FROM node:11 as frontend +FROM node:18 as frontend WORKDIR /src COPY ./ui ./ui RUN yarn --cwd /src/ui install RUN yarn --cwd /src/ui build -ARG GO_VERSION=1.15 -FROM golang:${GO_VERSION}-alpine AS build +FROM golang:1.21.1-alpine AS build RUN apk add --no-cache ca-certificates git make WORKDIR /src COPY ./go.mod ./go.sum ./Makefile ./ -RUN make deps COPY ./ ./ RUN make build -FROM alpine:3.11 AS final +FROM alpine:3.18 AS final RUN apk --no-cache add ca-certificates graphviz -COPY --from=build /tmp/amflow /bin/amflow +COPY --from=build /src/dist/amflow /bin/amflow ENTRYPOINT ["/amflow"] diff --git a/Dockerfile.release b/Dockerfile.release index 5c11d8d..620d194 100644 --- a/Dockerfile.release +++ b/Dockerfile.release @@ -1,5 +1,8 @@ # This is used by GoReleaser. -FROM alpine:3.11 AS final +FROM alpine:3.18 AS final RUN apk --no-cache add ca-certificates graphviz COPY amflow / +RUN addgroup -S amflow +RUN adduser -S amflow -G amflow +USER amflow ENTRYPOINT ["/amflow"] diff --git a/Makefile b/Makefile index 5277389..1693235 100644 --- a/Makefile +++ b/Makefile @@ -16,9 +16,6 @@ help: @echo " check check all the things" @echo " help this help message" -tools: - env GO111MODULE=off go get github.com/gobuffalo/packr/packr2 - .PHONY: deps deps: tools @echo "Downloading modules..." @@ -27,29 +24,20 @@ deps: tools .PHONY: goagen goagen: @goagen app -d github.com/artefactual-labs/amflow/design -o internal/api - @goagen swagger -d github.com/artefactual-labs/amflow/design -o public - @goagen schema -d github.com/artefactual-labs/amflow/design -o public @goagen js -d github.com/artefactual-labs/amflow/design -o web/js/client --noexample .PHONY: clean clean: git clean -f -d -x -.PHONY: prebuild -prebuild: frontend generate - .PHONY: build -build: prebuild +build: CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GOFLAGS=-ldflags=-w \ go build \ -o dist/amflow \ -ldflags="-s -X github.com/artefactual-labs/amflow/internal/version.version=try" \ github.com/artefactual-labs/amflow -.PHONY: generate -generate: - go generate - .PHONY: frontend frontend: yarn --cwd web install diff --git a/cmd/cmd.go b/cmd/cmd.go index 4f151ab..2bea724 100644 --- a/cmd/cmd.go +++ b/cmd/cmd.go @@ -6,7 +6,6 @@ package cmd import ( "fmt" "io" - "io/ioutil" "net/http" "net/url" "os" @@ -17,14 +16,14 @@ import ( "github.com/spf13/cobra" "go.uber.org/multierr" - "github.com/artefactual-labs/amflow/internal/constants" "github.com/artefactual-labs/amflow/internal/graph" "github.com/artefactual-labs/amflow/internal/graph/encoding" "github.com/artefactual-labs/amflow/internal/version" ) var ( - v string + v string + defaultLogLevel = logrus.InfoLevel ) var rootCmd = &cobra.Command{ @@ -43,7 +42,7 @@ func command(out, err io.Writer) *cobra.Command { return err } rootCmd.SilenceUsage = true - logrus.Infof("amflow %+s", version.Get()) + logrus.Infof("amflow %+s", version.Version()) return nil } @@ -54,7 +53,7 @@ func command(out, err io.Writer) *cobra.Command { rootCmd.AddCommand(newCmdSearch(out)) rootCmd.AddCommand(newCmdCheck(out)) - rootCmd.PersistentFlags().StringVarP(&v, "verbosity", "v", constants.DefaultLogLevel.String(), "Log level (debug, info, warn, error, fatal, panic") + rootCmd.PersistentFlags().StringVarP(&v, "verbosity", "v", defaultLogLevel.String(), "Log level (debug, info, warn, error, fatal, panic") return rootCmd } @@ -79,13 +78,13 @@ func load(file string) (*graph.Workflow, error) { // Load workflow bytes. if file == "" { logrus.WithFields(logrus.Fields{"mode": "embedded"}).Info("Loading workfow") - bytes, err = graph.WorkflowSchemaBox.Find("example.json") + bytes = graph.WorkflowSample } else if isURL(file) { logrus.WithFields(logrus.Fields{"mode": "file", "source": file}).Info("Downloading workfow") bytes, err = downloadRemote(file) } else { logrus.WithFields(logrus.Fields{"mode": "file", "source": file}).Info("Loading workfow") - bytes, err = ioutil.ReadFile(file) + bytes, err = os.ReadFile(file) } if err != nil { return nil, errors.WithMessage(err, "Workflow could not be retrieved") @@ -134,7 +133,7 @@ func downloadRemote(addr string) ([]byte, error) { return nil, fmt.Errorf("remote server returned and unexpected response with status code: %d", resp.StatusCode) } defer resp.Body.Close() - bytes, err := ioutil.ReadAll(resp.Body) + bytes, err := io.ReadAll(resp.Body) if err != nil { return nil, errors.WithMessage(err, "remote resource could not be loaded") } diff --git a/cmd/edit.go b/cmd/edit.go index c8180af..f6461ac 100644 --- a/cmd/edit.go +++ b/cmd/edit.go @@ -50,6 +50,7 @@ func edit(out io.Writer) error { } defer ln.Close() logger := logrus.WithField("subsystem", "api") + logger.WithField("port", ln.Addr()).Info("Staring API server") svc := api.Create(w, logger) if err := svc.Serve(ln); err != nil { svc.LogError("startup", "err", err) diff --git a/cmd/version.go b/cmd/version.go index 6835833..b6bb253 100644 --- a/cmd/version.go +++ b/cmd/version.go @@ -14,7 +14,7 @@ func newCmdVersion(out io.Writer) *cobra.Command { Use: "version", Short: "Print the version information", RunE: func(cmd *cobra.Command, args []string) error { - fmt.Println(version.Get()) + fmt.Println(version.Version()) return nil }, } diff --git a/design/resources.go b/design/resources.go index fccde3a..13e372d 100644 --- a/design/resources.go +++ b/design/resources.go @@ -55,17 +55,9 @@ var _ = Resource("workflow", func() { }) }) -var _ = Resource("swagger", func() { - Files("/swagger/*filepath", "public/swagger/") -}) - -var _ = Resource("schema", func() { - Files("/schema/*filepath", "public/schema/") -}) - var _ = Resource("web", func() { Origin("*", func() { Methods("GET, OPTIONS") }) - Files("/*filepath", "public/web/") + Files("/*filepath", "web/") }) diff --git a/go.mod b/go.mod index 9a7e907..01f9f88 100644 --- a/go.mod +++ b/go.mod @@ -1,34 +1,39 @@ module github.com/artefactual-labs/amflow -go 1.15 +go 1.21 + +require ( + github.com/goadesign/goa v1.4.3 + github.com/olekukonko/tablewriter v0.0.5 + github.com/pkg/errors v0.9.1 + github.com/sirupsen/logrus v1.9.3 + github.com/spf13/cobra v1.7.0 + github.com/stretchr/testify v1.8.4 + go.uber.org/multierr v1.11.0 + gonum.org/v1/gonum v0.14.0 +) require ( github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da // indirect + github.com/davecgh/go-spew v1.1.1 // indirect github.com/dimfeld/httppath v0.0.0-20170720192232-ee938bf73598 // indirect github.com/dimfeld/httptreemux v5.0.1+incompatible // indirect - github.com/goadesign/goa v1.0.1-0.20181221201017-4a2fb392efda - github.com/gobuffalo/packr/v2 v2.7.1 + github.com/gofrs/uuid v4.4.0+incompatible // indirect github.com/google/gxui v0.0.0-20151028112939-f85e0a97b3a4 // indirect - github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e // indirect github.com/hashicorp/go-immutable-radix v1.0.0 // indirect - github.com/hashicorp/go-uuid v1.0.1 // indirect - github.com/jtolds/gls v4.2.1+incompatible // indirect + github.com/hashicorp/golang-lru v0.5.1 // indirect + github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/manveru/faker v0.0.0-20171103152722-9fbc68a78c4d // indirect github.com/manveru/gobdd v0.0.0-20131210092515-f1a17fdd710b // indirect - github.com/olekukonko/tablewriter v0.0.4 + github.com/mattn/go-runewidth v0.0.9 // indirect github.com/onsi/ginkgo v1.7.0 // indirect github.com/onsi/gomega v1.4.3 // indirect - github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c // indirect - github.com/pkg/errors v0.9.1 - github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b // indirect - github.com/sirupsen/logrus v1.4.2 - github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304 // indirect - github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c // indirect - github.com/spf13/cobra v0.0.6 - github.com/stretchr/testify v1.5.1 + github.com/pascaldekloe/goe v0.1.1 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/smartystreets/goconvey v1.8.1 // indirect + github.com/spf13/pflag v1.0.5 // indirect github.com/zach-klippenstein/goregen v0.0.0-20160303162051-795b5e3961ea // indirect - go.uber.org/multierr v1.5.0 - golang.org/x/exp v0.0.0-20190316020145-860388717186 // indirect - gonum.org/v1/gonum v0.7.0 - gonum.org/v1/netlib v0.0.0-20190314102120-fc220b4194ca // indirect + golang.org/x/net v0.8.0 // indirect + golang.org/x/sys v0.6.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 9ebcb91..b6655d2 100644 --- a/go.sum +++ b/go.sum @@ -1,305 +1,97 @@ -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= -github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da h1:8GUt8eRujhVEGZFFEjBj46YV4rDjvGrNxb0KMWYkL2I= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= -github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= -github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= -github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= -github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= -github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= -github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= -github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= 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/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= -github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/dimfeld/httppath v0.0.0-20170720192232-ee938bf73598 h1:MGKhKyiYrvMDZsmLR/+RGffQSXwEkXgfLSA08qDn9AI= github.com/dimfeld/httppath v0.0.0-20170720192232-ee938bf73598/go.mod h1:0FpDmbrt36utu8jEmeU05dPC9AB5tsLYVVi+ZHfyuwI= github.com/dimfeld/httptreemux v5.0.1+incompatible h1:Qj3gVcDNoOthBAqftuD596rm4wg/adLLz5xh5CmpiCA= github.com/dimfeld/httptreemux v5.0.1+incompatible/go.mod h1:rbUlSV+CCpv/SuqUTP/8Bk2O3LyUV436/yaRGkhP6Z0= -github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= -github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= -github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= -github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/goadesign/goa v1.0.1-0.20181221201017-4a2fb392efda h1:1i38SyzCm4MW+pA7vCbxqWkMmcRWTSKjVHFdEnPmpeY= -github.com/goadesign/goa v1.0.1-0.20181221201017-4a2fb392efda/go.mod h1:d/9lpuZBK7HFi/7O0oXfwvdoIl+nx2bwKqctZe/lQao= -github.com/gobuffalo/envy v1.7.0/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI= -github.com/gobuffalo/envy v1.7.1 h1:OQl5ys5MBea7OGCdvPbBJWRgnhC/fGona6QKfvFeau8= -github.com/gobuffalo/envy v1.7.1/go.mod h1:FurDp9+EDPE4aIUS3ZLyD+7/9fpx7YRt/ukY6jIHf0w= -github.com/gobuffalo/logger v1.0.1 h1:ZEgyRGgAm4ZAhAO45YXMs5Fp+bzGLESFewzAVBMKuTg= -github.com/gobuffalo/logger v1.0.1/go.mod h1:2zbswyIUa45I+c+FLXuWl9zSWEiVuthsk8ze5s8JvPs= -github.com/gobuffalo/packd v0.3.0 h1:eMwymTkA1uXsqxS0Tpoop3Lc0u3kTfiMBE6nKtQU4g4= -github.com/gobuffalo/packd v0.3.0/go.mod h1:zC7QkmNkYVGKPw4tHpBQ+ml7W/3tIebgeo1b36chA3Q= -github.com/gobuffalo/packr/v2 v2.7.1 h1:n3CIW5T17T8v4GGK5sWXLVWJhCz7b5aNLSxW6gYim4o= -github.com/gobuffalo/packr/v2 v2.7.1/go.mod h1:qYEvAazPaVxy7Y7KR0W8qYEE+RymX74kETFqjFoFlOc= -github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= -github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM= +github.com/goadesign/goa v1.4.3 h1:aJz/3RD7sUXgwKxlszZBHuObxKTJbmgf/M1Z6/YPz8c= +github.com/goadesign/goa v1.4.3/go.mod h1:d/9lpuZBK7HFi/7O0oXfwvdoIl+nx2bwKqctZe/lQao= +github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1YrTJupqA= +github.com/gofrs/uuid v4.4.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg= -github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/gxui v0.0.0-20151028112939-f85e0a97b3a4 h1:OL2d27ueTKnlQJoqLW2fc9pWYulFnJYLWzomGV7HqZo= github.com/google/gxui v0.0.0-20151028112939-f85e0a97b3a4/go.mod h1:Pw1H1OjSNHiqeuxAduB1BKYXIwFtsyrY47nEqSgEiCM= -github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e h1:JKmoR8x90Iww1ks85zJ1lfDGgIiMDuIptTOhJq+zKyg= -github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= -github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= -github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= -github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/gopherjs/gopherjs v1.17.2 h1:fQnZVsXk8uxXIStYb0N4bGk7jeyTalG/wsZjQ25dO0g= +github.com/gopherjs/gopherjs v1.17.2/go.mod h1:pRRIvn/QzFLrKfvEz3qUuEhtE/zLCWfreZ6J5gM2i+k= github.com/hashicorp/go-immutable-radix v1.0.0 h1:AKDB1HM5PWEA7i4nhcpwOrO2byshxBjXVn/J/3+z5/0= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-uuid v1.0.0 h1:RS8zrF7PhGwyNPOtxSClXXj9HA8feRnJzgnI1RJCSnM= github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-uuid v1.0.1 h1:fv1ep09latC32wFoVwnqcnKJGnMSdBanPczbHAYm1BE= -github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/golang-lru v0.5.0 h1:CL2msUPvZTLb5O648aiLNJw3hnBxN2+1Jq8rCOH9wdo= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU= +github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= -github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= -github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= -github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= -github.com/jtolds/gls v4.2.1+incompatible h1:fSuqC+Gmlu6l/ZYAoZzx2pyucC8Xza35fpRVWLVmUEE= -github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= -github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= -github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= -github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= -github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s= -github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= -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/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= +github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= +github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= +github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/manveru/faker v0.0.0-20171103152722-9fbc68a78c4d h1:Zj+PHjnhRYWBK6RqCDBcAhLXoi3TzC27Zad/Vn+gnVQ= github.com/manveru/faker v0.0.0-20171103152722-9fbc68a78c4d/go.mod h1:WZy8Q5coAB1zhY9AOBJP0O6J4BuDfbupUDavKY+I3+s= github.com/manveru/gobdd v0.0.0-20131210092515-f1a17fdd710b h1:3E44bLeN8uKYdfQqVQycPnaVviZdBLbizFhU49mtbe4= github.com/manveru/gobdd v0.0.0-20131210092515-f1a17fdd710b/go.mod h1:Bj8LjjP0ReT1eKt5QlKjwgi5AFm5mI6O1A2G4ChI0Ag= -github.com/mattn/go-runewidth v0.0.7 h1:Ei8KR0497xHyKJPAv59M1dkC+rOZCMBJ+t3fZ+twI54= -github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= -github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= -github.com/olekukonko/tablewriter v0.0.4 h1:vHD/YYe1Wolo78koG299f7V/VAS08c6IpCLn+Ejf/w8= -github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA= -github.com/onsi/ginkgo v1.6.0 h1:Ix8l273rp3QzYgXSR+c8d1fTG7UPgYkOSELPhiY/YGw= +github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0= +github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= +github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= +github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/gomega v1.4.3 h1:RE1xgDvH7imwFD45h+u2SgIfERHlS2yNG4DObb5BSKU= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c h1:Lgl0gzECD8GnQ5QCWA8o6BtfL6mDH5rQgM4/fX3avOs= -github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= -github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw= -github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pascaldekloe/goe v0.1.1 h1:Ah6WQ56rZONR3RW3qWa2NCZ6JAVvSpUcoLBaOmYFt9Q= +github.com/pascaldekloe/goe v0.1.1/go.mod h1:KSyfaxQOh0HZPjDP1FL/kFtbqYqrALJTaMafFUIccqU= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= -github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= -github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= -github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M= -github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= -github.com/rogpeppe/go-internal v1.1.0 h1:g0fH8RicVgNl+zVZDCDfbdWxAWoAEJyI7I3TZYXFiig= -github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rogpeppe/go-internal v1.3.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= -github.com/rogpeppe/go-internal v1.4.0 h1:LUa41nrWTQNGhzdsZ5lTnkwbNjj6rXTdazA1cSdjkOY= -github.com/rogpeppe/go-internal v1.4.0/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= -github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= -github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b h1:gQZ0qzfKHQIybLANtM3mBXNUtOfsCFXeTsnBqCsx1KM= -github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= -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.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= -github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= -github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304 h1:Jpy1PXuP99tXNrhbq2BaPz9B+jNAvH1JPQQpG/9GCXY= -github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= -github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c h1:Ho+uVpkel/udgjbwB5Lktg9BtvJSh2DT0Hi6LPSyI2w= -github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s= -github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= -github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= -github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= -github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= -github.com/spf13/cobra v0.0.6 h1:breEStsVwemnKh2/s6gMvSdMEkwW0sK8vGStnlVBMCs= -github.com/spf13/cobra v0.0.6/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= -github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= -github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= -github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= -github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= -github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4= +github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= +github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= +github.com/smarty/assertions v1.15.0 h1:cR//PqUBUiQRakZWqBiFFQ9wb8emQGDb0HeGdqGByCY= +github.com/smarty/assertions v1.15.0/go.mod h1:yABtdzeQs6l1brC900WlRNwj6ZR55d7B+E8C6HtKdec= +github.com/smartystreets/goconvey v1.8.1 h1:qGjIddxOk4grTu9JPOU31tVfq3cNdBlNa5sSznIX1xY= +github.com/smartystreets/goconvey v1.8.1/go.mod h1:+/u4qLyY6x1jReYOp7GOM2FSt8aP9CzCZL03bI28W60= +github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= +github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= +github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= +github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A= -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4= -github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= -github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= -github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= -github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/zach-klippenstein/goregen v0.0.0-20160303162051-795b5e3961ea h1:CyhwejzVGvZ3Q2PSbQ4NRRYn+ZWv5eS1vlaEusT+bAI= github.com/zach-klippenstein/goregen v0.0.0-20160303162051-795b5e3961ea/go.mod h1:eNr558nEUjP8acGw8FFjTeWvSgU1stO7FAO6eknhHe4= -go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= -go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk= -go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= -go.uber.org/multierr v1.1.0 h1:HoEmRHQPVSqub6w2z2d2EOVs2fjyFRGyofhKuyDq0QI= -go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= -go.uber.org/multierr v1.5.0 h1:KCa4XfM8CWFCpxXRGok+Q0SS/0XBhMDbHHGABQLvD2A= -go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= -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= -golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -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-20190621222207-cc06ce4a13d4 h1:ydJNl0ENAG67pFbB+9tfhiL2pYqLhfoaZFw/cjLhY4A= -golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/exp v0.0.0-20180321215751-8460e604b9de h1:xSjD6HQTqT0H/k60N5yYBtnN1OEkVy7WIo/DYyxKRO0= -golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2 h1:y102fOLFqhV41b+4GPiJoa0k/x+pJcEi2/HB1Y5T6fU= -golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= -golang.org/x/exp v0.0.0-20190316020145-860388717186 h1:WVLLpyUE5WfDFkoRe+vPPFxVzwDwXwwG197QU7doL0M= -golang.org/x/exp v0.0.0-20190316020145-860388717186/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= -golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= -golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= -golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/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/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= -golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= -golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= +go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= +golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug= +golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859 h1:R/3boaszxrf1GEUWTVDzSKVwLmSJpwZ1yqXm8j0v2QI= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/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/sync v0.0.0-20180314180146-1d60e4601c6f h1:wMNYb4v58l5UBM7MYRLPG6ZhfOqbKu7X5eyFl8ZhKvA= +golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ= +golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= 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= -golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 h1:YUO/7uOKsKeq9UokNS62b8FYywz3ker1l1vDZRCRefw= -golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190515120540-06a5c4944438 h1:khxRGsvPk4n2y8I/mLLjp7e5dMTJmH75wvqS6nMwUtY= -golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= +golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/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-20190312151545-0bb0c0a6e846/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-20191004055002-72853e10c5a3/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5 h1:hKsoRgsbwY1NafxrwTs+k64bikrLBkAgPir1TNCj3Zs= -golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= -gonum.org/v1/gonum v0.0.0-20190312223110-e28f136e01a8/go.mod h1:jevfED4GnIEnJrWW55YmY9DMhajHcnkqVnEXmEtMyNI= -gonum.org/v1/gonum v0.7.0 h1:Hdks0L0hgznZLG9nzXb8vZ0rRvqNvAcgAp84y7Mwkgw= -gonum.org/v1/gonum v0.7.0/go.mod h1:L02bwd0sqlsvRv41G7wGWFCsVNZFv/k1xzGIxeANHGM= -gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= -gonum.org/v1/netlib v0.0.0-20190314102120-fc220b4194ca h1:oC3ljwKsarVAGe4U+HJBo7+WJ9Krdun3QIma7CfYNWo= -gonum.org/v1/netlib v0.0.0-20190314102120-fc220b4194ca/go.mod h1:HtmWMIgmX0AAq9G6qwzC9jvu1967JZcewWVFn32Ojy4= -gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod h1:Wt8AAjI+ypCyYX3nZBvf6cAIx93T+c/OS2HFAYskSZc= -google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= -gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= +golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68= +golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= +gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.1-2019.2.3 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM= -honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= -modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw= -modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk= -modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k= -modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs= -modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I= -rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/internal/api/api.go b/internal/api/api.go index 1971322..9e1e69e 100644 --- a/internal/api/api.go +++ b/internal/api/api.go @@ -1,18 +1,19 @@ package api import ( + "io/fs" "net/http" "time" "github.com/goadesign/goa" logadapter "github.com/goadesign/goa/logging/logrus" "github.com/goadesign/goa/middleware" - "github.com/gobuffalo/packr/v2" "github.com/sirupsen/logrus" "github.com/artefactual-labs/amflow/internal/api/app" "github.com/artefactual-labs/amflow/internal/api/controllers" "github.com/artefactual-labs/amflow/internal/graph" + "github.com/artefactual-labs/amflow/public" ) func Create(graph *graph.Workflow, logger *logrus.Entry) *goa.Service { @@ -27,26 +28,14 @@ func Create(graph *graph.Workflow, logger *logrus.Entry) *goa.Service { service.Server.WriteTimeout = 10 * time.Second // Workflow controller. - app.MountWorkflowController(service, controllers.NewWorkflow(service, graph)) - - // Schema controller. - schemaCtrl := controllers.NewSchemaController(service) - schemaCtrl.FileSystem = func(dir string) http.FileSystem { - return packr.New("schema", "../../public/schema") - } - app.MountSchemaController(service, schemaCtrl) - - // Swagger controller. - swaggerCtrl := controllers.NewSwaggerController(service) - swaggerCtrl.FileSystem = func(dir string) http.FileSystem { - return packr.New("swagger", "../../public/swagger") - } - app.MountSwaggerController(service, swaggerCtrl) + wfCtrl := controllers.NewWorkflow(service, graph) + app.MountWorkflowController(service, wfCtrl) // Web controller. webCtrl := controllers.NewSwaggerController(service) webCtrl.FileSystem = func(dir string) http.FileSystem { - return packr.New("assets", "../../public/web") + assetsDir, _ := fs.Sub(public.Assets, "web") + return http.FS(assetsDir) } app.MountWebController(service, webCtrl) diff --git a/internal/api/app/contexts.go b/internal/api/app/contexts.go index f9d6877..64b7fb4 100644 --- a/internal/api/app/contexts.go +++ b/internal/api/app/contexts.go @@ -1,12 +1,12 @@ -// Code generated by goagen v1.3.1, DO NOT EDIT. +// Code generated by goagen v1.4.3, DO NOT EDIT. // // API "amflow": Application Contexts // // Command: // $ goagen // --design=github.com/artefactual-labs/amflow/design -// --out=/Users/jesus/amflow/internal/api -// --version=v1.3.1 +// --out=/home/jesus/Projects/amflow/internal/api +// --version=v1.4.3 package app diff --git a/internal/api/app/controllers.go b/internal/api/app/controllers.go index 589f80a..67501f1 100644 --- a/internal/api/app/controllers.go +++ b/internal/api/app/controllers.go @@ -1,12 +1,12 @@ -// Code generated by goagen v1.3.1, DO NOT EDIT. +// Code generated by goagen v1.4.3, DO NOT EDIT. // // API "amflow": Application Controllers // // Command: // $ goagen // --design=github.com/artefactual-labs/amflow/design -// --out=/Users/jesus/amflow/internal/api -// --version=v1.3.1 +// --out=/home/jesus/Projects/amflow/internal/api +// --version=v1.4.3 package app @@ -29,104 +29,6 @@ func initService(service *goa.Service) { service.Decoder.Register(goa.NewJSONDecoder, "*/*") } -// SchemaController is the controller interface for the Schema actions. -type SchemaController interface { - goa.Muxer - goa.FileServer -} - -// MountSchemaController "mounts" a Schema resource controller on the given service. -func MountSchemaController(service *goa.Service, ctrl SchemaController) { - initService(service) - var h goa.Handler - service.Mux.Handle("OPTIONS", "/schema/*filepath", ctrl.MuxHandler("preflight", handleSchemaOrigin(cors.HandlePreflight()), nil)) - - h = ctrl.FileHandler("/schema/*filepath", "public/schema/") - h = handleSchemaOrigin(h) - service.Mux.Handle("GET", "/schema/*filepath", ctrl.MuxHandler("serve", h, nil)) - service.LogInfo("mount", "ctrl", "Schema", "files", "public/schema/", "route", "GET /schema/*filepath") - - h = ctrl.FileHandler("/schema/", "public/schema/index.html") - h = handleSchemaOrigin(h) - service.Mux.Handle("GET", "/schema/", ctrl.MuxHandler("serve", h, nil)) - service.LogInfo("mount", "ctrl", "Schema", "files", "public/schema/index.html", "route", "GET /schema/") -} - -// handleSchemaOrigin applies the CORS response headers corresponding to the origin. -func handleSchemaOrigin(h goa.Handler) goa.Handler { - - return func(ctx context.Context, rw http.ResponseWriter, req *http.Request) error { - origin := req.Header.Get("Origin") - if origin == "" { - // Not a CORS request - return h(ctx, rw, req) - } - if cors.MatchOrigin(origin, "http://swagger.goa.design") { - ctx = goa.WithLogContext(ctx, "origin", origin) - rw.Header().Set("Access-Control-Allow-Origin", origin) - rw.Header().Set("Vary", "Origin") - rw.Header().Set("Access-Control-Max-Age", "600") - rw.Header().Set("Access-Control-Allow-Credentials", "true") - if acrm := req.Header.Get("Access-Control-Request-Method"); acrm != "" { - // We are handling a preflight request - rw.Header().Set("Access-Control-Allow-Methods", "GET, POST, PUT, PATCH, DELETE") - } - return h(ctx, rw, req) - } - - return h(ctx, rw, req) - } -} - -// SwaggerController is the controller interface for the Swagger actions. -type SwaggerController interface { - goa.Muxer - goa.FileServer -} - -// MountSwaggerController "mounts" a Swagger resource controller on the given service. -func MountSwaggerController(service *goa.Service, ctrl SwaggerController) { - initService(service) - var h goa.Handler - service.Mux.Handle("OPTIONS", "/swagger/*filepath", ctrl.MuxHandler("preflight", handleSwaggerOrigin(cors.HandlePreflight()), nil)) - - h = ctrl.FileHandler("/swagger/*filepath", "public/swagger/") - h = handleSwaggerOrigin(h) - service.Mux.Handle("GET", "/swagger/*filepath", ctrl.MuxHandler("serve", h, nil)) - service.LogInfo("mount", "ctrl", "Swagger", "files", "public/swagger/", "route", "GET /swagger/*filepath") - - h = ctrl.FileHandler("/swagger/", "public/swagger/index.html") - h = handleSwaggerOrigin(h) - service.Mux.Handle("GET", "/swagger/", ctrl.MuxHandler("serve", h, nil)) - service.LogInfo("mount", "ctrl", "Swagger", "files", "public/swagger/index.html", "route", "GET /swagger/") -} - -// handleSwaggerOrigin applies the CORS response headers corresponding to the origin. -func handleSwaggerOrigin(h goa.Handler) goa.Handler { - - return func(ctx context.Context, rw http.ResponseWriter, req *http.Request) error { - origin := req.Header.Get("Origin") - if origin == "" { - // Not a CORS request - return h(ctx, rw, req) - } - if cors.MatchOrigin(origin, "http://swagger.goa.design") { - ctx = goa.WithLogContext(ctx, "origin", origin) - rw.Header().Set("Access-Control-Allow-Origin", origin) - rw.Header().Set("Vary", "Origin") - rw.Header().Set("Access-Control-Max-Age", "600") - rw.Header().Set("Access-Control-Allow-Credentials", "true") - if acrm := req.Header.Get("Access-Control-Request-Method"); acrm != "" { - // We are handling a preflight request - rw.Header().Set("Access-Control-Allow-Methods", "GET, POST, PUT, PATCH, DELETE") - } - return h(ctx, rw, req) - } - - return h(ctx, rw, req) - } -} - // WebController is the controller interface for the Web actions. type WebController interface { goa.Muxer @@ -139,15 +41,15 @@ func MountWebController(service *goa.Service, ctrl WebController) { var h goa.Handler service.Mux.Handle("OPTIONS", "/*filepath", ctrl.MuxHandler("preflight", handleWebOrigin(cors.HandlePreflight()), nil)) - h = ctrl.FileHandler("/*filepath", "public/web/") + h = ctrl.FileHandler("/*filepath", "web/") h = handleWebOrigin(h) service.Mux.Handle("GET", "/*filepath", ctrl.MuxHandler("serve", h, nil)) - service.LogInfo("mount", "ctrl", "Web", "files", "public/web/", "route", "GET /*filepath") + service.LogInfo("mount", "ctrl", "Web", "files", "web/", "route", "GET /*filepath") - h = ctrl.FileHandler("/", "public/web/index.html") + h = ctrl.FileHandler("/", "web/index.html") h = handleWebOrigin(h) service.Mux.Handle("GET", "/", ctrl.MuxHandler("serve", h, nil)) - service.LogInfo("mount", "ctrl", "Web", "files", "public/web/index.html", "route", "GET /") + service.LogInfo("mount", "ctrl", "Web", "files", "web/index.html", "route", "GET /") } // handleWebOrigin applies the CORS response headers corresponding to the origin. diff --git a/internal/api/app/hrefs.go b/internal/api/app/hrefs.go index 22b7b65..fe7e36a 100644 --- a/internal/api/app/hrefs.go +++ b/internal/api/app/hrefs.go @@ -1,12 +1,12 @@ -// Code generated by goagen v1.3.1, DO NOT EDIT. +// Code generated by goagen v1.4.3, DO NOT EDIT. // // API "amflow": Application Resource Href Factories // // Command: // $ goagen // --design=github.com/artefactual-labs/amflow/design -// --out=/Users/jesus/amflow/internal/api -// --version=v1.3.1 +// --out=/home/jesus/Projects/amflow/internal/api +// --version=v1.4.3 package app diff --git a/internal/api/app/media_types.go b/internal/api/app/media_types.go index e11bd73..4842621 100644 --- a/internal/api/app/media_types.go +++ b/internal/api/app/media_types.go @@ -1,11 +1,11 @@ -// Code generated by goagen v1.3.1, DO NOT EDIT. +// Code generated by goagen v1.4.3, DO NOT EDIT. // // API "amflow": Application Media Types // // Command: // $ goagen // --design=github.com/artefactual-labs/amflow/design -// --out=/Users/jesus/amflow/internal/api -// --version=v1.3.1 +// --out=/home/jesus/Projects/amflow/internal/api +// --version=v1.4.3 package app diff --git a/internal/api/app/test/schema_testing.go b/internal/api/app/test/schema_testing.go deleted file mode 100644 index 2a4f01b..0000000 --- a/internal/api/app/test/schema_testing.go +++ /dev/null @@ -1,11 +0,0 @@ -// Code generated by goagen v1.3.1, DO NOT EDIT. -// -// API "amflow": schema TestHelpers -// -// Command: -// $ goagen -// --design=github.com/artefactual-labs/amflow/design -// --out=/Users/jesus/amflow/internal/api -// --version=v1.3.1 - -package test diff --git a/internal/api/app/test/swagger_testing.go b/internal/api/app/test/swagger_testing.go deleted file mode 100644 index c4127a9..0000000 --- a/internal/api/app/test/swagger_testing.go +++ /dev/null @@ -1,11 +0,0 @@ -// Code generated by goagen v1.3.1, DO NOT EDIT. -// -// API "amflow": swagger TestHelpers -// -// Command: -// $ goagen -// --design=github.com/artefactual-labs/amflow/design -// --out=/Users/jesus/amflow/internal/api -// --version=v1.3.1 - -package test diff --git a/internal/api/app/test/web_testing.go b/internal/api/app/test/web_testing.go index 38e113f..b9a5e81 100644 --- a/internal/api/app/test/web_testing.go +++ b/internal/api/app/test/web_testing.go @@ -1,11 +1,11 @@ -// Code generated by goagen v1.3.1, DO NOT EDIT. +// Code generated by goagen v1.4.3, DO NOT EDIT. // // API "amflow": web TestHelpers // // Command: // $ goagen // --design=github.com/artefactual-labs/amflow/design -// --out=/Users/jesus/amflow/internal/api -// --version=v1.3.1 +// --out=/home/jesus/Projects/amflow/internal/api +// --version=v1.4.3 package test diff --git a/internal/api/app/test/workflow_testing.go b/internal/api/app/test/workflow_testing.go index 54a411d..910934c 100644 --- a/internal/api/app/test/workflow_testing.go +++ b/internal/api/app/test/workflow_testing.go @@ -1,12 +1,12 @@ -// Code generated by goagen v1.3.1, DO NOT EDIT. +// Code generated by goagen v1.4.3, DO NOT EDIT. // // API "amflow": workflow TestHelpers // // Command: // $ goagen // --design=github.com/artefactual-labs/amflow/design -// --out=/Users/jesus/amflow/internal/api -// --version=v1.3.1 +// --out=/home/jesus/Projects/amflow/internal/api +// --version=v1.4.3 package test diff --git a/internal/api/app/user_types.go b/internal/api/app/user_types.go index 4b8faf9..9a6daa9 100644 --- a/internal/api/app/user_types.go +++ b/internal/api/app/user_types.go @@ -1,11 +1,11 @@ -// Code generated by goagen v1.3.1, DO NOT EDIT. +// Code generated by goagen v1.4.3, DO NOT EDIT. // // API "amflow": Application User Types // // Command: // $ goagen // --design=github.com/artefactual-labs/amflow/design -// --out=/Users/jesus/amflow/internal/api -// --version=v1.3.1 +// --out=/home/jesus/Projects/amflow/internal/api +// --version=v1.4.3 package app diff --git a/internal/constants/constants.go b/internal/constants/constants.go deleted file mode 100644 index e06ceba..0000000 --- a/internal/constants/constants.go +++ /dev/null @@ -1,8 +0,0 @@ -package constants - -import "github.com/sirupsen/logrus" - -const ( - // DefaultLogLevel is the default global verbosity - DefaultLogLevel = logrus.InfoLevel -) diff --git a/internal/graph/encoding/decode.go b/internal/graph/encoding/decode.go index 7fe4973..8732dcb 100644 --- a/internal/graph/encoding/decode.go +++ b/internal/graph/encoding/decode.go @@ -61,13 +61,12 @@ type LinkConfig struct { Model string `json:"@model"` // StandardTaskConfig - Arguments string `json:"arguments"` - Execute string `json:"execute"` - FilterFileEnd string `json:"filter_file_end"` - FilterSubdir string `json:"filter_subdir"` - RequiresOutputLock bool `json:"requires_output_lock"` - StderrFile string `json:"stderr_file"` - StdoutFile string `json:"stdout_file"` + Arguments string `json:"arguments"` + Execute string `json:"execute"` + FilterFileEnd string `json:"filter_file_end"` + FilterSubdir string `json:"filter_subdir"` + StderrFile string `json:"stderr_file"` + StdoutFile string `json:"stdout_file"` // MicroServiceChainChoice ChainChoices []string `json:"chain_choices"` diff --git a/internal/graph/workflow.go b/internal/graph/workflow.go index 59fd2e3..4dd246c 100644 --- a/internal/graph/workflow.go +++ b/internal/graph/workflow.go @@ -1,10 +1,10 @@ package graph import ( + _ "embed" "fmt" "strings" - "github.com/gobuffalo/packr/v2" "go.uber.org/multierr" "gonum.org/v1/gonum/graph" "gonum.org/v1/gonum/graph/simple" @@ -13,7 +13,8 @@ import ( amjson "github.com/artefactual-labs/amflow/internal/graph/encoding" ) -var WorkflowSchemaBox = packr.New("workflow", "./schema") +//go:embed schema/example.json +var WorkflowSample []byte // Workflow is a sequence of operations in Archivematica. // diff --git a/internal/graph/workflow_test.go b/internal/graph/workflow_test.go index f4e7536..e34a9fb 100644 --- a/internal/graph/workflow_test.go +++ b/internal/graph/workflow_test.go @@ -1,7 +1,7 @@ package graph import ( - "io/ioutil" + "os" "testing" "github.com/stretchr/testify/assert" @@ -11,7 +11,7 @@ import ( ) func populate(t *testing.T) *Workflow { - bytes, _ := ioutil.ReadFile("./schema/example.json") + bytes, _ := os.ReadFile("./schema/example.json") data, err := amjson.LoadWorkflowData(bytes) if err != nil && t != nil { t.Fatal(err) diff --git a/internal/version/version.go b/internal/version/version.go index 02dc748..9c68050 100644 --- a/internal/version/version.go +++ b/internal/version/version.go @@ -2,7 +2,7 @@ package version var version string -func Get() string { +func Version() string { if version == "" { version = "(dev)" } diff --git a/main.go b/main.go index 384dd9f..028ffb0 100644 --- a/main.go +++ b/main.go @@ -1,5 +1,3 @@ -//go:generate env GO111MODULE=on packr2 - package main import ( diff --git a/public/assets.go b/public/assets.go new file mode 100644 index 0000000..f20320f --- /dev/null +++ b/public/assets.go @@ -0,0 +1,8 @@ +package public + +import ( + "embed" +) + +//go:embed web/* +var Assets embed.FS diff --git a/public/schema/schema.json b/public/schema/schema.json deleted file mode 100644 index 548c496..0000000 --- a/public/schema/schema.json +++ /dev/null @@ -1 +0,0 @@ -{"$schema":"http://json-schema.org/draft-04/hyper-schema","id":"http://localhost/schema","title":"amflow","type":"object","properties":{"schema":{"$ref":"#/definitions/schema"},"swagger":{"$ref":"#/definitions/swagger"},"web":{"$ref":"#/definitions/web"},"workflow":{"$ref":"#/definitions/workflow"}},"definitions":{"schema":{"title":"schema","type":"object"},"swagger":{"title":"swagger","type":"object"},"web":{"title":"web","type":"object"},"workflow":{"title":"workflow","type":"object","links":[{"title":"addLink","rel":"addLink","href":"/workflow/{workflowID}/links","method":"PATCH"},{"title":"deleteLink","rel":"deleteLink","href":"/workflow/{workflowID}/links/{linkID}","method":"DELETE"},{"title":"moveLink","rel":"moveLink","href":"/workflow/{workflowID}/links/{linkID}","method":"PATCH"},{"title":"show","rel":"self","href":"/workflow/{workflowID}","method":"GET"}]}},"description":"Archivematica workflow editor","links":[{"rel":"self","href":"http://localhost"},{"rel":"self","href":"/schema","method":"GET","targetSchema":{"$schema":"http://json-schema.org/draft-04/hyper-schema","additionalProperties":true}}]} \ No newline at end of file diff --git a/public/swagger/swagger.json b/public/swagger/swagger.json deleted file mode 100644 index 128518a..0000000 --- a/public/swagger/swagger.json +++ /dev/null @@ -1 +0,0 @@ -{"swagger":"2.0","info":{"title":"amflow","description":"Archivematica workflow editor","version":""},"host":"localhost","schemes":["http"],"consumes":["application/json"],"produces":["application/json","application/xml"],"paths":{"/schema/{filepath}":{"get":{"summary":"Download public/schema/","operationId":"schema#/schema/*filepath","parameters":[{"name":"filepath","in":"path","description":"Relative file path","required":true,"type":"string"}],"responses":{"200":{"description":"File downloaded","schema":{"type":"file"}},"404":{"description":"File not found","schema":{"$ref":"#/definitions/error"}}},"schemes":["http"]}},"/swagger/{filepath}":{"get":{"summary":"Download public/swagger/","operationId":"swagger#/swagger/*filepath","parameters":[{"name":"filepath","in":"path","description":"Relative file path","required":true,"type":"string"}],"responses":{"200":{"description":"File downloaded","schema":{"type":"file"}},"404":{"description":"File not found","schema":{"$ref":"#/definitions/error"}}},"schemes":["http"]}},"/workflow/{workflowID}":{"get":{"tags":["workflow"],"summary":"show workflow","description":"Read workflow","operationId":"workflow#show","parameters":[{"name":"workflowID","in":"path","description":"Workflow ID","required":true,"type":"string"}],"responses":{"200":{"description":"OK"},"404":{"description":"Not Found"}},"schemes":["http"]}},"/workflow/{workflowID}/links":{"patch":{"tags":["workflow"],"summary":"addLink workflow","description":"Add link","operationId":"workflow#addLink","produces":["text/plain"],"parameters":[{"name":"workflowID","in":"path","description":"Workflow ID","required":true,"type":"string"}],"responses":{"200":{"description":"OK"},"404":{"description":"Not Found"}},"schemes":["http"]}},"/workflow/{workflowID}/links/{linkID}":{"delete":{"tags":["workflow"],"summary":"deleteLink workflow","description":"Delete link","operationId":"workflow#deleteLink","produces":["text/plain"],"parameters":[{"name":"linkID","in":"path","description":"Link ID","required":true,"type":"string"},{"name":"workflowID","in":"path","description":"Workflow ID","required":true,"type":"string"}],"responses":{"200":{"description":"OK"},"404":{"description":"Not Found"}},"schemes":["http"]},"patch":{"tags":["workflow"],"summary":"moveLink workflow","description":"Move link","operationId":"workflow#moveLink","produces":["text/plain"],"parameters":[{"name":"linkID","in":"path","description":"Link ID","required":true,"type":"string"},{"name":"workflowID","in":"path","description":"Workflow ID","required":true,"type":"string"}],"responses":{"200":{"description":"OK"},"404":{"description":"Not Found"}},"schemes":["http"]}},"/{filepath}":{"get":{"summary":"Download public/web/","operationId":"web#/*filepath","parameters":[{"name":"filepath","in":"path","description":"Relative file path","required":true,"type":"string"}],"responses":{"200":{"description":"File downloaded","schema":{"type":"file"}},"404":{"description":"File not found","schema":{"$ref":"#/definitions/error"}}},"schemes":["http"]}}},"definitions":{"error":{"title":"Mediatype identifier: application/vnd.goa.error; view=default","type":"object","properties":{"code":{"type":"string","description":"an application-specific error code, expressed as a string value.","example":"invalid_value"},"detail":{"type":"string","description":"a human-readable explanation specific to this occurrence of the problem.","example":"Value of ID must be an integer"},"id":{"type":"string","description":"a unique identifier for this particular occurrence of the problem.","example":"3F1FKVRR"},"meta":{"type":"object","description":"a meta object containing non-standard meta-information about the error.","example":{"timestamp":1458609066},"additionalProperties":true},"status":{"type":"string","description":"the HTTP status code applicable to this problem, expressed as a string value.","example":"400"}},"description":"Error response media type (default view)","example":{"code":"invalid_value","detail":"Value of ID must be an integer","id":"3F1FKVRR","meta":{"timestamp":1458609066},"status":"400"}}},"responses":{"NotFound":{"description":"Not Found"},"OK":{"description":"OK"}},"externalDocs":{"description":"amflow README","url":"https://github.com/artefactual-labs/amflow"}} \ No newline at end of file diff --git a/public/swagger/swagger.yaml b/public/swagger/swagger.yaml deleted file mode 100644 index 035b7c6..0000000 --- a/public/swagger/swagger.yaml +++ /dev/null @@ -1,218 +0,0 @@ -consumes: -- application/json -definitions: - error: - description: Error response media type (default view) - example: - code: invalid_value - detail: Value of ID must be an integer - id: 3F1FKVRR - meta: - timestamp: 1458609066 - status: "400" - properties: - code: - description: an application-specific error code, expressed as a string value. - example: invalid_value - type: string - detail: - description: a human-readable explanation specific to this occurrence of the - problem. - example: Value of ID must be an integer - type: string - id: - description: a unique identifier for this particular occurrence of the problem. - example: 3F1FKVRR - type: string - meta: - additionalProperties: true - description: a meta object containing non-standard meta-information about - the error. - example: - timestamp: 1458609066 - type: object - status: - description: the HTTP status code applicable to this problem, expressed as - a string value. - example: "400" - type: string - title: 'Mediatype identifier: application/vnd.goa.error; view=default' - type: object -externalDocs: - description: amflow README - url: https://github.com/artefactual-labs/amflow -host: localhost -info: - description: Archivematica workflow editor - title: amflow - version: "" -paths: - /{filepath}: - get: - operationId: web#/*filepath - parameters: - - description: Relative file path - in: path - name: filepath - required: true - type: string - responses: - "200": - description: File downloaded - schema: - type: file - "404": - description: File not found - schema: - $ref: '#/definitions/error' - schemes: - - http - summary: Download public/web/ - /schema/{filepath}: - get: - operationId: schema#/schema/*filepath - parameters: - - description: Relative file path - in: path - name: filepath - required: true - type: string - responses: - "200": - description: File downloaded - schema: - type: file - "404": - description: File not found - schema: - $ref: '#/definitions/error' - schemes: - - http - summary: Download public/schema/ - /swagger/{filepath}: - get: - operationId: swagger#/swagger/*filepath - parameters: - - description: Relative file path - in: path - name: filepath - required: true - type: string - responses: - "200": - description: File downloaded - schema: - type: file - "404": - description: File not found - schema: - $ref: '#/definitions/error' - schemes: - - http - summary: Download public/swagger/ - /workflow/{workflowID}: - get: - description: Read workflow - operationId: workflow#show - parameters: - - description: Workflow ID - in: path - name: workflowID - required: true - type: string - responses: - "200": - description: OK - "404": - description: Not Found - schemes: - - http - summary: show workflow - tags: - - workflow - /workflow/{workflowID}/links: - patch: - description: Add link - operationId: workflow#addLink - parameters: - - description: Workflow ID - in: path - name: workflowID - required: true - type: string - produces: - - text/plain - responses: - "200": - description: OK - "404": - description: Not Found - schemes: - - http - summary: addLink workflow - tags: - - workflow - /workflow/{workflowID}/links/{linkID}: - delete: - description: Delete link - operationId: workflow#deleteLink - parameters: - - description: Link ID - in: path - name: linkID - required: true - type: string - - description: Workflow ID - in: path - name: workflowID - required: true - type: string - produces: - - text/plain - responses: - "200": - description: OK - "404": - description: Not Found - schemes: - - http - summary: deleteLink workflow - tags: - - workflow - patch: - description: Move link - operationId: workflow#moveLink - parameters: - - description: Link ID - in: path - name: linkID - required: true - type: string - - description: Workflow ID - in: path - name: workflowID - required: true - type: string - produces: - - text/plain - responses: - "200": - description: OK - "404": - description: Not Found - schemes: - - http - summary: moveLink workflow - tags: - - workflow -produces: -- application/json -- application/xml -responses: - NotFound: - description: Not Found - OK: - description: OK -schemes: -- http -swagger: "2.0" diff --git a/web/js/client/js/client.js b/web/js/client/js/client.js index b0536d3..7e97b44 100644 --- a/web/js/client/js/client.js +++ b/web/js/client/js/client.js @@ -22,7 +22,7 @@ define(['axios'] , function (axios) { // Add link // path is the request path, the format is "/workflow/:workflowID/links" // config is an optional object to be merged into the config built by the function prior to making the request. - // The content of the config object is described here: https://github.com/axios/axios#request-config + // The content of the config object is described here: https://github.com/mzabriskie/axios#request-api // This function returns a promise which raises an error if the HTTP response is a 4xx or 5xx. client.addLinkWorkflow = function (path, config) { var cfg = { @@ -40,7 +40,7 @@ define(['axios'] , function (axios) { // Delete link // path is the request path, the format is "/workflow/:workflowID/links/:linkID" // config is an optional object to be merged into the config built by the function prior to making the request. - // The content of the config object is described here: https://github.com/axios/axios#request-config + // The content of the config object is described here: https://github.com/mzabriskie/axios#request-api // This function returns a promise which raises an error if the HTTP response is a 4xx or 5xx. client.deleteLinkWorkflow = function (path, config) { var cfg = { @@ -58,7 +58,7 @@ define(['axios'] , function (axios) { // Move link // path is the request path, the format is "/workflow/:workflowID/links/:linkID" // config is an optional object to be merged into the config built by the function prior to making the request. - // The content of the config object is described here: https://github.com/axios/axios#request-config + // The content of the config object is described here: https://github.com/mzabriskie/axios#request-api // This function returns a promise which raises an error if the HTTP response is a 4xx or 5xx. client.moveLinkWorkflow = function (path, config) { var cfg = { @@ -76,7 +76,7 @@ define(['axios'] , function (axios) { // Read workflow // path is the request path, the format is "/workflow/:workflowID" // config is an optional object to be merged into the config built by the function prior to making the request. - // The content of the config object is described here: https://github.com/axios/axios#request-config + // The content of the config object is described here: https://github.com/mzabriskie/axios#request-api // This function returns a promise which raises an error if the HTTP response is a 4xx or 5xx. client.showWorkflow = function (path, config) { var cfg = {