github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-22 02:21:34 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3202 from ebriand/gcp-validate-project-name

Browse Source 
GCP: validate project name
This commit is contained in:
Justin Cormack 2018-10-16 14:53:06 +01:00 committed by GitHub
commit b7119b2ca5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,6 +38,9 @@ func NewGCPClient(keys, projectName string) (*GCPClient, error) {
log.Debugf("Connecting to GCP") log.Debugf("Connecting to GCP")
ctx := context.Background() ctx := context.Background()
var client *GCPClient var client *GCPClient
if projectName == "" {
return nil, fmt.Errorf("the project name is not specified")
}
if keys != "" { if keys != "" {
log.Debugf("Using Keys %s", keys) log.Debugf("Using Keys %s", keys)
f, err := os.Open(keys) f, err := os.Open(keys)
@ -63,7 +66,7 @@ func NewGCPClient(keys, projectName string) (*GCPClient, error) {
projectName: projectName, projectName: projectName,
} }
} else { } else {
log.Debugf("Using Application Default crednetials") log.Debugf("Using Application Default credentials")
gc, err := google.DefaultClient( gc, err := google.DefaultClient(
ctx, ctx,
storage.DevstorageReadWriteScope, storage.DevstorageReadWriteScope,

8
src/cmd/linuxkit/push_gcp.go
View File

@ -52,15 +52,15 @@ func pushGcp(args []string) {
name = filepath.Base(name) name = filepath.Base(name)
} }
if bucket == "" {
log.Fatalf("Please specify the bucket to use")
}
client, err := NewGCPClient(keys, project) client, err := NewGCPClient(keys, project)
if err != nil { if err != nil {
log.Fatalf("Unable to connect to GCP: %v", err) log.Fatalf("Unable to connect to GCP: %v", err)
} }
if bucket == "" {
log.Fatalf("Please specify the bucket to use")
}
err = client.UploadFile(path, name+suffix, bucket, public) err = client.UploadFile(path, name+suffix, bucket, public)
if err != nil { if err != nil {
log.Fatalf("Error copying to Google Storage: %v", err) log.Fatalf("Error copying to Google Storage: %v", err)

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

@ -84,7 +84,7 @@ func runGcp(args []string) {
client, err := NewGCPClient(keys, project) client, err := NewGCPClient(keys, project)
if err != nil { if err != nil {
log.Fatalf("Unable to connect to GCP") log.Fatalf("Unable to connect to GCP: %v", err)
} }
if err = client.CreateInstance(*name, image, zone, machine, disks, data, *nestedVirt, true); err != nil { if err = client.CreateInstance(*name, image, zone, machine, disks, data, *nestedVirt, true); err != nil {