Skip to content

Commit

Permalink
Update docs and add a tutorial
Browse files Browse the repository at this point in the history
  • Loading branch information
schneems committed Dec 21, 2024
1 parent 91202e9 commit a3c259c
Show file tree
Hide file tree
Showing 6 changed files with 440 additions and 96 deletions.
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion commons/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

### Added

- Introduced `layer::cache_buddy::CacheBuddy` for public cache use (https://github.com/heroku/buildpacks-ruby/pull/376)
- Introduced `layer::diff_migrate` and `DiffMigrateLayer` for public cache use (https://github.com/heroku/buildpacks-ruby/pull/376)

### Changed

Expand Down
1 change: 1 addition & 0 deletions commons/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,4 @@ indoc = "2"
libcnb-test = "=0.26.1"
pretty_assertions = "1"
toml = "0.8"
bullet_stream = "0.3.0"
43 changes: 33 additions & 10 deletions commons/src/layer/diff_migrate.rs
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
//! Your layer cache invalidation pal
//! Declarative Layer Cache invalidation logic.
//!
//! Cache invalidation is one of the "famously" difficult problems in computer science. This module
//! provides a clean, yet opinonated interface for handling cache invalidation and migrating invalid
//! metadata.
//!
//! - Declarative interface for defining cache invalidation behavior (via [`CacheDiff`])
//! - Declarative interface for defining invalid metadata migration behavior (via [`TryMigrate`])
//! - Declarative interface for defining cache invalidation behavior (via [`cache_diff::CacheDiff`])
//! - Declarative interface for defining invalid metadata migration behavior (via [`magic_migrate::TryMigrate`])
//! - Prevent accidentally reading one struct type and writing a different one
//!
//! The primary interface is [`CacheBuddy`].
//! The primary interface is [`DiffMigrateLayer`].
//!
//! ## Cache invalidation logic ([`CacheDiff`])
//! ## Cache invalidation logic ([`cache_diff::CacheDiff`])
//!
//! The `CacheDiff` derive macro from `cache_diff` allows you to tell `CacheBuddy` which fields in your
//! The `CacheDiff` derive macro from `cache_diff` allows you to tell [`DiffMigrateLayer`] which fields in your
//! metadata struct act as cache keys and how to compare them. If a difference is reported, the cache
//! is cleared.
//!
//! Importantly, when the cache is cleared, a clear message stating why the cache was cleared is returned
//! in a user readable format.
//!
//! ## Invalid metadata migration ([`TryMigrate`])
//! ## Invalid metadata migration ([`magic_migrate::TryMigrate`])
//!
//! If previously serialized metadata cannot be deserialized into the current struct then usually the
//! only thing a buildpack can do is discard the cache. However, that may involve needing to re-do an
Expand All @@ -40,7 +40,7 @@
//! build output. If the cache is cleared for any reason, then a user readable message is returned. This message should
//! be printed to the buildpack user so they can understand what caused the cache to clear.
//!
#![doc = include_str!("./fixtures/diff_migrate_example.md")]
#![doc = include_str!("fixtures/metadata_migration_example.md")]

use crate::display::SentenceList;
use cache_diff::CacheDiff;
Expand All @@ -51,7 +51,30 @@ use magic_migrate::TryMigrate;
use serde::ser::Serialize;
use std::fmt::Debug;

/// Handle caching behavior for a layer
#[cfg(test)]
use bullet_stream as _;

/// Creates a cached layer, potentially re-using a previously cached version with default invalidation and migration logic.
///
/// Like [`BuildContext::cached_layer`], this allows Buildpack code to create a cached layer and get
/// back a reference to the layer directory on disk. Intricacies of the CNB spec are automatically handled
/// such as the maintenance of TOML files.
///
/// In addition it provides default behavior for cache invalidation, automatic invalid metadata migration,
/// as well as ensuring that the latest metadata is set on the layer.
///
/// Uses [`BuildContext::cached_layer`] with declarative traits [`CacheDiff`] for invalidation and [`TryMigrate`]
/// for migration logic.
/// The behavior here can be manually assembled using the provided struct [`Meta`] and functions:
///
/// - [`invalid_metadata_action`]
/// - [`restored_layer_action`]
///
/// In addition to default behavior it also ensures that the metadata is updated.
///
/// The return is a [`LayerRef`] as if you had manually assembled your own [`BuildContext::cached_layer`]
/// call. This allows users to be flexible in how and when the layer is modified and to abstract layer
/// creation away if necessary.
///
/// Guarantees that new metadata is always written (prevents accidentally reading one struct type and
/// writing a different one). It also provides a standard interface to define caching behavior via
Expand All @@ -66,7 +89,7 @@ use std::fmt::Debug;
/// When a `CacheDiff::diff` is empty, the layer is kept and the old data is returned. Otherwise,
/// the layer is deleted and the changes are returned.
///
#[doc = include_str!("./fixtures/diff_migrate_example.md")]
/// **TUTORIAL:** In the [`diff_migrate`] module docs
#[derive(Debug, Clone, Eq, PartialEq)]
pub struct DiffMigrateLayer {
/// Whether the layer is intended for build.
Expand Down
85 changes: 0 additions & 85 deletions commons/src/layer/fixtures/diff_migrate_example.md

This file was deleted.

Loading

0 comments on commit a3c259c

Please sign in to comment.