Skip to content

Commit c681e1e

Browse files
0x2b3bfa00x2b3bfa0
authored
Improve machine identifier format (#726)
1 parent 529ba5e commit c681e1e

10 files changed

+34
-23
lines changed

Diff for: ‎iterative/aws/provider.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func ResourceMachineCreate(ctx context.Context, d *schema.ResourceData, m interf
4646
availabilityZone := GetAvailabilityZone(d.Get("region").(string))
4747

4848
metadata := map[string]string{
49-
"Name": d.Get("name").(string),
49+
"Name": d.Id(),
5050
"Id": d.Id(),
5151
}
5252
for key, value := range d.Get("metadata").(map[string]interface{}) {

Diff for: ‎iterative/azure/provider.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
azresources "terraform-provider-iterative/task/az/resources"
2121
)
2222

23-
//ResourceMachineCreate creates AWS instance
23+
// ResourceMachineCreate creates AWS instance
2424
func ResourceMachineCreate(ctx context.Context, d *schema.ResourceData, m interface{}) error {
2525
subscriptionID, err := subscriptionID()
2626
if err != nil {
@@ -59,7 +59,7 @@ func ResourceMachineCreate(ctx context.Context, d *schema.ResourceData, m interf
5959
sku := imageParts[2]
6060
version := imageParts[3]
6161

62-
vmName := d.Get("name").(string)
62+
vmName := d.Id()
6363
gpName := d.Id()
6464
nsgName := gpName + "-nsg"
6565
vnetName := gpName + "-vnet"
@@ -296,7 +296,7 @@ func ResourceMachineCreate(ctx context.Context, d *schema.ResourceData, m interf
296296
return nil
297297
}
298298

299-
//ResourceMachineDelete deletes Azure instance
299+
// ResourceMachineDelete deletes Azure instance
300300
func ResourceMachineDelete(ctx context.Context, d *schema.ResourceData, m interface{}) error {
301301
subscriptionID, err := subscriptionID()
302302
if err != nil {
@@ -398,7 +398,7 @@ func getUserAssignedIdentityMap(identitiesRaw string) (map[string]*compute.Virtu
398398
return identityMap, nil
399399
}
400400

401-
//GetRegion maps region to real cloud regions
401+
// GetRegion maps region to real cloud regions
402402
func GetRegion(region string) string {
403403
instanceRegions := make(map[string]string)
404404
instanceRegions["us-east"] = "eastus"

Diff for: ‎iterative/resource_runner.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ func provisionerCode(d *schema.ResourceData) (string, error) {
418418
Cloud: d.Get("cloud").(string),
419419
Spot: d.Get("spot").(bool),
420420
Region: d.Get("region").(string),
421-
Name: d.Get("name").(string),
421+
Name: d.Id(),
422422
Labels: "",
423423
IdleTimeout: d.Get("idle_timeout").(int),
424424
Repo: "",
@@ -460,7 +460,7 @@ func provisionerCode(d *schema.ResourceData) (string, error) {
460460
data["driver"] = d.Get("driver").(string)
461461
data["labels"] = d.Get("labels").(string)
462462
data["idle_timeout"] = strconv.Itoa(d.Get("idle_timeout").(int))
463-
data["name"] = d.Get("name").(string)
463+
data["name"] = d.Id()
464464
data["cloud"] = d.Get("cloud").(string)
465465
data["startup_script"] = d.Get("startup_script").(string)
466466
data["tf_resource"] = base64.StdEncoding.EncodeToString(jsonResource)

Diff for: ‎iterative/testdata/script_template_cloud_aws.golden

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,15 @@ export AWS_SESSION_TOKEN='2 value with "quotes" and spaces'
5858
while lsof /var/lib/dpkg/lock; do sleep 1; done
5959
6060
HOME="$(mktemp -d)" exec $(which cml-runner || echo $(which cml-internal || echo cml) runner) \
61-
--name '10 value with "quotes" and spaces' \
61+
\
6262
--labels '16 value with "quotes" and spaces' \
6363
--idle-timeout 11 \
6464
--driver '15 value with "quotes" and spaces' \
6565
--repo '14 value with "quotes" and spaces' \
6666
--token '13 value with "quotes" and spaces' \
6767
--single \
6868
\
69-
--tf-resource eyJtb2RlIjoibWFuYWdlZCIsInR5cGUiOiJpdGVyYXRpdmVfY21sX3J1bm5lciIsIm5hbWUiOiJydW5uZXIiLCJwcm92aWRlciI6InByb3ZpZGVyW1wicmVnaXN0cnkudGVycmFmb3JtLmlvL2l0ZXJhdGl2ZS9pdGVyYXRpdmVcIl0iLCJpbnN0YW5jZXMiOlt7InByaXZhdGUiOiIiLCJzY2hlbWFfdmVyc2lvbiI6MCwiYXR0cmlidXRlcyI6eyJuYW1lIjoiMTAgdmFsdWUgd2l0aCBcInF1b3Rlc1wiIGFuZCBzcGFjZXMiLCJsYWJlbHMiOiIiLCJpZGxlX3RpbWVvdXQiOjExLCJyZXBvIjoiIiwidG9rZW4iOiIiLCJkcml2ZXIiOiIiLCJjbG91ZCI6ImF3cyIsInNwb3QiOmZhbHNlLCJjdXN0b21fZGF0YSI6IiIsImlkIjoiIiwiaW1hZ2UiOiIiLCJpbnN0YW5jZV9ncHUiOiIiLCJpbnN0YW5jZV9oZGRfc2l6ZSI6MTIsImluc3RhbmNlX2lwIjoiIiwiaW5zdGFuY2VfbGF1bmNoX3RpbWUiOiIiLCJpbnN0YW5jZV90eXBlIjoiIiwicmVnaW9uIjoiOSB2YWx1ZSB3aXRoIFwicXVvdGVzXCIgYW5kIHNwYWNlcyIsInNzaF9uYW1lIjoiIiwic3NoX3ByaXZhdGUiOiIiLCJzc2hfcHVibGljIjoiIiwiYXdzX3NlY3VyaXR5X2dyb3VwIjoiIn19XX0=
69+
--tf-resource eyJtb2RlIjoibWFuYWdlZCIsInR5cGUiOiJpdGVyYXRpdmVfY21sX3J1bm5lciIsIm5hbWUiOiJydW5uZXIiLCJwcm92aWRlciI6InByb3ZpZGVyW1wicmVnaXN0cnkudGVycmFmb3JtLmlvL2l0ZXJhdGl2ZS9pdGVyYXRpdmVcIl0iLCJpbnN0YW5jZXMiOlt7InByaXZhdGUiOiIiLCJzY2hlbWFfdmVyc2lvbiI6MCwiYXR0cmlidXRlcyI6eyJuYW1lIjoiIiwibGFiZWxzIjoiIiwiaWRsZV90aW1lb3V0IjoxMSwicmVwbyI6IiIsInRva2VuIjoiIiwiZHJpdmVyIjoiIiwiY2xvdWQiOiJhd3MiLCJzcG90IjpmYWxzZSwiY3VzdG9tX2RhdGEiOiIiLCJpZCI6IiIsImltYWdlIjoiIiwiaW5zdGFuY2VfZ3B1IjoiIiwiaW5zdGFuY2VfaGRkX3NpemUiOjEyLCJpbnN0YW5jZV9pcCI6IiIsImluc3RhbmNlX2xhdW5jaF90aW1lIjoiIiwiaW5zdGFuY2VfdHlwZSI6IiIsInJlZ2lvbiI6IjkgdmFsdWUgd2l0aCBcInF1b3Rlc1wiIGFuZCBzcGFjZXMiLCJzc2hfbmFtZSI6IiIsInNzaF9wcml2YXRlIjoiIiwic3NoX3B1YmxpYyI6IiIsImF3c19zZWN1cml0eV9ncm91cCI6IiJ9fV19
7070
EOF
7171
sudo chmod +x /usr/bin/cml.sh
7272

Diff for: ‎iterative/testdata/script_template_cloud_azure.golden

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,15 @@ export AZURE_TENANT_ID='6 value with "quotes" and spaces'
5959
while lsof /var/lib/dpkg/lock; do sleep 1; done
6060
6161
HOME="$(mktemp -d)" exec $(which cml-runner || echo $(which cml-internal || echo cml) runner) \
62-
--name '10 value with "quotes" and spaces' \
62+
\
6363
--labels '16 value with "quotes" and spaces' \
6464
--idle-timeout 11 \
6565
--driver '15 value with "quotes" and spaces' \
6666
--repo '14 value with "quotes" and spaces' \
6767
--token '13 value with "quotes" and spaces' \
6868
--single \
6969
\
70-
--tf-resource eyJtb2RlIjoibWFuYWdlZCIsInR5cGUiOiJpdGVyYXRpdmVfY21sX3J1bm5lciIsIm5hbWUiOiJydW5uZXIiLCJwcm92aWRlciI6InByb3ZpZGVyW1wicmVnaXN0cnkudGVycmFmb3JtLmlvL2l0ZXJhdGl2ZS9pdGVyYXRpdmVcIl0iLCJpbnN0YW5jZXMiOlt7InByaXZhdGUiOiIiLCJzY2hlbWFfdmVyc2lvbiI6MCwiYXR0cmlidXRlcyI6eyJuYW1lIjoiMTAgdmFsdWUgd2l0aCBcInF1b3Rlc1wiIGFuZCBzcGFjZXMiLCJsYWJlbHMiOiIiLCJpZGxlX3RpbWVvdXQiOjExLCJyZXBvIjoiIiwidG9rZW4iOiIiLCJkcml2ZXIiOiIiLCJjbG91ZCI6ImF6dXJlIiwic3BvdCI6ZmFsc2UsImN1c3RvbV9kYXRhIjoiIiwiaWQiOiIiLCJpbWFnZSI6IiIsImluc3RhbmNlX2dwdSI6IiIsImluc3RhbmNlX2hkZF9zaXplIjoxMiwiaW5zdGFuY2VfaXAiOiIiLCJpbnN0YW5jZV9sYXVuY2hfdGltZSI6IiIsImluc3RhbmNlX3R5cGUiOiIiLCJyZWdpb24iOiI5IHZhbHVlIHdpdGggXCJxdW90ZXNcIiBhbmQgc3BhY2VzIiwic3NoX25hbWUiOiIiLCJzc2hfcHJpdmF0ZSI6IiIsInNzaF9wdWJsaWMiOiIiLCJhd3Nfc2VjdXJpdHlfZ3JvdXAiOiIifX1dfQ==
70+
--tf-resource eyJtb2RlIjoibWFuYWdlZCIsInR5cGUiOiJpdGVyYXRpdmVfY21sX3J1bm5lciIsIm5hbWUiOiJydW5uZXIiLCJwcm92aWRlciI6InByb3ZpZGVyW1wicmVnaXN0cnkudGVycmFmb3JtLmlvL2l0ZXJhdGl2ZS9pdGVyYXRpdmVcIl0iLCJpbnN0YW5jZXMiOlt7InByaXZhdGUiOiIiLCJzY2hlbWFfdmVyc2lvbiI6MCwiYXR0cmlidXRlcyI6eyJuYW1lIjoiIiwibGFiZWxzIjoiIiwiaWRsZV90aW1lb3V0IjoxMSwicmVwbyI6IiIsInRva2VuIjoiIiwiZHJpdmVyIjoiIiwiY2xvdWQiOiJhenVyZSIsInNwb3QiOmZhbHNlLCJjdXN0b21fZGF0YSI6IiIsImlkIjoiIiwiaW1hZ2UiOiIiLCJpbnN0YW5jZV9ncHUiOiIiLCJpbnN0YW5jZV9oZGRfc2l6ZSI6MTIsImluc3RhbmNlX2lwIjoiIiwiaW5zdGFuY2VfbGF1bmNoX3RpbWUiOiIiLCJpbnN0YW5jZV90eXBlIjoiIiwicmVnaW9uIjoiOSB2YWx1ZSB3aXRoIFwicXVvdGVzXCIgYW5kIHNwYWNlcyIsInNzaF9uYW1lIjoiIiwic3NoX3ByaXZhdGUiOiIiLCJzc2hfcHVibGljIjoiIiwiYXdzX3NlY3VyaXR5X2dyb3VwIjoiIn19XX0=
7171
EOF
7272
sudo chmod +x /usr/bin/cml.sh
7373

Diff for: ‎iterative/testdata/script_template_cloud_gcp.golden

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,15 @@ export CML_GCP_ACCESS_TOKEN=''
5757
while lsof /var/lib/dpkg/lock; do sleep 1; done
5858
5959
HOME="$(mktemp -d)" exec $(which cml-runner || echo $(which cml-internal || echo cml) runner) \
60-
--name '10 value with "quotes" and spaces' \
60+
\
6161
--labels '16 value with "quotes" and spaces' \
6262
--idle-timeout 11 \
6363
--driver '15 value with "quotes" and spaces' \
6464
--repo '14 value with "quotes" and spaces' \
6565
--token '13 value with "quotes" and spaces' \
6666
--single \
6767
\
68-
--tf-resource eyJtb2RlIjoibWFuYWdlZCIsInR5cGUiOiJpdGVyYXRpdmVfY21sX3J1bm5lciIsIm5hbWUiOiJydW5uZXIiLCJwcm92aWRlciI6InByb3ZpZGVyW1wicmVnaXN0cnkudGVycmFmb3JtLmlvL2l0ZXJhdGl2ZS9pdGVyYXRpdmVcIl0iLCJpbnN0YW5jZXMiOlt7InByaXZhdGUiOiIiLCJzY2hlbWFfdmVyc2lvbiI6MCwiYXR0cmlidXRlcyI6eyJuYW1lIjoiMTAgdmFsdWUgd2l0aCBcInF1b3Rlc1wiIGFuZCBzcGFjZXMiLCJsYWJlbHMiOiIiLCJpZGxlX3RpbWVvdXQiOjExLCJyZXBvIjoiIiwidG9rZW4iOiIiLCJkcml2ZXIiOiIiLCJjbG91ZCI6ImdjcCIsInNwb3QiOmZhbHNlLCJjdXN0b21fZGF0YSI6IiIsImlkIjoiIiwiaW1hZ2UiOiIiLCJpbnN0YW5jZV9ncHUiOiIiLCJpbnN0YW5jZV9oZGRfc2l6ZSI6MTIsImluc3RhbmNlX2lwIjoiIiwiaW5zdGFuY2VfbGF1bmNoX3RpbWUiOiIiLCJpbnN0YW5jZV90eXBlIjoiIiwicmVnaW9uIjoiOSB2YWx1ZSB3aXRoIFwicXVvdGVzXCIgYW5kIHNwYWNlcyIsInNzaF9uYW1lIjoiIiwic3NoX3ByaXZhdGUiOiIiLCJzc2hfcHVibGljIjoiIiwiYXdzX3NlY3VyaXR5X2dyb3VwIjoiIn19XX0=
68+
--tf-resource eyJtb2RlIjoibWFuYWdlZCIsInR5cGUiOiJpdGVyYXRpdmVfY21sX3J1bm5lciIsIm5hbWUiOiJydW5uZXIiLCJwcm92aWRlciI6InByb3ZpZGVyW1wicmVnaXN0cnkudGVycmFmb3JtLmlvL2l0ZXJhdGl2ZS9pdGVyYXRpdmVcIl0iLCJpbnN0YW5jZXMiOlt7InByaXZhdGUiOiIiLCJzY2hlbWFfdmVyc2lvbiI6MCwiYXR0cmlidXRlcyI6eyJuYW1lIjoiIiwibGFiZWxzIjoiIiwiaWRsZV90aW1lb3V0IjoxMSwicmVwbyI6IiIsInRva2VuIjoiIiwiZHJpdmVyIjoiIiwiY2xvdWQiOiJnY3AiLCJzcG90IjpmYWxzZSwiY3VzdG9tX2RhdGEiOiIiLCJpZCI6IiIsImltYWdlIjoiIiwiaW5zdGFuY2VfZ3B1IjoiIiwiaW5zdGFuY2VfaGRkX3NpemUiOjEyLCJpbnN0YW5jZV9pcCI6IiIsImluc3RhbmNlX2xhdW5jaF90aW1lIjoiIiwiaW5zdGFuY2VfdHlwZSI6IiIsInJlZ2lvbiI6IjkgdmFsdWUgd2l0aCBcInF1b3Rlc1wiIGFuZCBzcGFjZXMiLCJzc2hfbmFtZSI6IiIsInNzaF9wcml2YXRlIjoiIiwic3NoX3B1YmxpYyI6IiIsImF3c19zZWN1cml0eV9ncm91cCI6IiJ9fV19
6969
EOF
7070
sudo chmod +x /usr/bin/cml.sh
7171

Diff for: ‎iterative/testdata/script_template_cloud_invalid.golden

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,15 @@ sudo tee /usr/bin/cml.sh << 'EOF'
5555
while lsof /var/lib/dpkg/lock; do sleep 1; done
5656
5757
HOME="$(mktemp -d)" exec $(which cml-runner || echo $(which cml-internal || echo cml) runner) \
58-
--name '10 value with "quotes" and spaces' \
58+
\
5959
--labels '16 value with "quotes" and spaces' \
6060
--idle-timeout 11 \
6161
--driver '15 value with "quotes" and spaces' \
6262
--repo '14 value with "quotes" and spaces' \
6363
--token '13 value with "quotes" and spaces' \
6464
--single \
6565
\
66-
--tf-resource eyJtb2RlIjoibWFuYWdlZCIsInR5cGUiOiJpdGVyYXRpdmVfY21sX3J1bm5lciIsIm5hbWUiOiJydW5uZXIiLCJwcm92aWRlciI6InByb3ZpZGVyW1wicmVnaXN0cnkudGVycmFmb3JtLmlvL2l0ZXJhdGl2ZS9pdGVyYXRpdmVcIl0iLCJpbnN0YW5jZXMiOlt7InByaXZhdGUiOiIiLCJzY2hlbWFfdmVyc2lvbiI6MCwiYXR0cmlidXRlcyI6eyJuYW1lIjoiMTAgdmFsdWUgd2l0aCBcInF1b3Rlc1wiIGFuZCBzcGFjZXMiLCJsYWJlbHMiOiIiLCJpZGxlX3RpbWVvdXQiOjExLCJyZXBvIjoiIiwidG9rZW4iOiIiLCJkcml2ZXIiOiIiLCJjbG91ZCI6ImludmFsaWQiLCJzcG90IjpmYWxzZSwiY3VzdG9tX2RhdGEiOiIiLCJpZCI6IiIsImltYWdlIjoiIiwiaW5zdGFuY2VfZ3B1IjoiIiwiaW5zdGFuY2VfaGRkX3NpemUiOjEyLCJpbnN0YW5jZV9pcCI6IiIsImluc3RhbmNlX2xhdW5jaF90aW1lIjoiIiwiaW5zdGFuY2VfdHlwZSI6IiIsInJlZ2lvbiI6IjkgdmFsdWUgd2l0aCBcInF1b3Rlc1wiIGFuZCBzcGFjZXMiLCJzc2hfbmFtZSI6IiIsInNzaF9wcml2YXRlIjoiIiwic3NoX3B1YmxpYyI6IiIsImF3c19zZWN1cml0eV9ncm91cCI6IiJ9fV19
66+
--tf-resource eyJtb2RlIjoibWFuYWdlZCIsInR5cGUiOiJpdGVyYXRpdmVfY21sX3J1bm5lciIsIm5hbWUiOiJydW5uZXIiLCJwcm92aWRlciI6InByb3ZpZGVyW1wicmVnaXN0cnkudGVycmFmb3JtLmlvL2l0ZXJhdGl2ZS9pdGVyYXRpdmVcIl0iLCJpbnN0YW5jZXMiOlt7InByaXZhdGUiOiIiLCJzY2hlbWFfdmVyc2lvbiI6MCwiYXR0cmlidXRlcyI6eyJuYW1lIjoiIiwibGFiZWxzIjoiIiwiaWRsZV90aW1lb3V0IjoxMSwicmVwbyI6IiIsInRva2VuIjoiIiwiZHJpdmVyIjoiIiwiY2xvdWQiOiJpbnZhbGlkIiwic3BvdCI6ZmFsc2UsImN1c3RvbV9kYXRhIjoiIiwiaWQiOiIiLCJpbWFnZSI6IiIsImluc3RhbmNlX2dwdSI6IiIsImluc3RhbmNlX2hkZF9zaXplIjoxMiwiaW5zdGFuY2VfaXAiOiIiLCJpbnN0YW5jZV9sYXVuY2hfdGltZSI6IiIsImluc3RhbmNlX3R5cGUiOiIiLCJyZWdpb24iOiI5IHZhbHVlIHdpdGggXCJxdW90ZXNcIiBhbmQgc3BhY2VzIiwic3NoX25hbWUiOiIiLCJzc2hfcHJpdmF0ZSI6IiIsInNzaF9wdWJsaWMiOiIiLCJhd3Nfc2VjdXJpdHlfZ3JvdXAiOiIifX1dfQ==
6767
EOF
6868
sudo chmod +x /usr/bin/cml.sh
6969

Diff for: ‎iterative/testdata/script_template_cloud_kubernetes.golden

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ export KUBERNETES_CONFIGURATION='8 value with "quotes" and spaces'
88
while lsof /var/lib/dpkg/lock; do sleep 1; done
99

1010
HOME="$(mktemp -d)" exec $(which cml-runner || echo $(which cml-internal || echo cml) runner) \
11-
--name '10 value with "quotes" and spaces' \
11+
\
1212
--labels '16 value with "quotes" and spaces' \
1313
--idle-timeout 11 \
1414
--driver '15 value with "quotes" and spaces' \
1515
--repo '14 value with "quotes" and spaces' \
1616
--token '13 value with "quotes" and spaces' \
1717
--single \
1818
\
19-
--tf-resource eyJtb2RlIjoibWFuYWdlZCIsInR5cGUiOiJpdGVyYXRpdmVfY21sX3J1bm5lciIsIm5hbWUiOiJydW5uZXIiLCJwcm92aWRlciI6InByb3ZpZGVyW1wicmVnaXN0cnkudGVycmFmb3JtLmlvL2l0ZXJhdGl2ZS9pdGVyYXRpdmVcIl0iLCJpbnN0YW5jZXMiOlt7InByaXZhdGUiOiIiLCJzY2hlbWFfdmVyc2lvbiI6MCwiYXR0cmlidXRlcyI6eyJuYW1lIjoiMTAgdmFsdWUgd2l0aCBcInF1b3Rlc1wiIGFuZCBzcGFjZXMiLCJsYWJlbHMiOiIiLCJpZGxlX3RpbWVvdXQiOjExLCJyZXBvIjoiIiwidG9rZW4iOiIiLCJkcml2ZXIiOiIiLCJjbG91ZCI6Imt1YmVybmV0ZXMiLCJzcG90IjpmYWxzZSwiY3VzdG9tX2RhdGEiOiIiLCJpZCI6IiIsImltYWdlIjoiIiwiaW5zdGFuY2VfZ3B1IjoiIiwiaW5zdGFuY2VfaGRkX3NpemUiOjEyLCJpbnN0YW5jZV9pcCI6IiIsImluc3RhbmNlX2xhdW5jaF90aW1lIjoiIiwiaW5zdGFuY2VfdHlwZSI6IiIsInJlZ2lvbiI6IjkgdmFsdWUgd2l0aCBcInF1b3Rlc1wiIGFuZCBzcGFjZXMiLCJzc2hfbmFtZSI6IiIsInNzaF9wcml2YXRlIjoiIiwic3NoX3B1YmxpYyI6IiIsImF3c19zZWN1cml0eV9ncm91cCI6IiJ9fV19
19+
--tf-resource eyJtb2RlIjoibWFuYWdlZCIsInR5cGUiOiJpdGVyYXRpdmVfY21sX3J1bm5lciIsIm5hbWUiOiJydW5uZXIiLCJwcm92aWRlciI6InByb3ZpZGVyW1wicmVnaXN0cnkudGVycmFmb3JtLmlvL2l0ZXJhdGl2ZS9pdGVyYXRpdmVcIl0iLCJpbnN0YW5jZXMiOlt7InByaXZhdGUiOiIiLCJzY2hlbWFfdmVyc2lvbiI6MCwiYXR0cmlidXRlcyI6eyJuYW1lIjoiIiwibGFiZWxzIjoiIiwiaWRsZV90aW1lb3V0IjoxMSwicmVwbyI6IiIsInRva2VuIjoiIiwiZHJpdmVyIjoiIiwiY2xvdWQiOiJrdWJlcm5ldGVzIiwic3BvdCI6ZmFsc2UsImN1c3RvbV9kYXRhIjoiIiwiaWQiOiIiLCJpbWFnZSI6IiIsImluc3RhbmNlX2dwdSI6IiIsImluc3RhbmNlX2hkZF9zaXplIjoxMiwiaW5zdGFuY2VfaXAiOiIiLCJpbnN0YW5jZV9sYXVuY2hfdGltZSI6IiIsImluc3RhbmNlX3R5cGUiOiIiLCJyZWdpb24iOiI5IHZhbHVlIHdpdGggXCJxdW90ZXNcIiBhbmQgc3BhY2VzIiwic3NoX25hbWUiOiIiLCJzc2hfcHJpdmF0ZSI6IiIsInNzaF9wdWJsaWMiOiIiLCJhd3Nfc2VjdXJpdHlfZ3JvdXAiOiIifX1dfQ==

Diff for: ‎iterative/utils/helpers.go

+4-6
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ import (
66
"os"
77
"strings"
88

9-
"github.com/aohorodnyk/uid"
109
"github.com/blang/semver/v4"
1110
"github.com/google/go-github/v42/github"
1211
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
12+
13+
"terraform-provider-iterative/task/common"
1314
)
1415

1516
func GetCML(version string) string {
@@ -81,11 +82,8 @@ func MachinePrefix(d *schema.ResourceData) string {
8182

8283
func SetId(d *schema.ResourceData) {
8384
if len(d.Id()) == 0 {
84-
d.SetId("iterative-" + uid.NewProvider36Size(8).MustGenerate().String())
85-
86-
if len(d.Get("name").(string)) == 0 {
87-
d.Set("name", d.Id())
88-
}
85+
id := common.NewRandomIdentifier(d.Get("name").(string))
86+
d.SetId(strings.Replace(id.Long(), "tpi-", "cml-", 1))
8987
}
9088
}
9189

Diff for: ‎iterative/utils/helpers_test.go

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package utils
2+
3+
import (
4+
"testing"
5+
6+
"github.com/stretchr/testify/require"
7+
)
8+
9+
func TestIdentifier(t *testing.T) {
10+
d := generateSchemaData(t, map[string]interface{}{"name": "example"})
11+
SetId(d)
12+
require.Regexp(t, "^cml-example-", d.Id())
13+
}

0 commit comments

Comments
 (0)