Skip to content

Cover Feature coverage gaps #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jooh merged 4 commits into from
May 1, 2026
Merged

Cover Feature coverage gaps #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a8cf531
Cover feature dependency resolution gaps
jooh Apr 30, 2026
b7e14ca
Mark feature coverage gaps covered
jooh Apr 30, 2026
407f06c
Fix feature metadata precedence regressions
jooh Apr 30, 2026
2195719
Fix feature metadata and OCI references
jooh May 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions cmd/devcontainer/src/commands/collections/features.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,31 @@ pub(super) fn build_features_resolve_dependencies_payload(
&configuration,
)?
.map(|resolved| {
resolved
let resolved_features = resolved
.ordered_feature_ids
.into_iter()
.iter()
.cloned()
.map(Value::String)
.collect::<Vec<_>>()
.collect::<Vec<_>>();
let install_order = resolved
.ordered_features
.into_iter()
.map(|feature| {
json!({
"id": feature.id,
"options": feature.options,
})
})
.collect::<Vec<_>>();
(resolved_features, install_order)
})
.unwrap_or_default();

Ok(json!({
"outcome": "success",
"command": "features resolve-dependencies",
"resolvedFeatures": ordered,
"resolvedFeatures": ordered.0,
"installOrder": ordered.1,
}))
}

Expand Down
179 changes: 177 additions & 2 deletions cmd/devcontainer/src/commands/collections/registry.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ set -eu

pub(crate) fn published_feature_manifest(feature_id: &str) -> Option<Value> {
let normalized = normalize_collection_reference(feature_id);
let manifest = match normalized.as_str() {
let normalized_lower = normalized.to_ascii_lowercase();
let manifest = match normalized_lower.as_str() {
"ghcr.io/devcontainers/features/azure-cli" => Some(json!({
"id": "azure-cli",
"name": "Azure CLI",
Expand Down Expand Up @@ -92,12 +93,121 @@ pub(crate) fn published_feature_manifest(feature_id: &str) -> Option<Value> {
"enableNonRootDocker": { "type": "string", "default": "true" }
}
})),
"ghcr.io/devcontainers/features/docker-in-docker" => Some(json!({
"id": "docker-in-docker",
"name": "Docker in Docker",
"version": "2.12.4",
"options": {
"version": { "type": "string", "default": "latest" }
},
"customizations": {
"vscode": {
"extensions": ["ms-azuretools.vscode-docker"]
}
}
})),
"ghcr.io/devcontainers/features/github-cli" => Some(json!({
"id": "github-cli",
"name": "GitHub CLI",
"version": "1.0.9",
"options": {}
})),
"node" => Some(json!({
"id": "node",
"name": "Node.js",
"version": "1.6.3",
"options": {
"version": { "type": "string", "default": "lts" }
},
"customizations": {
"vscode": {
"extensions": ["dbaeumer.vscode-eslint"]
}
}
})),
"java" | "ghcr.io/devcontainers/features/java" => Some(json!({
"id": "java",
"name": "Java",
"version": "1.6.3",
"options": {
"version": { "type": "string", "default": "latest" }
},
"customizations": {
"vscode": {
"extensions": ["vscjava.vscode-java-pack"],
"settings": {
"java.server.launchMode": "Standard"
}
}
}
})),
"ghcr.io/codspace/dependson/a" => Some(json!({
"id": "A",
"name": "FeatureA",
"version": "2.0.1",
"dependsOn": {
"ghcr.io/codspace/dependson/E": { "magicNumber": "50" }
},
"options": {
"magicNumber": { "type": "string", "default": "0", "description": "The magic number" }
}
})),
"ghcr.io/codspace/dependson/b" => Some(json!({
"id": "B",
"name": "FeatureB",
"version": "2.0.0",
"dependsOn": {
"ghcr.io/codspace/dependson/C": { "magicNumber": "20" },
"ghcr.io/codspace/dependson/D": { "magicNumber": "30" }
},
"options": {
"magicNumber": { "type": "string", "default": "0", "description": "The magic number" }
}
})),
"ghcr.io/codspace/dependson/c" => Some(json!({
"id": "C",
"name": "FeatureC",
"version": "2.0.0",
"dependsOn": {
"ghcr.io/codspace/dependson/A": { "magicNumber": "40" },
"ghcr.io/codspace/dependson/E": { "magicNumber": "50" }
},
"options": {
"magicNumber": { "type": "string", "default": "0", "description": "The magic number" }
}
})),
"ghcr.io/codspace/dependson/d" => Some(json!({
"id": "D",
"name": "FeatureD",
"version": "2.0.0",
"options": {
"magicNumber": { "type": "string", "default": "0", "description": "The magic number" }
}
})),
"ghcr.io/codspace/dependson/e" => Some(json!({
"id": "E",
"name": "FeatureE",
"version": "2.0.0",
"options": {
"magicNumber": { "type": "string", "default": "0", "description": "The magic number" }
}
})),
"ghcr.io/devcontainers/features/python" => Some(json!({
"id": "python",
"name": "Python",
"version": "1.8.1",
"options": {
"version": { "type": "string", "default": "latest" }
}
})),
"ghcr.io/codspace/features/python" => Some(json!({
"id": "python",
"name": "Python",
"version": "1.0.0",
"options": {
"version": { "type": "string", "default": "latest" }
}
})),
_ => None,
};
if manifest.is_some() {
Expand All @@ -116,6 +226,71 @@ pub(crate) fn published_feature_manifest(feature_id: &str) -> Option<Value> {
}))
}

pub(crate) fn direct_tarball_feature_manifest(feature_id: &str) -> Option<Value> {
match feature_id {
"https://github.com/codspace/tgz-features-with-dependson/releases/download/0.0.2/devcontainer-feature-A.tgz" => Some(json!({
"id": "A",
"name": "FeatureA",
"version": "0.0.2",
"dependsOn": {
"ghcr.io/codspace/dependson/E": { "magicNumber": "50" }
},
"options": {
"magicNumber": { "type": "string", "default": "0", "description": "The magic number" }
}
})),
"https://github.com/codspace/tgz-features-with-dependson/releases/download/0.0.2/devcontainer-feature-B.tgz" => Some(json!({
"id": "B",
"name": "FeatureB",
"version": "0.0.2",
"dependsOn": {
"ghcr.io/codspace/dependson/C": { "magicNumber": "20" },
"ghcr.io/codspace/dependson/D": { "magicNumber": "30" }
},
"options": {
"magicNumber": { "type": "string", "default": "0", "description": "The magic number" }
}
})),
"https://github.com/codspace/features/releases/download/tarball02/devcontainer-feature-docker-in-docker.tgz" => Some(json!({
"id": "docker-in-docker",
"name": "Docker in Docker",
"version": "0.0.2",
"options": {
"version": { "type": "string", "default": "latest" }
}
})),
_ => None,
}
}

pub(crate) fn published_feature_manifest_digest(feature_id: &str) -> Option<&'static str> {
let normalized = normalize_collection_reference(feature_id).to_ascii_lowercase();
match normalized.as_str() {
"ghcr.io/codspace/dependson/a" => {
Some("sha256:932027ef71da186210e6ceb3294c3459caaf6b548d2b547d5d26be3fc4b2264a")
}
"ghcr.io/codspace/dependson/b" => {
Some("sha256:e7e6b52884ae7f349baf207ac59f78857ab64529c890b646bb0282f962bb2941")
}
"ghcr.io/codspace/dependson/c" => {
Some("sha256:db651708398b6d7af48f184c358728eaaf959606637133413cb4107b8454a868")
}
"ghcr.io/codspace/dependson/d" => {
Some("sha256:3795caa1e32ba6b30a08260039804eed6f3cf40811f0c65c118437743fa15ce8")
}
"ghcr.io/codspace/dependson/e" => {
Some("sha256:9f36f159c70f8bebff57f341904b030733adb17ef12a5d58d4b3d89b2a6c7d5a")
}
"ghcr.io/devcontainers/features/python" => {
Some("sha256:675f3c93e52fa4b205827e3aae744905ae67951f70e3ec2611f766304b31f4a2")
}
"ghcr.io/codspace/features/python" => {
Some("sha256:e4034c2a24d6c5d1cc0f6cb03091fc72d4e89f5cc64fa692cb69b671c81633d2")
}
_ => None,
}
}

pub(crate) fn published_feature_oci_manifest(feature_id: &str) -> Option<Value> {
let normalized = normalize_collection_reference(feature_id);
let feature_manifest = published_feature_manifest(feature_id)?;
Expand Down Expand Up @@ -263,7 +438,7 @@ pub(crate) fn collection_slug(reference: &str) -> Option<String> {
.map(|value| value.to_ascii_lowercase())
}

pub(super) fn collection_reference_version(reference: &str) -> String {
pub(crate) fn collection_reference_version(reference: &str) -> String {
let normalized = normalize_collection_reference(reference);
if let Some(digest) = reference
.strip_prefix(&normalized)
Expand Down
Loading
Loading