[metadata] remove support for outdated registry fields (bytecodeallia…

…nce#1941)
yoshuawuyts · Dec 7, 2024 · ebb55ce · ebb55ce
1 parent fcbdf64
commit ebb55ce
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 626 deletions.
diff --git a/crates/wasm-metadata/src/add_metadata.rs b/crates/wasm-metadata/src/add_metadata.rs
@@ -1,4 +1,4 @@
-use crate::{rewrite_wasm, Author, Description, Licenses, Producers, RegistryMetadata, Source};
+use crate::{rewrite_wasm, Author, Description, Licenses, Producers, Source};
 
 use anyhow::Result;
 
@@ -41,10 +41,6 @@ pub struct AddMetadata {
     /// URL to get source code for building the image
     #[cfg_attr(feature = "clap", clap(long, value_name = "NAME"))]
     pub source: Option<Source>,
-
-    /// Add an registry metadata to the registry-metadata section
-    #[cfg_attr(feature="clap", clap(long, value_parser = parse_registry_metadata_value, value_name="PATH"))]
-    pub registry_metadata: Option<RegistryMetadata>,
 }
 
 #[cfg(feature = "clap")]
@@ -54,15 +50,6 @@ pub(crate) fn parse_key_value(s: &str) -> Result<(String, String)> {
         .ok_or_else(|| anyhow::anyhow!("expected KEY=VALUE"))
 }
 
-#[cfg(feature = "clap")]
-pub(crate) fn parse_registry_metadata_value(s: &str) -> Result<RegistryMetadata> {
-    let contents = std::fs::read(s)?;
-
-    let registry_metadata = RegistryMetadata::from_bytes(&contents, 0)?;
-
-    Ok(registry_metadata)
-}
-
 impl AddMetadata {
     /// Process a WebAssembly binary. Supports both core WebAssembly modules, and WebAssembly
     /// components. The module and component will have, at very least, an empty name and producers
@@ -75,7 +62,6 @@ impl AddMetadata {
             &self.description,
             &self.licenses,
             &self.source,
-            self.registry_metadata.as_ref(),
             input,
         )
     }

diff --git a/crates/wasm-metadata/src/lib.rs b/crates/wasm-metadata/src/lib.rs
@@ -7,7 +7,6 @@ pub use metadata::Metadata;
 pub use names::{ComponentNames, ModuleNames};
 pub use oci_annotations::{Author, Description, Licenses, Source};
 pub use producers::{Producers, ProducersField};
-pub use registry::{CustomLicense, Link, LinkType, RegistryMetadata};
 
 pub(crate) use rewrite::rewrite_wasm;
 
@@ -16,7 +15,6 @@ mod metadata;
 mod names;
 mod oci_annotations;
 mod producers;
-mod registry;
 mod rewrite;
 
 pub(crate) mod utils;
diff --git a/crates/wasm-metadata/src/metadata.rs b/crates/wasm-metadata/src/metadata.rs
@@ -4,9 +4,7 @@ use std::fmt;
 use std::ops::Range;
 use wasmparser::{KnownCustom, Parser, Payload::*};
 
-use crate::{
-    Author, ComponentNames, Description, Licenses, ModuleNames, Producers, RegistryMetadata, Source,
-};
+use crate::{Author, ComponentNames, Description, Licenses, ModuleNames, Producers, Source};
 
 /// A tree of the metadata found in a WebAssembly binary.
 #[derive(Debug, Serialize)]
@@ -18,8 +16,6 @@ pub enum Metadata {
         name: Option<String>,
         /// The component's producers section, if any.
         producers: Option<Producers>,
-        /// The component's registry metadata section, if any.
-        registry_metadata: Option<RegistryMetadata>,
         /// The component's author section, if any.
         author: Option<Author>,
         /// Human-readable description of the binary
@@ -39,8 +35,6 @@ pub enum Metadata {
         name: Option<String>,
         /// The module's producers section, if any.
         producers: Option<Producers>,
-        /// The module's registry metadata section, if any.
-        registry_metadata: Option<RegistryMetadata>,
         /// The component's author section, if any.
         author: Option<Author>,
         /// Human-readable description of the binary
@@ -116,14 +110,6 @@ impl Metadata {
                             .expect("non-empty metadata stack")
                             .set_producers(producers);
                     }
-                    KnownCustom::Unknown if c.name() == "registry-metadata" => {
-                        let registry: RegistryMetadata =
-                            RegistryMetadata::from_bytes(&c.data(), 0)?;
-                        metadata
-                            .last_mut()
-                            .expect("non-empty metadata stack")
-                            .set_registry_metadata(registry);
-                    }
                     KnownCustom::Unknown if c.name() == "author" => {
                         let a = Author::parse_custom_section(&c)?;
                         match metadata.last_mut().expect("non-empty metadata stack") {
@@ -170,7 +156,6 @@ impl Metadata {
             description: None,
             licenses: None,
             source: None,
-            registry_metadata: None,
             children: Vec::new(),
             range,
         }
@@ -184,7 +169,6 @@ impl Metadata {
             description: None,
             licenses: None,
             source: None,
-            registry_metadata: None,
             range,
         }
     }
@@ -200,16 +184,6 @@ impl Metadata {
             Metadata::Component { producers, .. } => *producers = Some(p),
         }
     }
-    fn set_registry_metadata(&mut self, r: RegistryMetadata) {
-        match self {
-            Metadata::Module {
-                registry_metadata, ..
-            } => *registry_metadata = Some(r),
-            Metadata::Component {
-                registry_metadata, ..
-            } => *registry_metadata = Some(r),
-        }
-    }
     fn push_child(&mut self, child: Self) {
         match self {
             Metadata::Module { .. } => panic!("module shouldnt have children"),
@@ -221,10 +195,7 @@ impl Metadata {
         let spaces = std::iter::repeat(" ").take(indent).collect::<String>();
         match self {
             Metadata::Module {
-                name,
-                producers,
-                registry_metadata,
-                ..
+                name, producers, ..
             } => {
                 if let Some(name) = name {
                     writeln!(f, "{spaces}module {name}:")?;
@@ -234,15 +205,11 @@ impl Metadata {
                 if let Some(producers) = producers {
                     producers.display(f, indent + 4)?;
                 }
-                if let Some(registry_metadata) = registry_metadata {
-                    registry_metadata.display(f, indent + 4)?;
-                }
                 Ok(())
             }
             Metadata::Component {
                 name,
                 producers,
-                registry_metadata,
                 children,
                 ..
             } => {
@@ -254,9 +221,6 @@ impl Metadata {
                 if let Some(producers) = producers {
                     producers.display(f, indent + 4)?;
                 }
-                if let Some(registry_metadata) = registry_metadata {
-                    registry_metadata.display(f, indent + 4)?;
-                }
                 for c in children {
                     c.display(f, indent + 4)?;
                 }

diff --git a/crates/wasm-metadata/src/producers.rs b/crates/wasm-metadata/src/producers.rs
@@ -148,7 +148,7 @@ impl Producers {
     /// Merge into an existing wasm module. Rewrites the module with this producers section
     /// merged into its existing one, or adds this producers section if none is present.
     pub fn add_to_wasm(&self, input: &[u8]) -> Result<Vec<u8>> {
-        rewrite_wasm(&None, self, &None, &None, &None, &None, None, input)
+        rewrite_wasm(&None, self, &None, &None, &None, &None, input)
     }
 
     pub(crate) fn display(&self, f: &mut fmt::Formatter, indent: usize) -> fmt::Result {