prefer provider over external to avoid confusion

Signed-off-by: Nicolas De Loof <[email protected]>

Author: ndeloof

loader/loader_test.go

@@ -3761,18 +3761,18 @@ services:
 	assert.Equal(t, *p.Services["test"].Secrets[0].Mode, types.FileMode(0o440))
 }
 
-func TestExternalService(t *testing.T) {
+func TestServiceProvider(t *testing.T) {
 	p, err := loadYAML(`
-name: external-service
+name: service-provider
 services:
   test:
-    external:
+    provider:
       type: foo
       options:
         bar: zot
 `)
 	assert.NilError(t, err)
-	assert.DeepEqual(t, p.Services["test"].External, &types.ExternalServiceConfig{
+	assert.DeepEqual(t, p.Services["test"].Provider, &types.ServiceProviderConfig{
 		Type:    "foo",
 		Options: map[string]string{"bar": "zot"},
 	})

loader/validate.go

@@ -29,7 +29,7 @@ import (
 // checkConsistency validate a compose model is consistent
 func checkConsistency(project *types.Project) error { //nolint:gocyclo
 	for name, s := range project.Services {
-		if s.Build == nil && s.Image == "" && s.External == nil {
+		if s.Build == nil && s.Image == "" && s.Provider == nil {
 			return fmt.Errorf("service %q has neither an image nor a build context specified: %w", s.Name, errdefs.ErrInvalid)
 		}
 

schema/compose-spec.json

@@ -259,7 +259,7 @@
             }
           ]
         },
-        "external": {
+        "provider": {
           "type": "object",
           "properties": {
             "type": {"type": "string"},

types/derived.gen.go

@@ -76,7 +76,7 @@ type ServiceConfig struct {
 	//
 	// Set to `[]` or an empty string to clear the entrypoint from the image.
 	Entrypoint      ShellCommand                     `yaml:"entrypoint,omitempty" json:"entrypoint"` // NOTE: we can NOT omitempty for JSON! see ShellCommand type for details.
-	External        *ExternalServiceConfig           `yaml:"external,omitempty" json:"external,omitempty"`
+	Provider        *ServiceProviderConfig           `yaml:"provider,omitempty" json:"provider,omitempty"`
 	Environment     MappingWithEquals                `yaml:"environment,omitempty" json:"environment,omitempty"`
 	EnvFiles        []EnvFile                        `yaml:"env_file,omitempty" json:"env_file,omitempty"`
 	Expose          StringOrNumberList               `yaml:"expose,omitempty" json:"expose,omitempty"`
@@ -142,7 +142,7 @@ type ServiceConfig struct {
 	Extensions Extensions `yaml:"#extensions,inline,omitempty" json:"-"`
 }
 
-type ExternalServiceConfig struct {
+type ServiceProviderConfig struct {
 	Type       string     `yaml:"type,omitempty" json:"driver,omitempty"`
 	Options    Options    `yaml:"options,omitempty" json:"options,omitempty"`
 	Extensions Extensions `yaml:"#extensions,inline,omitempty" json:"-"`