Merge pull request #12 from UpCloudLtd/feature/rebrand

Feature/rebrand
UpCloudLtd · May 26, 2017 · 8a5e870 · 8a5e870
2 parents 621b8a8 + 7a6b433
commit 8a5e870
Show file tree

Hide file tree

Showing 13 changed files with 56 additions and 39 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
 .idea
 examples/crash.log
-resources/build-host-web-root/packer-builder-upcloud*
-packer-builder-upcloud
+dist
+upcloud-packer
 vendor
diff --git a/.travis.yml b/.travis.yml
@@ -13,7 +13,7 @@ install:
 
 script:
   # build for all platforms with gox
-  - gox -arch="amd64" -os="darwin linux windows" -output "dist/{{.OS}}-{{.Arch}}/{{.Dir}}" .
+  - gox -arch="amd64" -os="darwin linux windows" -output "dist/{{.OS}}-{{.Arch}}/packer-builder-upcloud" .
   # create one archive per platform
   - zip -j packer-builder-upcloud-${TRAVIS_TAG}-darwin-amd64.zip ./dist/darwin-amd64/*
   - zip -j packer-builder-upcloud-${TRAVIS_TAG}-linux-amd64.zip ./dist/linux-amd64/*
@@ -29,5 +29,5 @@ deploy:
     - packer-builder-upcloud-${TRAVIS_TAG}-linux-amd64.zip
     - packer-builder-upcloud-${TRAVIS_TAG}-windows-amd64.zip
   on:
-    repo: Jalle19/packer-builder-upcloud
+    repo: UpCloudLtd/upcloud-packer
     tags: true
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Change log
 
+## 3.0.0
+
+* Moved the project to UpCloud's GitHub organization
+* Adapted to the fact that the UpCloud Go SDK was moved to UpCloud's GitHub organization
+* Renamed the repository from `packer-builder-upcloud` to `upcloud-packer`. The released binaries still use the 
+`packer-$TYPE-$NAME` naming scheme though.
+* Bumped the Packer dependency to v1.0.0
+
 ## 2.0.5
 
 * Fix some issues with the Travis releases

diff --git a/README.md b/README.md
@@ -1,16 +1,16 @@
-# packer-builder-upcloud
+# upcloud-packer
 
-[![Build Status](https://travis-ci.org/Jalle19/packer-builder-upcloud.svg?branch=master)](https://travis-ci.org/Jalle19/packer-builder-upcloud)
+[![Build Status](https://travis-ci.org/UpCloudLtd/upcloud-packer.svg?branch=master)](https://travis-ci.org/UpCloudLtd/upcloud-packer)
 
 This is a Packer builder which can be used to generate storage templates on UpCloud. It uses the 
-[UpCloud Go SDK](https://github.com/Jalle19/upcloud-go-sdk) to interface with UpCloud's API.
+[UpCloud Go SDK](https://github.com/UpCloudLtd/upcloud-go-sdk) to interface with UpCloud's API.
 
 ## Installation
 
 ### Pre-built binaries
 
 You can download pre-built binaries of the plugin from the 
-[GitHub releases page](https://github.com/Jalle19/packer-builder-upcloud/releases). Just download the archive for your 
+[GitHub releases page](https://github.com/UpCloudLtd/upcloud-packer/releases). Just download the archive for your 
 operating system and architecture, unpack it, then place the binary in `~/.packer.d/plugins`. Make sure the file is 
 executable.
 
@@ -26,11 +26,11 @@ instructions in their README to install it.
 Run the following commands:
 
 ```
-go get github.com/Jalle19/packer-builder-upcloud
-cd $GOPATH/src/github.com/Jalle19/packer-builder-upcloud
+go get github.com/UpCloudLtd/upcloud-packer
+cd $GOPATH/src/github.com/UpCloudLtd/upcloud-packer
 glide install --strip-vendor
 go build
-cp packer-builder-upcloud ~/.packer.d/plugins
+cp upcloud-packer ~/.packer.d/plugins/packer-builder-upcloud
 ```
 
 ## Usage

diff --git a/builder/upcloud/artifact.go b/builder/upcloud/artifact.go
@@ -2,8 +2,8 @@ package upcloud
 
 import (
 	"fmt"
-	"github.com/Jalle19/upcloud-go-sdk/upcloud/request"
-	"github.com/Jalle19/upcloud-go-sdk/upcloud/service"
+	"github.com/UpCloudLtd/upcloud-go-sdk/upcloud/request"
+	"github.com/UpCloudLtd/upcloud-go-sdk/upcloud/service"
 	"log"
 )
 

diff --git a/builder/upcloud/builder.go b/builder/upcloud/builder.go
@@ -2,8 +2,8 @@ package upcloud
 
 import (
 	"fmt"
-	"github.com/Jalle19/upcloud-go-sdk/upcloud"
-	"github.com/Jalle19/upcloud-go-sdk/upcloud/request"
+	"github.com/UpCloudLtd/upcloud-go-sdk/upcloud"
+	"github.com/UpCloudLtd/upcloud-go-sdk/upcloud/request"
 	"github.com/mitchellh/multistep"
 	"github.com/mitchellh/packer/common"
 	"github.com/mitchellh/packer/helper/communicator"
@@ -12,7 +12,7 @@ import (
 )
 
 // The unique ID for this builder.
-const BuilderId = "jalle19.upcloud"
+const BuilderId = "upcloudltd.upcloud"
 
 // Builder represents a Packer Builder.
 type Builder struct {

diff --git a/builder/upcloud/config.go b/builder/upcloud/config.go
@@ -3,8 +3,8 @@ package upcloud
 import (
 	"errors"
 	"fmt"
-	"github.com/Jalle19/upcloud-go-sdk/upcloud/client"
-	"github.com/Jalle19/upcloud-go-sdk/upcloud/service"
+	"github.com/UpCloudLtd/upcloud-go-sdk/upcloud/client"
+	"github.com/UpCloudLtd/upcloud-go-sdk/upcloud/service"
 	"github.com/mitchellh/packer/common"
 	"github.com/mitchellh/packer/helper/communicator"
 	"github.com/mitchellh/packer/helper/config"

diff --git a/builder/upcloud/ssh.go b/builder/upcloud/ssh.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"golang.org/x/crypto/ssh"
 
-	"github.com/Jalle19/upcloud-go-sdk/upcloud"
+	"github.com/UpCloudLtd/upcloud-go-sdk/upcloud"
 	"github.com/mitchellh/multistep"
 )
 

diff --git a/builder/upcloud/step_create_server.go b/builder/upcloud/step_create_server.go
@@ -2,9 +2,9 @@ package upcloud
 
 import (
 	"fmt"
-	"github.com/Jalle19/upcloud-go-sdk/upcloud"
-	"github.com/Jalle19/upcloud-go-sdk/upcloud/request"
-	"github.com/Jalle19/upcloud-go-sdk/upcloud/service"
+	"github.com/UpCloudLtd/upcloud-go-sdk/upcloud"
+	"github.com/UpCloudLtd/upcloud-go-sdk/upcloud/request"
+	"github.com/UpCloudLtd/upcloud-go-sdk/upcloud/service"
 	"github.com/mitchellh/multistep"
 	"github.com/mitchellh/packer/packer"
 	"time"

diff --git a/builder/upcloud/step_templatize_storage.go b/builder/upcloud/step_templatize_storage.go
@@ -2,9 +2,9 @@ package upcloud
 
 import (
 	"fmt"
-	"github.com/Jalle19/upcloud-go-sdk/upcloud"
-	"github.com/Jalle19/upcloud-go-sdk/upcloud/request"
-	"github.com/Jalle19/upcloud-go-sdk/upcloud/service"
+	"github.com/UpCloudLtd/upcloud-go-sdk/upcloud"
+	"github.com/UpCloudLtd/upcloud-go-sdk/upcloud/request"
+	"github.com/UpCloudLtd/upcloud-go-sdk/upcloud/service"
 	"github.com/mitchellh/multistep"
 	"github.com/mitchellh/packer/packer"
 	"github.com/pkg/errors"

diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -1,15 +1,15 @@
-package: github.com/Jalle19/packer-builder-upcloud 
+package: github.com/UpCloudLtd/upcloud-packer 
 flatten: true 
 import: 
-- package: github.com/Jalle19/upcloud-go-sdk 
+- package: github.com/UpCloudLtd/upcloud-go-sdk 
   subpackages: 
   - upcloud 
   - upcloud/client 
   - upcloud/request 
   - upcloud/service 
 - package: github.com/mitchellh/multistep 
-- package: github.com/mitchellh/packer 
-  version: ~0.10.2 
+- package: github.com/hashicorp/packer 
+  version: ~1.0.0
   subpackages: 
   - common 
   - helper/communicator 

diff --git a/main.go b/main.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/Jalle19/packer-builder-upcloud/builder/upcloud"
+	"github.com/UpCloudLtd/upcloud-packer/builder/upcloud"
 	"github.com/mitchellh/packer/packer/plugin"
 )