Update libcnb to 0.10.0 (#98)

heroku · Aug 31, 2022 · f8211c7 · f8211c7
1 parent afb8163
commit f8211c7
Show file tree

Hide file tree

Showing 5 changed files with 70 additions and 29 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ## Unreleased
 
+- Upgrade `libcnb` and `libherokubuildpack` to `0.10.0`. ([#98](https://github.com/heroku/procfile-cnb/pull/98))
+- Buildpack now implements buildpack API version `0.8` and so requires lifecycle version `0.14.x` or newer. ([#98](https://github.com/heroku/procfile-cnb/pull/98))
+
 ## 1.0.2
 
 - Strip buildpack binary for reduced builder image size (thanks to [`libcnb-cargo` v0.5.0](https://github.com/heroku/libcnb.rs/releases/tag/libcnb-cargo%2Fv0.5.0)).

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -8,10 +8,10 @@ rust-version = "1.61"
 
 [dependencies]
 indoc = "1.0.7"
-libcnb = "0.9.0"
-libherokubuildpack = "0.9.0"
+libcnb = "0.10.0"
+libherokubuildpack = "0.10.0"
 linked-hash-map = "0.5.6"
 regex = "1.6.0"
 
 [dev-dependencies]
-libcnb-test = "0.6.0"
+libcnb-test = "0.10.0"
diff --git a/buildpack.toml b/buildpack.toml
@@ -1,4 +1,4 @@
-api = "0.6"
+api = "0.8"
 
 [buildpack]
 id = "heroku/procfile"
@@ -12,7 +12,7 @@ keywords = ["procfile", "processes"]
 id = "*"
 
 # Explicit stack identifiers are required for `pack` versions `0.24.0`
-# and older. `heroku-*` stack identifiers may be removed once the buildpack 
+# and older. `heroku-*` stack identifiers may be removed once the buildpack
 # api is upgraded to something greater than "0.6".
 [[stacks]]
 id = "heroku-18"

diff --git a/src/launch.rs b/src/launch.rs
@@ -1,12 +1,16 @@
 use crate::Procfile;
-use libcnb::data::launch::{Launch, Process, ProcessType};
+use libcnb::data::launch::{Launch, Process, ProcessType, WorkingDirectory};
 use std::str::FromStr;
 
 impl TryFrom<Procfile> for Launch {
     type Error = ProcfileConversionError;
 
     fn try_from(value: Procfile) -> Result<Self, Self::Error> {
-        let mut launch = Launch::new();
+        let mut launch = Launch {
+            labels: vec![],
+            processes: vec![],
+            slices: vec![],
+        };
 
         for (key, value) in value.processes {
             launch.processes.push(Process {
@@ -16,6 +20,7 @@ impl TryFrom<Procfile> for Launch {
                 args: Vec::<String>::new(),
                 direct: false,
                 default: key == "web",
+                working_directory: WorkingDirectory::App,
             });
         }
 
@@ -37,7 +42,7 @@ pub enum ProcfileConversionError {
 #[cfg(test)]
 mod test {
     use crate::Procfile;
-    use libcnb::data::launch::{Launch, Process};
+    use libcnb::data::launch::{Launch, Process, WorkingDirectory};
     use libcnb::data::process_type;
 
     #[test]
@@ -54,7 +59,8 @@ mod test {
                 command: String::from("web_command"),
                 args: vec![],
                 direct: false,
-                default: true
+                default: true,
+                working_directory: WorkingDirectory::App,
             }]
         );
     }
@@ -73,7 +79,8 @@ mod test {
                 command: String::from("xxx_command"),
                 args: vec![],
                 direct: false,
-                default: true
+                default: true,
+                working_directory: WorkingDirectory::App,
             }]
         );
     }
@@ -94,14 +101,16 @@ mod test {
                     command: String::from("web_command"),
                     args: vec![],
                     direct: false,
-                    default: true
+                    default: true,
+                    working_directory: WorkingDirectory::App,
                 },
                 Process {
                     r#type: process_type!("foo"),
                     command: String::from("foo_command"),
                     args: vec![],
                     direct: false,
-                    default: false
+                    default: false,
+                    working_directory: WorkingDirectory::App,
                 }
             ]
         );
@@ -123,14 +132,16 @@ mod test {
                     command: String::from("foo_command"),
                     args: vec![],
                     direct: false,
-                    default: false
+                    default: false,
+                    working_directory: WorkingDirectory::App,
                 },
                 Process {
                     r#type: process_type!("bar"),
                     command: String::from("bar_command"),
                     args: vec![],
                     direct: false,
-                    default: false
+                    default: false,
+                    working_directory: WorkingDirectory::App,
                 }
             ]
         );
@@ -161,21 +172,24 @@ mod test {
                     command: String::from("aaa_command"),
                     args: vec![],
                     direct: false,
-                    default: false
+                    default: false,
+                    working_directory: WorkingDirectory::App,
                 },
                 Process {
                     r#type: process_type!("ccc"),
                     command: String::from("ccc_command"),
                     args: vec![],
                     direct: false,
-                    default: false
+                    default: false,
+                    working_directory: WorkingDirectory::App,
                 },
                 Process {
                     r#type: process_type!("bbb"),
                     command: String::from("bbb_command"),
                     args: vec![],
                     direct: false,
-                    default: false
+                    default: false,
+                    working_directory: WorkingDirectory::App,
                 },
             ]
         );