feat: keep original upstream / anonymous remote

dervoeti · dervoeti · commit cf27542fcae4 · 2025-04-30T18:35:41.000+02:00
diff --git a/druid/stackable/patches/30.0.0/patchable.toml b/druid/stackable/patches/30.0.0/patchable.toml
@@ -1,2 +1,3 @@
-upstream = "https://github.com/stackabletech/druid.git"
+upstream = "https://github.com/apache/druid.git"
 base = "09d36ee324747f1407705c27618b6d415c3fa8a9"
+mirror = "https://github.com/stackabletech/druid.git"
diff --git a/druid/stackable/patches/30.0.1/patchable.toml b/druid/stackable/patches/30.0.1/patchable.toml
@@ -1,2 +1,3 @@
-upstream = "https://github.com/stackabletech/druid.git"
+upstream = "https://github.com/apache/druid.git"
 base = "a30af7a91d528e5c3a90356a5592abc7119191c6"
+mirror = "https://github.com/stackabletech/druid.git"
diff --git a/druid/stackable/patches/31.0.1/patchable.toml b/druid/stackable/patches/31.0.1/patchable.toml
@@ -1,2 +1,3 @@
-upstream = "https://github.com/stackabletech/druid.git"
+upstream = "https://github.com/apache/druid.git"
 base = "520482cb9638e452b0553595b4f29bb397a63758"
+mirror = "https://github.com/stackabletech/druid.git"
diff --git a/hadoop/stackable/patches/3.3.4/patchable.toml b/hadoop/stackable/patches/3.3.4/patchable.toml
@@ -1,2 +1,3 @@
-upstream = "https://github.com/stackabletech/hadoop.git"
+upstream = "https://github.com/apache/hadoop.git"
 base = "a585a73c3e02ac62350c136643a5e7f6095a3dbb"
+mirror = "https://github.com/stackabletech/hadoop.git"
diff --git a/hadoop/stackable/patches/3.3.6/patchable.toml b/hadoop/stackable/patches/3.3.6/patchable.toml
@@ -1,2 +1,3 @@
-upstream = "https://github.com/stackabletech/hadoop.git"
+upstream = "https://github.com/apache/hadoop.git"
 base = "1be78238728da9266a4f88195058f08fd012bf9c"
+mirror = "https://github.com/stackabletech/hadoop.git"
diff --git a/hadoop/stackable/patches/3.4.0/patchable.toml b/hadoop/stackable/patches/3.4.0/patchable.toml
@@ -1,2 +1,3 @@
-upstream = "https://github.com/stackabletech/hadoop.git"
+upstream = "https://github.com/apache/hadoop.git"
 base = "bd8b77f398f626bb7791783192ee7a5dfaeec760"
+mirror = "https://github.com/stackabletech/hadoop.git"
diff --git a/hadoop/stackable/patches/3.4.1/patchable.toml b/hadoop/stackable/patches/3.4.1/patchable.toml
@@ -1,2 +1,3 @@
-upstream = "https://github.com/stackabletech/hadoop.git"
+upstream = "https://github.com/apache/hadoop.git"
 base = "4d7825309348956336b8f06a08322b78422849b1"
+mirror = "https://github.com/stackabletech/hadoop.git"
diff --git a/hbase/hbase-operator-tools/stackable/patches/1.2.0/patchable.toml b/hbase/hbase-operator-tools/stackable/patches/1.2.0/patchable.toml
@@ -1,2 +1,3 @@
 upstream = "https://github.com/apache/hbase-operator-tools.git"
 base = "478af00af79f82624264fd2bb447b97fecc8e790"
+mirror = "https://github.com/stackabletech/hbase-operator-tools.git"
diff --git a/hbase/hbase-operator-tools/stackable/patches/1.3.0-fd5a5fb/patchable.toml b/hbase/hbase-operator-tools/stackable/patches/1.3.0-fd5a5fb/patchable.toml
@@ -1,2 +1,3 @@
 upstream = "https://github.com/apache/hbase-operator-tools.git"
 base = "fd5a5fb90755949a90c502c76de8313130403fa3"
+mirror = "https://github.com/stackabletech/hbase-operator-tools.git"
diff --git a/hbase/phoenix/stackable/patches/5.2.1/patchable.toml b/hbase/phoenix/stackable/patches/5.2.1/patchable.toml
@@ -1,2 +1,3 @@
 upstream = "https://github.com/apache/phoenix.git"
 base = "b738d66cb5863b759bb98eaa417b3b5731d41f95"
+mirror = "https://github.com/stackabletech/phoenix.git"
diff --git a/hbase/stackable/patches/2.4.18/patchable.toml b/hbase/stackable/patches/2.4.18/patchable.toml
@@ -1,2 +1,3 @@
-upstream = "https://github.com/stackabletech/hbase.git"
+upstream = "https://github.com/apache/hbase.git"
 base = "a1767f4d76859c0068720a6c1e5cb78282ebfe1e"
+mirror = "https://github.com/stackabletech/hbase.git"
diff --git a/hbase/stackable/patches/2.6.0/patchable.toml b/hbase/stackable/patches/2.6.0/patchable.toml
@@ -1,2 +1,3 @@
-upstream = "https://github.com/stackabletech/hbase.git"
+upstream = "https://github.com/apache/hbase.git"
 base = "de99f8754135ea69adc39da48d2bc2b2710a5366"
+mirror = "https://github.com/stackabletech/hbase.git"
diff --git a/hbase/stackable/patches/2.6.1/patchable.toml b/hbase/stackable/patches/2.6.1/patchable.toml
@@ -1,2 +1,3 @@
-upstream = "https://github.com/stackabletech/hbase.git"
+upstream = "https://github.com/apache/hbase.git"
 base = "7ed50b4dd742269a78875fb32112215f831284ff"
+mirror = "https://github.com/stackabletech/hbase.git"
diff --git a/hive/stackable/patches/3.1.3/patchable.toml b/hive/stackable/patches/3.1.3/patchable.toml
@@ -1,2 +1,3 @@
-upstream = "https://github.com/stackabletech/hive.git"
+upstream = "https://github.com/apache/hive.git"
 base = "4df4d75bf1e16fe0af75aad0b4179c34c07fc975"
+mirror = "https://github.com/stackabletech/hive.git"
diff --git a/hive/stackable/patches/4.0.0/patchable.toml b/hive/stackable/patches/4.0.0/patchable.toml
@@ -1,2 +1,3 @@
-upstream = "https://github.com/stackabletech/hive.git"
+upstream = "https://github.com/apache/hive.git"
 base = "183f8cb41d3dbed961ffd27999876468ff06690c"
+mirror = "https://github.com/stackabletech/hive.git"
diff --git a/hive/stackable/patches/4.0.1/patchable.toml b/hive/stackable/patches/4.0.1/patchable.toml
@@ -1,2 +1,3 @@
-upstream = "https://github.com/stackabletech/hive.git"
+upstream = "https://github.com/apache/hive.git"
 base = "3af4517eb8cfd9407ad34ed78a0b48b57dfaa264"
+mirror = "https://github.com/stackabletech/hive.git"
diff --git a/kafka/stackable/patches/3.7.1/patchable.toml b/kafka/stackable/patches/3.7.1/patchable.toml
@@ -1,2 +1,3 @@
-upstream = "https://github.com/stackabletech/kafka.git"
+upstream = "https://github.com/apache/kafka.git"
 base = "e2494e6ffb89f8288ed2aeb9b5596c755210bffd"
+mirror = "https://github.com/stackabletech/kafka.git"
diff --git a/kafka/stackable/patches/3.7.2/patchable.toml b/kafka/stackable/patches/3.7.2/patchable.toml
@@ -1,2 +1,3 @@
-upstream = "https://github.com/stackabletech/kafka.git"
+upstream = "https://github.com/apache/kafka.git"
 base = "79a8f2b5f44f9d5a6867190d1dfc463d08d60b82"
+mirror = "https://github.com/stackabletech/kafka.git"
diff --git a/kafka/stackable/patches/3.8.0/patchable.toml b/kafka/stackable/patches/3.8.0/patchable.toml
@@ -1,2 +1,3 @@
-upstream = "https://github.com/stackabletech/kafka.git"
+upstream = "https://github.com/apache/kafka.git"
 base = "771b9576b00ecf5b64ab6e8bedf04156fbdb5cd6"
+mirror = "https://github.com/stackabletech/kafka.git"
diff --git a/kafka/stackable/patches/3.9.0/patchable.toml b/kafka/stackable/patches/3.9.0/patchable.toml
@@ -1,2 +1,3 @@
-upstream = "https://github.com/stackabletech/kafka.git"
+upstream = "https://github.com/apache/kafka.git"
 base = "84caaa6e9da06435411510a81fa321d4f99c351f"
+mirror = "https://github.com/stackabletech/kafka.git"
diff --git a/nifi/stackable/patches/1.27.0/patchable.toml b/nifi/stackable/patches/1.27.0/patchable.toml
@@ -1,2 +1,3 @@
-upstream = "https://github.com/stackabletech/nifi.git"
+upstream = "https://github.com/apache/nifi.git"
 base = "e0c4461d90bd4f6e5f2b81765bcff5cd97ed3e18"
+mirror = "https://github.com/stackabletech/nifi.git"
diff --git a/nifi/stackable/patches/1.28.1/patchable.toml b/nifi/stackable/patches/1.28.1/patchable.toml
@@ -1,2 +1,3 @@
-upstream = "https://github.com/stackabletech/nifi.git"
+upstream = "https://github.com/apache/nifi.git"
 base = "883338fe28883733417d10f6ffa9319e75f5ea06"
+mirror = "https://github.com/stackabletech/nifi.git"
diff --git a/nifi/stackable/patches/2.2.0/patchable.toml b/nifi/stackable/patches/2.2.0/patchable.toml
@@ -1,2 +1,3 @@
-upstream = "https://github.com/stackabletech/nifi.git"
+upstream = "https://github.com/apache/nifi.git"
 base = "b33ffac8aa10992482f7fa54e6cfccc46a5e8e27"
+mirror = "https://github.com/stackabletech/nifi.git"
diff --git a/omid/stackable/patches/1.1.0/patchable.toml b/omid/stackable/patches/1.1.0/patchable.toml
@@ -1,2 +1,3 @@
-upstream = "https://github.com/stackabletech/phoenix-omid.git"
+upstream = "https://github.com/apache/phoenix-omid.git"
 base = "3b9e16b7537adbc90a7403507fb8aabd8d1fab0c"
+mirror = "https://github.com/stackabletech/phoenix-omid.git"
diff --git a/omid/stackable/patches/1.1.1/patchable.toml b/omid/stackable/patches/1.1.1/patchable.toml
@@ -1,2 +1,3 @@
-upstream = "https://github.com/stackabletech/phoenix-omid.git"
+upstream = "https://github.com/apache/phoenix-omid.git"
 base = "cd546d58d93f380fec9bf65dbfa618f53493f662"
+mirror = "https://github.com/stackabletech/phoenix-omid.git"
diff --git a/omid/stackable/patches/1.1.2/patchable.toml b/omid/stackable/patches/1.1.2/patchable.toml
@@ -1,2 +1,3 @@
-upstream = "https://github.com/stackabletech/phoenix-omid.git"
+upstream = "https://github.com/apache/phoenix-omid.git"
 base = "88812c9e127063f3b3016262f81ea3e8b48ec157"
+mirror = "https://github.com/stackabletech/phoenix-omid.git"
diff --git a/omid/stackable/patches/1.1.3-SNAPSHOT/patchable.toml b/omid/stackable/patches/1.1.3-SNAPSHOT/patchable.toml
@@ -1,2 +1,3 @@
 upstream = "https://github.com/apache/phoenix-omid.git"
 base = "c3e4da626fdb27060fd139a809e057965e52d163"
+mirror = "https://github.com/stackabletech/phoenix-omid.git"
diff --git a/rust/patchable/src/main.rs b/rust/patchable/src/main.rs
@@ -29,6 +29,7 @@ struct ProductVersionConfig {
     upstream: String,
     #[serde(with = "utils::oid_serde")]
     base: Oid,
+    mirror: Option<String>,
 }
 
 struct ProductVersionContext {
@@ -213,11 +214,6 @@ pub enum Error {
         refspec: String,
         commit: Oid,
     },
-    #[snafu(display("failed to delete remote {name}"))]
-    DeleteRemote {
-        source: git2::Error,
-        name: String,
-    },
 
     #[snafu(display("failed to find images repository"))]
     FindImagesRepo { source: repo::Error },
@@ -309,7 +305,7 @@ fn main() -> Result<()> {
             let base_commit = repo::resolve_and_fetch_commitish(
                 &product_repo,
                 &config.base.to_string(),
-                &config.upstream,
+                config.mirror.as_deref().unwrap_or(&config.upstream),
             )
             .context(FetchBaseCommitSnafu)?;
             let base_branch = ctx.base_branch();
@@ -441,8 +437,10 @@ fn main() -> Result<()> {
             // --base can be a reference, but patchable.toml should always have a resolved commit id,
             // so that it cannot be changed under our feet (without us knowing so, anyway...).
             tracing::info!(?base, "resolving base commit-ish");
+            let base_commit = repo::resolve_and_fetch_commitish(&product_repo, &base, &upstream).context(FetchBaseCommitSnafu)?;
+            let mut upstream_mirror = None;
 
-            let (base_commit, upstream) = if mirrored {
+            if mirrored {
                 // Parse e.g. "https://github.com/apache/druid.git" into "druid"
                 let repo_name = upstream.split('/').last().map(|repo| repo.trim_end_matches(".git")).context(ParseUpstreamUrlSnafu { url: &upstream })?;
 
@@ -451,25 +449,13 @@ fn main() -> Result<()> {
                 let mirror_url = format!("https://github.com/stackabletech/{}.git", repo_name);
                 tracing::info!(%mirror_url, "using mirror repository");
 
-                // Fetch from original upstream using a temporary remote name
-                tracing::info!(upstream = upstream, %base, "fetching base ref from original upstream");
-                let base_commit_oid = repo::resolve_and_fetch_commitish(
-                    &product_repo,
-                    &base,
-                    &upstream
-                )
-                .context(FetchBaseCommitSnafu)?;
-
-                tracing::info!(commit = %base_commit_oid, "fetched base commit OID");
-
                 // Add mirror remote
-                let temp_mirror_remote = "patchable_mirror_push";
                 let mut mirror_remote = product_repo
-                    .remote(temp_mirror_remote, &mirror_url)
+                    .remote_anonymous(&mirror_url)
                     .context(AddMirrorRemoteSnafu { url: mirror_url.clone() })?;
 
                 // Push the base commit to the mirror
-                tracing::info!(commit = %base_commit_oid, base = base, url = mirror_url, "pushing commit to mirror");
+                tracing::info!(commit = %base_commit, base = base, url = mirror_url, "pushing commit to mirror");
                 let mut callbacks = git2::RemoteCallbacks::new();
                 callbacks.credentials(|_url, username_from_url, _allowed_types| {
                     git2::Cred::credential_helper(
@@ -501,10 +487,10 @@ fn main() -> Result<()> {
                         .is_ok();
 
                     if is_tag {
-                        format!("{}:refs/tags/{}", base_commit_oid, base)
+                        format!("{}:refs/tags/{}", base_commit, base)
                     } else {
                         // Assume it's a branch as default behavior
-                        format!("{}:refs/heads/{}", base_commit_oid, base)
+                        format!("{}:refs/heads/{}", base_commit, base)
                     }
                 };
 
@@ -515,24 +501,20 @@ fn main() -> Result<()> {
                     .context(PushToMirrorSnafu {
                         url: mirror_url.clone(),
                         refspec: &refspec,
-                        commit: base_commit_oid,
+                        commit: base_commit,
                     })?;
 
-                product_repo.remote_delete(temp_mirror_remote)
-                    .context(DeleteRemoteSnafu { name: temp_mirror_remote.to_string() })?;
-
                 tracing::info!("successfully pushed base ref to mirror");
 
-                (base_commit_oid, mirror_url)
-            } else {
-                (repo::resolve_and_fetch_commitish(&product_repo, &base, &upstream).context(FetchBaseCommitSnafu)?, upstream)
+                upstream_mirror = Some(mirror_url);
             };
 
             tracing::info!(?base, base.commit = ?base_commit, "resolved base commit");
 
             tracing::info!("saving configuration");
             let config = ProductVersionConfig {
                 upstream,
+                mirror: upstream_mirror,
                 base: base_commit,
             };
             let config_path = ctx.config_path();
diff --git a/spark-k8s/hbase-connectors/stackable/patches/1.0.1/patchable.toml b/spark-k8s/hbase-connectors/stackable/patches/1.0.1/patchable.toml
@@ -1,2 +1,3 @@
 upstream = "https://github.com/apache/hbase-connectors.git"
 base = "e5217d13ed729703580ff2d1b02378ada2d94f4d"
+mirror = "https://github.com/stackabletech/hbase-connectors.git"
diff --git a/spark-k8s/stackable/patches/3.5.2/patchable.toml b/spark-k8s/stackable/patches/3.5.2/patchable.toml
@@ -1,2 +1,3 @@
-upstream = "https://github.com/stackabletech/spark.git"
+upstream = "https://github.com/apache/spark.git"
 base = "bb7846dd487f259994fdc69e18e03382e3f64f42"
+mirror = "https://github.com/stackabletech/spark.git"
diff --git a/spark-k8s/stackable/patches/3.5.5/patchable.toml b/spark-k8s/stackable/patches/3.5.5/patchable.toml
@@ -1,2 +1,3 @@
-upstream = "https://github.com/stackabletech/spark.git"
+upstream = "https://github.com/apache/spark.git"
 base = "7c29c664cdc9321205a98a14858aaf8daaa19db2"
+mirror = "https://github.com/stackabletech/spark.git"
diff --git a/trino-storage-connector/stackable/patches/451/patchable.toml b/trino-storage-connector/stackable/patches/451/patchable.toml
@@ -1,2 +1,3 @@
-upstream = "https://github.com/stackabletech/trino-storage.git"
+upstream = "https://github.com/snowlift/trino-storage.git"
 base = "b6e5825bb84a4f1a3f89ff45ea39ce349313f60a"
+mirror = "https://github.com/stackabletech/trino-storage.git"
diff --git a/trino-storage-connector/stackable/patches/455/patchable.toml b/trino-storage-connector/stackable/patches/455/patchable.toml
@@ -1,2 +1,3 @@
-upstream = "https://github.com/stackabletech/trino-storage.git"
+upstream = "https://github.com/snowlift/trino-storage.git"
 base = "869a735d8be527117a19150e161ad8ca69317578"
+mirror = "https://github.com/stackabletech/trino-storage.git"
diff --git a/trino-storage-connector/stackable/patches/470/patchable.toml b/trino-storage-connector/stackable/patches/470/patchable.toml
@@ -1,2 +1,3 @@
-upstream = "https://github.com/stackabletech/trino-storage.git"
+upstream = "https://github.com/snowlift/trino-storage.git"
 base = "1b25d617940f14a844a43ee34aa705f7d11fbaf9"
+mirror = "https://github.com/stackabletech/trino-storage.git"
diff --git a/trino/stackable/patches/451/patchable.toml b/trino/stackable/patches/451/patchable.toml
@@ -1,2 +1,3 @@
-upstream = "https://github.com/stackabletech/trino.git"
+upstream = "https://github.com/trinodb/trino.git"
 base = "2c974f7cb1d71e1f9f466941a317190a474fc432"
+mirror = "https://github.com/stackabletech/trino.git"
diff --git a/trino/stackable/patches/455/patchable.toml b/trino/stackable/patches/455/patchable.toml
@@ -1,2 +1,3 @@
-upstream = "https://github.com/stackabletech/trino.git"
+upstream = "https://github.com/trinodb/trino.git"
 base = "e212460ea0aa663f0de9b16fecd480c4ad6490cc"
+mirror = "https://github.com/stackabletech/trino.git"
diff --git a/trino/stackable/patches/470/patchable.toml b/trino/stackable/patches/470/patchable.toml
@@ -1,2 +1,3 @@
-upstream = "https://github.com/stackabletech/trino.git"
+upstream = "https://github.com/trinodb/trino.git"
 base = "05bc059cf0c9263e4ee8be2c1ad69753d0dd4faf"
+mirror = "https://github.com/stackabletech/trino.git"
diff --git a/zookeeper/stackable/patches/3.9.2/patchable.toml b/zookeeper/stackable/patches/3.9.2/patchable.toml
@@ -1,2 +1,3 @@
-upstream = "https://github.com/stackabletech/zookeeper.git"
+upstream = "https://github.com/apache/zookeeper.git"
 base = "e454e8c7283100c7caec6dcae2bc82aaecb63023"
+mirror = "https://github.com/stackabletech/zookeeper.git"
diff --git a/zookeeper/stackable/patches/3.9.3/patchable.toml b/zookeeper/stackable/patches/3.9.3/patchable.toml
@@ -1,2 +1,3 @@
-upstream = "https://github.com/stackabletech/zookeeper.git"
+upstream = "https://github.com/apache/zookeeper.git"
 base = "c26634f34490bb0ea7a09cc51e05ede3b4e320ee"
+mirror = "https://github.com/stackabletech/zookeeper.git"

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`upstream = "https://github.com/apache/hbase-operator-tools.git"`
`2`	`2`	`base = "478af00af79f82624264fd2bb447b97fecc8e790"`
	`3`	`+mirror = "https://github.com/stackabletech/hbase-operator-tools.git"`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`upstream = "https://github.com/apache/hbase-operator-tools.git"`
`2`	`2`	`base = "fd5a5fb90755949a90c502c76de8313130403fa3"`
	`3`	`+mirror = "https://github.com/stackabletech/hbase-operator-tools.git"`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`upstream = "https://github.com/apache/phoenix.git"`
`2`	`2`	`base = "b738d66cb5863b759bb98eaa417b3b5731d41f95"`
	`3`	`+mirror = "https://github.com/stackabletech/phoenix.git"`