Fixed issue where no default source spec if found when no source provided

Fixed issue with the default values for the meta struct when no values are provided

Reverted du command tests back as it was related to the issue with the source spec.

Signed-off-by: Nichol Yip <[email protected]>

Author: Nichol Yip

crates/spk-cli/cmd-du/src/cmd_du_test.rs

@@ -72,7 +72,7 @@ async fn test_du_trivially_works() {
 
     let mut expected_output = vec![
         "2local/my-pkg/1.0.0/3I42H3S6/:build/spk/pkg/my-pkg/1.0.0/3I42H3S6/options.json",
-        "82local/my-pkg/1.0.0/3I42H3S6/:build/spk/pkg/my-pkg/1.0.0/3I42H3S6/spec.yaml",
+        "160local/my-pkg/1.0.0/3I42H3S6/:build/spk/pkg/my-pkg/1.0.0/3I42H3S6/spec.yaml",
         "0local/my-pkg/1.0.0/3I42H3S6/:build/spk/pkg/my-pkg/1.0.0/3I42H3S6/build.cmpt",
         "17local/my-pkg/1.0.0/3I42H3S6/:build/spk/pkg/my-pkg/1.0.0/3I42H3S6/build.sh",
         "0local/my-pkg/1.0.0/3I42H3S6/:run/spk/pkg/my-pkg/1.0.0/3I42H3S6/options.json",
@@ -343,7 +343,7 @@ async fn test_du_summarize_output_enabled() {
     let mut opt = Opt::try_parse_from(["du", "local/my-pkg", "-s"]).unwrap();
     opt.du.run().await.unwrap();
 
-    let expected_output = format!("101local/my-pkg/{}", "".red());
+    let expected_output = format!("179local/my-pkg/{}", "".red());
     let mut generated_output = opt.du.output.vec.lock().unwrap()[0].clone();
     generated_output.retain(|c| !c.is_whitespace());
 
@@ -382,7 +382,7 @@ async fn test_du_summarize_output_is_not_enabled() {
         "2local/my-pkg/1.0.0/3I42H3S6/:build/spk/pkg/my-pkg/1.0.0/3I42H3S6/options.json",
         "0local/my-pkg/1.0.0/3I42H3S6/:build/spk/pkg/my-pkg/1.0.0/3I42H3S6/build.cmpt",
         "17local/my-pkg/1.0.0/3I42H3S6/:build/spk/pkg/my-pkg/1.0.0/3I42H3S6/build.sh",
-        "82local/my-pkg/1.0.0/3I42H3S6/:build/spk/pkg/my-pkg/1.0.0/3I42H3S6/spec.yaml",
+        "160local/my-pkg/1.0.0/3I42H3S6/:build/spk/pkg/my-pkg/1.0.0/3I42H3S6/spec.yaml",
         "0local/my-pkg/1.0.0/3I42H3S6/:run/spk/pkg/my-pkg/1.0.0/3I42H3S6/spec.yaml",
         "0local/my-pkg/1.0.0/3I42H3S6/:run/spk/pkg/my-pkg/1.0.0/3I42H3S6/options.json",
         "0local/my-pkg/1.0.0/3I42H3S6/:run/spk/pkg/my-pkg/1.0.0/3I42H3S6/run.cmpt",
@@ -440,7 +440,7 @@ async fn test_deprecate_flag() {
 
     let mut opt_with_deprecate_flag = Opt::try_parse_from(["du", "local/my-pkg", "-ds"]).unwrap();
     opt_with_deprecate_flag.du.run().await.unwrap();
-    let expected_output = format!("118local/my-pkg/{}", "DEPRECATED".red());
+    let expected_output = format!("196local/my-pkg/{}", "DEPRECATED".red());
     let mut generated_output = opt_with_deprecate_flag.du.output.vec.lock().unwrap()[0].clone();
     generated_output.retain(|c| !c.is_whitespace());
     assert_eq!(expected_output, generated_output);

crates/spk-schema/src/meta.rs

@@ -53,8 +53,8 @@ impl Meta {
 struct MetaVisitor {
     description: Option<String>,
     homepage: Option<String>,
-    license: String,
-    labels: BTreeMap<String, String>,
+    license: Option<String>,
+    labels: Option<BTreeMap<String, String>>,
     #[field_names_as_array(skip)]
     lints: Vec<String>,
 }
@@ -70,8 +70,8 @@ impl From<MetaVisitor> for Meta {
         Self {
             description: value.description,
             homepage: value.homepage,
-            license: value.license,
-            labels: value.labels,
+            license: value.license.unwrap_or(Meta::default_license()),
+            labels: value.labels.unwrap_or_default(),
         }
     }
 }
@@ -107,10 +107,10 @@ impl<'de> serde::de::Visitor<'de> for MetaVisitor {
     {
         while let Some(key) = map.next_key::<Stringified>()? {
             match key.as_str() {
-                "description" => self.description = map.next_value::<Option<String>>()?,
-                "homepage" => self.homepage = map.next_value::<Option<String>>()?,
-                "license" => self.license = map.next_value::<Stringified>()?.0,
-                "labels" => self.labels = map.next_value::<BTreeMap<String, String>>()?,
+                "description" => self.description = Some(map.next_value::<Stringified>()?.0),
+                "homepage" => self.homepage = Some(map.next_value::<Stringified>()?.0),
+                "license" => self.license = Some(map.next_value::<Stringified>()?.0),
+                "labels" => self.labels = Some(map.next_value::<BTreeMap<String, String>>()?),
                 unknown_key => {
                     let lint =
                         UnknownKey::new(unknown_key, MetaVisitor::FIELD_NAMES_AS_ARRAY.to_vec());

crates/spk-schema/src/v0/spec.rs

@@ -889,13 +889,17 @@ where
             meta: value.meta.take().unwrap_or_default().item,
             compat: value.compat.take().unwrap_or_default(),
             deprecated: value.deprecated.take().unwrap_or_default(),
-            sources: value
-                .sources
-                .take()
-                .unwrap_or_default()
-                .iter()
-                .map(|l| l.item.clone())
-                .collect_vec(),
+            sources: if value.sources.is_none() {
+                vec![SourceSpec::default()]
+            } else {
+                value
+                    .sources
+                    .take()
+                    .expect("list of sources")
+                    .iter()
+                    .map(|l| l.item.clone())
+                    .collect_vec()
+            },
             build: match value.build.take() {
                 Some(build_spec) if !value.check_build_spec => {
                     // Safety: see the SpecVisitor::package constructor

crates/spk-schema/src/v0/spec_test.rs

@@ -43,6 +43,7 @@ fn test_sources_relative_to_spec_file(tmpdir: tempfile::TempDir) {
         .unwrap()
         .generate_source_build(&spec_dir)
         .unwrap();
+    println!("{:?}", spec);
     if let Some(super::SourceSpec::Local(local)) = spec.sources.get(0) {
         assert_eq!(local.path, spec_dir);
     } else {