github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-08-11 03:12:26 +00:00
Code Issues Projects Releases Wiki Activity

cleanup API

Browse Source 
moving stuff around (godoc.org review)

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
This commit is contained in:
Antonio Murdaca 2016-05-23 17:20:50 +02:00
parent 1cf55db9be
commit 4036b3543e
3 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
cmd/skopeo/utils.go
View File

@ -11,6 +11,15 @@ import (
"github.com/projectatomic/skopeo/types" "github.com/projectatomic/skopeo/types"
) )
const (
// atomicPrefix is the URL-like schema prefix used for Atomic registry image references.
atomicPrefix = "atomic:"
// dockerPrefix is the URL-like schema prefix used for Docker image references.
dockerPrefix = "docker://"
// directoryPrefix is the URL-like schema prefix used for local directories (for debugging)
directoryPrefix = "dir:"
)
// ParseImage converts image URL-like string to an initialized handler for that image. // ParseImage converts image URL-like string to an initialized handler for that image.
func parseImage(c *cli.Context) (types.Image, error) { func parseImage(c *cli.Context) (types.Image, error) {
var ( var (
@ -19,8 +28,8 @@ func parseImage(c *cli.Context) (types.Image, error) {
tlsVerify = c.GlobalBool("tls-verify") tlsVerify = c.GlobalBool("tls-verify")
) )
switch { switch {
case strings.HasPrefix(imgName, types.DockerPrefix): case strings.HasPrefix(imgName, dockerPrefix):
return docker.NewDockerImage(strings.TrimPrefix(imgName, types.DockerPrefix), certPath, tlsVerify) return docker.NewDockerImage(strings.TrimPrefix(imgName, dockerPrefix), certPath, tlsVerify)
//case strings.HasPrefix(img, appcPrefix): //case strings.HasPrefix(img, appcPrefix):
// //
} }
@ -34,12 +43,12 @@ func parseImageSource(c *cli.Context, name string) (types.ImageSource, error) {
tlsVerify = c.GlobalBool("tls-verify") // FIXME!! defaults to false? tlsVerify = c.GlobalBool("tls-verify") // FIXME!! defaults to false?
) )
switch { switch {
case strings.HasPrefix(name, types.DockerPrefix): case strings.HasPrefix(name, dockerPrefix):
return docker.NewDockerImageSource(strings.TrimPrefix(name, types.DockerPrefix), certPath, tlsVerify) return docker.NewDockerImageSource(strings.TrimPrefix(name, dockerPrefix), certPath, tlsVerify)
case strings.HasPrefix(name, types.AtomicPrefix): case strings.HasPrefix(name, atomicPrefix):
return openshift.NewOpenshiftImageSource(strings.TrimPrefix(name, types.AtomicPrefix), certPath, tlsVerify) return openshift.NewOpenshiftImageSource(strings.TrimPrefix(name, atomicPrefix), certPath, tlsVerify)
case strings.HasPrefix(name, types.DirectoryPrefix): case strings.HasPrefix(name, directoryPrefix):
return directory.NewDirImageSource(strings.TrimPrefix(name, types.DirectoryPrefix)), nil return directory.NewDirImageSource(strings.TrimPrefix(name, directoryPrefix)), nil
} }
return nil, fmt.Errorf("Unrecognized image reference %s", name) return nil, fmt.Errorf("Unrecognized image reference %s", name)
} }
@ -51,12 +60,12 @@ func parseImageDestination(c *cli.Context, name string) (types.ImageDestination,
tlsVerify = c.GlobalBool("tls-verify") // FIXME!! defaults to false? tlsVerify = c.GlobalBool("tls-verify") // FIXME!! defaults to false?
) )
switch { switch {
case strings.HasPrefix(name, types.DockerPrefix): case strings.HasPrefix(name, dockerPrefix):
return docker.NewDockerImageDestination(strings.TrimPrefix(name, types.DockerPrefix), certPath, tlsVerify) return docker.NewDockerImageDestination(strings.TrimPrefix(name, dockerPrefix), certPath, tlsVerify)
case strings.HasPrefix(name, types.AtomicPrefix): case strings.HasPrefix(name, atomicPrefix):
return openshift.NewOpenshiftImageDestination(strings.TrimPrefix(name, types.AtomicPrefix), certPath, tlsVerify) return openshift.NewOpenshiftImageDestination(strings.TrimPrefix(name, atomicPrefix), certPath, tlsVerify)
case strings.HasPrefix(name, types.DirectoryPrefix): case strings.HasPrefix(name, directoryPrefix):
return directory.NewDirImageDestination(strings.TrimPrefix(name, types.DirectoryPrefix)), nil return directory.NewDirImageDestination(strings.TrimPrefix(name, directoryPrefix)), nil
} }
return nil, fmt.Errorf("Unrecognized image reference %s", name) return nil, fmt.Errorf("Unrecognized image reference %s", name)
} }

8
openshift/openshift-copies.go
View File

@ -166,10 +166,10 @@ func (config *deferredLoadingClientConfig) ClientConfig() (*restConfig, error) {
var ( var (
// DefaultCluster is the cluster config used when no other config is specified // DefaultCluster is the cluster config used when no other config is specified
// TODO: eventually apiserver should start on 443 and be secure by default // TODO: eventually apiserver should start on 443 and be secure by default
DefaultCluster = clientcmdCluster{Server: "http://localhost:8080"} defaultCluster = clientcmdCluster{Server: "http://localhost:8080"}
// EnvVarCluster allows overriding the DefaultCluster using an envvar for the server name // EnvVarCluster allows overriding the DefaultCluster using an envvar for the server name
EnvVarCluster = clientcmdCluster{Server: os.Getenv("KUBERNETES_MASTER")} envVarCluster = clientcmdCluster{Server: os.Getenv("KUBERNETES_MASTER")}
) )
// directClientConfig is a modified copy of k8s.io/kubernetes/pkg/client/unversioned/clientcmd.DirectClientConfig. // directClientConfig is a modified copy of k8s.io/kubernetes/pkg/client/unversioned/clientcmd.DirectClientConfig.
@ -440,8 +440,8 @@ func (config *directClientConfig) getCluster() clientcmdCluster {
clusterInfoName := config.getClusterName() clusterInfoName := config.getClusterName()
var mergedClusterInfo clientcmdCluster var mergedClusterInfo clientcmdCluster
mergo.Merge(&mergedClusterInfo, DefaultCluster) mergo.Merge(&mergedClusterInfo, defaultCluster)
mergo.Merge(&mergedClusterInfo, EnvVarCluster) mergo.Merge(&mergedClusterInfo, envVarCluster)
if configClusterInfo, exists := clusterInfos[clusterInfoName]; exists { if configClusterInfo, exists := clusterInfos[clusterInfoName]; exists {
mergo.Merge(&mergedClusterInfo, configClusterInfo) mergo.Merge(&mergedClusterInfo, configClusterInfo)
} }

9
types/types.go
View File

@ -6,15 +6,6 @@ import (
"time" "time"
) )
const (
// AtomicPrefix is the URL-like schema prefix used for Atomic registry image references.
AtomicPrefix = "atomic:"
// DockerPrefix is the URL-like schema prefix used for Docker image references.
DockerPrefix = "docker://"
// DirectoryPrefix is the URL-like schema prefix used for local directories (for debugging)
DirectoryPrefix = "dir:"
)
// Registry is a service providing repositories. // Registry is a service providing repositories.
type Registry interface { type Registry interface {
Repositories() []Repository Repositories() []Repository