tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-24 22:24:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #554 from docker/context_create_output

Browse Source 
Display nice message on context creation (message taken from Moby cli)
This commit is contained in:
Guillaume Tardif 2020-08-27 11:27:02 +02:00 committed by GitHub
commit 7c891ff3ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cli/cmd/context/create.go
View File

@ -135,6 +135,7 @@ func createDockerContext(ctx context.Context, name string, contextType string, d
description, description,
data, data,
) )
fmt.Printf("Successfully created %s context %q\n", contextType, name)
return result return result
} }

7
tests/aci-e2e/e2e-aci_test.go
View File

@ -124,7 +124,7 @@ func TestLoginLogout(t *testing.T) {
}) })
} }
func TestContainerRun(t *testing.T) { func TestContainerRunVolume(t *testing.T) {
c := NewParallelE2eCLI(t, binDir) c := NewParallelE2eCLI(t, binDir)
sID, rg := setupTestResourceGroup(t, c) sID, rg := setupTestResourceGroup(t, c)
@ -581,8 +581,9 @@ func createResourceGroup(sID, rgName string) error {
} }
func createAciContextAndUseIt(t *testing.T, c *E2eCLI, sID, rgName string) { func createAciContextAndUseIt(t *testing.T, c *E2eCLI, sID, rgName string) {
c.RunDockerCmd("context", "create", "aci", contextName, "--subscription-id", sID, "--resource-group", rgName, "--location", location) res := c.RunDockerCmd("context", "create", "aci", contextName, "--subscription-id", sID, "--resource-group", rgName, "--location", location)
res := c.RunDockerCmd("context", "use", contextName) res.Assert(t, icmd.Expected{Out: "Successfully created aci context \"" + contextName + "\""})
res = c.RunDockerCmd("context", "use", contextName)
res.Assert(t, icmd.Expected{Out: contextName}) res.Assert(t, icmd.Expected{Out: contextName})
res = c.RunDockerCmd("context", "ls") res = c.RunDockerCmd("context", "ls")
res.Assert(t, icmd.Expected{Out: contextName + " *"}) res.Assert(t, icmd.Expected{Out: contextName + " *"})

5
tests/ecs-e2e/e2e-ecs_test.go
View File

@ -131,7 +131,7 @@ func setupTest(t *testing.T) (*E2eCLI, string) {
if localTestProfile != "" { if localTestProfile != "" {
region := os.Getenv("TEST_AWS_REGION") region := os.Getenv("TEST_AWS_REGION")
assert.Check(t, region != "") assert.Check(t, region != "")
c.RunDockerCmd("context", "create", "ecs", contextName, "--profile", localTestProfile, "--region", region) res = c.RunDockerCmd("context", "create", "ecs", contextName, "--profile", localTestProfile, "--region", region)
} else { } else {
profile := contextName profile := contextName
region := os.Getenv("AWS_DEFAULT_REGION") region := os.Getenv("AWS_DEFAULT_REGION")
@ -140,8 +140,9 @@ func setupTest(t *testing.T) (*E2eCLI, string) {
assert.Check(t, keyID != "") assert.Check(t, keyID != "")
assert.Check(t, secretKey != "") assert.Check(t, secretKey != "")
assert.Check(t, region != "") assert.Check(t, region != "")
c.RunDockerCmd("context", "create", "ecs", contextName, "--profile", profile, "--region", region, "--secret-key", secretKey, "--key-id", keyID) res = c.RunDockerCmd("context", "create", "ecs", contextName, "--profile", profile, "--region", region, "--secret-key", secretKey, "--key-id", keyID)
} }
res.Assert(t, icmd.Expected{Out: "Successfully created ecs context \"" + contextName + "\""})
res = c.RunDockerCmd("context", "use", contextName) res = c.RunDockerCmd("context", "use", contextName)
res.Assert(t, icmd.Expected{Out: contextName}) res.Assert(t, icmd.Expected{Out: contextName})
res = c.RunDockerCmd("context", "ls") res = c.RunDockerCmd("context", "ls")