aws delete by tag

Author: DavidGOrtega

examples/main.tf

@@ -1,28 +1,18 @@
 terraform {
   required_providers {
-    # iterative = {
-    #   versions = ["0.6"]
-    #   source = "github.com/iterative/iterative"
-    # }
-
     iterative = {
-      source = "iterative/iterative"
-      version = "0.5.7"
+      versions = ["0.6"]
+      source = "github.com/iterative/iterative"
     }
+
+    # iterative = {
+    #   source = "iterative/iterative"
+    #   version = "0.5.7"
+    # }
   }
 }
 
 provider "iterative" {}
-
-/*
-resource "iterative_machine" "machine-az" {
-  cloud = "azure"
-  region = "us-east"
-  instance_type = "m"
-}
-*/
-
-
 resource "iterative_runner" "runner-az" {
     name = "holy-moly56"
     token = "arszDpb3xtNdKaXmQ6vN"
@@ -35,14 +25,6 @@ resource "iterative_runner" "runner-az" {
     instance_type = "m"
 } 
 
-/*
- resource "iterative_machine" "machine-aws" {
-    cloud = "aws"
-    region = "us-west"
-    instance_type = "t2.micro" //fallback to known instance type
-} 
-*/
-
 
 /*
 resource "iterative_machine" "machine-az" {
@@ -83,4 +65,18 @@ resource "iterative_machine" "machine-az" {
       host        = "${self.instance_ip}"
     }
   }
-} */
+} */
+/* 
+resource "iterative_machine" "machine-aws" {
+  name = "cml-aws4"
+  cloud = "aws"
+  region = "us-west"
+  instance_type = "t2.micro" //fallback to known instance type
+}  */
+
+/* resource "iterative_machine" "machine-az" {
+  name = "cml-azure"
+  cloud = "azure"
+  region = "us-west"
+  instance_type = "m"
+} */

iterative/aws/provider.go

@@ -14,7 +14,9 @@ import (
 
 //ResourceMachineCreate creates AWS instance
 func ResourceMachineCreate(ctx context.Context, d *schema.ResourceData, m interface{}) error {
+	userData := d.Get("startup_script").(string)
 	instanceName := d.Get("name").(string)
+	pairName := d.Id()
 	hddSize := d.Get("instance_hdd_size").(int)
 	region := getRegion(d.Get("region").(string))
 	instanceType := getInstanceType(d.Get("instance_type").(string), d.Get("instance_gpu").(string))
@@ -57,13 +59,15 @@ func ResourceMachineCreate(ctx context.Context, d *schema.ResourceData, m interf
 	})
 
 	instanceAmi := *imagesRes.Images[0].ImageId
-	pairName := instanceName
 
 	// key-pair
 	svc.ImportKeyPair(&ec2.ImportKeyPairInput{
 		KeyName:           aws.String(pairName),
 		PublicKeyMaterial: []byte(keyPublic),
 	})
+	//if err != nil {
+	//return err
+	//}
 
 	// securityGroup
 	var vpcID, sgID string
@@ -128,6 +132,7 @@ func ResourceMachineCreate(ctx context.Context, d *schema.ResourceData, m interf
 
 	//launch instance
 	runResult, err := svc.RunInstancesWithContext(ctx, &ec2.RunInstancesInput{
+		UserData:         aws.String(userData),
 		ImageId:          aws.String(instanceAmi),
 		KeyName:          aws.String(pairName),
 		InstanceType:     aws.String(instanceType),
@@ -163,6 +168,10 @@ func ResourceMachineCreate(ctx context.Context, d *schema.ResourceData, m interf
 				Key:   aws.String("Name"),
 				Value: aws.String(instanceName),
 			},
+			{
+				Key:   aws.String("Id"),
+				Value: aws.String(d.Id()),
+			},
 		},
 	})
 	if err != nil {
@@ -182,43 +191,50 @@ func ResourceMachineCreate(ctx context.Context, d *schema.ResourceData, m interf
 	svc.WaitUntilInstanceExistsWithContext(ctx, &statusInput)
 
 	descResult, err := svc.DescribeInstancesWithContext(ctx, &statusInput)
-	instanceDesc := descResult.Reservations[0].Instances[0]
-
-	d.SetId(instanceID)
-	d.Set("instance_id", instanceID)
-	d.Set("instance_ip", instanceDesc.PublicIpAddress)
-	d.Set("instance_launch_time", instanceDesc.LaunchTime.Format(time.RFC3339))
-
-	d.Set("key_name", pairName)
-
 	if err != nil {
 		return err
 	}
 
+	instanceDesc := descResult.Reservations[0].Instances[0]
+	d.Set("instance_ip", instanceDesc.PublicIpAddress)
+	d.Set("instance_launch_time", instanceDesc.LaunchTime.Format(time.RFC3339))
+
 	return nil
 }
 
 //ResourceMachineDelete deletes AWS instance
 func ResourceMachineDelete(ctx context.Context, d *schema.ResourceData, m interface{}) error {
-	svc, _ := awsClient(getRegion(d.Get("region").(string)))
-	instanceID := d.Get("instance_id").(string)
+	id := aws.String(d.Id())
+	region := getRegion(d.Get("region").(string))
 
-	/*
-		pairName := d.Get("key_name").(string)
-		svc.DeleteKeyPair(&ec2.DeleteKeyPairInput{
-			KeyName: aws.String(pairName),
-		})
-	*/
+	svc, err := awsClient(region)
+	if err != nil {
+		return err
+	}
 
-	input := &ec2.TerminateInstancesInput{
-		InstanceIds: []*string{
-			aws.String(instanceID),
+	descResult, err := svc.DescribeInstancesWithContext(ctx, &ec2.DescribeInstancesInput{
+		Filters: []*ec2.Filter{
+			{
+				Name:   aws.String("tag:Id"),
+				Values: []*string{id},
+			},
 		},
-		DryRun: aws.Bool(false),
+	})
+	if err != nil {
+		return err
 	}
 
-	_, err := svc.TerminateInstances(input)
+	svc.DeleteKeyPair(&ec2.DeleteKeyPairInput{
+		KeyName: id,
+	})
 
+	instanceID := *descResult.Reservations[0].Instances[0].InstanceId
+	_, err = svc.TerminateInstances(&ec2.TerminateInstancesInput{
+		InstanceIds: []*string{
+			aws.String(instanceID),
+		},
+		DryRun: aws.Bool(false),
+	})
 	if err != nil {
 		return err
 	}

iterative/azure/provider.go

@@ -2,7 +2,6 @@ package azure
 
 import (
 	"context"
-	"encoding/base64"
 	"fmt"
 	"os"
 	"strings"
@@ -25,9 +24,7 @@ func ResourceMachineCreate(ctx context.Context, d *schema.ResourceData, m interf
 	username := "ubuntu"
 	//username := d.Get("ssh_user").(string)
 
-	vmName := d.Get("name").(string)
-
-	customData := base64.StdEncoding.EncodeToString([]byte(d.Get("custom_data").(string)))
+	customData := d.Get("startup_script").(string)
 	region := getRegion(d.Get("region").(string))
 	instanceType := getInstanceType(d.Get("instance_type").(string), d.Get("instance_gpu").(string))
 	keyPublic := d.Get("ssh_public").(string)
@@ -45,13 +42,14 @@ func ResourceMachineCreate(ctx context.Context, d *schema.ResourceData, m interf
 	sku := imageParts[2]
 	version := imageParts[3]
 
-	gpName := vmName
-	nsgName := vmName + "-nsg"
-	vnetName := vmName + "-vnet"
-	ipName := vmName + "-ip"
-	subnetName := vmName + "-sn"
-	nicName := vmName + "-nic"
-	ipConfigName := vmName + "-ipc"
+	vmName := d.Get("name").(string)
+	gpName := d.Id()
+	nsgName := gpName + "-nsg"
+	vnetName := gpName + "-vnet"
+	ipName := gpName + "-ip"
+	subnetName := gpName + "-sn"
+	nicName := gpName + "-nic"
+	ipConfigName := gpName + "-ipc"
 
 	groupsClient, err := getGroupsClient(subscriptionID)
 	_, err = groupsClient.CreateOrUpdate(
@@ -64,9 +62,6 @@ func ResourceMachineCreate(ctx context.Context, d *schema.ResourceData, m interf
 		return err
 	}
 
-	d.SetId(gpName)
-	d.Set("instance_id", gpName)
-
 	// securityGroup
 	nsgClient, _ := getNsgClient(subscriptionID)
 	futureNsg, _ := nsgClient.CreateOrUpdate(
@@ -268,14 +263,16 @@ func ResourceMachineDelete(ctx context.Context, d *schema.ResourceData, m interf
 	if err != nil {
 		return err
 	}
-	future, err := groupsClient.Delete(context.Background(), d.Id())
-	if err != nil {
-		return err
-	}
-	err = future.WaitForCompletionRef(ctx, groupsClient.Client)
+	_, err = groupsClient.Delete(context.Background(), d.Id())
 	if err != nil {
 		return err
 	}
+	/*
+		err = future.WaitForCompletionRef(ctx, groupsClient.Client)
+		if err != nil {
+			return err
+		}
+	*/
 	return err
 }
 

iterative/resource_machine.go

@@ -2,6 +2,7 @@ package iterative
 
 import (
 	"context"
+	"encoding/base64"
 	"fmt"
 
 	"terraform-provider-iterative/iterative/aws"
@@ -65,10 +66,6 @@ func machineSchema() *map[string]*schema.Schema {
 			Optional: true,
 			Default:  "",
 		},
-		"instance_id": &schema.Schema{
-			Type:     schema.TypeString,
-			Computed: true,
-		},
 		"instance_ip": &schema.Schema{
 			Type:     schema.TypeString,
 			Computed: true,
@@ -95,7 +92,7 @@ func machineSchema() *map[string]*schema.Schema {
 			Optional: true,
 			Default:  "ubuntu",
 		},
-		"custom_data": &schema.Schema{
+		"startup_script": &schema.Schema{
 			Type:     schema.TypeString,
 			ForceNew: true,
 			Optional: true,
@@ -113,7 +110,10 @@ 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)
+	utils.SetId(d)
+
+	script64 := base64.StdEncoding.EncodeToString([]byte(d.Get("startup_script").(string)))
+	d.Set("startup_script", script64)
 
 	keyPublic := d.Get("ssh_public").(string)
 	if len(keyPublic) == 0 {

iterative/resource_runner.go

@@ -89,10 +89,6 @@ func resourceRunner() *schema.Resource {
 				Optional: true,
 				Default:  "",
 			},
-			"instance_id": &schema.Schema{
-				Type:     schema.TypeString,
-				Computed: true,
-			},
 			"instance_ip": &schema.Schema{
 				Type:     schema.TypeString,
 				Computed: true,
@@ -119,7 +115,7 @@ func resourceRunner() *schema.Resource {
 				Optional: true,
 				Default:  "ubuntu",
 			},
-			"custom_data": &schema.Schema{
+			"startup_script": &schema.Schema{
 				Type:     schema.TypeString,
 				Computed: true,
 			},
@@ -136,17 +132,17 @@ func resourceRunner() *schema.Resource {
 func resourceRunnerCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	var diags diag.Diagnostics
 
-	utils.SetName(d)
+	utils.SetId(d)
 
-	customData, err := provisionerCode(d)
+	startupScript, err := provisionerCode(d)
 	if err != nil {
 		diags = append(diags, diag.Diagnostic{
 			Severity: diag.Error,
-			Summary:  fmt.Sprintf("Error generating provisioner code: %s", err),
+			Summary:  fmt.Sprintf("Error generating startup script: %s", err),
 		})
 		return diags
 	}
-	d.Set("custom_data", customData)
+	d.Set("startup_script", startupScript)
 
 	/*
 		diags = append(diags, diag.Diagnostic{
@@ -187,9 +183,10 @@ func provisionerCode(d *schema.ResourceData) (string, error) {
 			InstanceType{
 				SchemaVersion: 0,
 				Attributes: AttributesType{
-					ID:                 d.Get("name").(string),
+					ID:                 d.Id(),
 					Cloud:              d.Get("cloud").(string),
-					Name:               "",
+					Region:             d.Get("region").(string),
+					Name:               d.Get("name").(string),
 					Labels:             "",
 					IdleTimeout:        d.Get("idle_timeout").(int),
 					Repo:               "",
@@ -200,11 +197,9 @@ func provisionerCode(d *schema.ResourceData) (string, error) {
 					Image:              "",
 					InstanceGpu:        "",
 					InstanceHddSize:    d.Get("instance_hdd_size").(int),
-					InstanceID:         "",
 					InstanceIP:         "",
 					InstanceLaunchTime: "",
 					InstanceType:       "",
-					Region:             "",
 					SSHName:            "",
 					SSHPrivate:         "",
 					SSHPublic:          "",
@@ -267,21 +262,20 @@ type AttributesType struct {
 	Repo               string      `json:"repo"`
 	Token              string      `json:"token"`
 	Driver             string      `json:"driver"`
-	AwsSecurityGroup   interface{} `json:"aws_security_group"`
 	Cloud              string      `json:"cloud"`
 	CustomData         string      `json:"custom_data"`
 	ID                 string      `json:"id"`
 	Image              interface{} `json:"image"`
 	InstanceGpu        interface{} `json:"instance_gpu"`
 	InstanceHddSize    int         `json:"instance_hdd_size"`
-	InstanceID         string      `json:"instance_id"`
 	InstanceIP         string      `json:"instance_ip"`
 	InstanceLaunchTime string      `json:"instance_launch_time"`
 	InstanceType       string      `json:"instance_type"`
 	Region             string      `json:"region"`
 	SSHName            string      `json:"ssh_name"`
 	SSHPrivate         string      `json:"ssh_private"`
 	SSHPublic          string      `json:"ssh_public"`
+	AwsSecurityGroup   interface{} `json:"aws_security_group"`
 }
 type InstanceType struct {
 	Private       string         `json:"private"`