Browse code

builder-next: fix gcr workaround token cache

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit cfce0acd332d7536f85356f99b99a920be6cda87)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Tonis Tiigi authored on 2019/05/08 02:33:04
Showing 1 changed files
... ...
@@ -842,7 +842,7 @@ func (r *resolverCache) Add(ctx context.Context, ref string, resolver remotes.Re
842 842
 	r.mu.Lock()
843 843
 	defer r.mu.Unlock()
844 844
 
845
-	ref = r.domain(ref) + "-" + session.FromContext(ctx)
845
+	ref = r.repo(ref) + "-" + session.FromContext(ctx)
846 846
 
847 847
 	cr, ok := r.m[ref]
848 848
 	cr.timeout = time.Now().Add(time.Minute)
... ...
@@ -855,19 +855,19 @@ func (r *resolverCache) Add(ctx context.Context, ref string, resolver remotes.Re
855 855
 	return &cr
856 856
 }
857 857
 
858
-func (r *resolverCache) domain(refStr string) string {
858
+func (r *resolverCache) repo(refStr string) string {
859 859
 	ref, err := distreference.ParseNormalizedNamed(refStr)
860 860
 	if err != nil {
861 861
 		return refStr
862 862
 	}
863
-	return distreference.Domain(ref)
863
+	return ref.Name()
864 864
 }
865 865
 
866 866
 func (r *resolverCache) Get(ctx context.Context, ref string) remotes.Resolver {
867 867
 	r.mu.Lock()
868 868
 	defer r.mu.Unlock()
869 869
 
870
-	ref = r.domain(ref) + "-" + session.FromContext(ctx)
870
+	ref = r.repo(ref) + "-" + session.FromContext(ctx)
871 871
 
872 872
 	cr, ok := r.m[ref]
873 873
 	if !ok {