wip

Author: DavidGOrtega

examples/main.tf

@@ -9,7 +9,14 @@ terraform {
 
 provider "iterative" {}
 
-resource "iterative_machine" "machine" {
+/* resource "iterative_machine" "machine-aws" {
+  driver = "aws"
   region = "us-west"
-  instance_type = "m" //fallback to known instance type
+  instance_type = "t2.micro" //fallback to known instance type
+} */
+
+resource "iterative_machine" "machine-azure" {
+  driver = "azure"
+  region = "us-west"
+  instance_type = "m"
 }

iterative/aws/provider.go

@@ -200,12 +200,11 @@ func ResourceMachineCreate(ctx context.Context, d *schema.ResourceData, m interf
 
 	d.SetId(instanceID)
 	d.Set("instance_id", instanceID)
-	d.Set("key_name", pairName)
-
-	d.Set("instance_name", instanceName)
 	d.Set("instance_ip", instanceDesc.PublicIpAddress)
 	d.Set("instance_launch_time", instanceDesc.LaunchTime.Format(time.RFC3339))
 
+	d.Set("key_name", pairName)
+
 	return diags
 }
 

iterative/azure/provider.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-07-01/compute"
 	"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2019-11-01/network"
-	"github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2019-05-01/resources"
+	"github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2020-06-01/resources"
 	"github.com/Azure/go-autorest/autorest/azure/auth"
 	"github.com/Azure/go-autorest/autorest/to"
 
@@ -31,6 +31,11 @@ func ResourceMachineCreate(ctx context.Context, d *schema.ResourceData, m interf
 	sku := "18.04-LTS"
 	version := "latest"
 
+	//publisher := "NVIDIA-GPU"
+	//offer := "GPU"
+	//sku := "Cloud-Image"
+	//version := "2020.06.29"
+
 	gpName := vmName + "-sg"
 	nsgName := vmName + "-nsg"
 	vnetName := vmName + "-vnet"
@@ -267,10 +272,7 @@ func ResourceMachineCreate(ctx context.Context, d *schema.ResourceData, m interf
 	}
 
 	d.SetId(gpName)
-	d.Set("instance_id", gpName)
-	//d.Set("key_name", pairName)
-
-	//d.Set("instance_name", instanceName)
+	d.Set("instance_id", vmName)
 	d.Set("instance_ip", ip.IPAddress)
 	//d.Set("instance_launch_time", vm.)
 
@@ -282,26 +284,9 @@ func ResourceMachineDelete(ctx context.Context, d *schema.ResourceData, m interf
 	var diags diag.Diagnostics
 
 	subscriptionID := os.Getenv("AZURE_SUBSCRIPTION_ID")
-
-	//vmName := ""
-	//ipName := ""
-
-	//getIPClient(subscriptionID).Delete(ctx, gpName, ipName)
-	//_, err = getNsgClient().Delete(ctx, gpName, nsgName)
-
-	/*
-		vmClient, _ := getVMClient(subscriptionID)
-		_, err := vmClient.Deallocate(ctx, gpName, vmName)
-		if err != nil {
-			diags = append(diags, diag.Diagnostic{
-				Severity: diag.Error,
-				Summary:  fmt.Sprintf("cannot deallocate vm: %v", err),
-			})
-		}
-	*/
-
 	groupsClient, err := getGroupsClient(subscriptionID)
-	_, err = groupsClient.Delete(ctx, d.Id())
+	_, err = groupsClient.Delete(context.Background(), d.Id())
+	//err = future.WaitForCompletionRef(ctx, groupsClient.Client)
 	if err != nil {
 		diags = append(diags, diag.Diagnostic{
 			Severity: diag.Error,

iterative/resource_machine.go

@@ -2,7 +2,9 @@ package iterative
 
 import (
 	"context"
+	"fmt"
 
+	"terraform-provider-iterative/iterative/aws"
 	"terraform-provider-iterative/iterative/azure"
 	"terraform-provider-iterative/iterative/utils"
 
@@ -18,6 +20,11 @@ func resourceMachine() *schema.Resource {
 		ReadContext:   resourceMachineRead,
 		UpdateContext: resourceMachineUpdate,
 		Schema: map[string]*schema.Schema{
+			"driver": &schema.Schema{
+				Type:     schema.TypeString,
+				Required: true,
+				ForceNew: true,
+			},
 			"region": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
@@ -99,6 +106,8 @@ func resourceMachine() *schema.Resource {
 }
 
 func resourceMachineCreate(ctx2 context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	var diags diag.Diagnostics
+
 	ctx := context.Background()
 	keyPublic := d.Get("key_public").(string)
 	//keyPrivate := d.Get("key_private").(string)
@@ -119,13 +128,33 @@ func resourceMachineCreate(ctx2 context.Context, d *schema.ResourceData, m inter
 		d.Set("instance_name", instanceName)
 	}
 
-	return azure.ResourceMachineCreate(ctx, d, m)
-	//return aws.ResourceMachineCreate(ctx, d, m)
+	driver := d.Get("driver").(string)
+	if driver == "aws" {
+		return aws.ResourceMachineCreate(ctx, d, m)
+	}
+
+	if driver == "azure" {
+		return azure.ResourceMachineCreate(ctx, d, m)
+	}
+
+	diags = append(diags, diag.Diagnostic{
+		Severity: diag.Error,
+		Summary:  fmt.Sprintf("Unknown provider: %s", driver),
+	})
+	return diags
 }
 
 func resourceMachineDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	return azure.ResourceMachineCreate(ctx, d, m)
-	//return aws.ResourceMachineDelete(ctx, d, m)
+	driver := d.Get("driver").(string)
+	if driver == "aws" {
+		return aws.ResourceMachineDelete(ctx, d, m)
+	}
+
+	if driver == "azure" {
+		return azure.ResourceMachineDelete(ctx, d, m)
+	}
+
+	return nil
 }
 
 func resourceMachineRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {