Fixed tests

builder/profitbricks/builder_test.go

@@ -9,9 +9,9 @@ import (
 func testConfig() map[string]interface{} {
 	return map[string]interface{}{
 		"image":      "Ubuntu-16.04",
-		"pbpassword": "password",
+		"password": "password",
-		"pbusername": "username",
+		"username": "username",
-		"servername": "packer",
+		"snapshot_name": "packer",
 		"type":       "profitbricks",
 	}
 }
@@ -54,33 +54,3 @@ func TestBuilderPrepare_InvalidKey(t *testing.T) {
 		t.Fatal("should have error")
 	}
 }
-
-func TestBuilderPrepare_Servername(t *testing.T) {
-	var b Builder
-	config := testConfig()
-
-	delete(config, "servername")
-	warnings, err := b.Prepare(config)
-	if len(warnings) > 0 {
-		t.Fatalf("bad: %#v", warnings)
-	}
-	if err == nil {
-		t.Fatalf("should error")
-	}
-
-	expected := "packer"
-
-	config["servername"] = expected
-	b = Builder{}
-	warnings, err = b.Prepare(config)
-	if len(warnings) > 0 {
-		t.Fatalf("bad: %#v", warnings)
-	}
-	if err != nil {
-		t.Fatalf("should not have error: %s", err)
-	}
-
-	if b.config.SnapshotName != expected {
-		t.Errorf("found %s, expected %s", b.config.SnapshotName, expected)
-	}
-}

command/plugin.go

@@ -15,50 +15,50 @@ import (
 
 	amazonchrootbuilder "github.com/mitchellh/packer/builder/amazon/chroot"
 	amazonebsbuilder "github.com/mitchellh/packer/builder/amazon/ebs"
-	amazonimportpostprocessor "github.com/mitchellh/packer/post-processor/amazon-import"
 	amazoninstancebuilder "github.com/mitchellh/packer/builder/amazon/instance"
-	ansiblelocalprovisioner "github.com/mitchellh/packer/provisioner/ansible-local"
-	ansibleprovisioner "github.com/mitchellh/packer/provisioner/ansible"
-	artificepostprocessor "github.com/mitchellh/packer/post-processor/artifice"
-	atlaspostprocessor "github.com/mitchellh/packer/post-processor/atlas"
 	azurearmbuilder "github.com/mitchellh/packer/builder/azure/arm"
-	checksumpostprocessor "github.com/mitchellh/packer/post-processor/checksum"
-	chefclientprovisioner "github.com/mitchellh/packer/provisioner/chef-client"
-	chefsoloprovisioner "github.com/mitchellh/packer/provisioner/chef-solo"
-	compresspostprocessor "github.com/mitchellh/packer/post-processor/compress"
 	digitaloceanbuilder "github.com/mitchellh/packer/builder/digitalocean"
 	dockerbuilder "github.com/mitchellh/packer/builder/docker"
-	dockerimportpostprocessor "github.com/mitchellh/packer/post-processor/docker-import"
-	dockerpushpostprocessor "github.com/mitchellh/packer/post-processor/docker-push"
-	dockersavepostprocessor "github.com/mitchellh/packer/post-processor/docker-save"
-	dockertagpostprocessor "github.com/mitchellh/packer/post-processor/docker-tag"
 	filebuilder "github.com/mitchellh/packer/builder/file"
-	fileprovisioner "github.com/mitchellh/packer/provisioner/file"
 	googlecomputebuilder "github.com/mitchellh/packer/builder/googlecompute"
-	googlecomputeexportpostprocessor "github.com/mitchellh/packer/post-processor/googlecompute-export"
-	manifestpostprocessor "github.com/mitchellh/packer/post-processor/manifest"
 	nullbuilder "github.com/mitchellh/packer/builder/null"
 	openstackbuilder "github.com/mitchellh/packer/builder/openstack"
 	parallelsisobuilder "github.com/mitchellh/packer/builder/parallels/iso"
 	parallelspvmbuilder "github.com/mitchellh/packer/builder/parallels/pvm"
-	powershellprovisioner "github.com/mitchellh/packer/provisioner/powershell"
+	profitbricksbuilder "github.com/mitchellh/packer/builder/profitbricks"
-	puppetmasterlessprovisioner "github.com/mitchellh/packer/provisioner/puppet-masterless"
-	puppetserverprovisioner "github.com/mitchellh/packer/provisioner/puppet-server"
 	qemubuilder "github.com/mitchellh/packer/builder/qemu"
-	saltmasterlessprovisioner "github.com/mitchellh/packer/provisioner/salt-masterless"
-	shelllocalpostprocessor "github.com/mitchellh/packer/post-processor/shell-local"
-	shelllocalprovisioner "github.com/mitchellh/packer/provisioner/shell-local"
-	shellprovisioner "github.com/mitchellh/packer/provisioner/shell"
-	vagrantcloudpostprocessor "github.com/mitchellh/packer/post-processor/vagrant-cloud"
-	vagrantpostprocessor "github.com/mitchellh/packer/post-processor/vagrant"
 	virtualboxisobuilder "github.com/mitchellh/packer/builder/virtualbox/iso"
 	virtualboxovfbuilder "github.com/mitchellh/packer/builder/virtualbox/ovf"
 	vmwareisobuilder "github.com/mitchellh/packer/builder/vmware/iso"
 	vmwarevmxbuilder "github.com/mitchellh/packer/builder/vmware/vmx"
+	amazonimportpostprocessor "github.com/mitchellh/packer/post-processor/amazon-import"
+	artificepostprocessor "github.com/mitchellh/packer/post-processor/artifice"
+	atlaspostprocessor "github.com/mitchellh/packer/post-processor/atlas"
+	checksumpostprocessor "github.com/mitchellh/packer/post-processor/checksum"
+	compresspostprocessor "github.com/mitchellh/packer/post-processor/compress"
+	dockerimportpostprocessor "github.com/mitchellh/packer/post-processor/docker-import"
+	dockerpushpostprocessor "github.com/mitchellh/packer/post-processor/docker-push"
+	dockersavepostprocessor "github.com/mitchellh/packer/post-processor/docker-save"
+	dockertagpostprocessor "github.com/mitchellh/packer/post-processor/docker-tag"
+	googlecomputeexportpostprocessor "github.com/mitchellh/packer/post-processor/googlecompute-export"
+	manifestpostprocessor "github.com/mitchellh/packer/post-processor/manifest"
+	shelllocalpostprocessor "github.com/mitchellh/packer/post-processor/shell-local"
+	vagrantpostprocessor "github.com/mitchellh/packer/post-processor/vagrant"
+	vagrantcloudpostprocessor "github.com/mitchellh/packer/post-processor/vagrant-cloud"
 	vspherepostprocessor "github.com/mitchellh/packer/post-processor/vsphere"
+	ansibleprovisioner "github.com/mitchellh/packer/provisioner/ansible"
+	ansiblelocalprovisioner "github.com/mitchellh/packer/provisioner/ansible-local"
+	chefclientprovisioner "github.com/mitchellh/packer/provisioner/chef-client"
+	chefsoloprovisioner "github.com/mitchellh/packer/provisioner/chef-solo"
+	fileprovisioner "github.com/mitchellh/packer/provisioner/file"
+	powershellprovisioner "github.com/mitchellh/packer/provisioner/powershell"
+	puppetmasterlessprovisioner "github.com/mitchellh/packer/provisioner/puppet-masterless"
+	puppetserverprovisioner "github.com/mitchellh/packer/provisioner/puppet-server"
+	saltmasterlessprovisioner "github.com/mitchellh/packer/provisioner/salt-masterless"
+	shellprovisioner "github.com/mitchellh/packer/provisioner/shell"
+	shelllocalprovisioner "github.com/mitchellh/packer/provisioner/shell-local"
 	windowsrestartprovisioner "github.com/mitchellh/packer/provisioner/windows-restart"
 	windowsshellprovisioner "github.com/mitchellh/packer/provisioner/windows-shell"
-
 )
 
 type PluginCommand struct {
@@ -78,6 +78,7 @@ var Builders = map[string]packer.Builder{
 	"openstack":       new(openstackbuilder.Builder),
 	"parallels-iso":   new(parallelsisobuilder.Builder),
 	"parallels-pvm":   new(parallelspvmbuilder.Builder),
+	"profitbricks":    new(profitbricksbuilder.Builder),
 	"qemu":            new(qemubuilder.Builder),
 	"virtualbox-iso":  new(virtualboxisobuilder.Builder),
 	"virtualbox-ovf":  new(virtualboxovfbuilder.Builder),
@@ -85,7 +86,6 @@ var Builders = map[string]packer.Builder{
 	"vmware-vmx":      new(vmwarevmxbuilder.Builder),
 }
 
-
 var Provisioners = map[string]packer.Provisioner{
 	"ansible":           new(ansibleprovisioner.Provisioner),
 	"ansible-local":     new(ansiblelocalprovisioner.Provisioner),
@@ -102,7 +102,6 @@ var Provisioners = map[string]packer.Provisioner{
 	"windows-shell":     new(windowsshellprovisioner.Provisioner),
 }
 
-
 var PostProcessors = map[string]packer.PostProcessor{
 	"amazon-import":        new(amazonimportpostprocessor.PostProcessor),
 	"artifice":             new(artificepostprocessor.PostProcessor),
@@ -121,7 +120,6 @@ var PostProcessors = map[string]packer.PostProcessor{
 	"vsphere":              new(vspherepostprocessor.PostProcessor),
 }
 
-
 var pluginRegexp = regexp.MustCompile("packer-(builder|post-processor|provisioner)-(.+)")
 
 func (c *PluginCommand) Run(args []string) int {