Merge pull request #120 from ganeshmaharaj/go-mod

Migrate to go mod

Author: Mark Ryan

.travis.yml

@@ -1,12 +1,11 @@
 language: go
 
 go:
-    - "1.11"
-    - "1.12"
+    - "1.16"
     - tip
 
 env:
-  - GOLANGCILINT="v1.16.0"
+  - GOLANGCILINT="v1.39.0"
 
 go_import_path: github.com/intel/ccloudvm
 

README.md

@@ -17,7 +17,7 @@ pre-shipped or user supplied annotated cloud-init files.
 
 All you need to have installed on your machine is:
 
-- Go 1.9 or greater.
+- Go 1.16 or greater.
 
 The installation instructions for the latest version of Go can be
 found [here](https://golang.org/doc/install).  Once installed, ensure
@@ -119,12 +119,14 @@ can specify:
   to run on the first boot of the VM.  This file is used to create
   user accounts, install packages and configure the VM.
 
-ccloudvm ships with a number of workloads for creating VMs based on standard images,
-such as Ubuntu 16.04 and Fedora 25.  Users are also free to create their own workloads.
-Standard workloads are stored in $GOPATH/src/github.com/intel/ccloudvm/workloads.
-User created workloads are stored in ~/.ccloudvm/workloads.  ccloudvm always checks the
-~/.ccloudvm/workloads directory first so if a workload exists in both directories
-with the same name, ccloudvm will use the workload in ~/.ccloudvm/workloads.
+ccloudvm ships with a number of workloads for creating VMs based on standard
+images, such as Ubuntu 16.04 and Fedora 25.  Users are also free to create
+their own workloads.  Standard workloads defined at
+$GOPATH/src/github.com/intel/ccloudvm/workloads are stored in the ccvm binary
+as data files.  User created workloads are stored in ~/.ccloudvm/workloads.
+ccloudvm always checks the ~/.ccloudvm/workloads directory first so if a
+workload exists in both directories with the same name, ccloudvm will use the
+workload in ~/.ccloudvm/workloads.
 
 When creating a new instance via the create command the user must specify a workload.
 This can be done by providing the name of a workload, present in one of the two directories

ccvm/ccvm.go

@@ -309,7 +309,7 @@ func (c ccvmBackend) createInstance(ctx context.Context, resultCh chan interface
 	}
 
 	resultCh <- types.CreateResult{
-		Line: fmt.Sprintf("VM successfully created!\n"),
+		Line: "VM successfully created!\n",
 	}
 
 	return nil

ccvm/workload.go

@@ -20,17 +20,17 @@ import (
 	"bufio"
 	"bytes"
 	"context"
+	"embed"
 	"fmt"
-	"go/build"
 	"io"
+	"io/fs"
 	"io/ioutil"
 	"net/http"
 	"net/url"
 	"os"
 	"path"
 	"path/filepath"
 	"reflect"
-	"regexp"
 	"text/template"
 	"time"
 
@@ -39,12 +39,11 @@ import (
 	yaml "gopkg.in/yaml.v2"
 )
 
-const ccloudvmPkg = "github.com/intel/ccloudvm"
-
-var indentedRegexp *regexp.Regexp
+//go:embed "workloads/*"
+var wkldfs embed.FS
+var allwklds, _ = fs.ReadDir(wkldfs, "workloads")
 
 func init() {
-	indentedRegexp = regexp.MustCompile(`\s+.*`)
 }
 
 type workload struct {
@@ -179,19 +178,16 @@ func loadWorkloadData(ctx context.Context, ws *workspace, workloadName string, t
 		return wkld, nil
 	}
 
-	bld := build.Default
-	bld.GOPATH = ws.GoPath
-	p, err := bld.Import(ccloudvmPkg, "", build.FindOnly)
-	if err != nil {
-		return nil, errors.Wrap(err, "Unable to locate ccloudvm workload directory")
-	}
-	workloadPath := filepath.Join(p.Dir, "workloads", fmt.Sprintf("%s.yaml", workloadName))
-	wkld, err = ioutil.ReadFile(workloadPath)
-	if err != nil {
-		return nil, fmt.Errorf("Unable to load workload %s", workloadPath)
+	for _, wkldfile := range allwklds {
+		if wkldfile.Name() == fmt.Sprintf("%s.yaml", workloadName) {
+			wkld, err := wkldfs.ReadFile(fmt.Sprintf("workloads/%s.yaml", workloadName))
+			if err != nil {
+				return nil, errors.Wrap(err, "unable to read workload file")
+			}
+			return wkld, nil
+		}
 	}
-
-	return wkld, nil
+	return nil, errors.New("Unable to find the workload anywhere")
 }
 
 func unmarshalWorkload(ws *workspace, wkld *workload, spec,

workloads/artful.yaml renamed to ccvm/workloads/artful.yaml

@@ -0,0 +1,19 @@
+module github.com/intel/ccloudvm
+
+go 1.16
+
+require (
+	github.com/ciao-project/ciao v0.0.0-20180108144400-194264adc583
+	github.com/coreos/go-systemd v0.0.0-20170731111925-d21964639418
+	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/intel/govmm v0.0.0-20180104200030-22c99930c2f6
+	github.com/mattn/goveralls v0.0.8 // indirect
+	github.com/pkg/errors v0.8.0
+	github.com/pmezard/go-difflib v1.0.0
+	github.com/spf13/cobra v0.0.2-0.20171231101556-b95ab734e27d
+	github.com/spf13/pflag v1.0.0 // indirect
+	golang.org/x/net v0.0.0-20200226121028-0de0cce0169b
+	golang.org/x/text v0.3.1-0.20171227012246-e19ae1496984 // indirect
+	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
+	gopkg.in/yaml.v2 v2.0.0-20180108131554-1244d3ce02e3
+)

workloads/bionic.yaml renamed to ccvm/workloads/bionic.yaml

@@ -0,0 +1,50 @@
+github.com/ciao-project/ciao v0.0.0-20180108144400-194264adc583 h1:Q8cD25/t4PB8XiCKMERa5KrkbrF4pDSgTLeLIL5erfc=
+github.com/ciao-project/ciao v0.0.0-20180108144400-194264adc583/go.mod h1:E4Y6ewbiZkB8WzlHjxj2a+WNJEUfGTCYQRkllEMsEjg=
+github.com/coreos/go-systemd v0.0.0-20170731111925-d21964639418 h1:0QH6fTJVDpblGjjozilaO++YRbnQNnTYh3yuFJHH0o8=
+github.com/coreos/go-systemd v0.0.0-20170731111925-d21964639418/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
+github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
+github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
+github.com/intel/govmm v0.0.0-20180104200030-22c99930c2f6 h1:aXt7UwonmIcuJxMQTRQsNvNtI53xYfHHQ+qopnSqcQA=
+github.com/intel/govmm v0.0.0-20180104200030-22c99930c2f6/go.mod h1:QKGWoQtjvkvFtzP6ybiM3lxUHqf83Sv3oLqyELUKH4g=
+github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/mattn/goveralls v0.0.8 h1:4xflElRkVgj/FcBVKTAkqSWhHFY2u2uv4c054kG2RY8=
+github.com/mattn/goveralls v0.0.8/go.mod h1:h8b4ow6FxSPMQHF6o2ve3qsclnffZjYTNEKmLesRwqw=
+github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw=
+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/spf13/cobra v0.0.2-0.20171231101556-b95ab734e27d h1:OsIJZZhPMbL7lkWvqWguX3Xd7om7VUGTdX54JkXCVx8=
+github.com/spf13/cobra v0.0.2-0.20171231101556-b95ab734e27d/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
+github.com/spf13/pflag v1.0.0 h1:oaPbdDe/x0UncahuwiPxW1GYJyilRAdsPnq3e1yaPcI=
+github.com/spf13/pflag v1.0.0/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/net v0.0.0-20180201030042-309822c5b9b9 h1:+Va2hqur1pIoaZgDZSzTxfatSy6IY0IOu7qmCh8b2W8=
+golang.org/x/net v0.0.0-20180201030042-309822c5b9b9/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b h1:0mm1VjtFUOIlE1SbDlwjYaDxZVDP2S5ou6y0gSgXHu8=
+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.1-0.20171227012246-e19ae1496984 h1:4S3Dic2vY09agWhKAjYa6buMB7HsLkVrliEHZclmmSU=
+golang.org/x/text v0.3.1-0.20171227012246-e19ae1496984/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20200522201501-cb1345f3a375 h1:SjQ2+AKWgZLc1xej6WSzL+Dfs5Uyd5xcZH1mGC411IA=
+golang.org/x/tools v0.0.0-20200522201501-cb1345f3a375/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
+gopkg.in/yaml.v2 v2.0.0-20180108131554-1244d3ce02e3 h1:AvhLfuYC9WaQFd0VTddg+tvjEcSy6/zAxUda5J/U68o=
+gopkg.in/yaml.v2 v2.0.0-20180108131554-1244d3ce02e3/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=

workloads/buster.yaml renamed to ccvm/workloads/buster.yaml

@@ -25,6 +25,16 @@ function finish {
 	echo "=          FAILURE           ="
     fi
     echo "=============================="
+
+    rm -rf ${TEMPDIR}
+}
+
+function get_latest_go {
+  GO_URL=$(curl -s https://golang.org/dl/#stable | grep 'linux-amd64' | grep downloadBox | awk -F '"' '{print $4}')
+  TEMPDIR=$(mktemp -d)
+  curl -L https://golang.org/${GO_URL} --output -| tar -C ${TEMPDIR} -xzf -
+  export GOROOT=${TEMPDIR}/go
+  export PATH=${TEMPDIR}/go/bin:$PATH
 }
 
 trap finish EXIT
@@ -33,6 +43,11 @@ created=0
 
 if [[ ! -z "${SEMAPHORE_REPO_SLUG}" ]]
 then
+    echo ""
+    echo "===== Download stable go ====="
+    echo ""
+    get_latest_go
+
     echo ""
     echo "===== Cloning repo ====="
     echo ""
@@ -205,6 +220,8 @@ fi
 
 if [ "$SEMAPHORE_REPO_SLUG" = "intel/ccloudvm" ]
 then
+    which go
+    echo ${GOROOT}
     go get github.com/mattn/goveralls
     $GOPATH/bin/goveralls --race -v -service=semaphore --package github.com/intel/ccloudvm/ccvm
 else