FIX docker-archive-public#2561 SSH pubkey should have username comment

dgageot · dgageot · commit b995a4d65a3e · 2015-12-15T11:12:53.000+01:00
Signed-off-by: David Gageot &lt;david@gageot.net&gt;
diff --git a/drivers/google/compute_util.go b/drivers/google/compute_util.go
@@ -297,7 +297,7 @@ func (c *ComputeUtil) createInstance(d *Driver) error {
 	}
 
 	log.Infof("Uploading SSH Key")
-	metaDataValue := c.userName + ":" + string(sshKey) + "\n"
+	metaDataValue := fmt.Sprintf("%s:%s %s\n", c.userName, strings.TrimSpace(string(sshKey)), c.userName)
 	op, err = c.service.Instances.SetMetadata(c.project, c.zone, c.instanceName, &raw.Metadata{
 		Fingerprint: instance.Metadata.Fingerprint,
 		Items: []*raw.MetadataItems{

Original file line number	Diff line number	Diff line change
`@@ -297,7 +297,7 @@ func (c ComputeUtil) createInstance(d Driver) error {`
`297`	`297`	`}`
`298`	`298`
`299`	`299`	`log.Infof("Uploading SSH Key")`
`300`		`- metaDataValue := c.userName + ":" + string(sshKey) + "\n"`
	`300`	`+ metaDataValue := fmt.Sprintf("%s:%s %s\n", c.userName, strings.TrimSpace(string(sshKey)), c.userName)`
`301`	`301`	`op, err = c.service.Instances.SetMetadata(c.project, c.zone, c.instanceName, &raw.Metadata{`
`302`	`302`	`Fingerprint: instance.Metadata.Fingerprint,`
`303`	`303`	`Items: []*raw.MetadataItems{`