Commit dd5de1e3 authored by Armon Dadgar's avatar Armon Dadgar

Merge pull request #1692 from nitrous-io/digitalocean-image-id

Use DigitalOcean image ID for artifact Id()
parents fdeb2bc8 3d6865fa
...@@ -3,6 +3,7 @@ package digitalocean ...@@ -3,6 +3,7 @@ package digitalocean
import ( import (
"fmt" "fmt"
"log" "log"
"strconv"
) )
type Artifact struct { type Artifact struct {
...@@ -29,8 +30,7 @@ func (*Artifact) Files() []string { ...@@ -29,8 +30,7 @@ func (*Artifact) Files() []string {
} }
func (a *Artifact) Id() string { func (a *Artifact) Id() string {
// mimicing the aws builder return strconv.FormatUint(uint64(a.snapshotId), 10)
return fmt.Sprintf("%s:%s", a.regionName, a.snapshotName)
} }
func (a *Artifact) String() string { func (a *Artifact) String() string {
......
package digitalocean package digitalocean
import ( import (
"github.com/mitchellh/packer/packer"
"testing" "testing"
"github.com/mitchellh/packer/packer"
) )
func TestArtifact_Impl(t *testing.T) { func TestArtifact_Impl(t *testing.T) {
...@@ -13,6 +14,15 @@ func TestArtifact_Impl(t *testing.T) { ...@@ -13,6 +14,15 @@ func TestArtifact_Impl(t *testing.T) {
} }
} }
func TestArtifactId(t *testing.T) {
a := &Artifact{"packer-foobar", 42, "San Francisco", nil}
expected := "42"
if a.Id() != expected {
t.Fatalf("artifact ID should match: %v", expected)
}
}
func TestArtifactString(t *testing.T) { func TestArtifactString(t *testing.T) {
a := &Artifact{"packer-foobar", 42, "San Francisco", nil} a := &Artifact{"packer-foobar", 42, "San Francisco", nil}
expected := "A snapshot was created: 'packer-foobar' in region 'San Francisco'" expected := "A snapshot was created: 'packer-foobar' in region 'San Francisco'"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment