Thanks to visit codestin.com
Credit goes to github.com

Skip to content

chore: update example templates to use display_name #7001

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
merged 17 commits into from
Apr 12, 2023
Merged

chore: update example templates to use display_name #7001

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
c29960f
add `display_name`
matifali Apr 4, 2023
1fec644
fix typos and `terraform validate`
matifali Apr 4, 2023
43c1a80
Merge branch 'coder:main' into update-example-templates
matifali Apr 7, 2023
6c9959e
update display_name
matifali Apr 7, 2023
9a49c95
Update examples/templates/aws-windows/main.tf
matifali Apr 7, 2023
8a50c23
Update examples/templates/aws-linux/main.tf
matifali Apr 7, 2023
c43d5c2
Update examples/templates/azure-linux/main.tf
matifali Apr 7, 2023
3f7d725
Update examples/templates/azure-linux/main.tf
matifali Apr 7, 2023
b747b98
Update examples/templates/do-linux/main.tf
matifali Apr 7, 2023
7844c4e
Update examples/templates/do-linux/main.tf
matifali Apr 7, 2023
8cb51a2
Update main.tf
matifali Apr 9, 2023
eade13c
Update main.tf
matifali Apr 9, 2023
1886cc9
Update main.tf
matifali Apr 9, 2023
a735277
Update main.tf
matifali Apr 9, 2023
7bc13fb
Update main.tf
matifali Apr 9, 2023
893a60f
Merge branch 'coder:main' into update-example-templates
matifali Apr 11, 2023
089129b
Merge branch 'main' into pr/matifali/7001
bpmct Apr 12, 2023
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
24 changes: 13 additions & 11 deletions examples/templates/aws-ecs-container/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
coder = {
source = "coder/coder"
version = "~> 0.6.17"
version = "~> 0.7.0"
}
aws = {
source = "hashicorp/aws"
Expand All @@ -20,19 +20,21 @@ variable "ecs-cluster" {
}

data "coder_parameter" "cpu" {
name = "cpu"
description = "The number of CPU units to reserve for the container"
type = "number"
default = "1024"
mutable = true
name = "cpu"
display_name = "CPU"
description = "The number of CPU units to reserve for the container"
type = "number"
default = "1024"
mutable = true
}

data "coder_parameter" "memory" {
name = "memory"
description = "The amount of memory (in MiB) to allow the container to use"
type = "number"
default = "2048"
mutable = true
name = "memory"
display_name = "Memory"
description = "The amount of memory (in MiB) to allow the container to use"
type = "number"
default = "2048"
mutable = true
}

# configure AWS provider with creds present on Coder server host
Expand Down
20 changes: 11 additions & 9 deletions examples/templates/aws-linux/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
coder = {
source = "coder/coder"
version = "~> 0.6.17"
version = "~> 0.7.0"
}
aws = {
source = "hashicorp/aws"
Expand All @@ -14,10 +14,11 @@ terraform {
# Last updated 2023-03-14
# aws ec2 describe-regions | jq -r '[.Regions[].RegionName] | sort'
data "coder_parameter" "region" {
name = "Region"
description = "The region to deploy the workspace in."
default = "us-east-1"
mutable = false
name = "region"
display_name = "Region"
description = "The region to deploy the workspace in."
default = "us-east-1"
mutable = false
option {
name = "Asia Pacific (Tokyo)"
value = "ap-northeast-1"
Expand Down Expand Up @@ -106,10 +107,11 @@ data "coder_parameter" "region" {
}

data "coder_parameter" "instance_type" {
name = "Instance Type"
description = "What instance type should your workspace use?"
default = "t3.micro"
mutable = false
name = "instance_type"
display_name = "Instance Type"
description = "What instance type should your workspace use?"
default = "t3.micro"
mutable = false
option {
name = "2 vCPU, 1 GiB RAM"
value = "t3.micro"
Expand Down
20 changes: 11 additions & 9 deletions examples/templates/aws-windows/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
coder = {
source = "coder/coder"
version = "~> 0.6.17"
version = "~> 0.7.0"
}
aws = {
source = "hashicorp/aws"
Expand All @@ -14,10 +14,11 @@ terraform {
# Last updated 2023-03-14
# aws ec2 describe-regions | jq -r '[.Regions[].RegionName] | sort'
data "coder_parameter" "region" {
name = "Region"
description = "The region to deploy the workspace in."
default = "us-east-1"
mutable = false
name = "region"
display_name = "Region"
description = "The region to deploy the workspace in."
default = "us-east-1"
mutable = false
option {
name = "Asia Pacific (Tokyo)"
value = "ap-northeast-1"
Expand Down Expand Up @@ -106,10 +107,11 @@ data "coder_parameter" "region" {
}

data "coder_parameter" "instance_type" {
name = "Instance Type"
description = "What instance type should your workspace use?"
default = "t3.micro"
mutable = false
name = "instance_type"
display_name = "Instance Type"
description = "What instance type should your workspace use?"
default = "t3.micro"
mutable = false
option {
name = "2 vCPU, 1 GiB RAM"
value = "t3.micro"
Expand Down
37 changes: 20 additions & 17 deletions examples/templates/azure-linux/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
coder = {
source = "coder/coder"
version = "~> 0.6.17"
version = "~> 0.7.0"
}
azurerm = {
source = "hashicorp/azurerm"
Expand All @@ -12,11 +12,12 @@ terraform {
}

data "coder_parameter" "location" {
name = "Location"
description = "What location should your workspace live in?"
default = "eastus"
icon = "/emojis/1f310.png"
mutable = false
name = "location"
display_name = "Location"
description = "What location should your workspace live in?"
default = "eastus"
icon = "/emojis/1f310.png"
mutable = false
option {
name = "US (Virginia)"
value = "eastus"
Expand Down Expand Up @@ -150,11 +151,12 @@ data "coder_parameter" "location" {
}

data "coder_parameter" "instance_type" {
name = "Instance Type"
description = "What instance type should your workspace use?"
default = "Standard_B4ms"
icon = "/icon/azure.png"
mutable = false
name = "instance_type"
display_name = "Instance Type"
description = "What instance type should your workspace use?"
default = "Standard_B4ms"
icon = "/icon/azure.png"
mutable = false
option {
name = "Standard_B1ms (1 vCPU, 2 GiB RAM)"
value = "Standard_B1ms"
Expand Down Expand Up @@ -202,12 +204,13 @@ data "coder_parameter" "instance_type" {
}

data "coder_parameter" "home_size" {
name = "Home Volume Size"
description = "How large would you like your home volume to be (in GB)?"
default = 20
type = "number"
icon = "/icon/azure.png"
mutable = false
name = "home_size"
display_name = "Home Volume Size"
description = "How large would you like your home volume to be (in GB)?"
default = 20
type = "number"
icon = "/icon/azure.png"
mutable = false
validation {
min = 1
max = 1024
Expand Down
48 changes: 27 additions & 21 deletions examples/templates/do-linux/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
coder = {
source = "coder/coder"
version = "~> 0.6.17"
version = "~> 0.7.0"
}
digitalocean = {
source = "digitalocean/digitalocean"
Expand Down Expand Up @@ -52,10 +52,12 @@ variable "step2_do_admin_ssh_key" {
}

data "coder_parameter" "droplet_image" {
name = "Which Droplet image would you like to use for your workspace?"
default = "ubuntu-22-04-x64"
type = "string"
mutable = false
name = "droplet_image"
display_name = "Droplet Image"
description = "Which Droplet image would you like to use?"
default = "ubuntu-22-04-x64"
type = "string"
mutable = false
option {
name = "Ubuntu 22.04"
value = "ubuntu-22-04-x64"
Expand Down Expand Up @@ -109,11 +111,13 @@ data "coder_parameter" "droplet_image" {
}

data "coder_parameter" "droplet_size" {
name = "Which Droplet configuration would you like to use?"
default = "s-1vcpu-1gb"
type = "string"
icon = "/icon/memory.svg"
mutable = false
name = "droplet_size"
display_name = "Droplet Size"
description = "Which Droplet configuration would you like to use?"
default = "s-1vcpu-1gb"
type = "string"
icon = "/icon/memory.svg"
mutable = false
option {
name = "1 vCPU, 1 GB RAM"
value = "s-1vcpu-1gb"
Expand Down Expand Up @@ -142,24 +146,26 @@ data "coder_parameter" "droplet_size" {


data "coder_parameter" "home_volume_size" {
name = "How large would you like your home volume to be (in GB)?"
description = "This volume will be mounted to /home/coder."
type = "number"
default = "20"
mutable = false
name = "home_volume_size"
display_name = "How large would you like your home volume to be (in GB)?"
description = "This volume will be mounted to /home/coder."
type = "number"
default = "20"
mutable = false
validation {
min = 1
max = 999999
}
}

data "coder_parameter" "region" {
name = "Which region would you like to use?"
description = "This is the region where your workspace will be created."
icon = "/emojis/1f30e.png"
type = "string"
default = "ams3"
mutable = false
name = "region"
display_name = "Which region would you like to use?"
description = "This is the region where your workspace will be created."
icon = "/emojis/1f30e.png"
type = "string"
default = "ams3"
mutable = false
option {
name = "New York 1"
value = "nyc1"
Expand Down
2 changes: 1 addition & 1 deletion examples/templates/docker-code-server/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
coder = {
source = "coder/coder"
version = "~> 0.6.17"
version = "~> 0.7.0"
}
docker = {
source = "kreuzwerker/docker"
Expand Down
2 changes: 1 addition & 1 deletion examples/templates/docker-image-builds/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ terraform {
required_providers {
coder = {
source = "coder/coder"
version = "~> 0.6.17"
version = "~> 0.7.0"
}
docker = {
source = "kreuzwerker/docker"
Expand Down
26 changes: 14 additions & 12 deletions examples/templates/docker-with-dotfiles/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ terraform {
required_providers {
coder = {
source = "coder/coder"
version = "~> 0.6.17"
version = "~> 0.7.0"
}
docker = {
source = "kreuzwerker/docker"
Expand All @@ -28,24 +28,26 @@ data "coder_workspace" "me" {
}

data "coder_parameter" "docker_image" {
name = "What Docker image would you like to use for your workspace?"
description = "The Docker image will be used to build your workspace."
default = "codercom/enterprise-base:ubuntu"
icon = "/icon/docker.png"
type = "string"
mutable = false
name = "docker_image"
display_name = "What Docker image would you like to use for your workspace?"
description = "The Docker image will be used to build your workspace."
default = "codercom/enterprise-base:ubuntu"
icon = "/icon/docker.png"
type = "string"
mutable = false
}

data "coder_parameter" "dotfiles_uri" {
name = "What dotfiles repo would you like to use for your workspace?"
description = <<-EOF
name = "dotfiles_uri"
display_name = "What dotfiles repo would you like to use for your workspace?"
description = <<-EOF
Dotfiles repo URI (optional)

see https://dotfiles.github.io
EOF
default = ""
type = "string"
mutable = true
default = ""
type = "string"
mutable = true
}

resource "coder_agent" "main" {
Expand Down
2 changes: 1 addition & 1 deletion examples/templates/docker/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
coder = {
source = "coder/coder"
version = "~> 0.6.17"
version = "~> 0.7.0"
}
docker = {
source = "kreuzwerker/docker"
Expand Down
Loading