Adjust linter and README

Signed-off-by: Ganesh Maharaj Mahalingam <[email protected]>

Author: Ganesh Maharaj Mahalingam

.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

@@ -31,7 +31,6 @@ import (
 	"path"
 	"path/filepath"
 	"reflect"
-	"regexp"
 	"text/template"
 	"time"
 
@@ -40,16 +39,11 @@ import (
 	yaml "gopkg.in/yaml.v2"
 )
 
-const ccloudvmPkg = "github.com/intel/ccloudvm"
-
 //go:embed "workloads/*"
 var wkldfs embed.FS
 var allwklds, _ = fs.ReadDir(wkldfs, "workloads")
 
-var indentedRegexp *regexp.Regexp
-
 func init() {
-	indentedRegexp = regexp.MustCompile(`\s+.*`)
 }
 
 type workload struct {