Deprecating ResolveRepositoryName

Passing RepositoryInfo to ResolveAuthConfig, pullRepository, and pushRepository

Moving --registry-mirror configuration to registry config

Created resolve_repository job

Repo names with 'index.docker.io' or 'docker.io' are now synonymous with omitting an index name.

Adding test for RepositoryInfo

Adding tests for opts.StringSetOpts and registry.ValidateMirror

Fixing search term use of repoInfo

Adding integration tests for registry mirror configuration

Normalizing LookupImage image name to match LocalName parsing rules

Normalizing repository LocalName to avoid multiple references to an official image

Removing errorOut use in tests

Removing TODO comment

gofmt changes

golint comments cleanup.  renaming RegistryOptions => registry.Options, and RegistryServiceConfig => registry.ServiceConfig

Splitting out builtins.Registry and registry.NewService calls

Stray whitespace cleanup

Moving integration tests for Mirrors and InsecureRegistries into TestNewIndexInfo unit test

Factoring out ValidateRepositoryName from NewRepositoryInfo

Removing unused IndexServerURL

Allowing json marshaling of ServiceConfig.  Exposing ServiceConfig in /info

Switching to CamelCase for json marshaling

PR cleanup; removing 'Is' prefix from boolean members.  Removing unneeded json tags.

Removing non-cleanup related fix for 'localhost:[port]' in splitReposName

Merge fixes for gh9735

Fixing integration test

Reapplying #9754

Adding comment on config.IndexConfigs use from isSecureIndex

Remove unused error return value from isSecureIndex

Signed-off-by: Don Kjer <don.kjer@gmail.com>

Adding back comment in isSecureIndex

Signed-off-by: Don Kjer <don.kjer@gmail.com>

docs/service.go

@@ -13,14 +13,14 @@ import (
 //  'pull': Download images from any registry (TODO)
 //  'push': Upload images to any registry (TODO)
 type Service struct {
-	insecureRegistries []string
+	Config *ServiceConfig
 }
 
 // NewService returns a new instance of Service ready to be
 // installed no an engine.
-func NewService(insecureRegistries []string) *Service {
+func NewService(options *Options) *Service {
 	return &Service{
-		insecureRegistries: insecureRegistries,
+		Config: NewServiceConfig(options),
 	}
 }
 
@@ -28,6 +28,9 @@ func NewService(insecureRegistries []string) *Service {
 func (s *Service) Install(eng *engine.Engine) error {
 	eng.Register("auth", s.Auth)
 	eng.Register("search", s.Search)
+	eng.Register("resolve_repository", s.ResolveRepository)
+	eng.Register("resolve_index", s.ResolveIndex)
+	eng.Register("registry_config", s.GetRegistryConfig)
 	return nil
 }
 
@@ -39,15 +42,18 @@ func (s *Service) Auth(job *engine.Job) engine.Status {
 
 	job.GetenvJson("authConfig", authConfig)
 
-	if addr := authConfig.ServerAddress; addr != "" && addr != IndexServerAddress() {
-		endpoint, err := NewEndpoint(addr, s.insecureRegistries)
+	if authConfig.ServerAddress != "" {
+		index, err := ResolveIndexInfo(job, authConfig.ServerAddress)
 		if err != nil {
 			return job.Error(err)
 		}
-		if _, err := endpoint.Ping(); err != nil {
-			return job.Error(err)
+		if !index.Official {
+			endpoint, err := NewEndpoint(index)
+			if err != nil {
+				return job.Error(err)
+			}
+			authConfig.ServerAddress = endpoint.String()
 		}
-		authConfig.ServerAddress = endpoint.String()
 	}
 
 	status, err := Login(authConfig, HTTPRequestFactory(nil))
@@ -87,12 +93,12 @@ func (s *Service) Search(job *engine.Job) engine.Status {
 	job.GetenvJson("authConfig", authConfig)
 	job.GetenvJson("metaHeaders", metaHeaders)
 
-	hostname, term, err := ResolveRepositoryName(term)
+	repoInfo, err := ResolveRepositoryInfo(job, term)
 	if err != nil {
 		return job.Error(err)
 	}
-
-	endpoint, err := NewEndpoint(hostname, s.insecureRegistries)
+	// *TODO: Search multiple indexes.
+	endpoint, err := repoInfo.GetEndpoint()
 	if err != nil {
 		return job.Error(err)
 	}
@@ -100,7 +106,7 @@ func (s *Service) Search(job *engine.Job) engine.Status {
 	if err != nil {
 		return job.Error(err)
 	}
-	results, err := r.SearchRepositories(term)
+	results, err := r.SearchRepositories(repoInfo.GetSearchTerm())
 	if err != nil {
 		return job.Error(err)
 	}
@@ -116,3 +122,92 @@ func (s *Service) Search(job *engine.Job) engine.Status {
 	}
 	return engine.StatusOK
 }
+
+// ResolveRepository splits a repository name into its components
+// and configuration of the associated registry.
+func (s *Service) ResolveRepository(job *engine.Job) engine.Status {
+	var (
+		reposName = job.Args[0]
+	)
+
+	repoInfo, err := NewRepositoryInfo(s.Config, reposName)
+	if err != nil {
+		return job.Error(err)
+	}
+
+	out := engine.Env{}
+	err = out.SetJson("repository", repoInfo)
+	if err != nil {
+		return job.Error(err)
+	}
+	out.WriteTo(job.Stdout)
+
+	return engine.StatusOK
+}
+
+// Convenience wrapper for calling resolve_repository Job from a running job.
+func ResolveRepositoryInfo(jobContext *engine.Job, reposName string) (*RepositoryInfo, error) {
+	job := jobContext.Eng.Job("resolve_repository", reposName)
+	env, err := job.Stdout.AddEnv()
+	if err != nil {
+		return nil, err
+	}
+	if err := job.Run(); err != nil {
+		return nil, err
+	}
+	info := RepositoryInfo{}
+	if err := env.GetJson("repository", &info); err != nil {
+		return nil, err
+	}
+	return &info, nil
+}
+
+// ResolveIndex takes indexName and returns index info
+func (s *Service) ResolveIndex(job *engine.Job) engine.Status {
+	var (
+		indexName = job.Args[0]
+	)
+
+	index, err := NewIndexInfo(s.Config, indexName)
+	if err != nil {
+		return job.Error(err)
+	}
+
+	out := engine.Env{}
+	err = out.SetJson("index", index)
+	if err != nil {
+		return job.Error(err)
+	}
+	out.WriteTo(job.Stdout)
+
+	return engine.StatusOK
+}
+
+// Convenience wrapper for calling resolve_index Job from a running job.
+func ResolveIndexInfo(jobContext *engine.Job, indexName string) (*IndexInfo, error) {
+	job := jobContext.Eng.Job("resolve_index", indexName)
+	env, err := job.Stdout.AddEnv()
+	if err != nil {
+		return nil, err
+	}
+	if err := job.Run(); err != nil {
+		return nil, err
+	}
+	info := IndexInfo{}
+	if err := env.GetJson("index", &info); err != nil {
+		return nil, err
+	}
+	return &info, nil
+}
+
+// GetRegistryConfig returns current registry configuration.
+func (s *Service) GetRegistryConfig(job *engine.Job) engine.Status {
+	out := engine.Env{}
+	err := out.SetJson("config", s.Config)
+	if err != nil {
+		return job.Error(err)
+	}
+	out.WriteTo(job.Stdout)
+
+	return engine.StatusOK
+}