Skip to content

Commit

Permalink
Merge pull request #4377 from concourse/remove-res-session
Browse files Browse the repository at this point in the history 
remove reference to db.containerMetadat from resource package
  • Loading branch information
Divya Dadlani committed Sep 5, 2019
2 parents d84d968 + 862a79f commit e67bc91
Show file tree
Hide file tree
Showing 11 changed files with 41 additions and 49 deletions.
4 changes: 1 addition & 3 deletions atc/exec/get_step.go
View file
Expand Up @@ -198,9 +198,7 @@ func (step *GetStep) Run(ctx context.Context, state RunState) error {
versionedSource, err := step.resourceFetcher.Fetch(
ctx,
logger,
resource.Session{
Metadata: step.containerMetadata,
},
step.containerMetadata,
chosenWorker,
containerSpec,
resourceTypes,
Expand Down
7 changes: 3 additions & 4 deletions atc/exec/get_step_test.go
View file
Expand Up @@ -182,15 +182,14 @@ var _ = Describe("GetStep", func() {
Expect(stepErr).ToNot(HaveOccurred())

Expect(fakeResourceFetcher.FetchCallCount()).To(Equal(1))
fctx, _, sid, actualWorker, actualContainerSpec, actualResourceTypes, resourceInstance, delegate := fakeResourceFetcher.FetchArgsForCall(0)
fctx, _, actualContainerMetadata, actualWorker, actualContainerSpec, actualResourceTypes, resourceInstance, delegate := fakeResourceFetcher.FetchArgsForCall(0)
Expect(fctx).To(Equal(ctx))
Expect(sid).To(Equal(resource.Session{
Metadata: db.ContainerMetadata{
Expect(actualContainerMetadata).To(Equal(
db.ContainerMetadata{
PipelineID: 4567,
Type: db.ContainerTypeGet,
StepName: "some-step",
WorkingDirectory: "/tmp/build/get",
},
}))
Expect(actualWorker.Name()).To(Equal("some-worker"))
Expect(actualContainerSpec).To(Equal(worker.ContainerSpec{
Expand Down
7 changes: 4 additions & 3 deletions atc/fetcher/fetcher.go
View file
Expand Up @@ -9,6 +9,7 @@ import (
"code.cloudfoundry.org/clock"
"code.cloudfoundry.org/lager"
"github.com/concourse/concourse/atc"
"github.com/concourse/concourse/atc/db"
"github.com/concourse/concourse/atc/db/lock"
"github.com/concourse/concourse/atc/resource"
"github.com/concourse/concourse/atc/worker"
Expand All @@ -25,7 +26,7 @@ type Fetcher interface {
Fetch(
ctx context.Context,
logger lager.Logger,
session resource.Session,
containerMetadata db.ContainerMetadata,
gardenWorker worker.Worker,
containerSpec worker.ContainerSpec,
resourceTypes atc.VersionedResourceTypes,
Expand Down Expand Up @@ -55,7 +56,7 @@ type fetcher struct {
func (f *fetcher) Fetch(
ctx context.Context,
logger lager.Logger,
session resource.Session,
containerMetadata db.ContainerMetadata,
gardenWorker worker.Worker,
containerSpec worker.ContainerSpec,
resourceTypes atc.VersionedResourceTypes,
Expand All @@ -66,7 +67,7 @@ func (f *fetcher) Fetch(
"resource": resource.ResourcesDir("get"),
}

source := f.fetchSourceFactory.NewFetchSource(logger, gardenWorker, resourceInstance, resourceTypes, containerSpec, session, imageFetchingDelegate)
source := f.fetchSourceFactory.NewFetchSource(logger, gardenWorker, resourceInstance, resourceTypes, containerSpec, containerMetadata, imageFetchingDelegate)

ticker := f.clock.NewTicker(GetResourceLockInterval)
defer ticker.Stop()
Expand Down
3 changes: 2 additions & 1 deletion atc/fetcher/fetcher_test.go
View file
Expand Up @@ -9,6 +9,7 @@ import (
"code.cloudfoundry.org/lager"
"code.cloudfoundry.org/lager/lagertest"
"github.com/concourse/concourse/atc"
"github.com/concourse/concourse/atc/db"
"github.com/concourse/concourse/atc/db/lock"
"github.com/concourse/concourse/atc/db/lock/lockfakes"
"github.com/concourse/concourse/atc/fetcher/fetcherfakes"
Expand Down Expand Up @@ -64,7 +65,7 @@ var _ = Describe("Fetcher", func() {
versionedSource, fetchErr = fetcher.Fetch(
ctx,
lagertest.NewTestLogger("test"),
resource.Session{},
db.ContainerMetadata{},
fakeWorker,
worker.ContainerSpec{
TeamID: teamID,
Expand Down
13 changes: 7 additions & 6 deletions atc/fetcher/fetcherfakes/fake_fetch_source_factory.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 7 additions & 6 deletions atc/fetcher/fetcherfakes/fake_fetcher.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions atc/fetcher/resource_instance_fetch_source.go
View file
Expand Up @@ -27,7 +27,7 @@ type FetchSourceFactory interface {
resourceInstance resource.ResourceInstance,
resourceTypes atc.VersionedResourceTypes,
containerSpec worker.ContainerSpec,
session resource.Session,
containerMetadata db.ContainerMetadata,
imageFetchingDelegate worker.ImageFetchingDelegate,
) FetchSource
}
Expand All @@ -53,7 +53,7 @@ func (r *fetchSourceFactory) NewFetchSource(
resourceInstance resource.ResourceInstance,
resourceTypes atc.VersionedResourceTypes,
containerSpec worker.ContainerSpec,
session resource.Session,
containerMetadata db.ContainerMetadata,
imageFetchingDelegate worker.ImageFetchingDelegate,
) FetchSource {
return &resourceInstanceFetchSource{
Expand All @@ -62,7 +62,7 @@ func (r *fetchSourceFactory) NewFetchSource(
resourceInstance: resourceInstance,
resourceTypes: resourceTypes,
containerSpec: containerSpec,
session: session,
containerMetadata: containerMetadata,
imageFetchingDelegate: imageFetchingDelegate,
dbResourceCacheFactory: r.resourceCacheFactory,
resourceFactory: r.resourceFactory,
Expand All @@ -75,7 +75,7 @@ type resourceInstanceFetchSource struct {
resourceInstance resource.ResourceInstance
resourceTypes atc.VersionedResourceTypes
containerSpec worker.ContainerSpec
session resource.Session
containerMetadata db.ContainerMetadata
imageFetchingDelegate worker.ImageFetchingDelegate
dbResourceCacheFactory db.ResourceCacheFactory
resourceFactory resource.ResourceFactory
Expand Down Expand Up @@ -136,7 +136,7 @@ func (s *resourceInstanceFetchSource) Create(ctx context.Context) (resource.Vers
s.logger,
s.imageFetchingDelegate,
s.resourceInstance.ContainerOwner(),
s.session.Metadata,
s.containerMetadata,
s.containerSpec,
s.resourceTypes,
)
Expand Down
4 changes: 1 addition & 3 deletions atc/fetcher/resource_instance_fetch_source_test.go
View file
Expand Up @@ -117,9 +117,7 @@ var _ = Describe("ResourceInstanceFetchSource", func() {
"resource": resource.ResourcesDir("get"),
},
},
resource.Session{
Metadata: metadata,
},
metadata,
fakeDelegate,
)
})
Expand Down
5 changes: 0 additions & 5 deletions atc/resource/resource.go
View file
Expand Up @@ -6,7 +6,6 @@ import (
"path/filepath"

"github.com/concourse/concourse/atc"
"github.com/concourse/concourse/atc/db"
"github.com/concourse/concourse/atc/worker"
)

Expand All @@ -20,10 +19,6 @@ type Resource interface {

type ResourceType string

type Session struct {
Metadata db.ContainerMetadata
}

type Metadata interface {
Env() []string
}
Expand Down
8 changes: 3 additions & 5 deletions atc/worker/image/image_resource_fetcher.go
View file
Expand Up @@ -157,10 +157,8 @@ func (i *imageResourceFetcher) Fetch(
return nil, nil, nil, err
}

getSess := resource.Session{
Metadata: db.ContainerMetadata{
Type: db.ContainerTypeGet,
},
containerMetadata := db.ContainerMetadata{
Type: db.ContainerTypeGet,
}

containerSpec := worker.ContainerSpec{
Expand All @@ -175,7 +173,7 @@ func (i *imageResourceFetcher) Fetch(
versionedSource, err := i.resourceFetcher.Fetch(
ctx,
logger.Session("init-image"),
getSess,
containerMetadata,
i.worker,
containerSpec,
i.customTypes,
Expand Down
16 changes: 8 additions & 8 deletions atc/worker/image/image_resource_fetcher_test.go
View file
Expand Up @@ -344,12 +344,12 @@ var _ = Describe("Image", func() {

It("fetches resource with correct session", func() {
Expect(fakeResourceFetcher.FetchCallCount()).To(Equal(1))
_, _, session, actualWorker, containerSpec, actualCustomTypes, resourceInstance, delegate := fakeResourceFetcher.FetchArgsForCall(0)
Expect(session).To(Equal(resource.Session{
Metadata: db.ContainerMetadata{
_, _, actualContainerMetadata, actualWorker, containerSpec, actualCustomTypes, resourceInstance, delegate := fakeResourceFetcher.FetchArgsForCall(0)
Expect(actualContainerMetadata).To(Equal(
db.ContainerMetadata{
Type: db.ContainerTypeGet,
},
}))
))
Expect(actualWorker.Name()).To(Equal("some-worker"))
Expect(containerSpec.ImageSpec).To(Equal(worker.ImageSpec{
ResourceType: "docker",
Expand Down Expand Up @@ -565,12 +565,12 @@ var _ = Describe("Image", func() {

It("fetches resource with correct session", func() {
Expect(fakeResourceFetcher.FetchCallCount()).To(Equal(1))
_, _, session, actualWorker, containerSpec, actualCustomTypes, resourceInstance, delegate := fakeResourceFetcher.FetchArgsForCall(0)
Expect(session).To(Equal(resource.Session{
Metadata: db.ContainerMetadata{
_, _, actualContainerMetadata, actualWorker, containerSpec, actualCustomTypes, resourceInstance, delegate := fakeResourceFetcher.FetchArgsForCall(0)
Expect(actualContainerMetadata).To(Equal(
db.ContainerMetadata{
Type: db.ContainerTypeGet,
},
}))
))
Expect(actualWorker.Name()).To(Equal("some-worker"))
Expect(containerSpec.ImageSpec).To(Equal(worker.ImageSpec{
ResourceType: "docker",
Expand Down

0 comments on commit e67bc91

Please sign in to comment.