Additional info and error logs

Author: kylos101

components/image-builder-mk3/pkg/auth/auth.go

@@ -77,6 +77,7 @@ func (a *DockerConfigFileAuth) loadFromFile(fn string) (err error) {
 	_, _ = hash.Write(cntnt)
 	newHash := fmt.Sprintf("%x", hash.Sum(nil))
 	if a.hash == newHash {
+		log.Infof("nothing has changed: %s", fn)
 		return nil
 	}
 
@@ -101,6 +102,7 @@ func (a *DockerConfigFileAuth) loadFromFile(fn string) (err error) {
 func (a *DockerConfigFileAuth) Authenticate(ctx context.Context, registry string) (auth *Authentication, err error) {
 	ac, err := a.C.GetAuthConfig(registry)
 	if err != nil {
+		log.WithError(err).WithField("registry", registry).Error("failed DockerConfigFileAuth Authenticate")
 		return nil, err
 	}
 
@@ -122,7 +124,7 @@ func (ca CompositeAuth) Authenticate(ctx context.Context, registry string) (auth
 	for _, ath := range ca {
 		res, err := ath.Authenticate(ctx, registry)
 		if err != nil {
-			log.WithError(err).Errorf("failed composite authenticate")
+			log.WithError(err).WithField("registry", registry).Errorf("failed CompositeAuth Authenticate")
 			return nil, err
 		}
 		if !res.Empty() {
@@ -173,7 +175,8 @@ func (ath *ECRAuthenticator) Authenticate(ctx context.Context, registry string)
 			return nil, err
 		}
 		if len(tknout.AuthorizationData) == 0 {
-			return nil, fmt.Errorf("no ECR authorization data received")
+			err = fmt.Errorf("no ECR authorization data received")
+			return nil, err
 		}
 
 		pwd, err := base64.StdEncoding.DecodeString(aws.ToString(tknout.AuthorizationData[0].AuthorizationToken))
@@ -184,6 +187,8 @@ func (ath *ECRAuthenticator) Authenticate(ctx context.Context, registry string)
 		ath.ecrAuth = string(pwd)
 		ath.ecrAuthLastRefreshTime = time.Now()
 		log.Info("refreshed ECR token")
+	} else {
+		log.Info("no ECR token refresh necessary")
 	}
 
 	segs := strings.Split(ath.ecrAuth, ":")
@@ -373,7 +378,7 @@ func (a AllowedAuthFor) additionalAuth(domain string) *Authentication {
 			res.Password = strings.Join(segs[1:], ":")
 		}
 	} else {
-		log.WithError(err).Errorf("failed getting additional auth")
+		log.Errorf("failed getting additional auth")
 	}
 	return res
 }