This repository was archived by the owner on May 15, 2025. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 58
feat(devcontainers-cli): add devcontainers-cli module #425
Merged
Changes from all commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
0c75144
add devcontainers-cli module
defelmnq 6f51315
small fixes on readme and test name
defelmnq cda311d
run prettier
defelmnq d1684e2
fmt
defelmnq f0b707a
lint
defelmnq 0c086c6
update-version
defelmnq 7d7ae8b
fix tests and add more package manager
defelmnq f269de5
add docker detection and lint
defelmnq 4f7cd1e
improve log and docker handling
defelmnq 47e28bc
fix missing tests
defelmnq 67dd5ea
Update devcontainers-cli/run.sh
defelmnq 8936b9a
Update devcontainers-cli/run.sh
defelmnq 89cca9c
fix tests due to log changes
defelmnq 0e188a0
Merge branch 'main' into vvi-16432
matifali e6b4ac7
update version
matifali 1928e96
Fix typo and clarify npm requirement wording
matifali File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
--- | ||
display_name: devcontainers-cli | ||
description: devcontainers-cli module provides an easy way to install @devcontainers/cli into a workspace | ||
icon: ../.icons/devcontainers.svg | ||
verified: true | ||
maintainer_github: coder | ||
tags: [devcontainers] | ||
--- | ||
|
||
# devcontainers-cli | ||
|
||
The devcontainers-cli module provides an easy way to install [`@devcontainers/cli`](https://github.com/devcontainers/cli) into a workspace. It can be used within any workspace as it runs only if | ||
@devcontainers/cli is not installed yet. | ||
`npm` is required and should be pre-installed in order for the module to work. | ||
|
||
```tf | ||
module "devcontainers-cli" { | ||
source = "registry.coder.com/modules/devcontainers-cli/coder" | ||
version = "1.0.0" | ||
agent_id = coder_agent.example.id | ||
} | ||
``` |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,130 @@ | ||
import { describe, expect, it } from "bun:test"; | ||
import { | ||
execContainer, | ||
executeScriptInContainer, | ||
findResourceInstance, | ||
runContainer, | ||
runTerraformApply, | ||
runTerraformInit, | ||
testRequiredVariables, | ||
type TerraformState, | ||
} from "../test"; | ||
|
||
const executeScriptInContainerWithPackageManager = async ( | ||
state: TerraformState, | ||
image: string, | ||
packageManager: string, | ||
shell = "sh", | ||
): Promise<{ | ||
exitCode: number; | ||
stdout: string[]; | ||
stderr: string[]; | ||
}> => { | ||
const instance = findResourceInstance(state, "coder_script"); | ||
const id = await runContainer(image); | ||
|
||
// Install the specified package manager | ||
if (packageManager === "npm") { | ||
await execContainer(id, [shell, "-c", "apk add nodejs npm"]); | ||
} else if (packageManager === "pnpm") { | ||
await execContainer(id, [ | ||
shell, | ||
"-c", | ||
"apk add nodejs npm && npm install -g pnpm", | ||
]); | ||
} else if (packageManager === "yarn") { | ||
await execContainer(id, [ | ||
shell, | ||
"-c", | ||
"apk add nodejs npm && npm install -g yarn", | ||
]); | ||
} | ||
|
||
const resp = await execContainer(id, [shell, "-c", instance.script]); | ||
const stdout = resp.stdout.trim().split("\n"); | ||
const stderr = resp.stderr.trim().split("\n"); | ||
return { | ||
exitCode: resp.exitCode, | ||
stdout, | ||
stderr, | ||
}; | ||
}; | ||
|
||
describe("devcontainers-cli", async () => { | ||
await runTerraformInit(import.meta.dir); | ||
|
||
testRequiredVariables(import.meta.dir, { | ||
agent_id: "some-agent-id", | ||
}); | ||
|
||
it("misses all package managers", async () => { | ||
const state = await runTerraformApply(import.meta.dir, { | ||
agent_id: "some-agent-id", | ||
}); | ||
const output = await executeScriptInContainer(state, "docker:dind"); | ||
expect(output.exitCode).toBe(1); | ||
expect(output.stderr).toEqual([ | ||
"ERROR: No supported package manager (npm, pnpm, yarn) is installed. Please install one first.", | ||
]); | ||
}, 15000); | ||
|
||
it("installs devcontainers-cli with npm", async () => { | ||
const state = await runTerraformApply(import.meta.dir, { | ||
agent_id: "some-agent-id", | ||
}); | ||
|
||
const output = await executeScriptInContainerWithPackageManager( | ||
state, | ||
"docker:dind", | ||
"npm", | ||
); | ||
expect(output.exitCode).toBe(0); | ||
|
||
expect(output.stdout[0]).toEqual( | ||
"Installing @devcontainers/cli using npm...", | ||
); | ||
expect(output.stdout[output.stdout.length - 1]).toEqual( | ||
"🥳 @devcontainers/cli has been installed into /usr/local/bin/devcontainer!", | ||
); | ||
}); | ||
|
||
it("installs devcontainers-cli with yarn", async () => { | ||
const state = await runTerraformApply(import.meta.dir, { | ||
agent_id: "some-agent-id", | ||
}); | ||
|
||
const output = await executeScriptInContainerWithPackageManager( | ||
state, | ||
"docker:dind", | ||
"yarn", | ||
); | ||
expect(output.exitCode).toBe(0); | ||
|
||
expect(output.stdout[0]).toEqual( | ||
"Installing @devcontainers/cli using yarn...", | ||
); | ||
expect(output.stdout[output.stdout.length - 1]).toEqual( | ||
"🥳 @devcontainers/cli has been installed into /usr/local/bin/devcontainer!", | ||
); | ||
}); | ||
|
||
it("displays warning if docker is not installed", async () => { | ||
const state = await runTerraformApply(import.meta.dir, { | ||
agent_id: "some-agent-id", | ||
}); | ||
|
||
const output = await executeScriptInContainerWithPackageManager( | ||
state, | ||
"alpine", | ||
"npm", | ||
); | ||
expect(output.exitCode).toBe(0); | ||
|
||
expect(output.stdout[0]).toEqual( | ||
"WARNING: Docker was not found but is required to use @devcontainers/cli, please make sure it is available.", | ||
); | ||
expect(output.stdout[output.stdout.length - 1]).toEqual( | ||
"🥳 @devcontainers/cli has been installed into /usr/local/bin/devcontainer!", | ||
); | ||
}); | ||
}); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
terraform { | ||
required_version = ">= 1.0" | ||
|
||
required_providers { | ||
coder = { | ||
source = "coder/coder" | ||
version = ">= 0.17" | ||
defelmnq marked this conversation as resolved.
Show resolved
Hide resolved
|
||
} | ||
} | ||
} | ||
|
||
variable "agent_id" { | ||
type = string | ||
description = "The ID of a Coder agent." | ||
} | ||
|
||
resource "coder_script" "devcontainers-cli" { | ||
agent_id = var.agent_id | ||
display_name = "devcontainers-cli" | ||
icon = "/icon/devcontainers.svg" | ||
script = templatefile("${path.module}/run.sh", {}) | ||
run_on_start = true | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
#!/usr/bin/env sh | ||
|
||
# If @devcontainers/cli is already installed, we can skip | ||
if command -v devcontainer > /dev/null 2>&1; then | ||
echo "🥳 @devcontainers/cli is already installed into $(which devcontainer)!" | ||
exit 0 | ||
fi | ||
|
||
# Check if docker is installed | ||
if ! command -v docker > /dev/null 2>&1; then | ||
echo "WARNING: Docker was not found but is required to use @devcontainers/cli, please make sure it is available." | ||
fi | ||
|
||
# Determine the package manager to use: npm, pnpm, or yarn | ||
if command -v pnpm > /dev/null 2>&1; then | ||
PACKAGE_MANAGER="pnpm" | ||
elif command -v yarn > /dev/null 2>&1; then | ||
PACKAGE_MANAGER="yarn" | ||
elif command -v npm > /dev/null 2>&1; then | ||
PACKAGE_MANAGER="npm" | ||
else | ||
echo "ERROR: No supported package manager (npm, pnpm, yarn) is installed. Please install one first." 1>&2 | ||
exit 1 | ||
fi | ||
|
||
echo "Installing @devcontainers/cli using $PACKAGE_MANAGER..." | ||
|
||
# Install @devcontainers/cli using the selected package manager | ||
if [ "$PACKAGE_MANAGER" = "npm" ] || [ "$PACKAGE_MANAGER" = "pnpm" ]; then | ||
$PACKAGE_MANAGER install -g @devcontainers/cli \ | ||
&& echo "🥳 @devcontainers/cli has been installed into $(which devcontainer)!" | ||
elif [ "$PACKAGE_MANAGER" = "yarn" ]; then | ||
$PACKAGE_MANAGER global add @devcontainers/cli \ | ||
&& echo "🥳 @devcontainers/cli has been installed into $(which devcontainer)!" | ||
fi | ||
|
||
exit 0 |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.