tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

avoir use of []types.ServiceConfig 

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
This commit is contained in:
Nicolas De Loof 2023-11-21 12:06:46 +01:00
parent f557220140
commit 5e77ae9247
No known key found for this signature in database
GPG Key ID: 9858809D6F8F6E7E
9 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/compose/compose_test.go
View File

@ -25,7 +25,7 @@ import (
func TestFilterServices(t *testing.T) {
p := &types.Project{
Services: []types.ServiceConfig{
Services: types.Services{
{
Name: "foo",
Links: []string{"bar"},

6
cmd/compose/options_test.go
View File

@ -26,7 +26,7 @@ import (
func TestApplyPlatforms_InferFromRuntime(t *testing.T) {
makeProject := func() *types.Project {
return &types.Project{
Services: []types.ServiceConfig{
Services: types.Services{
{
Name: "test",
Image: "foo",
@ -64,7 +64,7 @@ func TestApplyPlatforms_DockerDefaultPlatform(t *testing.T) {
Environment: map[string]string{
"DOCKER_DEFAULT_PLATFORM": "linux/amd64",
},
Services: []types.ServiceConfig{
Services: types.Services{
{
Name: "test",
Image: "foo",
@ -100,7 +100,7 @@ func TestApplyPlatforms_UnsupportedPlatform(t *testing.T) {
Environment: map[string]string{
"DOCKER_DEFAULT_PLATFORM": "commodore/64",
},
Services: []types.ServiceConfig{
Services: types.Services{
{
Name: "test",
Image: "foo",

2
cmd/compose/pullOptions_test.go
View File

@ -25,7 +25,7 @@ import (
func TestApplyPullOptions(t *testing.T) {
project := &types.Project{
Services: []types.ServiceConfig{
Services: types.Services{
{
Name: "must-build",
// No image, local build only

2
cmd/compose/up_test.go
View File

@ -25,7 +25,7 @@ import (
func TestApplyScaleOpt(t *testing.T) {
p := types.Project{
Services: []types.ServiceConfig{
Services: types.Services{
{
Name: "foo",
},

4
pkg/compose/convergence_test.go
View File

@ -224,7 +224,7 @@ func TestWaitDependencies(t *testing.T) {
t.Run("should skip dependencies with scale 0", func(t *testing.T) {
dbService := types.ServiceConfig{Name: "db", Scale: 0}
redisService := types.ServiceConfig{Name: "redis", Scale: 0}
project := types.Project{Name: strings.ToLower(testProject), Services: []types.ServiceConfig{dbService, redisService}}
project := types.Project{Name: strings.ToLower(testProject), Services: types.Services{dbService, redisService}}
dependencies := types.DependsOnConfig{
"db": {Condition: ServiceConditionRunningOrHealthy},
"redis": {Condition: ServiceConditionRunningOrHealthy},
@ -234,7 +234,7 @@ func TestWaitDependencies(t *testing.T) {
t.Run("should skip dependencies with condition service_started", func(t *testing.T) {
dbService := types.ServiceConfig{Name: "db", Scale: 1}
redisService := types.ServiceConfig{Name: "redis", Scale: 1}
project := types.Project{Name: strings.ToLower(testProject), Services: []types.ServiceConfig{dbService, redisService}}
project := types.Project{Name: strings.ToLower(testProject), Services: types.Services{dbService, redisService}}
dependencies := types.DependsOnConfig{
"db": {Condition: types.ServiceConditionStarted, Required: true},
"redis": {Condition: types.ServiceConditionStarted, Required: true},

4
pkg/compose/dependencies_test.go
View File

@ -32,7 +32,7 @@ import (
func createTestProject() *types.Project {
return &types.Project{
Services: []types.ServiceConfig{
Services: types.Services{
{
Name: "test1",
DependsOn: map[string]types.ServiceDependency{
@ -59,7 +59,7 @@ func TestTraversalWithMultipleParents(t *testing.T) {
}
project := types.Project{
Services: []types.ServiceConfig{dependent},
Services: types.Services{dependent},
}
for i := 1; i <= 100; i++ {

4
pkg/compose/pull.go
View File

@ -260,7 +260,7 @@ func encodedAuth(ref reference.Named, configFile driver.Auth) (string, error) {
}
func (s *composeService) pullRequiredImages(ctx context.Context, project *types.Project, images map[string]string, quietPull bool) error {
var needPull []types.ServiceConfig
var needPull types.Services
for _, service := range project.Services {
if service.Image == "" {
continue
@ -308,7 +308,7 @@ func (s *composeService) pullRequiredImages(ctx context.Context, project *types.
}, s.stdinfo())
}
func isServiceImageToBuild(service types.ServiceConfig, services []types.ServiceConfig) bool {
func isServiceImageToBuild(service types.ServiceConfig, services types.Services) bool {
if service.Build != nil {
return true
}

2
pkg/compose/viz_test.go
View File

@ -33,7 +33,7 @@ func TestViz(t *testing.T) {
project := types.Project{
Name: "viz-test",
WorkingDir: "/home",
Services: []types.ServiceConfig{
Services: types.Services{
{
Name: "service1",
Image: "image-for-service1",

2
pkg/compose/watch_test.go
View File

@ -105,7 +105,7 @@ func TestWatch_Sync(t *testing.T) {
t.Cleanup(cancelFunc)
proj := types.Project{
Services: []types.ServiceConfig{
Services: types.Services{
{
Name: "test",
},