opensourcemirror
/
concourse
mirror of https://github.com/concourse/concourse.git
1
0
Fork 0
Code Issues Releases Wiki Activity

update baggageclaim import paths 

also, removes the baggageclaim go module, merging it with the main
concourse one.

Signed-off-by: Aidan Oldershaw <aoldershaw@pivotal.io>
Co-authored-by: Taylor Silva <tsilva@pivotal.io>
This commit is contained in:
Aidan Oldershaw 2021-07-28 16:28:08 -04:00 committed by Taylor Silva
parent d743acc930
commit b6f4bddce9
100 changed files with 150 additions and 243 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CONTRIBUTING.md
View File

@ -213,7 +213,7 @@ silly air-traffic-themed names.
| `/skymarshal` | Adapts [Dex](https://github.com/dexidp/dex) into an embeddable auth component for the ATC, plus the auth flag specifications for `fly` and `concourse web`. |
| `/tsa` | A custom-built SSH server responsible for securely authenticating and registering workers. The other half of `concourse web`. |
| `/worker` | The `concourse worker` library code for registering with the TSA, periodically reaping containers/volumes, etc. |
| `/cmd` | This is mainly glue code to wire the ATC, TSA, [BaggageClaim](https://github.com/concourse/baggageclaim), and Garden into the single `concourse` CLI. |
| `/cmd` | This is mainly glue code to wire the ATC, TSA, and Garden into the single `concourse` CLI. |
| `/topgun` | Another acceptance suite which covers operator-level features and technical aspects of the Concourse runtime. Deploys its own Concourse clusters, runs tests against them, and tears them down. |
### Rebuilding to test your changes
@ -237,18 +237,18 @@ $ docker-compose up --build -d
```
If you're working on a dependency that doesn't live under this repository (for instance,
`baggageclaim`), you'll need to update `go.mod` with a `replace` directive with the exact
`dex`), you'll need to update `go.mod` with a `replace` directive with the exact
reference that the module lives at:
```sh
# after pushing to the `sample` branch in your baggageclaim fork,
# after pushing to the `sample` branch in your dex fork,
# try to fetch the module revision and get the version.
$ go mod download -json github.com/your-user/baggageclaim@sample | jq '.Version'
go: finding github.com/cirocosta/baggageclaim sample
$ go mod download -json github.com/your-user/dex@sample | jq '.Version'
go: finding github.com/cirocosta/dex sample
"v1.3.6-0.20190315100745-09d349f19891"
# with that version, update `go.mod` including a replace directive
$ echo 'replace github.com/concourse/baggageclaim => github.com/your-user/baggageclaim v1.3.6-0.20190315100745-09d349f19891' \
$ echo 'replace github.com/concourse/dex => github.com/your-user/dex v1.3.6-0.20190315100745-09d349f19891' \
> ./go.mod
# run the usual build

2
atc/api/artifacts_test.go
View File

@ -10,12 +10,12 @@ import (
"net/url"
"time"
"github.com/concourse/baggageclaim"
"github.com/concourse/concourse/atc/db"
"github.com/concourse/concourse/atc/db/dbfakes"
. "github.com/concourse/concourse/atc/testhelpers"
"github.com/concourse/concourse/atc/worker"
"github.com/concourse/concourse/atc/worker/workerfakes"
"github.com/concourse/concourse/worker/baggageclaim"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)

2
atc/api/artifactserver/create.go
View File

@ -4,10 +4,10 @@ import (
"encoding/json"
"net/http"
"github.com/concourse/baggageclaim"
"github.com/concourse/concourse/atc/api/present"
"github.com/concourse/concourse/atc/db"
"github.com/concourse/concourse/atc/worker"
"github.com/concourse/concourse/worker/baggageclaim"
)
func (s *Server) CreateArtifact(team db.Team) http.Handler {

2
atc/api/artifactserver/get.go
View File

@ -5,8 +5,8 @@ import (
"net/http"
"strconv"
"github.com/concourse/baggageclaim"
"github.com/concourse/concourse/atc/db"
"github.com/concourse/concourse/worker/baggageclaim"
)
func (s *Server) GetArtifact(team db.Team) http.Handler {

2
atc/compression/compression.go
View File

@ -3,7 +3,7 @@ package compression
import (
"io"
"github.com/concourse/baggageclaim"
"github.com/concourse/concourse/worker/baggageclaim"
)
//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate

2
atc/compression/compression_test.go
View File

@ -1,8 +1,8 @@
package compression_test
import (
"github.com/concourse/baggageclaim"
"github.com/concourse/concourse/atc/compression"
"github.com/concourse/concourse/worker/baggageclaim"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

2
atc/compression/compressionfakes/fake_compression.go
View File

@ -5,7 +5,7 @@ import (
"io"
"sync"
"github.com/concourse/baggageclaim"
"github.com/concourse/concourse/worker/baggageclaim"
"github.com/concourse/concourse/atc/compression"
)

2
atc/compression/gzip.go
View File

@ -4,7 +4,7 @@ import (
"compress/gzip"
"io"
"github.com/concourse/baggageclaim"
"github.com/concourse/concourse/worker/baggageclaim"
)
type gzipCompression struct{}

2
atc/compression/zstd.go
View File

@ -3,7 +3,7 @@ package compression
import (
"io"
"github.com/concourse/baggageclaim"
"github.com/concourse/concourse/worker/baggageclaim"
"github.com/klauspost/compress/zstd"
)

2
atc/exec/load_var_step.go
View File

@ -14,12 +14,12 @@ import (
"code.cloudfoundry.org/lager/lagerctx"
"sigs.k8s.io/yaml"
"github.com/concourse/baggageclaim"
"github.com/concourse/concourse/atc"
"github.com/concourse/concourse/atc/exec/artifact"
"github.com/concourse/concourse/atc/exec/build"
"github.com/concourse/concourse/atc/worker"
"github.com/concourse/concourse/tracing"
"github.com/concourse/concourse/worker/baggageclaim"
)
// LoadVarStep loads a value from a file and sets it as a build-local var.

2
atc/exec/set_pipeline_step.go
View File

@ -12,7 +12,6 @@ import (
"code.cloudfoundry.org/lager/lagerctx"
"sigs.k8s.io/yaml"
"github.com/concourse/baggageclaim"
"github.com/concourse/concourse/atc"
"github.com/concourse/concourse/atc/configvalidate"
"github.com/concourse/concourse/atc/creds"
@ -22,6 +21,7 @@ import (
"github.com/concourse/concourse/atc/worker"
"github.com/concourse/concourse/tracing"
"github.com/concourse/concourse/vars"
"github.com/concourse/concourse/worker/baggageclaim"
)
// SetPipelineStep sets a pipeline to current team. This step takes pipeline

2
atc/exec/task_config_source.go
View File

@ -8,11 +8,11 @@ import (
"code.cloudfoundry.org/lager"
"code.cloudfoundry.org/lager/lagerctx"
"github.com/concourse/baggageclaim"
"github.com/concourse/concourse/atc"
"github.com/concourse/concourse/atc/exec/build"
"github.com/concourse/concourse/atc/worker"
"github.com/concourse/concourse/vars"
"github.com/concourse/concourse/worker/baggageclaim"
"sigs.k8s.io/yaml"
)

2
atc/exec/task_config_source_test.go
View File

@ -6,7 +6,6 @@ import (
"fmt"
"code.cloudfoundry.org/lager/lagertest"
"github.com/concourse/baggageclaim"
"github.com/concourse/concourse/atc"
. "github.com/concourse/concourse/atc/exec"
"github.com/concourse/concourse/atc/exec/build"
@ -14,6 +13,7 @@ import (
"github.com/concourse/concourse/atc/runtime/runtimefakes"
"github.com/concourse/concourse/atc/worker/workerfakes"
"github.com/concourse/concourse/vars"
"github.com/concourse/concourse/worker/baggageclaim"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/onsi/gomega/gbytes"

2
atc/worker/artifact_destination.go
View File

@ -4,8 +4,8 @@ import (
"context"
"io"
"github.com/concourse/baggageclaim"
"github.com/concourse/concourse/atc/db"
"github.com/concourse/concourse/worker/baggageclaim"
)
//counterfeiter:generate . ArtifactDestination

2
atc/worker/artifact_source_test.go
View File

@ -12,7 +12,6 @@ import (
"code.cloudfoundry.org/lager"
"code.cloudfoundry.org/lager/lagertest"
"github.com/concourse/baggageclaim"
"github.com/concourse/concourse/atc"
"github.com/concourse/concourse/atc/compression"
"github.com/concourse/concourse/atc/compression/compressionfakes"
@ -22,6 +21,7 @@ import (
"github.com/concourse/concourse/atc/runtime/runtimefakes"
"github.com/concourse/concourse/atc/worker"
"github.com/concourse/concourse/atc/worker/workerfakes"
"github.com/concourse/concourse/worker/baggageclaim"
"github.com/onsi/gomega/gbytes"
. "github.com/onsi/ginkgo"

2
atc/worker/artifact_streamer.go
View File

@ -5,9 +5,9 @@ import (
"io"
"code.cloudfoundry.org/lager/lagerctx"
"github.com/concourse/baggageclaim"
"github.com/concourse/concourse/atc/compression"
"github.com/concourse/concourse/atc/runtime"
"github.com/concourse/concourse/worker/baggageclaim"
)
//counterfeiter:generate . ArtifactStreamer

2
atc/worker/artifact_streamer_test.go
View File

@ -4,10 +4,10 @@ import (
"context"
"io/ioutil"
"github.com/concourse/baggageclaim"
"github.com/concourse/concourse/atc/compression"
"github.com/concourse/concourse/atc/runtime"
"github.com/concourse/concourse/atc/worker"
"github.com/concourse/concourse/worker/baggageclaim"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)

2
atc/worker/db_worker_provider.go
View File

@ -6,11 +6,11 @@ import (
"code.cloudfoundry.org/clock"
"code.cloudfoundry.org/lager"
bclient "github.com/concourse/baggageclaim/client"
"github.com/concourse/concourse/atc/db"
"github.com/concourse/concourse/atc/db/lock"
"github.com/concourse/concourse/atc/worker/gclient"
"github.com/concourse/concourse/atc/worker/transport"
bclient "github.com/concourse/concourse/worker/baggageclaim/client"
"github.com/concourse/retryhttp"
"github.com/cppforlife/go-semi-semantic/version"
)

2
atc/worker/db_worker_provider_test.go
View File

@ -12,13 +12,13 @@ import (
gfakes "code.cloudfoundry.org/garden/gardenfakes"
"code.cloudfoundry.org/garden/server"
"code.cloudfoundry.org/lager/lagertest"
"github.com/concourse/baggageclaim"
"github.com/concourse/concourse/atc"
"github.com/concourse/concourse/atc/db"
"github.com/concourse/concourse/atc/db/dbfakes"
"github.com/concourse/concourse/atc/db/lock/lockfakes"
. "github.com/concourse/concourse/atc/worker"
"github.com/concourse/concourse/atc/worker/workerfakes"
"github.com/concourse/concourse/worker/baggageclaim"
"github.com/concourse/retryhttp/retryhttpfakes"
"github.com/cppforlife/go-semi-semantic/version"

2
atc/worker/image/image.go
View File

@ -7,11 +7,11 @@ import (
"path"
"code.cloudfoundry.org/lager"
"github.com/concourse/baggageclaim"
"github.com/concourse/concourse/atc"
"github.com/concourse/concourse/atc/db"
"github.com/concourse/concourse/atc/worker"
"github.com/concourse/concourse/tracing"
"github.com/concourse/concourse/worker/baggageclaim"
)
const RawRootFSScheme = "raw"

4
atc/worker/image/image_test.go
View File

@ -7,13 +7,13 @@ import (
"strings"
"code.cloudfoundry.org/lager/lagertest"
"github.com/concourse/baggageclaim"
"github.com/concourse/baggageclaim/baggageclaimfakes"
"github.com/concourse/concourse/atc"
"github.com/concourse/concourse/atc/db/dbfakes"
"github.com/concourse/concourse/atc/worker"
"github.com/concourse/concourse/atc/worker/image"
"github.com/concourse/concourse/atc/worker/workerfakes"
"github.com/concourse/concourse/worker/baggageclaim"
"github.com/concourse/concourse/worker/baggageclaim/baggageclaimfakes"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)

9
atc/worker/pool_test.go
View File

@ -3,18 +3,19 @@ package worker_test
import (
"fmt"
"code.cloudfoundry.org/lager"
"code.cloudfoundry.org/lager/lagerctx"
"code.cloudfoundry.org/lager/lagertest"
"context"
"errors"
"github.com/concourse/baggageclaim"
"code.cloudfoundry.org/lager"
"code.cloudfoundry.org/lager/lagerctx"
"code.cloudfoundry.org/lager/lagertest"
"github.com/concourse/concourse/atc"
"github.com/concourse/concourse/atc/db"
"github.com/concourse/concourse/atc/db/dbfakes"
. "github.com/concourse/concourse/atc/worker"
"github.com/concourse/concourse/atc/worker/workerfakes"
"github.com/concourse/concourse/worker/baggageclaim"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)

2
atc/worker/testhelpers_test.go
View File

@ -14,10 +14,10 @@ import (
"code.cloudfoundry.org/lager"
"code.cloudfoundry.org/lager/lagertest"
"github.com/concourse/baggageclaim"
"github.com/concourse/concourse/atc/db"
"github.com/concourse/concourse/atc/worker"
"github.com/concourse/concourse/atc/worker/workerfakes"
"github.com/concourse/concourse/worker/baggageclaim"
"github.com/onsi/gomega/format"
"github.com/onsi/gomega/types"
)

2
atc/worker/volume.go
View File

@ -7,8 +7,8 @@ import (
"github.com/concourse/concourse/tracing"
"code.cloudfoundry.org/lager"
"github.com/concourse/baggageclaim"
"github.com/concourse/concourse/atc/db"
"github.com/concourse/concourse/worker/baggageclaim"
)
//counterfeiter:generate . Volume

2
atc/worker/volume_client.go
View File

@ -7,10 +7,10 @@ import (
"code.cloudfoundry.org/clock"
"code.cloudfoundry.org/lager"
"github.com/concourse/baggageclaim"
"github.com/concourse/concourse/atc/db"
"github.com/concourse/concourse/atc/db/lock"
"github.com/concourse/concourse/atc/metric"
"github.com/concourse/concourse/worker/baggageclaim"
)
const creatingVolumeRetryDelay = 1 * time.Second

4
atc/worker/volume_client_test.go
View File

@ -7,14 +7,14 @@ import (
"code.cloudfoundry.org/clock/fakeclock"
"code.cloudfoundry.org/lager"
"code.cloudfoundry.org/lager/lagertest"
"github.com/concourse/baggageclaim"
"github.com/concourse/baggageclaim/baggageclaimfakes"
"github.com/concourse/concourse/atc/db"
"github.com/concourse/concourse/atc/db/dbfakes"
"github.com/concourse/concourse/atc/db/lock"
"github.com/concourse/concourse/atc/db/lock/lockfakes"
"github.com/concourse/concourse/atc/worker"
"github.com/concourse/concourse/atc/worker/workerfakes"
"github.com/concourse/concourse/worker/baggageclaim"
"github.com/concourse/concourse/worker/baggageclaim/baggageclaimfakes"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)

2
atc/worker/worker.go
View File

@ -15,7 +15,7 @@ import (
"code.cloudfoundry.org/garden"
"code.cloudfoundry.org/lager"
"github.com/concourse/baggageclaim"
"github.com/concourse/concourse/worker/baggageclaim"
"github.com/cppforlife/go-semi-semantic/version"
"golang.org/x/sync/errgroup"

4
atc/worker/worker_test.go
View File

@ -9,8 +9,8 @@ import (
"code.cloudfoundry.org/garden"
"code.cloudfoundry.org/lager"
"github.com/concourse/baggageclaim"
"github.com/concourse/baggageclaim/baggageclaimfakes"
"github.com/concourse/concourse/worker/baggageclaim"
"github.com/concourse/concourse/worker/baggageclaim/baggageclaimfakes"
"code.cloudfoundry.org/lager/lagertest"
"github.com/concourse/concourse/atc"

2
atc/worker/workerfakes/fake_artifact_destination.go
View File

@ -6,7 +6,7 @@ import (
"io"
"sync"
"github.com/concourse/baggageclaim"
"github.com/concourse/concourse/worker/baggageclaim"
"github.com/concourse/concourse/atc/db"
"github.com/concourse/concourse/atc/worker"
)

2
atc/worker/workerfakes/fake_volume.go
View File

@ -7,7 +7,7 @@ import (
"sync"
"code.cloudfoundry.org/lager"
"github.com/concourse/baggageclaim"
"github.com/concourse/concourse/worker/baggageclaim"
"github.com/concourse/concourse/atc/db"
"github.com/concourse/concourse/atc/worker"
)

2
go.mod
View File

@ -19,7 +19,6 @@ require (
github.com/cenkalti/backoff v2.2.1+incompatible
github.com/cloudfoundry/go-socks5 v0.0.0-20180221174514-54f73bdb8a8e // indirect
github.com/cloudfoundry/socks5-proxy v0.0.0-20180530211953-3659db090cb2 // indirect
github.com/concourse/baggageclaim v1.11.0
github.com/concourse/dex v0.7.0
github.com/concourse/flag v1.1.0
github.com/concourse/go-archive v1.0.1
@ -93,6 +92,7 @@ require (
golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2
golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
google.golang.org/grpc v1.40.0
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect

11
go.sum
View File

@ -48,7 +48,6 @@ code.cloudfoundry.org/credhub-cli v0.0.0-20190415201820-e3951663d25c h1:qdDzK71H
code.cloudfoundry.org/credhub-cli v0.0.0-20190415201820-e3951663d25c/go.mod h1:oZAAU/4R7ssJ+kighWL4VLyyyY+Utm8H9r721AE3edQ=
code.cloudfoundry.org/garden v0.0.0-20181108172608-62470dc86365 h1:W9nK4TUFQCzLniQN2xykFvzAteV0FogE94bVj8Ulu8A=
code.cloudfoundry.org/garden v0.0.0-20181108172608-62470dc86365/go.mod h1:9edl55ou1627lC7chvtltZ561+iITkNTzkZsLgohU8s=
code.cloudfoundry.org/lager v1.1.0/go.mod h1:O2sS7gKP3HM2iemG+EnwvyNQK7pTSC6Foi4QiMp9sSk=
code.cloudfoundry.org/lager v2.0.0+incompatible h1:WZwDKDB2PLd/oL+USK4b4aEjUymIej9My2nUQ9oWEwQ=
code.cloudfoundry.org/lager v2.0.0+incompatible/go.mod h1:O2sS7gKP3HM2iemG+EnwvyNQK7pTSC6Foi4QiMp9sSk=
code.cloudfoundry.org/localip v0.0.0-20170223024724-b88ad0dea95c h1:dO6i+2uQgR1ZHMwPu5wTTrJAXpG75VCnaMwFgFSOmgI=
@ -163,7 +162,6 @@ github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod h1:obH5gd0Bsq
github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE=
github.com/caarlos0/env v3.5.0+incompatible h1:Yy0UN8o9Wtr/jGHZDpCBLpNrzcFLLM2yixi/rBrKyJs=
github.com/caarlos0/env v3.5.0+incompatible/go.mod h1:tdCsowwCzMLdkqRYDlHpZCp2UooDD3MspDBjZ2AD02Y=
github.com/cenkalti/backoff v2.1.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4=
github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
github.com/cenkalti/backoff/v4 v4.1.0/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw=
@ -198,18 +196,13 @@ github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnht
github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
github.com/concourse/baggageclaim v1.11.0 h1:/2WtecK6KZ0Zw3zyc3MApTZIxUh1568aKW+dKT3OeOU=
github.com/concourse/baggageclaim v1.11.0/go.mod h1:UdvVE2W8LgXcCz0ZdKBwUbpKZ0KN4Fx1OeY1xtZOUvY=
github.com/concourse/dex v0.7.0 h1:yiX8wLFdXBocLIPpHCHf5nyFUffpTzDixkC2hWLtkOo=
github.com/concourse/dex v0.7.0/go.mod h1:bkH7clreyLOrHOjWN0N2Hdobk0p5TNn3GEf7K2RxFZg=
github.com/concourse/flag v0.0.0-20180907155614-cb47f24fff1c/go.mod h1:ngs845OZCESOe8vgeK5fsCNIiS0vUSqB8MGQMS9+4og=
github.com/concourse/flag v1.1.0 h1:d2l91vIK6lwfIC7uNLb3i51tZtaWCTokh80VoE6T/RU=
github.com/concourse/flag v1.1.0/go.mod h1:ngs845OZCESOe8vgeK5fsCNIiS0vUSqB8MGQMS9+4og=
github.com/concourse/go-archive v0.0.0-20180803203406-784931698f4f/go.mod h1:Xfo080IPQBmVz3I5ehjCddW3phA2mwv0NFwlpjf5CO8=
github.com/concourse/go-archive v1.0.0/go.mod h1:Xfo080IPQBmVz3I5ehjCddW3phA2mwv0NFwlpjf5CO8=
github.com/concourse/go-archive v1.0.1 h1:6jQk0VDiE4G6lNJQ0mLZ7XmxbqI3spO4x0wgVwk4pfo=
github.com/concourse/go-archive v1.0.1/go.mod h1:Xfo080IPQBmVz3I5ehjCddW3phA2mwv0NFwlpjf5CO8=
github.com/concourse/retryhttp v0.0.0-20170802173037-937335fd9545/go.mod h1:4+V9YCkKuoV7rg+/No+ZM9FsO3BK4tIJNUiYMI7nki0=
github.com/concourse/retryhttp v1.1.1 h1:Yc+kJKHupCcAmxW78EZWzC87JN0qjqZfjcdmvsww6Ro=
github.com/concourse/retryhttp v1.1.1/go.mod h1:QHhy6lQHGmqOKNv0UdoUPYzsTOy9wrf6nHfYsJpow0o=
github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4/go.mod h1:nukgQABAEopAHvB6j7cnP5zJ+/3aVcE7hCYqvIwAHyE=
@ -639,7 +632,6 @@ github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod
github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod h1:ymszkNOg6tORTn+6F6j+Jc8TOr5osrynvN6ivFWZ2GA=
github.com/jackpal/gateway v1.0.7 h1:7tIFeCGmpyrMx9qvT0EgYUi7cxVW48a0mMvnIL17bPM=
github.com/jackpal/gateway v1.0.7/go.mod h1:aRcO0UFKt+MgIZmRmvOmnejdDT4Y1DNiNOsSd1AcIbA=
github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
github.com/jessevdk/go-flags v1.4.1-0.20200711081900-c17162fe8fd7 h1:Ug59miTxVKVg5Oi2S5uHlKOIV5jBx4Hb2u0jIxxDaSs=
github.com/jessevdk/go-flags v1.4.1-0.20200711081900-c17162fe8fd7/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
@ -668,7 +660,6 @@ github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvW
github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
github.com/klauspost/compress v1.9.7/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
github.com/klauspost/compress v1.11.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
github.com/klauspost/compress v1.11.13/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
github.com/klauspost/compress v1.13.4 h1:0zhec2I8zGnjWcKyLl6i3gPqKANCCn5e9xmviEEeX6s=
@ -1070,7 +1061,6 @@ go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/
go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20180910181607-0e37d006457b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20181127143415-eb0de9b17e85/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
@ -1216,7 +1206,6 @@ golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5h
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-20180918153733-ee1b12c67af4/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/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=

2
topgun/common/common.go
View File

@ -23,7 +23,7 @@ import (
"code.cloudfoundry.org/lager"
"code.cloudfoundry.org/lager/lagertest"
sq "github.com/Masterminds/squirrel"
bclient "github.com/concourse/baggageclaim/client"
bclient "github.com/concourse/concourse/worker/baggageclaim/client"
"golang.org/x/oauth2"
"github.com/concourse/concourse/go-concourse/concourse"

2
tsa/cmd/tsa/register_test.go
View File

@ -16,9 +16,9 @@ import (
gfakes "code.cloudfoundry.org/garden/gardenfakes"
"code.cloudfoundry.org/lager/lagerctx"
"code.cloudfoundry.org/lager/lagertest"
"github.com/concourse/baggageclaim"
"github.com/concourse/concourse/atc"
"github.com/concourse/concourse/tsa"
"github.com/concourse/concourse/worker/baggageclaim"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)

2
tsa/heartbeater.go
View File

@ -12,9 +12,9 @@ import (
"code.cloudfoundry.org/clock"
"code.cloudfoundry.org/lager"
"code.cloudfoundry.org/lager/lagerctx"
"github.com/concourse/baggageclaim"
"github.com/concourse/concourse/atc"
"github.com/concourse/concourse/atc/worker/gclient"
"github.com/concourse/concourse/worker/baggageclaim"
"github.com/tedsuo/rata"
)

4
tsa/heartbeater_test.go
View File

@ -11,13 +11,13 @@ import (
"code.cloudfoundry.org/lager"
"code.cloudfoundry.org/lager/lagerctx"
"code.cloudfoundry.org/lager/lagertest"
"github.com/concourse/baggageclaim"
"github.com/concourse/baggageclaim/baggageclaimfakes"
"github.com/concourse/concourse/atc"
"github.com/concourse/concourse/atc/worker/gclient"
"github.com/concourse/concourse/atc/worker/gclient/gclientfakes"
. "github.com/concourse/concourse/tsa"
"github.com/concourse/concourse/tsa/tsafakes"
"github.com/concourse/concourse/worker/baggageclaim"
"github.com/concourse/concourse/worker/baggageclaim/baggageclaimfakes"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/onsi/gomega/gbytes"

2
tsa/tsacmd/remote_cli.go
View File

@ -10,10 +10,10 @@ import (
"code.cloudfoundry.org/clock"
"code.cloudfoundry.org/lager"
"code.cloudfoundry.org/lager/lagerctx"
bclient "github.com/concourse/baggageclaim/client"
"github.com/concourse/concourse/atc"
"github.com/concourse/concourse/atc/worker/gclient"
"github.com/concourse/concourse/tsa"
bclient "github.com/concourse/concourse/worker/baggageclaim/client"
"golang.org/x/crypto/ssh"
)

4
worker/README.md
View File

@ -30,8 +30,8 @@
* [Garden](https://github.com/cloudfoundry-incubator/garden) is a generic
interface for orchestrating containers remotely on a worker
* [Baggageclaim](https://github.com/concourse/baggageclaim) is a server for
managing caches and artifacts on the workers
* [Baggageclaim](https://github.com/concourse/concourse/tree/master/worker/baggageclaim)
is a server for managing caches and artifacts on the workers
It can be scaled horizontally in order to scale the system.

4
worker/baggageclaim/api/handler.go
View File

@ -8,8 +8,8 @@ import (
"code.cloudfoundry.org/lager"
"github.com/tedsuo/rata"
"github.com/concourse/baggageclaim"
"github.com/concourse/baggageclaim/volume"
"github.com/concourse/concourse/worker/baggageclaim"
"github.com/concourse/concourse/worker/baggageclaim/volume"
)
func NewHandler(

2
worker/baggageclaim/api/p2p_server_test.go
View File

@ -7,7 +7,7 @@ import (
"runtime"
"code.cloudfoundry.org/lager/lagertest"
"github.com/concourse/baggageclaim/api"
"github.com/concourse/concourse/worker/baggageclaim/api"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)

2
worker/baggageclaim/api/query.go
View File

@ -5,7 +5,7 @@ import (
"net/url"
"strings"
"github.com/concourse/baggageclaim/volume"
"github.com/concourse/concourse/worker/baggageclaim/volume"
)
func ConvertQueryToProperties(values url.Values) (volume.Properties, error) {

4
worker/baggageclaim/api/query_test.go
View File

@ -6,8 +6,8 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/concourse/baggageclaim/api"
"github.com/concourse/baggageclaim/volume"
"github.com/concourse/concourse/worker/baggageclaim/api"
"github.com/concourse/concourse/worker/baggageclaim/volume"
)
var _ = Describe("Query Parameters", func() {

4
worker/baggageclaim/api/volume_server.go
View File

@ -10,8 +10,8 @@ import (
"code.cloudfoundry.org/lager"
"code.cloudfoundry.org/lager/lagerctx"
"github.com/concourse/baggageclaim"
"github.com/concourse/baggageclaim/volume"
"github.com/concourse/concourse/worker/baggageclaim"
"github.com/concourse/concourse/worker/baggageclaim/volume"
uuid "github.com/nu7hatch/gouuid"
"github.com/tedsuo/rata"
)

10
worker/baggageclaim/api/volume_server_linux_test.go
View File

@ -21,11 +21,11 @@ import (
"code.cloudfoundry.org/lager/lagertest"
"github.com/concourse/baggageclaim"
"github.com/concourse/baggageclaim/api"
"github.com/concourse/baggageclaim/uidgid"
"github.com/concourse/baggageclaim/volume"
"github.com/concourse/baggageclaim/volume/driver"
"github.com/concourse/concourse/worker/baggageclaim"
"github.com/concourse/concourse/worker/baggageclaim/api"
"github.com/concourse/concourse/worker/baggageclaim/uidgid"
"github.com/concourse/concourse/worker/baggageclaim/volume"
"github.com/concourse/concourse/worker/baggageclaim/volume/driver"
)
var _ = Describe("Volume Server", func() {

10
worker/baggageclaim/api/volume_server_test.go
View File

@ -24,11 +24,11 @@ import (
"code.cloudfoundry.org/lager/lagertest"
"github.com/concourse/go-archive/tgzfs"
"github.com/concourse/baggageclaim"
"github.com/concourse/baggageclaim/api"
"github.com/concourse/baggageclaim/uidgid"
"github.com/concourse/baggageclaim/volume"
"github.com/concourse/baggageclaim/volume/driver"
"github.com/concourse/concourse/worker/baggageclaim"
"github.com/concourse/concourse/worker/baggageclaim/api"
"github.com/concourse/concourse/worker/baggageclaim/uidgid"
"github.com/concourse/concourse/worker/baggageclaim/volume"
"github.com/concourse/concourse/worker/baggageclaim/volume/driver"
)
var _ = Describe("Volume Server", func() {

6
worker/baggageclaim/baggageclaimcmd/command.go
View File

@ -7,9 +7,9 @@ import (
"regexp"
"code.cloudfoundry.org/lager"
"github.com/concourse/baggageclaim/api"
"github.com/concourse/baggageclaim/uidgid"
"github.com/concourse/baggageclaim/volume"
"github.com/concourse/concourse/worker/baggageclaim/api"
"github.com/concourse/concourse/worker/baggageclaim/uidgid"
"github.com/concourse/concourse/worker/baggageclaim/volume"
"github.com/concourse/flag"
"github.com/tedsuo/ifrit"
"github.com/tedsuo/ifrit/grouper"

8
worker/baggageclaim/baggageclaimcmd/driver_linux.go
View File

@ -11,10 +11,10 @@ import (
"syscall"
"code.cloudfoundry.org/lager"
"github.com/concourse/baggageclaim/fs"
"github.com/concourse/baggageclaim/kernel"
"github.com/concourse/baggageclaim/volume"
"github.com/concourse/baggageclaim/volume/driver"
"github.com/concourse/concourse/worker/baggageclaim/fs"
"github.com/concourse/concourse/worker/baggageclaim/kernel"
"github.com/concourse/concourse/worker/baggageclaim/volume"
"github.com/concourse/concourse/worker/baggageclaim/volume/driver"
)
const btrfsFSType = 0x9123683e

4
worker/baggageclaim/baggageclaimcmd/driver_nonlinux.go
View File

@ -4,8 +4,8 @@ package baggageclaimcmd
import (
"code.cloudfoundry.org/lager"
"github.com/concourse/baggageclaim/volume"
"github.com/concourse/baggageclaim/volume/driver"
"github.com/concourse/concourse/worker/baggageclaim/volume"
"github.com/concourse/concourse/worker/baggageclaim/volume/driver"
)
func (cmd *BaggageclaimCommand) driver(logger lager.Logger) (volume.Driver, error) {

2
worker/baggageclaim/baggageclaimfakes/fake_client.go
View File

@ -5,7 +5,7 @@ import (
"sync"
"code.cloudfoundry.org/lager"
"github.com/concourse/baggageclaim"
"github.com/concourse/concourse/worker/baggageclaim"
)
type FakeClient struct {

2
worker/baggageclaim/baggageclaimfakes/fake_volume.go
View File

@ -6,7 +6,7 @@ import (
"io"
"sync"
"github.com/concourse/baggageclaim"
"github.com/concourse/concourse/worker/baggageclaim"
)
type FakeVolume struct {

2
worker/baggageclaim/baggageclaimfakes/fake_volume_future.go
View File

@ -4,7 +4,7 @@ package baggageclaimfakes
import (
"sync"
"github.com/concourse/baggageclaim"
"github.com/concourse/concourse/worker/baggageclaim"
)
type FakeVolumeFuture struct {

4
worker/baggageclaim/client/client.go
View File

@ -14,8 +14,8 @@ import (
"code.cloudfoundry.org/lager"
"github.com/tedsuo/rata"
"github.com/concourse/baggageclaim"
"github.com/concourse/baggageclaim/api"
"github.com/concourse/concourse/worker/baggageclaim"
"github.com/concourse/concourse/worker/baggageclaim/api"
"github.com/concourse/retryhttp"
)

6
worker/baggageclaim/client/client_resiliency_test.go
View File

@ -7,9 +7,9 @@ import (
"time"
"code.cloudfoundry.org/lager"
"github.com/concourse/baggageclaim"
"github.com/concourse/baggageclaim/client"
"github.com/concourse/baggageclaim/volume"
"github.com/concourse/concourse/worker/baggageclaim"
"github.com/concourse/concourse/worker/baggageclaim/client"
"github.com/concourse/concourse/worker/baggageclaim/volume"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/onsi/gomega/ghttp"

4
worker/baggageclaim/client/volume.go
View File

@ -5,8 +5,8 @@ import (
"io"
"code.cloudfoundry.org/lager"
"github.com/concourse/baggageclaim"
"github.com/concourse/baggageclaim/volume"
"github.com/concourse/concourse/worker/baggageclaim"
"github.com/concourse/concourse/worker/baggageclaim/volume"
)
type clientVolume struct {

2
worker/baggageclaim/client/volume_future.go
View File

@ -10,7 +10,7 @@ import (
"github.com/cenkalti/backoff"
"github.com/tedsuo/rata"
"github.com/concourse/baggageclaim"
"github.com/concourse/concourse/worker/baggageclaim"
)
type volumeFuture struct {

8
worker/baggageclaim/client_test.go
View File

@ -15,10 +15,10 @@ import (
. "github.com/onsi/gomega"
"github.com/onsi/gomega/ghttp"
"github.com/concourse/baggageclaim"
"github.com/concourse/baggageclaim/api"
"github.com/concourse/baggageclaim/client"
"github.com/concourse/baggageclaim/volume"
"github.com/concourse/concourse/worker/baggageclaim"
"github.com/concourse/concourse/worker/baggageclaim/api"
"github.com/concourse/concourse/worker/baggageclaim/client"
"github.com/concourse/concourse/worker/baggageclaim/volume"
)
var _ = Describe("Baggage Claim Client", func() {

2
worker/baggageclaim/cmd/baggageclaim/main.go
View File

@ -4,7 +4,7 @@ import (
"fmt"
"os"
"github.com/concourse/baggageclaim/baggageclaimcmd"
"github.com/concourse/concourse/worker/baggageclaim/baggageclaimcmd"
"github.com/jessevdk/go-flags"
)

2
worker/baggageclaim/cmd/fs_mounter/main.go
View File

@ -6,7 +6,7 @@ import (
"os"
"code.cloudfoundry.org/lager"
"github.com/concourse/baggageclaim/fs"
"github.com/concourse/concourse/worker/baggageclaim/fs"
"github.com/jessevdk/go-flags"
)

2
worker/baggageclaim/doc.go
View File

@ -25,7 +25,7 @@ parent volumes.
The standard way to construct a client is:
import "github.com/concourse/baggageclaim/client"
import "github.com/concourse/concourse/worker/baggageclaim/client"
bcClient := client.New("http://baggageclaim.example.com:7788")
bcClient.CreateVolume(...)

24
worker/baggageclaim/go.mod
View File

@ -1,24 +0,0 @@
module github.com/concourse/baggageclaim
require (
code.cloudfoundry.org/lager v1.1.0
github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40 // indirect
github.com/cenkalti/backoff v2.1.1+incompatible
github.com/concourse/flag v0.0.0-20180907155614-cb47f24fff1c
github.com/concourse/go-archive v0.0.0-20180803203406-784931698f4f
github.com/concourse/retryhttp v0.0.0-20170802173037-937335fd9545
github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
github.com/google/go-cmp v0.4.0 // indirect
github.com/jessevdk/go-flags v1.4.0
github.com/klauspost/compress v1.9.7
github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d
github.com/onsi/ginkgo v1.8.0
github.com/onsi/gomega v1.5.0
github.com/tedsuo/ifrit v0.0.0-20180802180643-bea94bb476cc
github.com/tedsuo/rata v1.0.1-0.20170830210128-07d200713958
golang.org/x/crypto v0.0.0-20180910181607-0e37d006457b // indirect
golang.org/x/net v0.0.0-20180911220305-26e67e76b6c3 // indirect
golang.org/x/sys v0.0.0-20180918153733-ee1b12c67af4
)
go 1.13

59
worker/baggageclaim/go.sum
View File

@ -1,59 +0,0 @@
code.cloudfoundry.org/lager v1.1.0 h1:v0RELJ2jqTeF2DW7PNjZaaGlrXbVxJBVz3uLxdP3fuY=
code.cloudfoundry.org/lager v1.1.0/go.mod h1:O2sS7gKP3HM2iemG+EnwvyNQK7pTSC6Foi4QiMp9sSk=
github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40 h1:y4B3+GPxKlrigF1ha5FFErxK+sr6sWxQovRMzwMhejo=
github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40/go.mod h1:8rLXio+WjiTceGBHIoTvn60HIbs7Hm7bcHjyrSqYB9c=
github.com/cenkalti/backoff v2.1.1+incompatible h1:tKJnvO2kl0zmb/jA5UKAt4VoEVw1qxKWjE/Bpp46npY=
github.com/cenkalti/backoff v2.1.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
github.com/concourse/flag v0.0.0-20180907155614-cb47f24fff1c h1:SwMKBc36jGTSS5/3AqVtbRjbGTvDfR3pJ5MkzfiYSas=
github.com/concourse/flag v0.0.0-20180907155614-cb47f24fff1c/go.mod h1:ngs845OZCESOe8vgeK5fsCNIiS0vUSqB8MGQMS9+4og=
github.com/concourse/go-archive v0.0.0-20180803203406-784931698f4f h1:Z7s60kZd9kuWiosivO9QPGH1vmfC/lzLDiuWIy0MT+o=
github.com/concourse/go-archive v0.0.0-20180803203406-784931698f4f/go.mod h1:Xfo080IPQBmVz3I5ehjCddW3phA2mwv0NFwlpjf5CO8=
github.com/concourse/retryhttp v0.0.0-20170802173037-937335fd9545 h1:EprZV3ig+v+5sOp0eruDCgrW/nlmyXm4Z8JOF1Unz1o=
github.com/concourse/retryhttp v0.0.0-20170802173037-937335fd9545/go.mod h1:4+V9YCkKuoV7rg+/No+ZM9FsO3BK4tIJNUiYMI7nki0=
github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
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/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA=
github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
github.com/klauspost/compress v1.9.7 h1:hYW1gP94JUmAhBtJ+LNz5My+gBobDxPR1iVuKug26aA=
github.com/klauspost/compress v1.9.7/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d h1:VhgPp6v9qf9Agr/56bj7Y/xa04UccTW04VP0Qed4vnQ=
github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod h1:YUTz3bUH2ZwIWBy3CJBeOBEugqcmXREj14T+iG/4k4U=
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.8.0 h1:VkHVNpR4iVnU8XQR6DBm8BqYjN7CRzw+xKUbVVbbW9w=
github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/gomega v1.5.0 h1:izbySO9zDPmjJ8rDjLvkA2zJHIo+HkYXHnf7eN7SSyo=
github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
github.com/tedsuo/ifrit v0.0.0-20180802180643-bea94bb476cc h1:LUUe4cdABGrIJAhl1P1ZpWY76AwukVszFdwkVFVLwIk=
github.com/tedsuo/ifrit v0.0.0-20180802180643-bea94bb476cc/go.mod h1:eyZnKCc955uh98WQvzOm0dgAeLnf2O0Rz0LPoC5ze+0=
github.com/tedsuo/rata v1.0.1-0.20170830210128-07d200713958 h1:mueRRuRjR35dEOkHdhpoRcruNgBz0ohG659HxxmcAwA=
github.com/tedsuo/rata v1.0.1-0.20170830210128-07d200713958/go.mod h1:X47ELzhOoLbfFIY0Cql9P6yo3Cdwf2CMX3FVZxRzJPc=
golang.org/x/crypto v0.0.0-20180910181607-0e37d006457b h1:2b9XGzhjiYsYPnKXoEfL7klWZQIt8IfyRCz62gCqqlQ=
golang.org/x/crypto v0.0.0-20180910181607-0e37d006457b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180911220305-26e67e76b6c3 h1:czFLhve3vsQetD6JOJ8NZZvGQIXlnN3/yXxbT6/awxI=
golang.org/x/net v0.0.0-20180911220305-26e67e76b6c3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f h1:wMNYb4v58l5UBM7MYRLPG6ZhfOqbKu7X5eyFl8ZhKvA=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180918153733-ee1b12c67af4 h1:h8ij2QOL81JqJ/Vi5Ru+hl4a1yct8+XDGrgBhG0XbuE=
golang.org/x/sys v0.0.0-20180918153733-ee1b12c67af4/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
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/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
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.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

2
worker/baggageclaim/integration/baggageclaim/copy_on_write_strategy_test.go
View File

@ -1,7 +1,7 @@
package integration_test
import (
"github.com/concourse/baggageclaim"
"github.com/concourse/concourse/worker/baggageclaim"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)

2
worker/baggageclaim/integration/baggageclaim/destroy_test.go
View File

@ -4,7 +4,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/concourse/baggageclaim"
"github.com/concourse/concourse/worker/baggageclaim"
)
var _ = Describe("Destroying", func() {

2
worker/baggageclaim/integration/baggageclaim/empty_strategy_test.go
View File

@ -4,7 +4,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/concourse/baggageclaim"
"github.com/concourse/concourse/worker/baggageclaim"
)
var _ = Describe("Empty Strategy", func() {

2
worker/baggageclaim/integration/baggageclaim/import_strategy_test.go
View File

@ -9,7 +9,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/concourse/baggageclaim"
"github.com/concourse/concourse/worker/baggageclaim"
)
var _ = Describe("Import Strategy", func() {

2
worker/baggageclaim/integration/baggageclaim/overlay_mounts_test.go
View File

@ -5,7 +5,7 @@ package integration_test
import (
"syscall"
"github.com/concourse/baggageclaim"
"github.com/concourse/concourse/worker/baggageclaim"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

4
worker/baggageclaim/integration/baggageclaim/privileges_test.go
View File

@ -17,8 +17,8 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/concourse/baggageclaim"
"github.com/concourse/baggageclaim/uidgid"
"github.com/concourse/concourse/worker/baggageclaim"
"github.com/concourse/concourse/worker/baggageclaim/uidgid"
)
var _ = Describe("Privileges", func() {

2
worker/baggageclaim/integration/baggageclaim/property_test.go
View File

@ -1,7 +1,7 @@
package integration_test
import (
"github.com/concourse/baggageclaim"
"github.com/concourse/concourse/worker/baggageclaim"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)

2
worker/baggageclaim/integration/baggageclaim/restart_test.go
View File

@ -4,7 +4,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/concourse/baggageclaim"
"github.com/concourse/concourse/worker/baggageclaim"
)
var _ = Describe("Restarting", func() {

6
worker/baggageclaim/integration/baggageclaim/suite_test.go
View File

@ -15,8 +15,8 @@ import (
"code.cloudfoundry.org/lager"
"code.cloudfoundry.org/lager/lagertest"
"github.com/concourse/baggageclaim"
"github.com/concourse/baggageclaim/client"
"github.com/concourse/concourse/worker/baggageclaim"
"github.com/concourse/concourse/worker/baggageclaim/client"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/tedsuo/ifrit"
@ -40,7 +40,7 @@ type suiteData struct {
}
var _ = SynchronizedBeforeSuite(func() []byte {
bcPath, err := gexec.Build("github.com/concourse/baggageclaim/cmd/baggageclaim")
bcPath, err := gexec.Build("github.com/concourse/concourse/worker/baggageclaim/cmd/baggageclaim")
Expect(err).NotTo(HaveOccurred())
data, err := json.Marshal(suiteData{

2
worker/baggageclaim/integration/fs_mounter/suite_test.go
View File

@ -32,7 +32,7 @@ type suiteData struct {
}
var _ = SynchronizedBeforeSuite(func() []byte {
fsmPath, err := gexec.Build("github.com/concourse/baggageclaim/cmd/fs_mounter")
fsmPath, err := gexec.Build("github.com/concourse/concourse/worker/baggageclaim/cmd/fs_mounter")
Expect(err).NotTo(HaveOccurred())
data, err := json.Marshal(suiteData{

2
worker/baggageclaim/uidgid/uidgidfakes/fake_namespacer.go
View File

@ -6,7 +6,7 @@ import (
"sync"
"code.cloudfoundry.org/lager"
"github.com/concourse/baggageclaim/uidgid"
"github.com/concourse/concourse/worker/baggageclaim/uidgid"
)
type FakeNamespacer struct {

2
worker/baggageclaim/uidgid/uidgidfakes/fake_translator.go
View File

@ -6,7 +6,7 @@ import (
"os/exec"
"sync"
"github.com/concourse/baggageclaim/uidgid"
"github.com/concourse/concourse/worker/baggageclaim/uidgid"
)
type FakeTranslator struct {

4
worker/baggageclaim/volume/cow_strategy_test.go
View File

@ -4,8 +4,8 @@ import (
"errors"
"code.cloudfoundry.org/lager/lagertest"
. "github.com/concourse/baggageclaim/volume"
"github.com/concourse/baggageclaim/volume/volumefakes"
. "github.com/concourse/concourse/worker/baggageclaim/volume"
"github.com/concourse/concourse/worker/baggageclaim/volume/volumefakes"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

2
worker/baggageclaim/volume/driver/btrfs.go
View File

@ -8,7 +8,7 @@ import (
"path/filepath"
"code.cloudfoundry.org/lager"
"github.com/concourse/baggageclaim/volume"
"github.com/concourse/concourse/worker/baggageclaim/volume"
)
type BtrFSDriver struct {

6
worker/baggageclaim/volume/driver/btrfs_test.go
View File

@ -15,9 +15,9 @@ import (
"code.cloudfoundry.org/lager/lagertest"
"github.com/concourse/baggageclaim/fs"
"github.com/concourse/baggageclaim/volume"
"github.com/concourse/baggageclaim/volume/driver"
"github.com/concourse/concourse/worker/baggageclaim/fs"
"github.com/concourse/concourse/worker/baggageclaim/volume"
"github.com/concourse/concourse/worker/baggageclaim/volume/driver"
)
var _ = Describe("BtrFS", func() {

4
worker/baggageclaim/volume/driver/naive.go
View File

@ -3,8 +3,8 @@ package driver
import (
"os"
"github.com/concourse/baggageclaim/volume"
"github.com/concourse/baggageclaim/volume/copy"
"github.com/concourse/concourse/worker/baggageclaim/volume"
"github.com/concourse/concourse/worker/baggageclaim/volume/copy"
)
type NaiveDriver struct{}

4
worker/baggageclaim/volume/driver/overlay_linux.go
View File

@ -7,8 +7,8 @@ import (
"path/filepath"
"syscall"
"github.com/concourse/baggageclaim/volume"
"github.com/concourse/baggageclaim/volume/copy"
"github.com/concourse/concourse/worker/baggageclaim/volume"
"github.com/concourse/concourse/worker/baggageclaim/volume/copy"
)
var mountOpts string

4
worker/baggageclaim/volume/driver/overlay_linux_test.go
View File

@ -6,8 +6,8 @@ import (
"os"
"path/filepath"
"github.com/concourse/baggageclaim/volume"
"github.com/concourse/baggageclaim/volume/driver"
"github.com/concourse/concourse/worker/baggageclaim/volume"
"github.com/concourse/concourse/worker/baggageclaim/volume/driver"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

4
worker/baggageclaim/volume/empty_strategy_test.go
View File

@ -4,8 +4,8 @@ import (
"errors"
"code.cloudfoundry.org/lager/lagertest"
. "github.com/concourse/baggageclaim/volume"
"github.com/concourse/baggageclaim/volume/volumefakes"
. "github.com/concourse/concourse/worker/baggageclaim/volume"
"github.com/concourse/concourse/worker/baggageclaim/volume/volumefakes"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

2
worker/baggageclaim/volume/import_strategy.go
View File

@ -5,7 +5,7 @@ import (
"path/filepath"
"code.cloudfoundry.org/lager"
"github.com/concourse/baggageclaim/volume/copy"
"github.com/concourse/concourse/worker/baggageclaim/volume/copy"
)
type ImportStrategy struct {

2
worker/baggageclaim/volume/locker_test.go
View File

@ -1,7 +1,7 @@
package volume_test
import (
"github.com/concourse/baggageclaim/volume"
"github.com/concourse/concourse/worker/baggageclaim/volume"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)

2
worker/baggageclaim/volume/properties_test.go
View File

@ -4,7 +4,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/concourse/baggageclaim/volume"
"github.com/concourse/concourse/worker/baggageclaim/volume"
)
var _ = Describe("Properties Superset", func() {

2
worker/baggageclaim/volume/repository.go
View File

@ -12,7 +12,7 @@ import (
"code.cloudfoundry.org/lager"
"code.cloudfoundry.org/lager/lagerctx"
"github.com/concourse/baggageclaim/uidgid"
"github.com/concourse/concourse/worker/baggageclaim/uidgid"
)
var ErrVolumeDoesNotExist = errors.New("volume does not exist")

6
worker/baggageclaim/volume/repository_test.go
View File

@ -12,9 +12,9 @@ import (
"os"
"path/filepath"
"github.com/concourse/baggageclaim/uidgid/uidgidfakes"
"github.com/concourse/baggageclaim/volume"
"github.com/concourse/baggageclaim/volume/volumefakes"
"github.com/concourse/concourse/worker/baggageclaim/uidgid/uidgidfakes"
"github.com/concourse/concourse/worker/baggageclaim/volume"
"github.com/concourse/concourse/worker/baggageclaim/volume/volumefakes"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)

2
worker/baggageclaim/volume/strategerizer.go
View File

@ -5,7 +5,7 @@ import (
"errors"
"fmt"
"github.com/concourse/baggageclaim"
"github.com/concourse/concourse/worker/baggageclaim"
)
type Strategerizer interface {

6
worker/baggageclaim/volume/strategerizer_test.go
View File

@ -1,9 +1,9 @@
package volume_test
import (
"github.com/concourse/baggageclaim"
"github.com/concourse/baggageclaim/baggageclaimfakes"
"github.com/concourse/baggageclaim/volume"
"github.com/concourse/concourse/worker/baggageclaim"
"github.com/concourse/concourse/worker/baggageclaim/baggageclaimfakes"
"github.com/concourse/concourse/worker/baggageclaim/volume"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

2
worker/baggageclaim/volume/stream.go
View File

@ -3,7 +3,7 @@ package volume
import (
"io"
"github.com/concourse/baggageclaim/uidgid"
"github.com/concourse/concourse/worker/baggageclaim/uidgid"
)
//go:generate counterfeiter . Streamer

2
worker/baggageclaim/volume/stream_in_out_linux.go
View File

@ -6,7 +6,7 @@ import (
"os/exec"
"path/filepath"
"github.com/concourse/baggageclaim/uidgid"
"github.com/concourse/concourse/worker/baggageclaim/uidgid"
"github.com/klauspost/compress/zstd"
)

2
worker/baggageclaim/volume/volumefakes/fake_driver.go
View File

@ -4,7 +4,7 @@ package volumefakes
import (
"sync"
"github.com/concourse/baggageclaim/volume"
"github.com/concourse/concourse/worker/baggageclaim/volume"
)
type FakeDriver struct {

2
worker/baggageclaim/volume/volumefakes/fake_filesystem.go
View File

@ -4,7 +4,7 @@ package volumefakes
import (
"sync"
"github.com/concourse/baggageclaim/volume"
"github.com/concourse/concourse/worker/baggageclaim/volume"
)
type FakeFilesystem struct {

2
worker/baggageclaim/volume/volumefakes/fake_filesystem_init_volume.go
View File

@ -4,7 +4,7 @@ package volumefakes
import (
"sync"
"github.com/concourse/baggageclaim/volume"
"github.com/concourse/concourse/worker/baggageclaim/volume"
)
type FakeFilesystemInitVolume struct {

2
worker/baggageclaim/volume/volumefakes/fake_filesystem_live_volume.go
View File

@ -4,7 +4,7 @@ package volumefakes
import (
"sync"
"github.com/concourse/baggageclaim/volume"
"github.com/concourse/concourse/worker/baggageclaim/volume"
)
type FakeFilesystemLiveVolume struct {

2
worker/baggageclaim/volume/volumefakes/fake_filesystem_volume.go
View File

@ -4,7 +4,7 @@ package volumefakes
import (
"sync"
"github.com/concourse/baggageclaim/volume"
"github.com/concourse/concourse/worker/baggageclaim/volume"
)
type FakeFilesystemVolume struct {

2
worker/baggageclaim/volume/volumefakes/fake_lock_manager.go
View File

@ -4,7 +4,7 @@ package volumefakes
import (
"sync"
"github.com/concourse/baggageclaim/volume"
"github.com/concourse/concourse/worker/baggageclaim/volume"
)
type FakeLockManager struct {

2
worker/baggageclaim/volume/volumefakes/fake_repository.go
View File

@ -6,7 +6,7 @@ import (
"io"
"sync"
"github.com/concourse/baggageclaim/volume"
"github.com/concourse/concourse/worker/baggageclaim/volume"
)
type FakeRepository struct {

2
worker/baggageclaim/volume/volumefakes/fake_strategy.go
View File

@ -5,7 +5,7 @@ import (
"sync"
"code.cloudfoundry.org/lager"
"github.com/concourse/baggageclaim/volume"
"github.com/concourse/concourse/worker/baggageclaim/volume"
)
type FakeStrategy struct {

2
worker/baggageclaim/volume/volumefakes/fake_streamer.go
View File

@ -5,7 +5,7 @@ import (
"io"
"sync"
"github.com/concourse/baggageclaim/volume"
"github.com/concourse/concourse/worker/baggageclaim/volume"
)
type FakeStreamer struct {

2
worker/volume_sweeper.go
View File

@ -8,7 +8,7 @@ import (
"code.cloudfoundry.org/lager"
"code.cloudfoundry.org/lager/lagerctx"
"github.com/concourse/baggageclaim"
"github.com/concourse/concourse/worker/baggageclaim"
)
// volumeSweeper is an ifrit.Runner that periodically reports and

4
worker/workercmd/worker.go
View File

@ -8,12 +8,12 @@ import (
"time"
"code.cloudfoundry.org/lager"
"github.com/concourse/baggageclaim/baggageclaimcmd"
bclient "github.com/concourse/baggageclaim/client"
"github.com/concourse/concourse"
"github.com/concourse/concourse/atc/worker/gclient"
concourseCmd "github.com/concourse/concourse/cmd"
"github.com/concourse/concourse/worker"
"github.com/concourse/concourse/worker/baggageclaim/baggageclaimcmd"
bclient "github.com/concourse/concourse/worker/baggageclaim/client"
"github.com/concourse/flag"
"github.com/tedsuo/ifrit"
"github.com/tedsuo/ifrit/grouper"