setname

Author: DavidGOrtega

examples/main.tf

@@ -1,14 +1,14 @@
 terraform {
   required_providers {
-    iterative = {
-      versions = ["0.6"]
-      source = "github.com/iterative/iterative"
-    }
-
     # iterative = {
-    #   source = "iterative/iterative"
-    #   version = "0.5.6"
+    #   versions = ["0.6"]
+    #   source = "github.com/iterative/iterative"
     # }
+
+    iterative = {
+      source = "iterative/iterative"
+      version = "0.5.7"
+    }
   }
 }
 

iterative/resource_machine.go

@@ -10,7 +10,6 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/teris-io/shortid"
 )
 
 func resourceMachine() *schema.Resource {
@@ -114,6 +113,8 @@ func machineSchema() *map[string]*schema.Schema {
 func resourceMachineCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	var diags diag.Diagnostics
 
+	utils.SetName(d)
+
 	keyPublic := d.Get("ssh_public").(string)
 	if len(keyPublic) == 0 {
 		public, private, _ := utils.SSHKeyPair()
@@ -122,13 +123,6 @@ func resourceMachineCreate(ctx context.Context, d *schema.ResourceData, m interf
 		d.Set("ssh_private", private)
 	}
 
-	name := d.Get("name").(string)
-	if len(name) == 0 {
-		sid, _ := shortid.New(1, shortid.DefaultABC, 2342)
-		id, _ := sid.Generate()
-		d.Set("name", "iterative-"+id)
-	}
-
 	cloud := d.Get("cloud").(string)
 	if cloud == "aws" {
 		err := aws.ResourceMachineCreate(ctx, d, m)

iterative/resource_runner.go

@@ -10,6 +10,8 @@ import (
 	"os"
 	"strconv"
 
+	"terraform-provider-iterative/iterative/utils"
+
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
@@ -134,6 +136,8 @@ func resourceRunner() *schema.Resource {
 func resourceRunnerCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	var diags diag.Diagnostics
 
+	utils.SetName(d)
+
 	customData, err := provisionerCode(d)
 	if err != nil {
 		diags = append(diags, diag.Diagnostic{

iterative/utils/helpers.go

@@ -2,6 +2,8 @@ package utils
 
 import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+
+	"github.com/teris-io/shortid"
 )
 
 func MachinePrefix(d *schema.ResourceData) string {
@@ -12,3 +14,12 @@ func MachinePrefix(d *schema.ResourceData) string {
 
 	return prefix
 }
+
+func SetName(d *schema.ResourceData) {
+	name := d.Get("name").(string)
+	if len(name) == 0 {
+		sid, _ := shortid.New(1, shortid.DefaultABC, 2342)
+		id, _ := sid.Generate()
+		d.Set("name", "iterative-"+id)
+	}
+}