From 4440f5aa3f164bced82146ba1c19122b2b958a1f Mon Sep 17 00:00:00 2001
From: Don Kjer <don.kjer@gmail.com>
Date: Tue, 7 Oct 2014 01:54:52 +0000
Subject: [PATCH] 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>
---
 opts/opts.go      | 24 +-----------------------
 opts/opts_test.go | 18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/opts/opts.go b/opts/opts.go
index f15064ac69..3d8c23ff77 100644
--- a/opts/opts.go
+++ b/opts/opts.go
@@ -3,7 +3,6 @@ package opts
 import (
 	"fmt"
 	"net"
-	"net/url"
 	"os"
 	"path"
 	"regexp"
@@ -39,10 +38,6 @@ func IPVar(value *net.IP, names []string, defaultValue, usage string) {
 	flag.Var(NewIpOpt(value, defaultValue), names, usage)
 }
 
-func MirrorListVar(values *[]string, names []string, usage string) {
-	flag.Var(newListOptsRef(values, ValidateMirror), names, usage)
-}
-
 func LabelListVar(values *[]string, names []string, usage string) {
 	flag.Var(newListOptsRef(values, ValidateLabel), names, usage)
 }
@@ -127,6 +122,7 @@ func (opts *ListOpts) Len() int {
 
 // Validators
 type ValidatorFctType func(val string) (string, error)
+type ValidatorFctListType func(val string) ([]string, error)
 
 func ValidateAttach(val string) (string, error) {
 	s := strings.ToLower(val)
@@ -214,24 +210,6 @@ func ValidateExtraHost(val string) (string, error) {
 	return val, nil
 }
 
-// Validates an HTTP(S) registry mirror
-func ValidateMirror(val string) (string, error) {
-	uri, err := url.Parse(val)
-	if err != nil {
-		return "", fmt.Errorf("%s is not a valid URI", val)
-	}
-
-	if uri.Scheme != "http" && uri.Scheme != "https" {
-		return "", fmt.Errorf("Unsupported scheme %s", uri.Scheme)
-	}
-
-	if uri.Path != "" || uri.RawQuery != "" || uri.Fragment != "" {
-		return "", fmt.Errorf("Unsupported path/query/fragment at end of the URI")
-	}
-
-	return fmt.Sprintf("%s://%s/v1/", uri.Scheme, uri.Host), nil
-}
-
 func ValidateLabel(val string) (string, error) {
 	if strings.Count(val, "=") != 1 {
 		return "", fmt.Errorf("bad attribute format: %s", val)
diff --git a/opts/opts_test.go b/opts/opts_test.go
index 09b5aa780b..e813c44326 100644
--- a/opts/opts_test.go
+++ b/opts/opts_test.go
@@ -30,7 +30,23 @@ func TestValidateIPAddress(t *testing.T) {
 func TestListOpts(t *testing.T) {
 	o := NewListOpts(nil)
 	o.Set("foo")
-	o.String()
+	if o.String() != "[foo]" {
+		t.Errorf("%s != [foo]", o.String())
+	}
+	o.Set("bar")
+	if o.Len() != 2 {
+		t.Errorf("%d != 2", o.Len())
+	}
+	if !o.Get("bar") {
+		t.Error("o.Get(\"bar\") == false")
+	}
+	if o.Get("baz") {
+		t.Error("o.Get(\"baz\") == true")
+	}
+	o.Delete("foo")
+	if o.String() != "[bar]" {
+		t.Errorf("%s != [bar]", o.String())
+	}
 }
 
 func TestValidateDnsSearch(t *testing.T) {