From 38b0b81677fe54c36cd07b237f05565456b64303 Mon Sep 17 00:00:00 2001 From: Schneems Date: Thu, 9 May 2024 13:02:31 -0400 Subject: [PATCH] Change to mutable layers The layer trait interface was changed to mutable in https://github.com/heroku/libcnb.rs/pull/669 --- buildpacks/ruby/src/layers/bundle_download_layer.rs | 4 ++-- buildpacks/ruby/src/layers/bundle_install_layer.rs | 7 ++++--- buildpacks/ruby/src/layers/metrics_agent_install.rs | 8 ++++---- buildpacks/ruby/src/layers/ruby_install_layer.rs | 4 ++-- commons/src/cache/in_app_dir_cache_layer.rs | 4 ++-- commons/src/layer/configure_env_layer.rs | 2 +- 6 files changed, 15 insertions(+), 14 deletions(-) diff --git a/buildpacks/ruby/src/layers/bundle_download_layer.rs b/buildpacks/ruby/src/layers/bundle_download_layer.rs index 7917c4f8..dcb55de0 100644 --- a/buildpacks/ruby/src/layers/bundle_download_layer.rs +++ b/buildpacks/ruby/src/layers/bundle_download_layer.rs @@ -46,7 +46,7 @@ impl<'a> Layer for BundleDownloadLayer<'a> { } fn create( - &self, + &mut self, _context: &BuildContext, layer_path: &Path, ) -> Result, RubyBuildpackError> { @@ -106,7 +106,7 @@ impl<'a> Layer for BundleDownloadLayer<'a> { } fn existing_layer_strategy( - &self, + &mut self, _context: &BuildContext, layer_data: &LayerData, ) -> Result { diff --git a/buildpacks/ruby/src/layers/bundle_install_layer.rs b/buildpacks/ruby/src/layers/bundle_install_layer.rs index 05e7d741..6ab8bfd7 100644 --- a/buildpacks/ruby/src/layers/bundle_install_layer.rs +++ b/buildpacks/ruby/src/layers/bundle_install_layer.rs @@ -114,9 +114,10 @@ impl Layer for BundleInstallLayer<'_> { cache: true, } } + /// Runs with gems cache from last execution fn update( - &self, + &mut self, context: &BuildContext, layer_data: &LayerData, ) -> Result, RubyBuildpackError> { @@ -150,7 +151,7 @@ impl Layer for BundleInstallLayer<'_> { /// Runs when with empty cache fn create( - &self, + &mut self, context: &BuildContext, layer_path: &Path, ) -> Result, RubyBuildpackError> { @@ -172,7 +173,7 @@ impl Layer for BundleInstallLayer<'_> { /// if a coder updates env vars they won't be set unless update or /// create is run. fn existing_layer_strategy( - &self, + &mut self, _context: &BuildContext, layer_data: &LayerData, ) -> Result { diff --git a/buildpacks/ruby/src/layers/metrics_agent_install.rs b/buildpacks/ruby/src/layers/metrics_agent_install.rs index 1c65e72a..6e1f74bb 100644 --- a/buildpacks/ruby/src/layers/metrics_agent_install.rs +++ b/buildpacks/ruby/src/layers/metrics_agent_install.rs @@ -77,7 +77,7 @@ impl<'a> Layer for MetricsAgentInstall<'a> { } fn create( - &self, + &mut self, _context: &libcnb::build::BuildContext, layer_path: &std::path::Path, ) -> Result< @@ -102,7 +102,7 @@ impl<'a> Layer for MetricsAgentInstall<'a> { } fn update( - &self, + &mut self, _context: &libcnb::build::BuildContext, layer_data: &libcnb::layer::LayerData, ) -> Result< @@ -123,7 +123,7 @@ impl<'a> Layer for MetricsAgentInstall<'a> { } fn existing_layer_strategy( - &self, + &mut self, _context: &libcnb::build::BuildContext, layer_data: &libcnb::layer::LayerData, ) -> Result::Error> @@ -144,7 +144,7 @@ impl<'a> Layer for MetricsAgentInstall<'a> { } fn migrate_incompatible_metadata( - &self, + &mut self, _context: &libcnb::build::BuildContext, _metadata: &GenericMetadata, ) -> Result< diff --git a/buildpacks/ruby/src/layers/ruby_install_layer.rs b/buildpacks/ruby/src/layers/ruby_install_layer.rs index 35f0238d..d39b8553 100644 --- a/buildpacks/ruby/src/layers/ruby_install_layer.rs +++ b/buildpacks/ruby/src/layers/ruby_install_layer.rs @@ -54,7 +54,7 @@ impl<'a> Layer for RubyInstallLayer<'a> { } fn create( - &self, + &mut self, _context: &BuildContext, layer_path: &Path, ) -> Result, RubyBuildpackError> { @@ -76,7 +76,7 @@ impl<'a> Layer for RubyInstallLayer<'a> { } fn existing_layer_strategy( - &self, + &mut self, _context: &BuildContext, layer_data: &LayerData, ) -> Result { diff --git a/commons/src/cache/in_app_dir_cache_layer.rs b/commons/src/cache/in_app_dir_cache_layer.rs index be581e0d..7a60b141 100644 --- a/commons/src/cache/in_app_dir_cache_layer.rs +++ b/commons/src/cache/in_app_dir_cache_layer.rs @@ -57,7 +57,7 @@ where } fn create( - &self, + &mut self, _context: &BuildContext, _layer_path: &Path, ) -> Result, B::Error> { @@ -68,7 +68,7 @@ where } fn existing_layer_strategy( - &self, + &mut self, _context: &BuildContext, layer_data: &LayerData, ) -> Result { diff --git a/commons/src/layer/configure_env_layer.rs b/commons/src/layer/configure_env_layer.rs index 3c063917..34bc868f 100644 --- a/commons/src/layer/configure_env_layer.rs +++ b/commons/src/layer/configure_env_layer.rs @@ -115,7 +115,7 @@ where } fn create( - &self, + &mut self, _context: &BuildContext, _layer_path: &Path, ) -> Result, B::Error> {