feat: allow apt-key to be used with apt repositories

src/actions/package/mod.rs

@@ -19,14 +19,17 @@ pub struct Package {
     #[serde(default)]
     repository: Option<String>,
 
+    #[serde(default)]
+    key: Option<String>,
+
     #[serde(default)]
     extra_args: Vec<String>,
 
     #[serde(default)]
     variants: HashMap<os_info::Type, PackageVariant>,
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize)]
+#[derive(Clone, Debug, Default, Serialize, Deserialize)]
 pub struct PackageVariant {
     name: Option<String>,
 
@@ -39,6 +42,9 @@ pub struct PackageVariant {
     #[serde(default)]
     repository: Option<String>,
 
+    #[serde(default)]
+    key: Option<String>,
+
     #[serde(default)]
     extra_args: Vec<String>,
 }
@@ -66,6 +72,7 @@ impl From<&Package> for PackageVariant {
                 list: package.list.clone(),
                 provider: package.provider.clone(),
                 repository: package.repository.clone(),
+                key: package.key.clone(),
                 extra_args: package.extra_args.clone(),
             };
         };
@@ -79,6 +86,7 @@ impl From<&Package> for PackageVariant {
             list: package.list.clone(),
             provider: variant.provider.clone(),
             repository: variant.repository.clone(),
+            key: package.key.clone(),
             extra_args: variant.extra_args.clone(),
         };
 
@@ -94,6 +102,10 @@ impl From<&Package> for PackageVariant {
             package.repository = variant.repository.clone();
         };
 
+        if variant.key.is_some() {
+            package.key = variant.key.clone();
+        }
+
         // I've been torn about this, but here's my logic.
         // Variants, when being used, shouldn't use the provider
         // of the main definition; as we're not the core OS.

src/actions/package/providers/aptitude.rs

@@ -41,6 +41,7 @@ impl PackageProvider for Aptitude {
                     String::from("install"),
                     String::from("--yes"),
                     String::from("software-properties-common"),
+                    String::from("curl"),
                     String::from("gpg"),
                 ],
                 environment: self.env(),
@@ -57,7 +58,33 @@ impl PackageProvider for Aptitude {
     }
 
     fn add_repository(&self, package: &PackageVariant) -> Vec<Step> {
-        vec![
+        if package.repository.is_none() {
+            return vec![];
+        }
+
+        let mut steps: Vec<Step> = vec![];
+
+        if package.key.is_some() {
+            steps.push(Step {
+                atom: Box::new(Exec {
+                    command: String::from("bash"),
+                    arguments: vec![
+                        String::from("-c"),
+                        String::from(format!(
+                            "curl {} | apt-key add -",
+                            package.key.clone().unwrap()
+                        )),
+                    ],
+                    environment: self.env(),
+                    privileged: true,
+                    ..Default::default()
+                }),
+                initializers: vec![],
+                finalizers: vec![],
+            });
+        }
+
+        steps.extend(vec![
             Step {
                 atom: Box::new(Exec {
                     command: String::from("apt-add-repository"),
@@ -80,7 +107,9 @@ impl PackageProvider for Aptitude {
                 initializers: vec![],
                 finalizers: vec![],
             },
-        ]
+        ]);
+
+        steps
     }
 
     fn query(&self, package: &PackageVariant) -> Vec<String> {
@@ -105,3 +134,54 @@ impl PackageProvider for Aptitude {
         }]
     }
 }
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    // These tests are really weak at the moment, but that's because I'm not
+    // sure how to add derive(Debug,Default) to struct Step
+    // TODO: Learn how to fix this
+
+    #[test]
+    fn test_add_repository_simple() {
+        let package = PackageVariant {
+            name: Some(String::from("test")),
+            ..Default::default()
+        };
+
+        let aptitude = Aptitude {};
+        let steps = aptitude.add_repository(&package);
+
+        assert_eq!(steps.len(), 0);
+    }
+
+    #[test]
+    fn test_add_repository_without_key() {
+        let package = PackageVariant {
+            name: Some(String::from("test")),
+            repository: Some(String::from("repository")),
+            ..Default::default()
+        };
+
+        let aptitude = Aptitude {};
+        let steps = aptitude.add_repository(&package);
+
+        assert_eq!(steps.len(), 2);
+    }
+
+    #[test]
+    fn test_add_repository_with_key() {
+        let package = PackageVariant {
+            name: Some(String::from("test")),
+            repository: Some(String::from("repository")),
+            key: Some(String::from("key")),
+            ..Default::default()
+        };
+
+        let aptitude = Aptitude {};
+        let steps = aptitude.add_repository(&package);
+
+        assert_eq!(steps.len(), 3);
+    }
+}