From 646925188dfcb0ac00c3abe2b635d6682a7f366a Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Mon, 9 May 2022 11:49:52 -0500 Subject: [PATCH] fix: Add "arm" architecture (#18) This allows for 32-bit arm to be used with Coder. --- docs/data-sources/workspace.md | 1 + docs/resources/agent.md | 2 +- docs/resources/app.md | 4 ++-- internal/provider/provider.go | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/docs/data-sources/workspace.md b/docs/data-sources/workspace.md index e7b20e84..84422697 100644 --- a/docs/data-sources/workspace.md +++ b/docs/data-sources/workspace.md @@ -26,6 +26,7 @@ resource "kubernetes_pod" "dev" { ### Read-Only +- `access_url` (String) The access URL of the Coder deployment provisioning this workspace. - `id` (String) UUID of the workspace. - `name` (String) Name of the workspace. - `owner` (String) Username of the workspace owner. diff --git a/docs/resources/agent.md b/docs/resources/agent.md index 4d33c950..d11e5ecf 100644 --- a/docs/resources/agent.md +++ b/docs/resources/agent.md @@ -41,7 +41,7 @@ resource "kubernetes_pod" "dev" { ### Required -- `arch` (String) The architecture the agent will run on. Must be one of: "amd64", "arm64". +- `arch` (String) The architecture the agent will run on. Must be one of: "amd64", "armv7", "arm64". - `os` (String) The operating system the agent will run on. Must be one of: "linux", "darwin", or "windows". ### Optional diff --git a/docs/resources/app.md b/docs/resources/app.md index 8742f0e9..4f8bf7a5 100644 --- a/docs/resources/app.md +++ b/docs/resources/app.md @@ -56,10 +56,10 @@ resource "coder_app" "intellij" { ### Optional -- `command` (String) A command to run in a terminal opening this app. In the web, this will open in a new tab. In the CLI, this will SSH and execute the command. +- `command` (String) A command to run in a terminal opening this app. In the web, this will open in a new tab. In the CLI, this will SSH and execute the command. Either "command" or "target" may be specified, but not both. - `icon` (String) A URL to an icon that will display in the dashboard. View built-in icons here: https://github.com/coder/coder/tree/main/site/static/icons. Use a built-in icon with `data.coder_workspace.me.access_url + "/icons/"`. - `id` (String) The ID of this resource. - `name` (String) A display name to identify the app. -- `target` (String) A URL to be proxied to from inside the workspace. +- `target` (String) A URL to be proxied to from inside the workspace. Either "command" or "target" may be specified, but not both. diff --git a/internal/provider/provider.go b/internal/provider/provider.go index e62c174e..1e31990d 100644 --- a/internal/provider/provider.go +++ b/internal/provider/provider.go @@ -163,8 +163,8 @@ func New() *schema.Provider { Type: schema.TypeString, ForceNew: true, Required: true, - Description: `The architecture the agent will run on. Must be one of: "amd64", "arm64".`, - ValidateFunc: validation.StringInSlice([]string{"amd64", "arm64"}, false), + Description: `The architecture the agent will run on. Must be one of: "amd64", "armv7", "arm64".`, + ValidateFunc: validation.StringInSlice([]string{"amd64", "armv7", "arm64"}, false), }, "auth": { Type: schema.TypeString,