Working with tests by filtering ports from the image registry

pull/279/head
Michael McCallum 2018-09-27 18:29:54 +12:00
parent 00c68877f2
commit 5971cf2452
2 changed files with 17 additions and 11 deletions

View File

@ -236,20 +236,19 @@ func credentialsFromConfig(image *types.TrackedImage, cfg DockerCfg) (*types.Cre
credentials := &types.Credentials{}
found := false
imageRegistry := hostname(image.Image.Registry())
imageRegistry, err := domainOnly(image.Image.Registry())
if err != nil {
log.WithFields(log.Fields{
"image": image.Image.Repository(),
"namespace": image.Namespace,
"registry": registry,
"error": err,
}).Error("secrets.credentialsFromConfig: failed to parse registry hostname")
return nil, err
}
log.WithFields(log.Fields{
"image": image.Image.Repository(),
"namespace": image.Namespace,
"error": err,
}).Error("secrets.credentialsFromConfig: failed to parse registry hostname")
return credentials, false
}
// looking for our registry
for registry, auth := range cfg {
h, err := hostname(registry)
if err != nil {
log.WithFields(log.Fields{
"image": image.Image.Repository(),
@ -328,6 +327,14 @@ func hostname(registry string) (string, error) {
return registry, nil
}
func domainOnly(registry string) (string, error) {
if strings.Contains(registry, ":") {
return strings.Split(registry, ":")[0], nil
}
return registry, nil
}
func decodeSecret(data []byte) (DockerCfg, error) {
var cfg DockerCfg
err := json.Unmarshal(data, &cfg)

View File

@ -354,7 +354,6 @@ func TestLookupWithPortedRegistry(t *testing.T) {
Data: map[string][]byte{
dockerConfigKey: []byte(secretDataPayloadWithPort),
},
Name: "example.com",
Type: v1.SecretTypeDockercfg,
},
}