Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

The Great Decoupling #3307

Merged
merged 21 commits into from Mar 15, 2019
Merged

The Great Decoupling #3307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
694b36a
atc: add user artifact api endpoints
Dec 19, 2018
2d8a917
atc: add artifacts to go-concourse client
Dec 20, 2018
cf7154a
atc: remove the send input/read output endpoints
Jan 3, 2019
c69f4ac
atc: add accessor entries for artifact things
Jan 16, 2019
b078b4c
atc: create artifacts for build outputs
Jan 3, 2019
4f458e3
atc: add artifact collector
Jan 14, 2019
edc95c2
atc: bump migrations
Feb 28, 2019
ba51e43
atc: fly exec builds get run by the scheduler
Feb 12, 2019
5c11d45
atc: abort build handler marks build as aborted in db
Feb 12, 2019
b15eb29
atc: triggering build from UI does not `TriggerImmediately`
Feb 12, 2019
490340c
atc: list job inputs no longer forces a scheduler tick
Feb 13, 2019
a32c883
atc: rename build things
Feb 13, 2019
4ae21e3
atc: api cleanse
Feb 14, 2019
6956b16
atc: remove peer url
Feb 14, 2019
ccb2c46
tsa: default peer ip to 127.0.0.1
Feb 28, 2019
0791d27
atc: bump migrations
Feb 28, 2019
fbd5528
atc: make the get artifact API members only
Mar 13, 2019
9981d90
fly: add back upload/download progress
Mar 13, 2019
a04753b
atc: register output artifacts in step
Mar 13, 2019
6828e5c
atc: double status ALL THE WAY
Mar 13, 2019
1afb5a6
fly: make upload/download progress clearer
vito Mar 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions atc/api/accessor/accessor.go
View file
Open in desktop
Expand Up @@ -197,6 +197,7 @@ var requiredRoles = map[string]string{
atc.RenameTeam: "owner",
atc.DestroyTeam: "owner",
atc.ListTeamBuilds: "viewer",
atc.SendInputToBuildPlan: "member",
atc.ReadOutputFromBuildPlan: "member",
atc.CreateArtifact: "member",
atc.GetArtifact: "member",
atc.ListBuildArtifacts: "viewer",
}
17 changes: 10 additions & 7 deletions atc/api/accessor/accessor_test.go
View file
Open in desktop
Expand Up @@ -9,7 +9,6 @@ import (
"github.com/concourse/concourse/atc"
"github.com/concourse/concourse/atc/api/accessor"
jwt "github.com/dgrijalva/jwt-go"

. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/extensions/table"
. "github.com/onsi/gomega"
Expand Down Expand Up @@ -651,12 +650,16 @@ var _ = Describe("Accessor", func() {
Entry("member :: "+atc.ListTeamBuilds, atc.ListTeamBuilds, "member", true),
Entry("viewer :: "+atc.ListTeamBuilds, atc.ListTeamBuilds, "viewer", true),

Entry("owner :: "+atc.SendInputToBuildPlan, atc.SendInputToBuildPlan, "owner", true),
Entry("member :: "+atc.SendInputToBuildPlan, atc.SendInputToBuildPlan, "member", true),
Entry("viewer :: "+atc.SendInputToBuildPlan, atc.SendInputToBuildPlan, "viewer", false),
Entry("owner :: "+atc.CreateArtifact, atc.CreateArtifact, "owner", true),
Entry("member :: "+atc.CreateArtifact, atc.CreateArtifact, "member", true),
Entry("viewer :: "+atc.CreateArtifact, atc.CreateArtifact, "viewer", false),

Entry("owner :: "+atc.GetArtifact, atc.GetArtifact, "owner", true),
Entry("member :: "+atc.GetArtifact, atc.GetArtifact, "member", true),
Entry("viewer :: "+atc.GetArtifact, atc.GetArtifact, "viewer", false),

Entry("owner :: "+atc.ReadOutputFromBuildPlan, atc.ReadOutputFromBuildPlan, "owner", true),
Entry("member :: "+atc.ReadOutputFromBuildPlan, atc.ReadOutputFromBuildPlan, "member", true),
Entry("viewer :: "+atc.ReadOutputFromBuildPlan, atc.ReadOutputFromBuildPlan, "viewer", false),
Entry("owner :: "+atc.ListBuildArtifacts, atc.ListBuildArtifacts, "owner", true),
Entry("member :: "+atc.ListBuildArtifacts, atc.ListBuildArtifacts, "member", true),
Entry("viewer :: "+atc.ListBuildArtifacts, atc.ListBuildArtifacts, "viewer", true),
)
})
33 changes: 8 additions & 25 deletions atc/api/api_suite_test.go
View file
Open in desktop
Expand Up @@ -10,35 +10,29 @@ import (

"code.cloudfoundry.org/lager"
"code.cloudfoundry.org/lager/lagertest"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

"github.com/concourse/concourse/atc/api"
"github.com/concourse/concourse/atc/api/accessor"
"github.com/concourse/concourse/atc/api/accessor/accessorfakes"
"github.com/concourse/concourse/atc/api/auth"
"github.com/concourse/concourse/atc/api/containerserver/containerserverfakes"
"github.com/concourse/concourse/atc/api/resourceserver/resourceserverfakes"
"github.com/concourse/concourse/atc/creds"
"github.com/concourse/concourse/atc/creds/credsfakes"
"github.com/concourse/concourse/atc/db"
"github.com/concourse/concourse/atc/db/dbfakes"
"github.com/concourse/concourse/atc/gc/gcfakes"

"github.com/concourse/concourse/atc/api/accessor/accessorfakes"
"github.com/concourse/concourse/atc/api/containerserver/containerserverfakes"
"github.com/concourse/concourse/atc/api/jobserver/jobserverfakes"
"github.com/concourse/concourse/atc/api/resourceserver/resourceserverfakes"
"github.com/concourse/concourse/atc/engine/enginefakes"
"github.com/concourse/concourse/atc/worker/workerfakes"
"github.com/concourse/concourse/atc/wrappa"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)

var (
sink *lager.ReconfigurableSink

externalURL = "https://example.com"

fakeEngine *enginefakes.FakeEngine
fakeWorkerPool *workerfakes.FakePool
fakeWorkerProvider *workerfakes.FakeWorkerProvider
fakeWorkerClient *workerfakes.FakeClient
fakeVolumeRepository *dbfakes.FakeVolumeRepository
fakeContainerRepository *dbfakes.FakeContainerRepository
fakeDestroyer *gcfakes.FakeDestroyer
Expand All @@ -54,13 +48,11 @@ var (
build *dbfakes.FakeBuild
dbBuildFactory *dbfakes.FakeBuildFactory
dbTeam *dbfakes.FakeTeam
fakeSchedulerFactory *jobserverfakes.FakeSchedulerFactory
fakeScannerFactory *resourceserverfakes.FakeScannerFactory
fakeVariablesFactory *credsfakes.FakeVariablesFactory
credsManagers creds.Managers
interceptTimeoutFactory *containerserverfakes.FakeInterceptTimeoutFactory
interceptTimeout *containerserverfakes.FakeInterceptTimeout
peerURL string
drain chan struct{}
expire time.Duration
isTLSEnabled bool
Expand Down Expand Up @@ -117,15 +109,10 @@ var _ = BeforeEach(func() {
dbWorkerFactory = new(dbfakes.FakeWorkerFactory)
dbWorkerLifecycle = new(dbfakes.FakeWorkerLifecycle)

peerURL = "http://127.0.0.1:1234"

drain = make(chan struct{})

fakeEngine = new(enginefakes.FakeEngine)
fakeWorkerPool = new(workerfakes.FakePool)
fakeWorkerProvider = new(workerfakes.FakeWorkerProvider)
fakeWorkerClient = new(workerfakes.FakeClient)

fakeSchedulerFactory = new(jobserverfakes.FakeSchedulerFactory)
fakeScannerFactory = new(resourceserverfakes.FakeScannerFactory)

fakeVolumeRepository = new(dbfakes.FakeVolumeRepository)
Expand Down Expand Up @@ -182,15 +169,11 @@ var _ = BeforeEach(func() {
dbBuildFactory,
dbResourceConfigFactory,

peerURL,
constructedEventHandler.Construct,
drain,

fakeEngine,
fakeWorkerPool,
fakeWorkerProvider,
fakeWorkerClient,

fakeSchedulerFactory,
fakeScannerFactory,

sink,
Expand Down