Skip to content

Commit 31b0d85

Browse files
DavidGOrtegarestyled-io[bot]restyled-commits
authored
Resource Cml runner failproof dependencies (#170)
* bndata * remove unused * tests * Restyle Resource Cml runner failproof dependencies (#171) * Restyled by shellharden * Restyled by shfmt * Restyled by whitespace Co-authored-by: Restyled.io <[email protected]> * tests prettier * restyled ignore golden * restyled ignore golden * remove dup git * remove dup git tests Co-authored-by: restyled-io[bot] <32688539+restyled-io[bot]@users.noreply.github.com> Co-authored-by: Restyled.io <[email protected]>
1 parent db91f48 commit 31b0d85

15 files changed

+506
-374
lines changed

‎.restyled.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
exclude:
2+
- "**/*.golden"

‎cml/clone-amis.go‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ import (
77
"os"
88
"sync"
99

10-
awsprovider "terraform-provider-iterative/iterative/aws"
11-
1210
"github.com/aws/aws-sdk-go/aws"
1311
"github.com/aws/aws-sdk-go/aws/session"
1412
"github.com/aws/aws-sdk-go/service/ec2"
@@ -18,7 +16,24 @@ import (
1816
func main() {
1917
region := "us-west-1"
2018
amiName := "iterative-cml"
21-
regions := awsprovider.ImageRegions
19+
regions := []string{
20+
"us-east-2",
21+
"us-east-1",
22+
"us-west-2",
23+
"ap-south-1",
24+
"ap-northeast-3",
25+
"ap-northeast-2",
26+
"ap-southeast-1",
27+
"ap-southeast-2",
28+
"ap-northeast-1",
29+
"ca-central-1",
30+
"eu-central-1",
31+
"eu-west-1",
32+
"eu-west-2",
33+
"eu-west-3",
34+
"eu-north-1",
35+
"sa-east-1",
36+
}
2237

2338
sess, sessError := session.NewSession(&aws.Config{
2439
Region: aws.String(region)},

‎cml/setup.sh‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,34 @@
11
#/bin/sh
2+
FILE=/var/log/cml_stack.log
3+
if [ ! -f "$FILE" ]; then
4+
DEBIAN_FRONTEND=noninteractive
5+
echo "APT::Get::Assume-Yes \"true\";" | sudo tee -a /etc/apt/apt.conf.d/90assumeyes
26

3-
DEBIAN_FRONTEND=noninteractive
4-
echo "APT::Get::Assume-Yes \"true\";" | sudo tee -a /etc/apt/apt.conf.d/90assumeyes
7+
sudo apt remove unattended-upgrades
8+
systemctl disable apt-daily-upgrade.service
59

6-
sudo apt remove unattended-upgrades
7-
systemctl disable apt-daily-upgrade.service
10+
sudo add-apt-repository universe -y
11+
sudo add-apt-repository ppa:git-core/ppa -y
12+
sudo apt update && sudo apt-get install -y software-properties-common build-essential git
813

9-
sudo add-apt-repository universe -y
10-
sudo add-apt-repository ppa:git-core/ppa -y
11-
sudo apt update && sudo apt-get install -y git
12-
sudo curl -fsSL https://get.docker.com -o get-docker.sh && sudo sh get-docker.sh && \
13-
sudo usermod -aG docker ubuntu
14-
sudo setfacl --modify user:ubuntu:rw /var/run/docker.sock
14+
sudo curl -fsSL https://get.docker.com -o get-docker.sh && sudo sh get-docker.sh &&
15+
sudo usermod -aG docker ubuntu
16+
sudo setfacl --modify user:ubuntu:rw /var/run/docker.sock
1517

16-
curl -fsSL https://apt.releases.hashicorp.com/gpg | sudo apt-key add -
17-
sudo apt-add-repository "deb [arch=amd64] https://apt.releases.hashicorp.com $(lsb_release -cs) main"
18-
sudo apt update && sudo apt-get install -y terraform
18+
curl -fsSL https://apt.releases.hashicorp.com/gpg | sudo apt-key add -
19+
sudo apt-add-repository "deb [arch=amd64] https://apt.releases.hashicorp.com $(lsb_release -cs) main"
20+
sudo apt update && sudo apt-get install -y terraform
1921

20-
curl -sL https://deb.nodesource.com/setup_12.x | sudo bash
21-
sudo apt update && sudo apt-get install -y nodejs
22+
curl -sL https://deb.nodesource.com/setup_12.x | sudo bash
23+
sudo apt update && sudo apt-get install -y nodejs
2224

23-
sudo apt install -y ubuntu-drivers-common git
24-
sudo ubuntu-drivers autoinstall
25+
sudo apt install -y ubuntu-drivers-common
26+
sudo ubuntu-drivers autoinstall
2527

26-
curl -s -L https://nvidia.github.io/nvidia-docker/gpgkey | sudo apt-key add -
27-
curl -s -L https://nvidia.github.io/nvidia-docker/ubuntu18.04/nvidia-docker.list | sudo tee /etc/apt/sources.list.d/nvidia-docker.list
28-
sudo apt update && sudo apt install -y nvidia-docker2
28+
curl -s -L https://nvidia.github.io/nvidia-docker/gpgkey | sudo apt-key add -
29+
curl -s -L https://nvidia.github.io/nvidia-docker/ubuntu18.04/nvidia-docker.list | sudo tee /etc/apt/sources.list.d/nvidia-docker.list
30+
sudo apt update && sudo apt install -y nvidia-docker2
31+
sudo systemctl restart docker
2932

30-
sudo systemctl restart docker
31-
32-
sudo nvidia-smi
33-
sudo docker run --rm --gpus all nvidia/cuda:11.0-base nvidia-smi
33+
sudo echo 'OK' >"$FILE"
34+
fi

‎go.mod‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ require (
1515
github.com/apparentlymart/go-userdirs v0.0.0-20200915174352-b0c018a67c13 // indirect
1616
github.com/apparentlymart/go-versions v1.0.1 // indirect
1717
github.com/aws/aws-sdk-go v1.34.13
18+
github.com/go-bindata/go-bindata v3.1.2+incompatible // indirect
1819
github.com/gofrs/uuid v3.3.0+incompatible // indirect
1920
github.com/hashicorp/aws-sdk-go-base v0.6.0 // indirect
2021
github.com/hashicorp/go-getter v1.5.1 // indirect

‎go.sum‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,9 @@ github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2H
222222
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
223223
github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
224224
github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
225+
github.com/go-bindata/go-bindata v1.0.0 h1:DZ34txDXWn1DyWa+vQf7V9ANc2ILTtrEjtlsdJRF26M=
226+
github.com/go-bindata/go-bindata v3.1.2+incompatible h1:5vjJMVhowQdPzjE1LdxyFF7YFTXg5IgGVW4gBr5IbvE=
227+
github.com/go-bindata/go-bindata v3.1.2+incompatible/go.mod h1:xK8Dsgwmeed+BBsSy2XTopBn/8uK2HWuGSnA11C3Joo=
225228
github.com/go-git/gcfg v1.5.0/go.mod h1:5m20vg6GwYabIxaOonVkTdrILxQMpEShl1xiMF4ua+E=
226229
github.com/go-git/go-billy/v5 v5.0.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0=
227230
github.com/go-git/go-git-fixtures/v4 v4.0.1/go.mod h1:m+ICp2rF3jDhFgEZ/8yziagdT1C+ZpZcrJjappBCDSw=

‎iterative/aws/provider.go‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -357,27 +357,6 @@ func awsClient(region string) (*ec2.EC2, error) {
357357
return svc, err
358358
}
359359

360-
//ImageRegions provider available image regions
361-
var ImageRegions = []string{
362-
"us-east-2",
363-
"us-east-1",
364-
"us-west-1",
365-
"us-west-2",
366-
"ap-south-1",
367-
"ap-northeast-3",
368-
"ap-northeast-2",
369-
"ap-southeast-1",
370-
"ap-southeast-2",
371-
"ap-northeast-1",
372-
"ca-central-1",
373-
"eu-central-1",
374-
"eu-west-1",
375-
"eu-west-2",
376-
"eu-west-3",
377-
"eu-north-1",
378-
"sa-east-1",
379-
}
380-
381360
//GetRegion maps region to real cloud regions
382361
func GetRegion(region string) string {
383362
instanceRegions := make(map[string]string)

‎iterative/azure/provider.go‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -348,9 +348,6 @@ func getVMClient(subscriptionID string) (compute.VirtualMachinesClient, error) {
348348
return client, err
349349
}
350350

351-
//ImageRegions provider available image regions
352-
var ImageRegions = []string{}
353-
354351
//GetRegion maps region to real cloud regions
355352
func GetRegion(region string) string {
356353
instanceRegions := make(map[string]string)

0 commit comments

Comments
 (0)