projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '17208-s3-signature-double-slash'
[arvados.git]
/
lib
/
cloud
/
ec2
/
ec2.go
diff --git
a/lib/cloud/ec2/ec2.go
b/lib/cloud/ec2/ec2.go
index c329c1f88a4c0b8a2b3c3b49142f3ce60d17e871..b20dbfcc986f764e78c51dead8a4ec11d427516a 100644
(file)
--- a/
lib/cloud/ec2/ec2.go
+++ b/
lib/cloud/ec2/ec2.go
@@
-103,10
+103,10
@@
func awsKeyFingerprint(pk ssh.PublicKey) (md5fp string, sha1fp string, err error
sha1pkix := sha1.Sum([]byte(pkix))
md5fp = ""
sha1fp = ""
sha1pkix := sha1.Sum([]byte(pkix))
md5fp = ""
sha1fp = ""
- for i := 0; i < len(md5pkix); i
+= 1
{
+ for i := 0; i < len(md5pkix); i
++
{
md5fp += fmt.Sprintf(":%02x", md5pkix[i])
}
md5fp += fmt.Sprintf(":%02x", md5pkix[i])
}
- for i := 0; i < len(sha1pkix); i
+= 1
{
+ for i := 0; i < len(sha1pkix); i
++
{
sha1fp += fmt.Sprintf(":%02x", sha1pkix[i])
}
return md5fp[1:], sha1fp[1:], nil
sha1fp += fmt.Sprintf(":%02x", sha1pkix[i])
}
return md5fp[1:], sha1fp[1:], nil
@@
-251,7
+251,7
@@
func (instanceSet *ec2InstanceSet) Instances(tags cloud.InstanceTags) (instances
}
}
}
}
-func (
az
*ec2InstanceSet) Stop() {
+func (
instanceSet
*ec2InstanceSet) Stop() {
}
type ec2Instance struct {
}
type ec2Instance struct {
@@
-308,9
+308,8
@@
func (inst *ec2Instance) Destroy() error {
func (inst *ec2Instance) Address() string {
if inst.instance.PrivateIpAddress != nil {
return *inst.instance.PrivateIpAddress
func (inst *ec2Instance) Address() string {
if inst.instance.PrivateIpAddress != nil {
return *inst.instance.PrivateIpAddress
- } else {
- return ""
}
}
+ return ""
}
func (inst *ec2Instance) RemoteUser() string {
}
func (inst *ec2Instance) RemoteUser() string {