diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 986fecb..9654e93 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,7 +1,7 @@ -# Contributing Guide For Heroku's Debian Packages Buildpack +# Contributing Guide For Heroku's `.deb` Packages Buildpack This page lists the operational governance model of this project, as well as the recommendations and requirements for -how to best contribute to `heroku/buildpacks-debian-packages`. We strive to obey these as best as possible. As always, +how to best contribute to `heroku/buildpacks-deb-packages`. We strive to obey these as best as possible. As always, thanks for contributing – we hope these guidelines make it easier and shed some light on our approach and processes. # Governance Model @@ -17,9 +17,9 @@ Use GitHub Issues page to submit issues, enhancement requests and discuss ideas. ### Bug Reports and Fixes -- If you find a bug, please search for it in the [Issues](https://github.com/heroku/buildpacks-debian-packages/issues), +- If you find a bug, please search for it in the [Issues](https://github.com/heroku/buildpacks-deb-packages/issues), and if it isn't already tracked, - [create a new issue](https://github.com/heroku/buildpacks-debian-packages/issues/new). Fill out the "Bug Report" + [create a new issue](https://github.com/heroku/buildpacks-deb-packages/issues/new). Fill out the "Bug Report" section of the issue template. Even if an Issue is closed, feel free to comment and add details, it will still be reviewed. - Issues that have already been identified as a bug (note: able to reproduce) will be labelled `bug`. @@ -29,7 +29,7 @@ Use GitHub Issues page to submit issues, enhancement requests and discuss ideas. ### New Features - If you'd like to add new functionality to this project, describe the problem you want to solve in - a [new Issue](https://github.com/heroku/buildpacks-debian-packages/issues/new). + a [new Issue](https://github.com/heroku/buildpacks-deb-packages/issues/new). - Issues that have been identified as a feature request will be labelled `enhancement`. - If you'd like to implement the new feature, please wait for feedback from the project maintainers before spending too much time writing the code. In some cases, `enhancement`s may @@ -42,7 +42,7 @@ Use GitHub Issues page to submit issues, enhancement requests and discuss ideas. done, or you have any other change, we would be happy to hear about it! - If it's a trivial change, go ahead and [send a Pull Request](#creating-a-pull-request) with the changes you have in mind. -- If not, [open an Issue](https://github.com/heroku/buildpacks-debian-packages/issues/new) to discuss the idea first. +- If not, [open an Issue](https://github.com/heroku/buildpacks-deb-packages/issues/new) to discuss the idea first. If you're new to our project and looking for some way to make your first contribution, look for Issues labelled `good first contribution`. diff --git a/Cargo.lock b/Cargo.lock index 3018485..5bcf95a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -279,7 +279,7 @@ dependencies = [ ] [[package]] -name = "buildpacks-debian-packages" +name = "buildpacks-deb-packages" version = "0.0.0" dependencies = [ "anyhow", diff --git a/Cargo.toml b/Cargo.toml index c346a86..bdc5e03 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "buildpacks-debian-packages" +name = "buildpacks-deb-packages" edition = "2021" rust-version = "1.76" diff --git a/README.md b/README.md index 9af8b08..39642a7 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,14 @@ -# Heroku's Debian Packages Cloud Native Buildpack +# Heroku's `.deb` Packages Buildpack [![CI][ci-badge]][ci-link] [![Registry][registry-badge]][registry-link] -`heroku/debian-packages` is a [Heroku Cloud Native Buildpack][heroku-cnbs] that adds support for installing Debian -packages required by an application that are not available in the build or run image used. It's roughly the equivalent -of `apt install {package}` for [Cloud Native Buildpacks][cnb]. +`heroku/deb-packages` is a [Heroku Cloud Native Buildpack][heroku-cnbs] that adds support for installing Debian +packages required by an application that are not available in the build or run image used. + +System dependencies on Debian distributions like Ubuntu are described by `.deb` files. These are +typically installed using CLI tools such as `apt` or `dpkg`. This buildpack implements logic to install packages +from `.deb` files in a CNB-friendly manner that does not require root permissions or modifications to system files +that could invalidate how [CNB rebasing][cnb-rebase] functionality works. > [!IMPORTANT] > This is a [Cloud Native Buildpack][cnb], and is a component of the [Heroku Cloud Native Buildpacks][heroku-cnbs] @@ -30,7 +34,7 @@ This buildpack is compatible with the following environments: To include this buildpack in your application: ```shell -pack build my-app --builder heroku/builder:24 --buildpack heroku/debian-packages +pack build my-app --builder heroku/builder:24 --buildpack heroku/deb-packages ``` And then run the image: @@ -42,7 +46,7 @@ docker run --rm -it my-app ## Configuration The configuration for this buildpack must be added to the project descriptor file (`project.toml`) at the root of your -project using the `com.heroku.buildpacks.debian-packages` table. The list of packages to install must be +project using the `com.heroku.buildpacks.deb-packages` table. The list of packages to install must be specified there. See below for the [configuration schema](#schema) and an [example](#example). ### Example @@ -53,7 +57,7 @@ specified there. See below for the [configuration schema](#schema) and an [examp schema-version = "0.2" # buildpack configuration goes here -[com.heroku.buildpacks.debian-packages] +[com.heroku.buildpacks.deb-packages] install = [ # string version of a dependency to install "package-name", @@ -64,7 +68,7 @@ install = [ ### Schema -- `com.heroku.buildpacks.debian-packages` *__([table][toml-table], optional)__* +- `com.heroku.buildpacks.deb-packages` *__([table][toml-table], optional)__* The root configuration for this buildpack. @@ -95,7 +99,7 @@ install = [ > [_] > schema-version = "0.2" > -> [com.heroku.buildpacks.debian-packages] +> [com.heroku.buildpacks.deb-packages] > install = [ > # copy the contents of your Aptfile here, e.g.; > # "package-a", @@ -188,9 +192,9 @@ Issues and pull requests are welcome. See our [contributing guidelines](./CONTRI [binary-dependency-fields]: https://www.debian.org/doc/debian-policy/ch-relationships.html#binary-dependencies-depends-recommends-suggests-enhances-pre-depends -[ci-badge]: https://github.com/heroku/buildpacks-debian-packages/actions/workflows/ci.yml/badge.svg +[ci-badge]: https://github.com/heroku/buildpacks-deb-packages/actions/workflows/ci.yml/badge.svg -[ci-link]: https://github.com/heroku/buildpacks-debian-packages/actions/workflows/ci.yml +[ci-link]: https://github.com/heroku/buildpacks-deb-packages/actions/workflows/ci.yml [classic-apt-buildpack]: https://github.com/heroku/heroku-buildpack-apt @@ -200,6 +204,8 @@ Issues and pull requests are welcome. See our [contributing guidelines](./CONTRI [cnb-layer]: https://github.com/buildpacks/spec/blob/main/buildpack.md#layer-types +[cnb-rebase]: https://buildpacks.io/docs/for-app-developers/concepts/rebase/ + [debian-archive]: https://www.man7.org/linux/man-pages/man5/deb.5.html [debian-binary-package]: https://www.debian.org/doc/debian-policy/ch-binary.html @@ -220,9 +226,9 @@ Issues and pull requests are welcome. See our [contributing guidelines](./CONTRI [project-descriptor]: https://buildpacks.io/docs/reference/config/project-descriptor/ -[registry-badge]: https://img.shields.io/badge/dynamic/json?url=https://registry.buildpacks.io/api/v1/buildpacks/heroku/debian-packages&label=version&query=$.latest.version&color=DF0A6B&logo=data:image/png;base64,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&labelColor=white +[registry-badge]: https://img.shields.io/badge/dynamic/json?url=https://registry.buildpacks.io/api/v1/buildpacks/heroku/deb-packages&label=version&query=$.latest.version&color=DF0A6B&logo=data:image/png;base64,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&labelColor=white -[registry-link]: https://registry.buildpacks.io/buildpacks/heroku/debian-packages +[registry-link]: https://registry.buildpacks.io/buildpacks/heroku/deb-packages [release-file]: https://wiki.debian.org/DebianRepository/Format#A.22Release.22_files diff --git a/buildpack.toml b/buildpack.toml index 2b842ac..045b1c4 100644 --- a/buildpack.toml +++ b/buildpack.toml @@ -1,12 +1,12 @@ api = "0.10" [buildpack] -id = "heroku/debian-packages" +id = "heroku/deb-packages" version = "0.0.1" -name = "Heroku Debian Packages Buildpack" -description = "Heroku's buildpack for installing Debian packages." -homepage = "https://github.com/heroku/buildpacks-debian-packages" -keywords = ["debian", "packages"] +name = "Heroku .deb Packages Buildpack" +description = "Heroku's buildpack for installing .deb system packages." +homepage = "https://github.com/heroku/buildpacks-deb-packages" +keywords = ["deb", "debian", "packages"] [[buildpack.licenses]] type = "Apache-2.0" @@ -27,4 +27,4 @@ distros = [ ] [metadata.release] -image = { repository = "docker.io/heroku/buildpacks-debian-packages" } +image = { repository = "docker.io/heroku/buildpacks-deb-packages" } diff --git a/src/config/buildpack_config.rs b/src/config/buildpack_config.rs index a5524f2..326733b 100644 --- a/src/config/buildpack_config.rs +++ b/src/config/buildpack_config.rs @@ -40,7 +40,7 @@ impl FromStr for BuildpackConfig { fn from_str(contents: &str) -> Result { let doc = DocumentMut::from_str(contents).map_err(Self::Err::InvalidToml)?; - // the root config is the table named `[com.heroku.buildpacks.debian-packages]` in project.toml + // the root config is the table named `[com.heroku.buildpacks.deb-packages]` in project.toml let root_config_item = doc .get("com") .and_then(|item| item.as_table_like()) @@ -48,7 +48,7 @@ impl FromStr for BuildpackConfig { .and_then(|item| item.as_table_like()) .and_then(|heroku| heroku.get("buildpacks")) .and_then(|item| item.as_table_like()) - .and_then(|buildpacks| buildpacks.get("debian-packages")); + .and_then(|buildpacks| buildpacks.get("deb-packages")); match root_config_item { None => Ok(BuildpackConfig::default()), @@ -117,7 +117,7 @@ mod test { [_] schema-version = "0.2" -[com.heroku.buildpacks.debian-packages] +[com.heroku.buildpacks.deb-packages] install = [ "package1", { name = "package2" }, @@ -153,7 +153,7 @@ install = [ [_] schema-version = "0.2" -[com.heroku.buildpacks.debian-packages] +[com.heroku.buildpacks.deb-packages] "# .trim(); @@ -178,7 +178,7 @@ schema-version = "0.2" [_] schema-version = "0.2" -[com.heroku.buildpacks.debian-packages] +[com.heroku.buildpacks.deb-packages] install = [ "not-a-package*", ] @@ -196,7 +196,7 @@ install = [ [_] schema-version = "0.2" -[com.heroku.buildpacks.debian-packages] +[com.heroku.buildpacks.deb-packages] install = [ { name = "not-a-package*" }, ] @@ -215,7 +215,7 @@ install = [ schema-version = "0.2" [com.heroku.buildpacks] -debian-packages = ["wrong"] +deb-packages = ["wrong"] "# .trim(); diff --git a/src/errors.rs b/src/errors.rs index 23565bf..e227f20 100644 --- a/src/errors.rs +++ b/src/errors.rs @@ -14,7 +14,7 @@ use libcnb::Error; use std::io::Write; use std::path::Path; -const BUILDPACK_NAME: &str = "Heroku Deb Packages buildpack"; +const BUILDPACK_NAME: &str = "Heroku .deb Packages buildpack"; pub(crate) fn on_error(error: Error, writer: W) where @@ -76,7 +76,7 @@ fn on_config_error(error: ConfigError) -> ErrorMessage { ConfigError::ParseConfig(config_file, error) => { let config_file = file_value(config_file); let toml_spec_url = style::url("https://toml.io/en/v1.0.0"); - let root_config_key = style::value("[com.heroku.buildpacks.debian-packages]"); + let root_config_key = style::value("[com.heroku.buildpacks.deb-packages]"); let configuration_doc_url = style::url("https://github.com/heroku/buildpacks-deb-packages#configuration"); let debian_package_name_format_url = style::url( @@ -746,7 +746,7 @@ fn on_framework_error(error: &Error) -> ErrorMessa Use the debug information above to troubleshoot and retry your build. If you think you found a \ bug in the buildpack, reproduce the issue locally with a minimal example and file an issue here: - https://github.com/heroku/buildpacks-debian-packages/issues/new + https://github.com/heroku/buildpacks-deb-packages/issues/new "}) .debug_info(error.to_string()) .call() @@ -763,7 +763,7 @@ fn create_error( header.as_ref().trim().to_string(), body.as_ref().trim().to_string(), ]; - let issues_url = style::url("https://github.com/heroku/buildpacks-debian-packages/issues/new"); + let issues_url = style::url("https://github.com/heroku/buildpacks-deb-packages/issues/new"); let pack = style::value("pack"); let pack_url = style::url("https://buildpacks.io/docs/for-platform-operators/how-to/integrate-ci/pack/"); @@ -776,7 +776,7 @@ fn create_error( workaround at this time. You can help our understanding by sharing your buildpack log \ and a description of the issue at: {issues_url} - + If you're able to reproduce the problem with an example application and the {pack} \ build tool ({pack_url}), adding that information to the discussion will also help. Once \ we have more information around the causes of this error we may update this message. @@ -898,7 +898,7 @@ mod tests { ! Unable to complete buildpack detection ! ! An unexpected I/O error occurred while checking `/path/to/project.toml` to \ - determine if the Heroku Deb Packages buildpack is compatible for this application. + determine if the Heroku .deb Packages buildpack is compatible for this application. "}, ); } @@ -923,7 +923,7 @@ mod tests { ! Error reading `/path/to/project.toml` ! - ! The Heroku Deb Packages buildpack reads configuration from `/path/to/project.toml` \ + ! The Heroku .deb Packages buildpack reads configuration from `/path/to/project.toml` \ to complete the build but the file can't be read. ! ! Suggestions: @@ -951,8 +951,8 @@ mod tests { indoc! {" ! Error parsing `/path/to/project.toml` with invalid key ! - ! The Heroku Deb Packages buildpack reads the configuration from `/path/to/project.toml` \ - to complete the build but the configuration for the key `[com.heroku.buildpacks.debian-packages]` \ + ! The Heroku .deb Packages buildpack reads the configuration from `/path/to/project.toml` \ + to complete the build but the configuration for the key `[com.heroku.buildpacks.deb-packages]` \ isn't the correct type. The value of this key must be a TOML table. ! ! Suggestions: @@ -991,7 +991,7 @@ mod tests { ! Error parsing `/path/to/project.toml` with invalid TOML file ! - ! The Heroku Deb Packages buildpack reads configuration from `/path/to/project.toml` \ + ! The Heroku .deb Packages buildpack reads configuration from `/path/to/project.toml` \ to complete the build but this file isn't a valid TOML file. ! ! Suggestions: @@ -1023,9 +1023,9 @@ mod tests { indoc! {" ! Error parsing `/path/to/project.toml` with invalid package name ! - ! The Heroku Deb Packages buildpack reads configuration from `/path/to/project.toml` \ + ! The Heroku .deb Packages buildpack reads configuration from `/path/to/project.toml` \ to complete the build but we found an invalid package name `invalid!package!name` \ - in the key `[com.heroku.buildpacks.debian-packages]`. + in the key `[com.heroku.buildpacks.deb-packages]`. ! ! Package names must consist only of lowercase letters (a-z), digits (0-9), plus (+) \ and minus (-) signs, and periods (.). Names must be at least two characters long and \ @@ -1065,9 +1065,9 @@ mod tests { ! Error parsing `/path/to/project.toml` with invalid package format ! - ! The Heroku Deb Packages buildpack reads configuration from `/path/to/project.toml` \ + ! The Heroku .deb Packages buildpack reads configuration from `/path/to/project.toml` \ to complete the build but we found an invalid package format in the key \ - `[com.heroku.buildpacks.debian-packages]`. + `[com.heroku.buildpacks.deb-packages]`. ! ! Packages must either be the following TOML values: ! - String (e.g.; \"package-name\") @@ -1105,7 +1105,7 @@ mod tests { indoc! {" ! Unsupported distribution ! - ! The Heroku Deb Packages buildpack doesn't support the Windows XP (x86) distribution. + ! The Heroku .deb Packages buildpack doesn't support the Windows XP (x86) distribution. ! ! Supported distributions: ! - Ubuntu 24.04 (amd64, arm64) @@ -1114,7 +1114,7 @@ mod tests { ! The causes for this error are unknown. We do not have suggestions for diagnosis or \ a workaround at this time. You can help our understanding by sharing your buildpack log \ and a description of the issue at: - ! https://github.com/heroku/buildpacks-debian-packages/issues/new + ! https://github.com/heroku/buildpacks-deb-packages/issues/new ! ! If you're able to reproduce the problem with an example application and the `pack` \ build tool (https://buildpacks.io/docs/for-platform-operators/how-to/integrate-ci/pack/), \ @@ -1143,7 +1143,7 @@ mod tests { ! The causes for this error are unknown. We do not have suggestions for diagnosis or \ a workaround at this time. You can help our understanding by sharing your buildpack log \ and a description of the issue at: - ! https://github.com/heroku/buildpacks-debian-packages/issues/new + ! https://github.com/heroku/buildpacks-deb-packages/issues/new ! ! If you're able to reproduce the problem with an example application and the `pack` \ build tool (https://buildpacks.io/docs/for-platform-operators/how-to/integrate-ci/pack/), \ @@ -1178,7 +1178,7 @@ mod tests { ! The causes for this error are unknown. We do not have suggestions for diagnosis or \ a workaround at this time. You can help our understanding by sharing your buildpack log \ and a description of the issue at: - ! https://github.com/heroku/buildpacks-debian-packages/issues/new + ! https://github.com/heroku/buildpacks-deb-packages/issues/new ! ! If you're able to reproduce the problem with an example application and the `pack` \ build tool \\(https://buildpacks.io/docs/for-platform-operators/how-to/integrate-ci/pack/\\), \ @@ -1224,7 +1224,7 @@ mod tests { ! The causes for this error are unknown. We do not have suggestions for diagnosis or \ a workaround at this time. You can help our understanding by sharing your buildpack log \ and a description of the issue at: - ! https://github.com/heroku/buildpacks-debian-packages/issues/new + ! https://github.com/heroku/buildpacks-deb-packages/issues/new ! ! If you're able to reproduce the problem with an example application and the `pack` \ build tool (https://buildpacks.io/docs/for-platform-operators/how-to/integrate-ci/pack/), \ @@ -1264,7 +1264,7 @@ mod tests { ! If the issue persists and you think you found a bug in the buildpack, reproduce the \ issue locally with a minimal example. Open an issue in the buildpack's GitHub repository \ and include the details here: - ! https://github.com/heroku/buildpacks-debian-packages/issues/new + ! https://github.com/heroku/buildpacks-deb-packages/issues/new "}, ); } @@ -1300,7 +1300,7 @@ mod tests { ! If the issue persists and you think you found a bug in the buildpack, reproduce the \ issue locally with a minimal example. Open an issue in the buildpack's GitHub repository \ and include the details here: - ! https://github.com/heroku/buildpacks-debian-packages/issues/new + ! https://github.com/heroku/buildpacks-deb-packages/issues/new "}, ); } @@ -1338,7 +1338,7 @@ mod tests { ! The causes for this error are unknown. We do not have suggestions for diagnosis or \ a workaround at this time. You can help our understanding by sharing your buildpack log \ and a description of the issue at: - ! https://github.com/heroku/buildpacks-debian-packages/issues/new + ! https://github.com/heroku/buildpacks-deb-packages/issues/new ! ! If you're able to reproduce the problem with an example application and the `pack` \ build tool (https://buildpacks.io/docs/for-platform-operators/how-to/integrate-ci/pack/), \ @@ -1378,7 +1378,7 @@ mod tests { ! The causes for this error are unknown. We do not have suggestions for diagnosis or \ a workaround at this time. You can help our understanding by sharing your buildpack log \ and a description of the issue at: - ! https://github.com/heroku/buildpacks-debian-packages/issues/new + ! https://github.com/heroku/buildpacks-deb-packages/issues/new ! ! If you're able to reproduce the problem with an example application and the `pack` \ build tool (https://buildpacks.io/docs/for-platform-operators/how-to/integrate-ci/pack/), \ @@ -1414,7 +1414,7 @@ mod tests { ! The causes for this error are unknown. We do not have suggestions for diagnosis or \ a workaround at this time. You can help our understanding by sharing your buildpack log \ and a description of the issue at: - ! https://github.com/heroku/buildpacks-debian-packages/issues/new + ! https://github.com/heroku/buildpacks-deb-packages/issues/new ! ! If you're able to reproduce the problem with an example application and the `pack` \ build tool (https://buildpacks.io/docs/for-platform-operators/how-to/integrate-ci/pack/), \ @@ -1450,7 +1450,7 @@ mod tests { ! The causes for this error are unknown. We do not have suggestions for diagnosis or \ a workaround at this time. You can help our understanding by sharing your buildpack log \ and a description of the issue at: - ! https://github.com/heroku/buildpacks-debian-packages/issues/new + ! https://github.com/heroku/buildpacks-deb-packages/issues/new ! ! If you're able to reproduce the problem with an example application and the `pack` \ build tool (https://buildpacks.io/docs/for-platform-operators/how-to/integrate-ci/pack/), \ @@ -1492,7 +1492,7 @@ mod tests { ! If the issue persists and you think you found a bug in the buildpack, reproduce the \ issue locally with a minimal example. Open an issue in the buildpack's GitHub repository \ and include the details here: - ! https://github.com/heroku/buildpacks-debian-packages/issues/new + ! https://github.com/heroku/buildpacks-deb-packages/issues/new "}, ); } @@ -1522,7 +1522,7 @@ mod tests { ! If the issue persists and you think you found a bug in the buildpack, reproduce the \ issue locally with a minimal example. Open an issue in the buildpack's GitHub repository \ and include the details here: - ! https://github.com/heroku/buildpacks-debian-packages/issues/new + ! https://github.com/heroku/buildpacks-deb-packages/issues/new "}, ); } @@ -1557,7 +1557,7 @@ mod tests { ! If the issue persists and you think you found a bug in the buildpack, reproduce the \ issue locally with a minimal example. Open an issue in the buildpack's GitHub repository \ and include the details here: - ! https://github.com/heroku/buildpacks-debian-packages/issues/new + ! https://github.com/heroku/buildpacks-deb-packages/issues/new "}, ); } @@ -1592,7 +1592,7 @@ mod tests { ! If the issue persists and you think you found a bug in the buildpack, reproduce the \ issue locally with a minimal example. Open an issue in the buildpack's GitHub repository \ and include the details here: - ! https://github.com/heroku/buildpacks-debian-packages/issues/new + ! https://github.com/heroku/buildpacks-deb-packages/issues/new "}, ); } @@ -1621,7 +1621,7 @@ mod tests { ! The causes for this error are unknown. We do not have suggestions for diagnosis or \ a workaround at this time. You can help our understanding by sharing your buildpack log \ and a description of the issue at: - ! https://github.com/heroku/buildpacks-debian-packages/issues/new + ! https://github.com/heroku/buildpacks-deb-packages/issues/new ! ! If you're able to reproduce the problem with an example application and the `pack` \ build tool (https://buildpacks.io/docs/for-platform-operators/how-to/integrate-ci/pack/), \ @@ -1663,7 +1663,7 @@ mod tests { ! If the issue persists and you think you found a bug in the buildpack, reproduce the \ issue locally with a minimal example. Open an issue in the buildpack's GitHub repository \ and include the details here: - ! https://github.com/heroku/buildpacks-debian-packages/issues/new + ! https://github.com/heroku/buildpacks-deb-packages/issues/new "}, ); } @@ -1723,7 +1723,7 @@ mod tests { ! The causes for this error are unknown. We do not have suggestions for diagnosis or \ a workaround at this time. You can help our understanding by sharing your buildpack log \ and a description of the issue at: - ! https://github.com/heroku/buildpacks-debian-packages/issues/new + ! https://github.com/heroku/buildpacks-deb-packages/issues/new ! ! If you're able to reproduce the problem with an example application and the `pack` \ build tool (https://buildpacks.io/docs/for-platform-operators/how-to/integrate-ci/pack/), \ @@ -1760,7 +1760,7 @@ mod tests { ! The causes for this error are unknown. We do not have suggestions for diagnosis or \ a workaround at this time. You can help our understanding by sharing your buildpack log \ and a description of the issue at: - ! https://github.com/heroku/buildpacks-debian-packages/issues/new + ! https://github.com/heroku/buildpacks-deb-packages/issues/new ! ! If you're able to reproduce the problem with an example application and the `pack` \ build tool (https://buildpacks.io/docs/for-platform-operators/how-to/integrate-ci/pack/), \ @@ -1810,7 +1810,7 @@ mod tests { ! The causes for this error are unknown. We do not have suggestions for diagnosis or \ a workaround at this time. You can help our understanding by sharing your buildpack log \ and a description of the issue at: - ! https://github.com/heroku/buildpacks-debian-packages/issues/new + ! https://github.com/heroku/buildpacks-deb-packages/issues/new ! ! If you're able to reproduce the problem with an example application and the `pack` \ build tool (https://buildpacks.io/docs/for-platform-operators/how-to/integrate-ci/pack/), \ @@ -1847,7 +1847,7 @@ mod tests { ! The causes for this error are unknown. We do not have suggestions for diagnosis or \ a workaround at this time. You can help our understanding by sharing your buildpack log \ and a description of the issue at: - ! https://github.com/heroku/buildpacks-debian-packages/issues/new + ! https://github.com/heroku/buildpacks-deb-packages/issues/new ! ! If you're able to reproduce the problem with an example application and the `pack` \ build tool (https://buildpacks.io/docs/for-platform-operators/how-to/integrate-ci/pack/), \ @@ -1887,7 +1887,7 @@ mod tests { ! The causes for this error are unknown. We do not have suggestions for diagnosis or \ a workaround at this time. You can help our understanding by sharing your buildpack log \ and a description of the issue at: - ! https://github.com/heroku/buildpacks-debian-packages/issues/new + ! https://github.com/heroku/buildpacks-deb-packages/issues/new ! ! If you're able to reproduce the problem with an example application and the `pack` \ build tool (https://buildpacks.io/docs/for-platform-operators/how-to/integrate-ci/pack/), \ @@ -1988,7 +1988,7 @@ mod tests { ! The causes for this error are unknown. We do not have suggestions for diagnosis or \ a workaround at this time. You can help our understanding by sharing your buildpack log \ and a description of the issue at: - ! https://github.com/heroku/buildpacks-debian-packages/issues/new + ! https://github.com/heroku/buildpacks-deb-packages/issues/new ! ! If you're able to reproduce the problem with an example application and the `pack` \ build tool \\(https://buildpacks.io/docs/for-platform-operators/how-to/integrate-ci/pack/\\), \ @@ -2022,7 +2022,7 @@ mod tests { ! The causes for this error are unknown. We do not have suggestions for diagnosis or \ a workaround at this time. You can help our understanding by sharing your buildpack log \ and a description of the issue at: - ! https://github.com/heroku/buildpacks-debian-packages/issues/new + ! https://github.com/heroku/buildpacks-deb-packages/issues/new ! ! If you're able to reproduce the problem with an example application and the `pack` \ build tool (https://buildpacks.io/docs/for-platform-operators/how-to/integrate-ci/pack/), \ @@ -2063,7 +2063,7 @@ mod tests { ! If the issue persists and you think you found a bug in the buildpack, reproduce the \ issue locally with a minimal example. Open an issue in the buildpack's GitHub repository \ and include the details here: - ! https://github.com/heroku/buildpacks-debian-packages/issues/new + ! https://github.com/heroku/buildpacks-deb-packages/issues/new "}, ); } @@ -2101,7 +2101,7 @@ mod tests { ! If the issue persists and you think you found a bug in the buildpack, reproduce the \ issue locally with a minimal example. Open an issue in the buildpack's GitHub repository \ and include the details here: - ! https://github.com/heroku/buildpacks-debian-packages/issues/new + ! https://github.com/heroku/buildpacks-deb-packages/issues/new "}, ); } @@ -2162,7 +2162,7 @@ mod tests { ! The causes for this error are unknown. We do not have suggestions for diagnosis or \ a workaround at this time. You can help our understanding by sharing your buildpack log \ and a description of the issue at: - ! https://github.com/heroku/buildpacks-debian-packages/issues/new + ! https://github.com/heroku/buildpacks-deb-packages/issues/new ! ! If you're able to reproduce the problem with an example application and the `pack` \ build tool (https://buildpacks.io/docs/for-platform-operators/how-to/integrate-ci/pack/), \ @@ -2199,7 +2199,7 @@ mod tests { ! The causes for this error are unknown. We do not have suggestions for diagnosis or \ a workaround at this time. You can help our understanding by sharing your buildpack log \ and a description of the issue at: - ! https://github.com/heroku/buildpacks-debian-packages/issues/new + ! https://github.com/heroku/buildpacks-deb-packages/issues/new ! ! If you're able to reproduce the problem with an example application and the `pack` \ build tool (https://buildpacks.io/docs/for-platform-operators/how-to/integrate-ci/pack/), \ @@ -2235,7 +2235,7 @@ mod tests { ! The causes for this error are unknown. We do not have suggestions for diagnosis or \ a workaround at this time. You can help our understanding by sharing your buildpack log \ and a description of the issue at: - ! https://github.com/heroku/buildpacks-debian-packages/issues/new + ! https://github.com/heroku/buildpacks-deb-packages/issues/new ! ! If you're able to reproduce the problem with an example application and the `pack` \ build tool (https://buildpacks.io/docs/for-platform-operators/how-to/integrate-ci/pack/), \ @@ -2268,7 +2268,7 @@ mod tests { ! The causes for this error are unknown. We do not have suggestions for diagnosis or \ a workaround at this time. You can help our understanding by sharing your buildpack log \ and a description of the issue at: - ! https://github.com/heroku/buildpacks-debian-packages/issues/new + ! https://github.com/heroku/buildpacks-deb-packages/issues/new ! ! If you're able to reproduce the problem with an example application and the `pack` \ build tool (https://buildpacks.io/docs/for-platform-operators/how-to/integrate-ci/pack/), \ @@ -2306,7 +2306,7 @@ mod tests { ! The causes for this error are unknown. We do not have suggestions for diagnosis or \ a workaround at this time. You can help our understanding by sharing your buildpack log \ and a description of the issue at: - ! https://github.com/heroku/buildpacks-debian-packages/issues/new + ! https://github.com/heroku/buildpacks-deb-packages/issues/new ! ! If you're able to reproduce the problem with an example application and the `pack` \ build tool (https://buildpacks.io/docs/for-platform-operators/how-to/integrate-ci/pack/), \ @@ -2344,7 +2344,7 @@ mod tests { ! The causes for this error are unknown. We do not have suggestions for diagnosis or \ a workaround at this time. You can help our understanding by sharing your buildpack log \ and a description of the issue at: - ! https://github.com/heroku/buildpacks-debian-packages/issues/new + ! https://github.com/heroku/buildpacks-deb-packages/issues/new ! ! If you're able to reproduce the problem with an example application and the `pack` \ build tool (https://buildpacks.io/docs/for-platform-operators/how-to/integrate-ci/pack/), \ @@ -2379,7 +2379,7 @@ mod tests { ! Use the debug information above to troubleshoot and retry your build. If you think you \ found a bug in the buildpack, reproduce the issue locally with a minimal example and file \ an issue here: - ! https://github.com/heroku/buildpacks-debian-packages/issues/new + ! https://github.com/heroku/buildpacks-deb-packages/issues/new "}, ); } diff --git a/src/main.rs b/src/main.rs index 5b4ffc9..22d4f2d 100644 --- a/src/main.rs +++ b/src/main.rs @@ -75,7 +75,7 @@ impl Buildpack for DebianPackagesBuildpack { No configured packages to install found in project.toml file. You may need to \ add a list of packages to install in your project.toml like this: -[com.heroku.buildpacks.debian-packages] +[com.heroku.buildpacks.deb-packages] install = [ \"package-name\", ] diff --git a/tests/fixtures/general_usage/project.toml b/tests/fixtures/general_usage/project.toml index fb4ff9f..c3b24a4 100644 --- a/tests/fixtures/general_usage/project.toml +++ b/tests/fixtures/general_usage/project.toml @@ -1,7 +1,7 @@ [_] schema-version = "0.2" -[com.heroku.buildpacks.debian-packages] +[com.heroku.buildpacks.deb-packages] install = [ # basic package with some dependencies "libgwenhywfar79", diff --git a/tests/fixtures/project_file_with_empty_config/project.toml b/tests/fixtures/project_file_with_empty_config/project.toml index 054d240..140fb05 100644 --- a/tests/fixtures/project_file_with_empty_config/project.toml +++ b/tests/fixtures/project_file_with_empty_config/project.toml @@ -1,4 +1,4 @@ [_] schema-version = "0.2" -[com.heroku.buildpacks.debian-packages] +[com.heroku.buildpacks.deb-packages] diff --git a/tests/integration_test.rs b/tests/integration_test.rs index 90b945a..663cd88 100644 --- a/tests/integration_test.rs +++ b/tests/integration_test.rs @@ -15,7 +15,7 @@ use toml_edit::{value, Array, DocumentMut, InlineTable}; #[ignore = "integration test"] fn test_successful_detection() { integration_test_with_config( - "fixtures/general_usage", + "fixtures/project_file_with_empty_config", |config| { config.expected_pack_result(PackResult::Success); }, @@ -58,7 +58,7 @@ fn test_failed_detection_when_project_file_has_no_config() { #[allow(clippy::too_many_lines)] fn test_general_usage_output() { integration_test("fixtures/general_usage", |ctx| { - assert_contains_match!(ctx.pack_stdout, r"# Heroku Debian Packages Buildpack \(v\d+\.\d+\.\d+\)"); + assert_contains_match!(ctx.pack_stdout, r"# Heroku .deb Packages Buildpack \(v\d+\.\d+\.\d+\)"); match (get_integration_test_builder().as_str(), get_integration_test_arch().as_str()) { ("heroku/builder:22", "amd64") => { @@ -224,7 +224,7 @@ fn test_general_usage_output_on_rebuild() { integration_test("fixtures/general_usage", |ctx| { let config = ctx.config.clone(); ctx.rebuild(config, |ctx| { - assert_contains_match!(ctx.pack_stdout, r"# Heroku Debian Packages Buildpack \(v\d+\.\d+\.\d+\)"); + assert_contains_match!(ctx.pack_stdout, r"# Heroku .deb Packages Buildpack \(v\d+\.\d+\.\d+\)"); match (get_integration_test_builder().as_str(), get_integration_test_arch().as_str()) { ("heroku/builder:22", "amd64") => { @@ -283,7 +283,7 @@ fn test_general_usage_output_on_rebuild() { #[allow(clippy::too_many_lines)] fn test_general_usage_env() { integration_test("fixtures/general_usage", |ctx| { - let layer_path = "/layers/heroku_debian-packages/packages"; + let layer_path = "/layers/heroku_deb-packages/packages"; let path = get_env_var(&ctx, "PATH"); let ld_library_path = get_env_var(&ctx, "LD_LIBRARY_PATH"); @@ -342,16 +342,16 @@ fn test_package_config_rewrite() { |ctx| { match (get_integration_test_builder().as_str(), get_integration_test_arch().as_str()) { ("heroku/builder:22", "amd64") => { - assert_contains!(read_package_config(&ctx, "usr/lib/pkgconfig/opusfile.pc"), "prefix=/layers/heroku_debian-packages/packages/usr"); - assert_contains!(read_package_config(&ctx, "usr/lib/pkgconfig/opusurl.pc"), "prefix=/layers/heroku_debian-packages/packages/usr"); + assert_contains!(read_package_config(&ctx, "usr/lib/pkgconfig/opusfile.pc"), "prefix=/layers/heroku_deb-packages/packages/usr"); + assert_contains!(read_package_config(&ctx, "usr/lib/pkgconfig/opusurl.pc"), "prefix=/layers/heroku_deb-packages/packages/usr"); } ("heroku/builder:24", "amd64") => { - assert_contains!(read_package_config(&ctx, "usr/lib/x86_64-linux-gnu/pkgconfig/opusfile.pc"), "prefix=/layers/heroku_debian-packages/packages/usr"); - assert_contains!(read_package_config(&ctx, "usr/lib/x86_64-linux-gnu/pkgconfig/opusurl.pc"), "prefix=/layers/heroku_debian-packages/packages/usr"); + assert_contains!(read_package_config(&ctx, "usr/lib/x86_64-linux-gnu/pkgconfig/opusfile.pc"), "prefix=/layers/heroku_deb-packages/packages/usr"); + assert_contains!(read_package_config(&ctx, "usr/lib/x86_64-linux-gnu/pkgconfig/opusurl.pc"), "prefix=/layers/heroku_deb-packages/packages/usr"); } ("heroku/builder:24", "arm64") => { - assert_contains!(read_package_config(&ctx, "usr/lib/aarch64-linux-gnu/pkgconfig/opusfile.pc"), "prefix=/layers/heroku_debian-packages/packages/usr"); - assert_contains!(read_package_config(&ctx, "usr/lib/aarch64-linux-gnu/pkgconfig/opusurl.pc"), "prefix=/layers/heroku_debian-packages/packages/usr"); + assert_contains!(read_package_config(&ctx, "usr/lib/aarch64-linux-gnu/pkgconfig/opusfile.pc"), "prefix=/layers/heroku_deb-packages/packages/usr"); + assert_contains!(read_package_config(&ctx, "usr/lib/aarch64-linux-gnu/pkgconfig/opusurl.pc"), "prefix=/layers/heroku_deb-packages/packages/usr"); } _ => panic_unsupported_test_configuration(), }; @@ -523,7 +523,7 @@ fn get_env_var(ctx: &TestContext, env_var_name: &str) -> String { } fn read_package_config(ctx: &TestContext, package_config_path: &str) -> String { - ctx.run_shell_command(format!("cat /layers/heroku_debian-packages/packages/{package_config_path}")).stdout + ctx.run_shell_command(format!("cat /layers/heroku_deb-packages/packages/{package_config_path}")).stdout } fn set_install_config(app_dir: &Path, requested_packages: I) @@ -538,7 +538,7 @@ where .and_then(|item| item.as_table_like_mut()) .and_then(|heroku| heroku.get_mut("buildpacks")) .and_then(|item| item.as_table_like_mut()) - .and_then(|buildpacks| buildpacks.get_mut("debian-packages")) + .and_then(|buildpacks| buildpacks.get_mut("deb-packages")) .and_then(|item| item.as_table_like_mut()) .unwrap(); root_config.insert("install", value(Array::from_iter(requested_packages)));