Ensure to pass resolved target registries for pushArtifact (#566)

Author: jonesbusy

src/main/java/land/oras/Config.java

@@ -115,6 +115,11 @@ public Config withMediaType(String mediaType) {
                 annotations == null ? Annotations.empty() : Annotations.ofConfig(annotations));
     }
 
+    @Override
+    protected Config withRegistry(String registry) {
+        return (Config) super.withRegistry(registry);
+    }
+
     /**
      * Get the data as bytes
      * @return The data as bytes

src/main/java/land/oras/CopyUtils.java

@@ -77,7 +77,7 @@ void copy(
         LOG.debug("Manifest digest: {}", manifestDigest);
 
         // Write all layer
-        for (Layer layer : source.collectLayers(sourceRef, contentType, true)) {
+        for (Layer layer : source.collectLayers(sourceRef.forTarget(resolveSourceRegistry), contentType, true)) {
             Objects.requireNonNull(layer.getDigest(), "Layer digest is required for streaming copy");
             Objects.requireNonNull(layer.getSize(), "Layer size is required for streaming copy");
             LOG.debug("Copying layer {}", layer.getDigest());

src/main/java/land/oras/Layer.java

@@ -73,6 +73,26 @@ private Layer(
         this.blobPath = null;
     }
 
+    /**
+     * Constructor that set the resolved registry
+     * @param mediaType The media type
+     * @param digest The digest
+     * @param size The size
+     * @param data The base 64 encoded data
+     * @param registry The registry
+     * @param annotations The annotations
+     */
+    private Layer(
+            String mediaType,
+            String digest,
+            @Nullable Long size,
+            @Nullable String data,
+            String registry,
+            @Nullable Map<String, String> annotations) {
+        this(mediaType, digest, size, data, annotations);
+        this.registry = registry;
+    }
+
     /**
      * Constructor that set the data from a file
      * @param mediaType The media type
@@ -186,6 +206,7 @@ public static Layer fromData(ContainerRef containerRef, byte[] data) {
                 containerRef.getAlgorithm().digest(data),
                 (long) data.length,
                 Base64.getEncoder().encodeToString(data),
+                containerRef.getRegistry(),
                 Map.of());
     }
 

src/main/java/land/oras/Manifest.java

@@ -140,6 +140,11 @@ public int getSchemaVersion() {
         return ArtifactType.unknown();
     }
 
+    @Override
+    protected Manifest withRegistry(String registry) {
+        return (Manifest) super.withRegistry(registry);
+    }
+
     /**
      * Get the artifact type as string for JSON serialization
      * @return The artifact type as string

src/main/java/land/oras/OCI.java

@@ -102,7 +102,7 @@ public Layer pushBlob(T ref, Path blob) {
     }
 
     /**
-     * Push a blob from file
+     * Push a blob stream. Creates a temporary file to store the blob and push the file. The temporary file will be deleted after pushing
      * @param ref The ref
      * @param input The input stream
      * @return The layer
@@ -234,7 +234,7 @@ protected boolean isManifestMediaType(String mediaType) {
     public final Config pushConfig(T ref, Config config) {
         Layer layer = pushBlob(ref, config.getDataBytes());
         LOG.debug("Config pushed: {}", layer.getDigest());
-        return config;
+        return config.withRegistry(layer.getRegistry());
     }
 
     /**

src/main/java/land/oras/Registry.java

@@ -31,6 +31,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.function.Supplier;
 import land.oras.auth.AuthProvider;
 import land.oras.auth.AuthStoreAuthenticationProvider;
@@ -392,20 +393,25 @@ public Manifest pushArtifact(
             manifest = manifest.withConfig(config);
         }
 
-        // Push layers
-        List<Layer> layers = pushLayers(containerRef, false, paths);
-
         // Push the config like any other blob
         Config pushedConfig = pushConfig(containerRef, config != null ? config : Config.empty());
+        String resolvedRegistry = pushedConfig.getRegistry();
+        Objects.requireNonNull(resolvedRegistry, "Pushed config must have a registry resolved");
+
+        // Build the resolved ref
+        ContainerRef resolvedRef = containerRef.forRegistry(resolvedRegistry);
+
+        // Push layers
+        List<Layer> layers = pushLayers(resolvedRef, false, paths);
 
         // Add layer and config
         manifest = manifest.withLayers(layers).withConfig(pushedConfig);
 
         // Push the manifest
-        manifest = pushManifest(containerRef, manifest);
+        manifest = pushManifest(resolvedRef, manifest);
         LOG.debug(
                 "Manifest pushed to: {}",
-                containerRef.withDigest(manifest.getDescriptor().getDigest()));
+                resolvedRef.withDigest(manifest.getDescriptor().getDigest()));
         return manifest;
     }
 
@@ -575,7 +581,7 @@ public Layer pushBlob(ContainerRef containerRef, byte[] data) {
         }
 
         handleError(response);
-        return Layer.fromData(containerRef, data);
+        return Layer.fromData(ref, data);
     }
 
     /**