github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-19 09:16:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2676 from justincormack/lint2

Browse Source 
Some linting improvements from gometalinter
This commit is contained in:
Justin Cormack 2017-11-03 16:36:19 +00:00 committed by GitHub
commit c3e5d3e7c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/cmd/linuxkit/azure.go
View File

@ -34,7 +34,6 @@ const (
defaultVirtualNetworkAddressPrefix = "10.0.0.0/16"
defaultSubnetAddressPrefix = "10.0.0.0/24"
defaultRegion = "westeurope"
// These values are only provided so the deployment gets validated
// Since there is currently no Azure Linux Agent, these values
@ -93,19 +92,6 @@ func initializeAzureClients(subscriptionID, tenantID, clientID, clientSecret str
}
func getOrCreateResourceGroup(resourceGroupName, location string) *resources.Group {
var resourceGroup resources.Group
resourceGroup, err := groupsClient.Get(resourceGroupName)
if err != nil {
log.Fatalf("Error in getting resource group: %v", err)
}
if &resourceGroup != nil {
return &resourceGroup
}
return createResourceGroup(resourceGroupName, location)
}
func createResourceGroup(resourceGroupName, location string) *resources.Group {
fmt.Printf("Creating resource group in %s\n", location)

2
src/cmd/linuxkit/run_aws.go
View File

@ -155,7 +155,7 @@ func runAWS(args []string) {
}
}
log.Warnf("AWS doesn't stream serial console output.\n Please use the AWS Management Console to obtain this output \n Console ouput will be displayed when the instance has been stopped.")
log.Warnf("AWS doesn't stream serial console output.\n Please use the AWS Management Console to obtain this output \n Console output will be displayed when the instance has been stopped.")
log.Warn("Waiting for instance to stop...")
if err = compute.WaitUntilInstanceStopped(instanceFilter); err != nil {

5
src/cmd/linuxkit/run_gcp.go
View File

@ -10,9 +10,8 @@ import (
)
const (
defaultZone = "europe-west1-d"
defaultMachine = "g1-small"
defaultDiskSize = 1
defaultZone = "europe-west1-d"
defaultMachine = "g1-small"
// Environment variables. Some are non-standard
zoneVar = "CLOUDSDK_COMPUTE_ZONE"
machineVar = "CLOUDSDK_COMPUTE_MACHINE" // non-standard

2
src/cmd/linuxkit/run_hyperkit.go
View File

@ -62,7 +62,7 @@ func runHyperKit(args []string) {
}
remArgs := flags.Args()
if len(remArgs) == 0 {
fmt.Println("Please specify the prefix to the image to boot\n")
fmt.Println("Please specify the prefix to the image to boot")
flags.Usage()
os.Exit(1)
}

4
src/cmd/linuxkit/run_hyperv.go
View File

@ -38,7 +38,7 @@ func runHyperV(args []string) {
}
remArgs := flags.Args()
if len(remArgs) == 0 {
fmt.Println("Please specify the path to the ISO image to boot\n")
fmt.Println("Please specify the path to the ISO image to boot")
flags.Usage()
os.Exit(1)
}
@ -223,7 +223,7 @@ func hypervChecks() {
out, _, err = poshCmd("@(Get-Command Get-VM).ModuleName")
if err != nil {
log.Fatalf("Check for Hyper-V powershell modules failed: %v")
log.Fatalf("Check for Hyper-V powershell modules failed: %v", err)
}
res = splitLines(out)
if res[0] != "Hyper-V" {

4
src/cmd/linuxkit/run_qemu.go
View File

@ -279,7 +279,7 @@ func runQemu(args []string) {
netdevConfig = "user,id=t0"
case qemuNetworkingTap:
if len(netMode) != 2 {
log.Fatalf("Not enough arugments for %q networking mode", qemuNetworkingTap)
log.Fatalf("Not enough arguments for %q networking mode", qemuNetworkingTap)
}
if len(publishFlags) != 0 {
log.Fatalf("Port publishing requires %q networking mode", qemuNetworkingUser)
@ -287,7 +287,7 @@ func runQemu(args []string) {
netdevConfig = fmt.Sprintf("tap,id=t0,ifname=%s,script=no,downscript=no", netMode[1])
case qemuNetworkingBridge:
if len(netMode) != 2 {
log.Fatalf("Not enough arugments for %q networking mode", qemuNetworkingBridge)
log.Fatalf("Not enough arguments for %q networking mode", qemuNetworkingBridge)
}
if len(publishFlags) != 0 {
log.Fatalf("Port publishing requires %q networking mode", qemuNetworkingUser)

2
src/cmd/linuxkit/util.go
View File

@ -113,7 +113,7 @@ func splitLines(in string) []string {
}
// This function parses the "size" parameter of a disk specification
// and returns the size in MB. The "size" paramter defaults to GB, but
// and returns the size in MB. The "size" parameter defaults to GB, but
// the unit can be explicitly set with either a G (for GB) or M (for
// MB). It returns the disk size in MB.
func getDiskSizeMB(s string) (int, error) {