Fix push artifact for alias (#570)

Author: jonesbusy

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

@@ -398,8 +398,8 @@ public Manifest pushArtifact(
         String resolvedRegistry = pushedConfig.getRegistry();
         Objects.requireNonNull(resolvedRegistry, "Pushed config must have a registry resolved");
 
-        // Build the resolved ref
-        ContainerRef resolvedRef = containerRef.forRegistry(resolvedRegistry);
+        // Build the resolved ref including rewrite
+        ContainerRef resolvedRef = containerRef.forRegistry(this).forRegistry(resolvedRegistry);
 
         // Push layers
         List<Layer> layers = pushLayers(resolvedRef, false, paths);

src/test/java/land/oras/RegistryTest.java

@@ -556,6 +556,48 @@ void shouldPushManifestWithRegistryConfig(@TempDir Path homeDir) throws Exceptio
         });
     }
 
+    @Test
+    @Execution(ExecutionMode.SAME_THREAD)
+    void shouldPushManifestWithAlias(@TempDir Path homeDir) throws Exception {
+
+        // language=toml
+        String config =
+                """
+            [[registry]]
+            location = "%s"
+            insecure = true
+
+            [aliases]
+            "my-library/my-namespace"="%s/test/bar"
+            """
+                        .formatted(this.unsecureRegistry.getRegistry(), this.unsecureRegistry.getRegistry());
+        TestUtils.createRegistriesConfFile(homeDir, config);
+
+        TestUtils.withHome(homeDir, () -> {
+            Registry registry = Registry.Builder.builder().defaults().build();
+
+            // Empty manifest
+            ContainerRef containerRef = ContainerRef.parse("my-library/my-namespace");
+            Index emptyIndex = Index.fromManifests(List.of());
+            Index pushIndex = registry.pushIndex(containerRef, emptyIndex);
+
+            // Assert
+            assertEquals(2, pushIndex.getSchemaVersion());
+            assertEquals(Const.DEFAULT_INDEX_MEDIA_TYPE, pushIndex.getMediaType());
+            assertEquals(0, pushIndex.getManifests().size());
+
+            // Push again
+            registry.pushIndex(containerRef, emptyIndex);
+
+            // Delete index
+            registry.deleteManifest(containerRef);
+            // Ensure the blob is deleted
+            assertThrows(OrasException.class, () -> {
+                registry.getManifest(containerRef);
+            });
+        });
+    }
+
     @Test
     @Execution(ExecutionMode.SAME_THREAD)
     void shouldDetermineRegistryFromAlias(@TempDir Path homeDir) throws Exception {
@@ -863,6 +905,46 @@ void testShouldCopySingleArtifactFromRegistryIntoRegistry() throws IOException {
         }
     }
 
+    @Test
+    @Execution(ExecutionMode.SAME_THREAD)
+    void testShouldArtifactWithAlias(@TempDir Path homeDir) throws Exception {
+
+        // language=toml
+        String config =
+                """
+            [aliases]
+            "the-target" = "%s/test/artifact-target"
+
+            [[registry]]
+            location = "%s"
+            insecure = true
+            """
+                        .formatted(this.registry.getRegistry(), this.registry.getRegistry());
+        TestUtils.createRegistriesConfFile(homeDir, config);
+
+        // Copy to same registry
+        TestUtils.withHome(homeDir, () -> {
+            try {
+                Registry registry =
+                        Registry.Builder.builder().defaults("myuser", "mypass").build();
+
+                ContainerRef originalRef = ContainerRef.parse("the-target");
+                Path file1 = blobDir.resolve("source.txt");
+                Files.writeString(file1, "foobar");
+
+                // Push
+                Manifest manifest = registry.pushArtifact(originalRef, LocalPath.of(file1));
+                assertNotNull(manifest);
+
+                // Pull
+                registry.pullArtifact(originalRef, artifactDir, true);
+                assertEquals("foobar", Files.readString(artifactDir.resolve("source.txt")));
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        });
+    }
+
     @Test
     @Execution(ExecutionMode.SAME_THREAD)
     @Disabled("#")