Update to libcnb 0.12.0 and buildpack API 0.9 (#463)

heroku · May 2, 2023 · 94c9cef · 94c9cef
1 parent becafb5
commit 94c9cef
Show file tree

Hide file tree

Showing 13 changed files with 61 additions and 137 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -14,8 +14,8 @@ edition = "2021"
 publish = false
 
 [workspace.dependencies]
-libcnb = "0.11"
-libcnb-test = "0.11"
-libherokubuildpack = "0.11"
+libcnb = "0.12"
+libcnb-test = "0.12"
+libherokubuildpack = "0.12"
 toml = "0.7"
 buildpacks-jvm-shared = { path = "buildpacks-jvm-shared" }
diff --git a/buildpacks/jvm-function-invoker/CHANGELOG.md b/buildpacks/jvm-function-invoker/CHANGELOG.md
@@ -4,6 +4,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+* Upgrade `libcnb` and `libherokubuildpack` to `0.12.0`. ([#463](https://github.com/heroku/buildpacks-jvm/pull/463))
+* The buildpack now implements Buildpack API 0.9 instead of 0.8, and so requires `lifecycle` 0.15.x or newer. ([#463](https://github.com/heroku/buildpacks-jvm/pull/463))
+
 ## [0.6.7] 2023/01/19
 * Update `sf-fx-runtime-java` from `1.1.2` to `1.1.3`.
 

diff --git a/buildpacks/jvm-function-invoker/buildpack.toml b/buildpacks/jvm-function-invoker/buildpack.toml
@@ -1,4 +1,4 @@
-api = "0.8"
+api = "0.9"
 
 [buildpack]
 id = "heroku/jvm-function-invoker"

diff --git a/buildpacks/jvm-function-invoker/src/main.rs b/buildpacks/jvm-function-invoker/src/main.rs
@@ -87,7 +87,7 @@ impl Buildpack for JvmFunctionInvokerBuildpack {
                     .process(
                         ProcessBuilder::new(
                             process_type!("web"),
-                            layers::opt::JVM_RUNTIME_SCRIPT_NAME,
+                            ["bash", layers::opt::JVM_RUNTIME_SCRIPT_NAME],
                         )
                         .default(true)
                         .build(),

diff --git a/buildpacks/jvm/CHANGELOG.md b/buildpacks/jvm/CHANGELOG.md
@@ -4,6 +4,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+* Upgrade `libcnb` and `libherokubuildpack` to `0.12.0`. ([#463](https://github.com/heroku/buildpacks-jvm/pull/463))
+* The buildpack now implements Buildpack API 0.9 instead of 0.8, and so requires `lifecycle` 0.15.x or newer. ([#463](https://github.com/heroku/buildpacks-jvm/pull/463))
+
 ## [1.0.9] 2023/04/24
 
 * Default version for **OpenJDK 8** is now `1.8.0_372`. ([#459](https://github.com/heroku/buildpacks-jvm/pull/459))

diff --git a/buildpacks/jvm/buildpack.toml b/buildpacks/jvm/buildpack.toml
@@ -1,4 +1,4 @@
-api = "0.8"
+api = "0.9"
 
 [buildpack]
 id = "heroku/jvm"

diff --git a/buildpacks/maven/CHANGELOG.md b/buildpacks/maven/CHANGELOG.md
@@ -4,6 +4,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+* Upgrade `libcnb` and `libherokubuildpack` to `0.12.0`. ([#463](https://github.com/heroku/buildpacks-jvm/pull/463))
+* The buildpack now implements Buildpack API 0.9 instead of 0.8, and so requires `lifecycle` 0.15.x or newer. ([#463](https://github.com/heroku/buildpacks-jvm/pull/463))
+
 ## [1.0.3] 2022/09/28
 
 * Upgrade `libcnb` and `libherokubuildpack` to `0.11.0`. ([#371](https://github.com/heroku/buildpacks-jvm/pull/371))

diff --git a/buildpacks/maven/buildpack.toml b/buildpacks/maven/buildpack.toml
@@ -1,4 +1,4 @@
-api = "0.8"
+api = "0.9"
 
 [buildpack]
 id = "heroku/maven"

diff --git a/buildpacks/maven/src/framework.rs b/buildpacks/maven/src/framework.rs
@@ -65,24 +65,30 @@ pub(crate) fn default_app_process<P: AsRef<Path>>(
         (Some(Framework::SpringBoot), Some(main_jar_file_path)) => Some(
             ProcessBuilder::new(
                 process_type!("web"),
-                format!(
-                    "java -Dserver.port=$PORT $JAVA_OPTS -jar {}",
-                    main_jar_file_path.to_string_lossy()
-                ),
+                [
+                    "bash",
+                    "-c",
+                    &format!(
+                        "java -Dserver.port=$PORT $JAVA_OPTS -jar {}",
+                        main_jar_file_path.to_string_lossy()
+                    ),
+                ],
             )
-            .direct(false)
             .default(true)
             .build(),
         ),
         (Some(Framework::WildflySwarm), Some(main_jar_file_path)) => Some(
             ProcessBuilder::new(
                 process_type!("web"),
-                format!(
-                    "java -Dswarm.http.port=$PORT $JAVA_OPTS -jar {}",
-                    main_jar_file_path.to_string_lossy()
-                ),
+                [
+                    "bash",
+                    "-c",
+                    &format!(
+                        "java -Dswarm.http.port=$PORT $JAVA_OPTS -jar {}",
+                        main_jar_file_path.to_string_lossy()
+                    ),
+                ],
             )
-            .direct(false)
             .default(true)
             .build(),
         ),

diff --git a/buildpacks/sbt/buildpack.toml b/buildpacks/sbt/buildpack.toml
@@ -1,4 +1,4 @@
-api = "0.8"
+api = "0.9"
 
 [buildpack]
 id = "heroku/sbt"

diff --git a/buildpacks/sbt/src/build_configuration.rs b/buildpacks/sbt/src/build_configuration.rs
@@ -1,11 +1,10 @@
 use crate::errors::ScalaBuildpackError;
 use crate::errors::ScalaBuildpackError::{
-    CouldNotConvertEnvironmentValueIntoString, CouldNotParseBooleanFromEnvironment,
-    CouldNotParseBooleanFromProperty, CouldNotParseListConfigurationFromEnvironment,
-    CouldNotParseListConfigurationFromProperty, CouldNotParseListConfigurationFromSbtOptsFile,
-    CouldNotReadSbtOptsFile, InvalidSbtPropertiesFile, MissingDeclaredSbtVersion,
-    MissingSbtBuildPropertiesFile, SbtPropertiesFileReadError, SbtVersionNotInSemverFormat,
-    UnsupportedSbtVersion,
+    CouldNotParseBooleanFromEnvironment, CouldNotParseBooleanFromProperty,
+    CouldNotParseListConfigurationFromEnvironment, CouldNotParseListConfigurationFromProperty,
+    CouldNotParseListConfigurationFromSbtOptsFile, CouldNotReadSbtOptsFile,
+    InvalidSbtPropertiesFile, MissingDeclaredSbtVersion, MissingSbtBuildPropertiesFile,
+    SbtPropertiesFileReadError, SbtVersionNotInSemverFormat, UnsupportedSbtVersion,
 };
 use libcnb::Env;
 use semver::{Version, VersionReq};
@@ -32,7 +31,7 @@ pub(crate) fn create_build_config<P: Into<PathBuf>>(
     let sbt_opts_file = app_dir.join(".sbtopts");
     let properties = read_system_properties(&app_dir);
     Ok(BuildConfiguration {
-        sbt_project: read_string_config("sbt.project", &properties, "SBT_PROJECT", env)?,
+        sbt_project: read_string_config("sbt.project", &properties, "SBT_PROJECT", env),
         sbt_pre_tasks: read_string_list_config("sbt.pre-tasks", &properties, "SBT_PRE_TASKS", env)?,
         sbt_tasks: read_string_list_config("sbt.tasks", &properties, "SBT_TASKS", env)?,
         sbt_clean: read_boolean_config("sbt.clean", &properties, "SBT_CLEAN", env)?,
@@ -58,19 +57,11 @@ fn read_string_config(
     system_properties: &HashMap<String, String>,
     environment_variable_name: &str,
     env: &Env,
-) -> Result<Option<String>, ScalaBuildpackError> {
-    if let Some(value) = system_properties.get(property_name) {
-        return Ok(Some(value.clone()));
-    }
-
-    if let Some(value) = env.get(environment_variable_name) {
-        let value = value.into_string().map_err(|e| {
-            CouldNotConvertEnvironmentValueIntoString(environment_variable_name.to_string(), e)
-        })?;
-        return Ok(Some(value));
-    }
-
-    Ok(None)
+) -> Option<String> {
+    system_properties
+        .get(property_name)
+        .cloned()
+        .or(env.get_string_lossy(environment_variable_name))
 }
 
 fn read_boolean_config(
@@ -86,10 +77,7 @@ fn read_boolean_config(
             .map_err(|e| CouldNotParseBooleanFromProperty(property_name.to_string(), e));
     }
 
-    if let Some(value) = env.get(environment_variable_name) {
-        let value = value.into_string().map_err(|e| {
-            CouldNotConvertEnvironmentValueIntoString(environment_variable_name.to_string(), e)
-        })?;
+    if let Some(value) = env.get_string_lossy(environment_variable_name) {
         return value.parse::<bool>().map(Some).map_err(|e| {
             CouldNotParseBooleanFromEnvironment(environment_variable_name.to_string(), e)
         });
@@ -110,10 +98,7 @@ fn read_string_list_config(
             .map_err(|e| CouldNotParseListConfigurationFromProperty(property_name.to_string(), e));
     }
 
-    if let Some(value) = env.get(environment_variable_name) {
-        let value = value.into_string().map_err(|e| {
-            CouldNotConvertEnvironmentValueIntoString(environment_variable_name.to_string(), e)
-        })?;
+    if let Some(value) = env.get_string_lossy(environment_variable_name) {
         return shell_words::split(&value).map(Some).map_err(|e| {
             CouldNotParseListConfigurationFromEnvironment(environment_variable_name.to_string(), e)
         });
@@ -137,10 +122,7 @@ fn read_sbt_opts(
         configured = true;
     }
 
-    if let Some(value) = env.get("SBT_OPTS") {
-        let value = value
-            .into_string()
-            .map_err(|e| CouldNotConvertEnvironmentValueIntoString("SBT_OPTS".to_string(), e))?;
+    if let Some(value) = env.get_string_lossy("SBT_OPTS") {
         let mut opts = shell_words::split(&value).map_err(|e| {
             CouldNotParseListConfigurationFromEnvironment("SBT_OPTS".to_string(), e)
         })?;
@@ -204,10 +186,9 @@ mod create_build_config_tests {
         MissingSbtBuildPropertiesFile, UnsupportedSbtVersion, Version,
     };
     use crate::errors::ScalaBuildpackError;
-    use std::ffi::{OsStr, OsString};
+    use std::ffi::OsString;
     use std::fs::{create_dir, write};
     use std::io::BufWriter;
-    use std::os::unix::ffi::OsStrExt;
     use tempfile::{tempdir, TempDir};
 
     macro_rules! assert_err {
@@ -236,11 +217,6 @@ mod create_build_config_tests {
         java_properties::write(writer, &properties).unwrap();
     }
 
-    fn invalid_unicode_os_string() -> OsString {
-        let invalid_unicode_sequence = [0x66, 0x6f, 0x80, 0x6f];
-        OsStr::from_bytes(&invalid_unicode_sequence[..]).to_os_string()
-    }
-
     #[test]
     fn create_build_config_raises_error_if_project_is_missing_the_sbt_build_properties_file() {
         let app_dir = tempdir().unwrap();
@@ -385,17 +361,6 @@ mod create_build_config_tests {
         assert_eq!(config.sbt_project, Some(String::from("testProjectName")));
     }
 
-    #[test]
-    fn create_build_config_raises_error_when_sbt_project_is_configured_from_environment_with_non_unicode_bytes(
-    ) {
-        let app_dir = tempdir().unwrap();
-        let mut env = Env::new();
-        set_sbt_version(&app_dir, "1.8.2");
-        env.insert("SBT_PROJECT", invalid_unicode_os_string());
-        let err = create_build_config(app_dir.path(), &env).unwrap_err();
-        assert_err!(err, ScalaBuildpackError::CouldNotConvertEnvironmentValueIntoString(name, _) if name == "SBT_PROJECT");
-    }
-
     #[test]
     fn create_build_config_when_sbt_pre_tasks_is_not_configured() {
         let app_dir = tempdir().unwrap();
@@ -462,17 +427,6 @@ mod create_build_config_tests {
         assert_err!(err, ScalaBuildpackError::CouldNotParseListConfigurationFromEnvironment(name, _) if name == "SBT_PRE_TASKS");
     }
 
-    #[test]
-    fn create_build_config_raises_error_when_sbt_pre_tasks_environment_variable_contains_non_unicode_bytes(
-    ) {
-        let app_dir = tempdir().unwrap();
-        let mut env = Env::new();
-        env.insert("SBT_PRE_TASKS", invalid_unicode_os_string());
-        set_sbt_version(&app_dir, "1.8.2");
-        let err = create_build_config(app_dir.path(), &env).unwrap_err();
-        assert_err!(err, ScalaBuildpackError::CouldNotConvertEnvironmentValueIntoString(name, _) if name == "SBT_PRE_TASKS");
-    }
-
     #[test]
     fn create_build_config_when_sbt_clean_is_not_configured() {
         let app_dir = tempdir().unwrap();
@@ -524,17 +478,6 @@ mod create_build_config_tests {
         assert_err!(err, ScalaBuildpackError::CouldNotParseBooleanFromEnvironment(name, _) if name == "SBT_CLEAN");
     }
 
-    #[test]
-    fn create_build_config_when_sbt_clean_is_configured_from_env_and_value_contains_non_unicode_bytes(
-    ) {
-        let app_dir = tempdir().unwrap();
-        let mut env = Env::new();
-        env.insert("SBT_CLEAN", invalid_unicode_os_string());
-        set_sbt_version(&app_dir, "1.8.2");
-        let err = create_build_config(app_dir.path(), &env).unwrap_err();
-        assert_err!(err, ScalaBuildpackError::CouldNotConvertEnvironmentValueIntoString(name, _) if name == "SBT_CLEAN");
-    }
-
     #[test]
     fn create_build_config_when_sbt_clean_prefers_system_property_over_env() {
         let app_dir = tempdir().unwrap();
@@ -609,17 +552,6 @@ mod create_build_config_tests {
         assert_err!(err, ScalaBuildpackError::CouldNotParseListConfigurationFromEnvironment(name, _) if name == "SBT_TASKS");
     }
 
-    #[test]
-    fn create_build_config_raises_error_when_sbt_tasks_environment_variable_contains_non_unicode_bytes(
-    ) {
-        let app_dir = tempdir().unwrap();
-        let mut env = Env::new();
-        env.insert("SBT_TASKS", invalid_unicode_os_string());
-        set_sbt_version(&app_dir, "1.8.2");
-        let err = create_build_config(app_dir.path(), &env).unwrap_err();
-        assert_err!(err, ScalaBuildpackError::CouldNotConvertEnvironmentValueIntoString(name, _) if name == "SBT_TASKS");
-    }
-
     #[test]
     fn create_build_config_when_sbt_opts_is_not_configured() {
         let app_dir = tempdir().unwrap();
@@ -690,15 +622,4 @@ mod create_build_config_tests {
         let err = create_build_config(app_dir.path(), &env).unwrap_err();
         assert_err!(err, ScalaBuildpackError::CouldNotParseListConfigurationFromEnvironment(name, _) if name == "SBT_OPTS");
     }
-
-    #[test]
-    fn create_build_config_raises_error_when_sbt_opts_environment_variable_contains_non_unicode_bytes(
-    ) {
-        let app_dir = tempdir().unwrap();
-        let mut env = Env::new();
-        env.insert("SBT_OPTS", invalid_unicode_os_string());
-        set_sbt_version(&app_dir, "1.8.2");
-        let err = create_build_config(app_dir.path(), &env).unwrap_err();
-        assert_err!(err, ScalaBuildpackError::CouldNotConvertEnvironmentValueIntoString(name, _) if name == "SBT_OPTS");
-    }
 }