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

Reformat

This commit is contained in:
Chris Bednarski 2016-02-11 23:53:40 -08:00
parent d375b6560d
commit 4458de4ea0
5 changed files with 80 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builder/amazon/common/state.go
View File

@ -7,8 +7,8 @@ import (
"net" "net"
"os" "os"
"strconv" "strconv"
"time"
"strings" "strings"
"time"
"github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/aws/awserr"
"github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/ec2"

8
post-processor/amazon-import/post-processor.go
View File

@ -2,15 +2,15 @@ package amazonimport
import ( import (
"fmt" "fmt"
"strings"
"os"
"log" "log"
"os"
"strings"
"github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/ec2"
"github.com/aws/aws-sdk-go/service/s3/s3manager"
"github.com/aws/aws-sdk-go/service/s3" "github.com/aws/aws-sdk-go/service/s3"
"github.com/aws/aws-sdk-go/service/s3/s3manager"
// This is bad, it should be pulled out into a common folder across // This is bad, it should be pulled out into a common folder across
// both builders and post-processors // both builders and post-processors
awscommon "github.com/mitchellh/packer/builder/amazon/common" awscommon "github.com/mitchellh/packer/builder/amazon/common"
@ -210,7 +210,7 @@ func (p *PostProcessor) PostProcess(ui packer.Ui, artifact packer.Artifact) (pac
// If we have tags, then apply them now to both the AMI and snaps // If we have tags, then apply them now to both the AMI and snaps
// created by the import // created by the import
if len(p.config.Tags) > 0 { if len(p.config.Tags) > 0 {
var ec2Tags []*ec2.Tag; var ec2Tags []*ec2.Tag
log.Printf("Repacking tags into AWS format") log.Printf("Repacking tags into AWS format")