iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Amend commit author for license pass

This commit is contained in:
Gareth Rees 2020-12-02 11:16:16 +00:00
parent 3ab9bae79c
commit 833855eec5
6 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builder/googlecompute/driver_mock.go
View File

@ -93,7 +93,7 @@ type DriverMock struct {
AddToInstanceMetadataName string AddToInstanceMetadataName string
AddToInstanceMetadataKVPairs map[string]string AddToInstanceMetadataKVPairs map[string]string
AddToInstanceMetadataErrCh <-chan error AddToInstanceMetadataErrCh <-chan error
AddToInstanceMetadataErr error AddToInstanceMetadataErr error
} }
func (d *DriverMock) CreateImage(name, description, family, zone, disk string, image_labels map[string]string, image_licenses []string, image_encryption_key *compute.CustomerEncryptionKey, imageStorageLocations []string) (<-chan *Image, <-chan error) { func (d *DriverMock) CreateImage(name, description, family, zone, disk string, image_labels map[string]string, image_licenses []string, image_encryption_key *compute.CustomerEncryptionKey, imageStorageLocations []string) (<-chan *Image, <-chan error) {
@ -296,8 +296,8 @@ func (d *DriverMock) DeleteOSLoginSSHKey(user, fingerprint string) error {
} }
func (d *DriverMock) AddToInstanceMetadata(zone string, name string, metadata map[string]string) (<-chan error, error) { func (d *DriverMock) AddToInstanceMetadata(zone string, name string, metadata map[string]string) (<-chan error, error) {
d.AddToInstanceMetadataZone = zone d.AddToInstanceMetadataZone = zone
d.AddToInstanceMetadataName = name d.AddToInstanceMetadataName = name
d.AddToInstanceMetadataKVPairs = metadata d.AddToInstanceMetadataKVPairs = metadata
resultCh := d.AddToInstanceMetadataErrCh resultCh := d.AddToInstanceMetadataErrCh

2
builder/googlecompute/startup.go
View File

@ -1,7 +1,7 @@
package googlecompute package googlecompute
import ( import (
"fmt" "fmt"
) )
const StartupScriptKey string = "startup-script" const StartupScriptKey string = "startup-script"

6
builder/googlecompute/step_create_instance.go
View File

@ -5,9 +5,9 @@ import (
"errors" "errors"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"log"
"strings" "strings"
"time" "time"
"log"
"github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer"
"github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/multistep"
@ -232,7 +232,7 @@ func (s *StepCreateInstance) Run(ctx context.Context, state multistep.StateBag)
} }
log.Printf("[DEBUG] %s wait is over. Adding SSH keys to existing instance...", log.Printf("[DEBUG] %s wait is over. Adding SSH keys to existing instance...",
c.WaitToAddSSHKeys.String()) c.WaitToAddSSHKeys.String())
errCh, err = d.AddToInstanceMetadata(c.Zone, name, metadataSSHKeys) errCh, err = d.AddToInstanceMetadata(c.Zone, name, metadataSSHKeys)
if err != nil { if err != nil {
@ -316,7 +316,7 @@ func (s *StepCreateInstance) Cleanup(state multistep.StateBag) {
} }
func addmap(a map[string]string, b map[string]string) { func addmap(a map[string]string, b map[string]string) {
for k,v := range b { for k, v := range b {
a[k] = v a[k] = v
} }
} }

2
builder/googlecompute/step_create_instance_test.go
View File

@ -337,7 +337,7 @@ func TestCreateInstanceMetadata_metadataFile(t *testing.T) {
c.MetadataFiles["user-data"] = fileName c.MetadataFiles["user-data"] = fileName
// create our metadata // create our metadata
metadataNoSSHKeys, _,err := c.createInstanceMetadata(image, "") metadataNoSSHKeys, _, err := c.createInstanceMetadata(image, "")
assert.True(t, err == nil, "Metadata creation should have succeeded.") assert.True(t, err == nil, "Metadata creation should have succeeded.")