AWS fallback ubuntu (#84)

Author: DavidGOrtega

iterative/aws/provider.go

@@ -56,7 +56,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 {

iterative/resource_runner.go

@@ -197,7 +197,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
@@ -209,17 +210,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