Merge branch 'master' of https://github.com/iterative/terraform-provider-iterative into await-runner

Author: DavidGOrtega

.github/workflows/test.yml

@@ -1,8 +1,6 @@
 on:
   push:
-    branches: "*"
   pull_request:
-    branches: "*"
   workflow_dispatch:
 
 jobs:
@@ -14,14 +12,11 @@ jobs:
     - name: Install
       uses: actions/setup-go@v2
       with:
-        go-version: ^1.14
+        go-version: ^1.16
 
     - name: Checkout
       uses: actions/checkout@v2
 
-    - name: Vendor # FIXME: remove this step when migrating to pure Go modules.
-      run: go mod vendor
-
     - name: Build
       run: make build
 

.gitignore

@@ -36,4 +36,9 @@ override.tf.json
 # Ignore CLI configuration files
 .terraformrc
 terraform.rc
-terraform
+terraform
+
+# Ignore the Go vendor directory, superseded by proxy.golang.org and go.{mod,sum}
+vendor
+
+./terraform-provider-iterative

Makefile

@@ -1,4 +1,3 @@
-TEST?=$$(go list ./... | grep -v 'vendor')
 HOSTNAME=github.com
 NAMESPACE=iterative
 NAME=iterative
@@ -16,9 +15,8 @@ install: build
 	mkdir -p ~/.terraform.d/plugins/${HOSTNAME}/${NAMESPACE}/${NAME}/${VERSION}/${OS_ARCH}
 	mv ${BINARY} ~/.terraform.d/plugins/${HOSTNAME}/${NAMESPACE}/${NAME}/${VERSION}/${OS_ARCH}
 
-test: 
-	go test -i $(TEST) || exit 1                                                   
-	echo $(TEST) | xargs -t -n4 go test $(TESTARGS) -timeout=30s -parallel=4                    
+test:
+	go test ./... $(TESTARGS) -timeout=30s -parallel=4
 
-testacc: 
-	TF_ACC=1 go test $(TEST) -v $(TESTARGS) -timeout 120m   
+testacc:
+	TF_ACC=1 go test ./... -v $(TESTARGS) -timeout 120m

iterative/aws/provider.go

@@ -7,6 +7,7 @@ import (
 	"regexp"
 	"sort"
 	"strconv"
+	"strings"
 	"time"
 
 	"github.com/aws/aws-sdk-go/aws"
@@ -56,7 +57,25 @@ func ResourceMachineCreate(ctx context.Context, d *schema.ResourceData, m interf
 		return decodeAWSError(region, err)
 	}
 	if len(imagesRes.Images) == 0 {
-		return errors.New(ami + " ami not found in region")
+		imagesRes, err = svc.DescribeImages(&ec2.DescribeImagesInput{
+			Filters: []*ec2.Filter{
+				{
+					Name:   aws.String("name"),
+					Values: []*string{aws.String("*ubuntu/images/hvm-ssd/ubuntu-bionic-18.04*")},
+				},
+				{
+					Name:   aws.String("architecture"),
+					Values: []*string{aws.String("x86_64")},
+				},
+			},
+		})
+
+		if err != nil {
+			return decodeAWSError(region, err)
+		}
+		if len(imagesRes.Images) == 0 {
+			return errors.New("Nor " + ami + " nor Ubuntu Server 18.04 are available in your region")
+		}
 	}
 
 	sort.Slice(imagesRes.Images, func(i, j int) bool {
@@ -111,13 +130,23 @@ func ResourceMachineCreate(ctx context.Context, d *schema.ResourceData, m interf
 				IpPermissions: ipPermissions,
 			})
 		}
+
+		if err != nil {
+			decodedError := decodeAWSError(region, err)
+			if !strings.Contains(decodedError.Error(), "already exists for VPC") {
+				return decodedError
+			}
+		}
 	}
 
 	sgDesc, err := svc.DescribeSecurityGroupsWithContext(ctx, &ec2.DescribeSecurityGroupsInput{
 		Filters: []*ec2.Filter{
 			{
-				Name:   aws.String("group-name"),
-				Values: []*string{aws.String(securityGroup)},
+				Name: aws.String("group-name"),
+				Values: []*string{
+					aws.String(securityGroup),
+					aws.String(strings.Title(securityGroup)),
+					aws.String(strings.ToUpper(securityGroup))},
 			},
 		},
 	})

iterative/resource_machine.go

@@ -91,10 +91,11 @@ func machineSchema() *map[string]*schema.Schema {
 			Computed: true,
 		},
 		"ssh_private": &schema.Schema{
-			Type:     schema.TypeString,
-			ForceNew: true,
-			Optional: true,
-			Default:  "",
+			Type:      schema.TypeString,
+			ForceNew:  true,
+			Optional:  true,
+			Default:   "",
+			Sensitive: true,
 		},
 		"ssh_name": &schema.Schema{
 			Type:     schema.TypeString,

iterative/resource_runner.go

@@ -126,10 +126,11 @@ func resourceRunner() *schema.Resource {
 				Computed: true,
 			},
 			"ssh_private": &schema.Schema{
-				Type:     schema.TypeString,
-				ForceNew: true,
-				Optional: true,
-				Default:  "",
+				Type:      schema.TypeString,
+				ForceNew:  true,
+				Optional:  true,
+				Default:   "",
+				Sensitive: true,
 			},
 			"startup_script": &schema.Schema{
 				Type:     schema.TypeString,
@@ -243,7 +244,8 @@ systemctl disable apt-daily-upgrade.service
 
 sudo add-apt-repository universe -y
 sudo add-apt-repository ppa:git-core/ppa -y
-sudo apt update && sudo apt-get install -y git
+sudo apt update && sudo apt install -y software-properties-common git
+
 sudo curl -fsSL https://get.docker.com -o get-docker.sh && sudo sh get-docker.sh
 sudo usermod -aG docker ubuntu
 sudo setfacl --modify user:ubuntu:rw /var/run/docker.sock
@@ -255,17 +257,14 @@ sudo apt update && sudo apt-get install -y terraform
 curl -sL https://deb.nodesource.com/setup_12.x | sudo bash
 sudo apt update && sudo apt-get install -y nodejs
 
-sudo apt install -y ubuntu-drivers-common git
 sudo ubuntu-drivers autoinstall
-
 curl -s -L https://nvidia.github.io/nvidia-docker/gpgkey | sudo apt-key add -
 curl -s -L https://nvidia.github.io/nvidia-docker/ubuntu18.04/nvidia-docker.list | sudo tee /etc/apt/sources.list.d/nvidia-docker.list
 sudo apt update && sudo apt install -y nvidia-docker2
-
 sudo systemctl restart docker
-
 sudo nvidia-smi
 sudo docker run --rm --gpus all nvidia/cuda:11.0-base nvidia-smi
+
 {{end}}
 
 sudo npm install -g git+https://github.com/iterative/cml.git