|
7 | 7 | "encoding/json"
|
8 | 8 | "fmt"
|
9 | 9 | "html/template"
|
| 10 | + "os" |
10 | 11 | "strconv"
|
11 | 12 |
|
12 | 13 | "github.com/hashicorp/terraform-plugin-sdk/v2/diag"
|
@@ -143,14 +144,12 @@ func resourceRunnerCreate(ctx context.Context, d *schema.ResourceData, m interfa
|
143 | 144 | }
|
144 | 145 | d.Set("custom_data", customData)
|
145 | 146 |
|
146 |
| - /* |
147 |
| - diags = append(diags, diag.Diagnostic{ |
148 |
| - Severity: diag.Error, |
149 |
| - Summary: d.Get("custom_data").(string), |
150 |
| - }) |
| 147 | + diags = append(diags, diag.Diagnostic{ |
| 148 | + Severity: diag.Error, |
| 149 | + Summary: d.Get("custom_data").(string), |
| 150 | + }) |
151 | 151 |
|
152 |
| - return diags |
153 |
| - */ |
| 152 | + return diags |
154 | 153 |
|
155 | 154 | cloud := d.Get("cloud").(string)
|
156 | 155 | if len(cloud) == 0 {
|
@@ -220,14 +219,28 @@ func provisionerCode(d *schema.ResourceData) (string, error) {
|
220 | 219 | data["idle_timeout"] = strconv.Itoa(d.Get("idle_timeout").(int))
|
221 | 220 | data["name"] = d.Get("name").(string)
|
222 | 221 | data["tf_resource"] = base64.StdEncoding.EncodeToString(jsonResource)
|
| 222 | + data["AWS_SECRET_ACCESS_KEY"] = os.Getenv("AWS_SECRET_ACCESS_KEY") |
| 223 | + data["AWS_ACCESS_KEY_ID"] = os.Getenv("AWS_ACCESS_KEY_ID") |
| 224 | + data["AZURE_CLIENT_ID"] = os.Getenv("AZURE_CLIENT_ID") |
| 225 | + data["AZURE_CLIENT_SECRET"] = os.Getenv("AZURE_CLIENT_SECRET") |
| 226 | + data["AZURE_SUBSCRIPTION_ID"] = os.Getenv("AZURE_SUBSCRIPTION_ID") |
| 227 | + data["AZURE_TENANT_ID"] = os.Getenv("AZURE_TENANT_ID") |
223 | 228 |
|
224 | 229 | tmpl, err := template.New("deploy").Parse(`#!/bin/bash
|
| 230 | +export DEBIAN_FRONTEND=noninteractive |
225 | 231 | echo "APT::Get::Assume-Yes \"true\";" | sudo tee -a /etc/apt/apt.conf.d/90assumeyes
|
226 | 232 | curl -sL https://deb.nodesource.com/setup_12.x | sudo bash
|
227 | 233 | curl -fsSL https://apt.releases.hashicorp.com/gpg | sudo apt-key add -
|
228 | 234 | sudo apt-add-repository "deb [arch=amd64] https://apt.releases.hashicorp.com $(lsb_release -cs) main"
|
229 | 235 | sudo apt update && sudo apt-get install -y terraform nodejs
|
230 | 236 | sudo npm install -g git+https://github.com/iterative/cml.git#cml-runner
|
| 237 | +
|
| 238 | +export AWS_SECRET_ACCESS_KEY={{.AWS_SECRET_ACCESS_KEY}} |
| 239 | +export AWS_ACCESS_KEY_ID={{.AWS_ACCESS_KEY_ID}} |
| 240 | +export AZURE_CLIENT_ID={{.AZURE_CLIENT_ID}} |
| 241 | +export AZURE_CLIENT_SECRET={{.AZURE_CLIENT_SECRET}} |
| 242 | +export AZURE_SUBSCRIPTION_ID={{.AZURE_SUBSCRIPTION_ID}} |
| 243 | +export AZURE_TENANT_ID={{.AZURE_TENANT_ID}} |
231 | 244 | nohup cml-runner{{if .name}} --name {{.name}}{{end}}{{if .labels}} --labels {{.labels}}{{end}}{{if .idle_timeout}} --idle-timeout {{.idle_timeout}}{{end}}{{if .driver}} --driver {{.driver}}{{end}}{{if .repo}} --repo {{.repo}}{{end}}{{if .token}} --token {{.token}}{{end}}{{if .tf_resource}} --tf_resource={{.tf_resource}}{{end}} < /dev/null > std.out 2> std.err &
|
232 | 245 | sleep 10
|
233 | 246 | `)
|
|
0 commit comments