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

4
builder/googlecompute/step_create_instance.go
View File

@ -5,9 +5,9 @@ import (
"errors"
"fmt"
"io/ioutil"
"log"
"strings"
"time"
"log"
"github.com/hashicorp/packer/packer"
"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
@ -316,7 +316,7 @@ func (s *StepCreateInstance) Cleanup(state multistep.StateBag) {
}
func addmap(a map[string]string, b map[string]string) {
for k,v := range b {
for k, v := range b {
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
// create our metadata
metadataNoSSHKeys, _,err := c.createInstanceMetadata(image, "")
metadataNoSSHKeys, _, err := c.createInstanceMetadata(image, "")
assert.True(t, err == nil, "Metadata creation should have succeeded.")