@@ -11,18 +11,7 @@ terraform {
1111 }
1212}
1313
14- variable "step1_do_token" {
15- type = string
16- description = " Enter token (see documentation at https://docs.digitalocean.com/reference/api/create-personal-access-token/)"
17- sensitive = true
18-
19- validation {
20- condition = length (var. step1_do_token )== 71 && substr (var. step1_do_token ,0 ,4 )== " dop_"
21- error_message = " Invalid Digital Ocean Personal Access Token."
22- }
23- }
24-
25- variable "step2_do_project_id" {
14+ variable "step1_do_project_id" {
2615type = string
2716description = <<- EOF
2817 Enter project ID
@@ -32,17 +21,17 @@ variable "step2_do_project_id" {
3221sensitive = true
3322
3423validation {
35- condition = length (var. step2_do_project_id )== 36
24+ condition = length (var. step1_do_project_id )== 36
3625error_message = " Invalid Digital Ocean Project ID."
3726 }
3827}
3928
40- variable "step3_do_admin_ssh_key " {
29+ variable "step2_do_admin_ssh_key " {
4130type = number
4231description = <<- EOF
4332 Enter admin SSH key ID (some Droplet images require an SSH key to be set):
4433
45- Can be set tozero .
34+ Can be set to"0" for no key .
4635
4736 Note: Setting this to zero will break Fedora images and notify root passwords via email.
4837
@@ -51,7 +40,7 @@ variable "step3_do_admin_ssh_key" {
5140sensitive = true
5241
5342validation {
54- condition = var. step3_do_admin_ssh_key >= 0
43+ condition = var. step2_do_admin_ssh_key >= 0
5544error_message = " Invalid Digital Ocean SSH key ID, a number is required."
5645 }
5746}
@@ -98,7 +87,8 @@ variable "region" {
9887
9988# Configure the DigitalOcean Provider
10089provider "digitalocean" {
101- token = var. step1_do_token
90+ # Recommended: use environment variable DIGITALOCEAN_TOKEN with your personal access token when starting coderd
91+ # alternatively, you can pass the token via a variable.
10292}
10393
10494data "coder_workspace" "me" {}
@@ -130,12 +120,12 @@ resource "digitalocean_droplet" "workspace" {
130120 coder_agent_token= coder_agent.dev.token
131121 })
132122# Required to provision Fedora.
133- ssh_keys = var. step3_do_admin_ssh_key > 0 ? [var . step3_do_admin_ssh_key ]: []
123+ ssh_keys = var. step2_do_admin_ssh_key > 0 ? [var . step2_do_admin_ssh_key ]: []
134124}
135125
136126# Temporarily disabled because it breaks SSH. (https://github.com/coder/coder/issues/1750)
137127# resource "digitalocean_project_resources" "project" {
138- # project = var.step2_do_project_id
128+ # project = var.step1_do_project_id
139129# # Workaround for terraform plan when using count.
140130# resources = length(digitalocean_droplet.workspace) > 0 ? [
141131# digitalocean_volume.home_volume.urn,