Merge pull request #44 from yamamoto-febc/feature/libsacloud

libdsacloud v2.8.2 - ubuntu2004

README.md

@@ -155,31 +155,32 @@ jsonファイルで指定できるオプションの一覧は以下の通りで
 
 - `os_type`(string): ベースとするアーカイブの種別。以下の値が指定可能です。
 
-| 値                              | 説明                                                    |
-|-- -------------------------    | ------------------                                  --|
-| `centos`                       | CentOS(最新安定板)                                         |
-| `centos8`                      | CentOS 8                                              |
-| `centos7`                      | CentOS 7                                              |
-| `centos6`                      | CentOS 6                                              |
-| `ubuntu`                       | Ubuntu(最新安定板)                                         |
-| `ubuntu1804`                   | Ubuntu 18.04                                          |
-| `ubuntu1604`                   | Ubuntu 16.04                                          |
-| `debian`                       | Debian(最新安定板)                                         |
-| `debian10`                     | Debian10                                              |
-| `debian9`                      | Debian9                                               |
-| `coreos`                       | CoreOS                                                |
-| `rancheros`                    | RancherOS                                             |
-| `k3os`                         | k3OS                                                  |
-| `kusanagi`                     | Kusanagi(CentOS7)                                     |
-| `freebsd`                      | FreeBSD                                               |
-| `windows2016`                  | Windows 2016                                          |
-| `windows2016-rds`              | Windows 2016(RDS)                                     |
-| `windows2016-rds-office`       | Windows 2016(RDS + Office)                            |
-| `windows2016-sql-web`          | Windows 2016 SQLServer(Web)                           |
-| `windows2016-sql-standard`     | Windows 2016 SQLServer(Standard)                      |
-| `windows2016-sql-standard-all` | Windows 2016 SQLServer(RDS+Office)                    |
-| `windows2019`                  | Windows 2019 Datacenter Edition                       |
-| `custom`                       | 任意のアーカイブID/ディスクIDを指定する場合                              |
+| 値                              | 説明                                 |
+|-- -------------------------    | ------------------               --|
+| `centos`                       | CentOS(最新安定板)                      |
+| `centos8`                      | CentOS 8                           |
+| `centos7`                      | CentOS 7                           |
+| `centos6`                      | CentOS 6                           |
+| `ubuntu`                       | Ubuntu(最新安定板)                      |
+| `ubuntu2004`                   | Ubuntu 20.04                       |
+| `ubuntu1804`                   | Ubuntu 18.04                       |
+| `ubuntu1604`                   | Ubuntu 16.04                       |
+| `debian`                       | Debian(最新安定板)                      |
+| `debian10`                     | Debian10                           |
+| `debian9`                      | Debian9                            |
+| `coreos`                       | CoreOS                             |
+| `rancheros`                    | RancherOS                          |
+| `k3os`                         | k3OS                               |
+| `kusanagi`                     | Kusanagi(CentOS7)                  |
+| `freebsd`                      | FreeBSD                            |
+| `windows2016`                  | Windows 2016                       |
+| `windows2016-rds`              | Windows 2016(RDS)                  |
+| `windows2016-rds-office`       | Windows 2016(RDS + Office)         |
+| `windows2016-sql-web`          | Windows 2016 SQLServer(Web)        |
+| `windows2016-sql-standard`     | Windows 2016 SQLServer(Standard)   |
+| `windows2016-sql-standard-all` | Windows 2016 SQLServer(RDS+Office) |
+| `windows2019`                  | Windows 2019 Datacenter Edition    |
+| `custom`                       | 任意のアーカイブID/ディスクIDを指定する場合           |
 | `iso`                          | さくらのクラウド上のISOイメージ、<br />またはURLを指定してISOイメージをダウンロードする場合 |
 
 

go.mod

@@ -4,9 +4,9 @@ require (
 	github.com/hashicorp/hcl/v2 v2.3.0
 	github.com/hashicorp/packer v1.5.4
 	github.com/mitchellh/go-vnc v0.0.0-20150629162542-723ed9867aed
-	github.com/mitchellh/mapstructure v1.1.2
-	github.com/sacloud/ftps v0.0.0-20171205062625-42fc0f9886fe
-	github.com/sacloud/libsacloud/v2 v2.3.0
+	github.com/mitchellh/mapstructure v1.3.2
+	github.com/sacloud/ftps v1.1.0
+	github.com/sacloud/libsacloud/v2 v2.8.2
 	github.com/stretchr/testify v1.4.0
 	github.com/zclconf/go-cty v1.2.1
 	golang.org/x/crypto v0.0.0-20200117160349-530e935923ad

go.sum

@@ -141,10 +141,14 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2
 github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
 github.com/go-ole/go-ole v1.2.4 h1:nNBDSCOigTSiarFpYE9J/KtEA1IOW4CNeqT9TQDqCxI=
 github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM=
-github.com/go-playground/locales v0.12.1 h1:2FITxuFt/xuCNP1Acdhv62OzaCiviiE4kotfhkmOqEc=
-github.com/go-playground/locales v0.12.1/go.mod h1:IUMDtCfWo/w/mtMfIE/IG2K+Ey3ygWanZIBtBW0W2TM=
-github.com/go-playground/universal-translator v0.16.0 h1:X++omBR/4cE2MNg91AoC3rmGrCjJ8eAeUP/K/EKx4DM=
-github.com/go-playground/universal-translator v0.16.0/go.mod h1:1AnU7NaIRDWWzGEKwgtJRd2xk99HeFyHw3yid4rvQIY=
+github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A=
+github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
+github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q=
+github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
+github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no=
+github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
+github.com/go-playground/validator/v10 v10.2.0 h1:KgJ0snyC2R9VXYN2rneOtQcw5aHQB1Vv0sFl1UcHBOY=
+github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
 github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68=
 github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
 github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
@@ -326,8 +330,8 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348 h1:MtvEpTB6LX3vkb4ax0b5D2DHbNAUsen0Gx5wZoq3lV4=
 github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k=
-github.com/leodido/go-urn v1.1.0 h1:Sm1gr51B1kKyfD2BlRcLSiEkffoG96g6TPv6eRoEiB8=
-github.com/leodido/go-urn v1.1.0/go.mod h1:+cyI34gQWZcE1eQU7NVgKkkzdXDQHr1dBMtdAPozLkw=
+github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
+github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
 github.com/linode/linodego v0.7.1 h1:4WZmMpSA2NRwlPZcc0+4Gyn7rr99Evk9bnr0B3gXRKE=
 github.com/linode/linodego v0.7.1/go.mod h1:ga11n3ivecUrPCHN0rANxKmfWBJVkOXfLMZinAbj2sY=
 github.com/masterzen/azure-sdk-for-go v0.0.0-20161014135628-ee4f0065d00c h1:FMUOnVGy8nWk1cvlMCAoftRItQGMxI0vzJ3dQjeZTCE=
@@ -369,8 +373,8 @@ github.com/mitchellh/iochan v1.0.0 h1:C+X3KsSTLFVBr/tK1eYN/vs4rJcvsiLU338UhYPJWe
 github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY=
 github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/mapstructure v0.0.0-20180111000720-b4575eea38cc/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
-github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
+github.com/mitchellh/mapstructure v1.3.2 h1:mRS76wmkOn3KkKAyXDu42V+6ebnXWIztFSYGN7GeoRg=
+github.com/mitchellh/mapstructure v1.3.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/panicwrap v0.0.0-20170106182340-fce601fe5557 h1:w1QuuAA2km2Hax+EPamrq5ZRBeaNv2vsjvgB4an0zoU=
 github.com/mitchellh/panicwrap v0.0.0-20170106182340-fce601fe5557/go.mod h1:QuAqW7/z+iv6aWFJdrA8kCbsF0OOJVKCICqTcYBexuY=
 github.com/mitchellh/prefixedio v0.0.0-20151214002211-6e6954073784 h1:+DAetXqxv/mSyCkE9KBIYOZs9b68y7SUaDCxQMRjA68=
@@ -420,10 +424,10 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/ryanuber/go-glob v0.0.0-20170128012129-256dc444b735 h1:7YvPJVmEeFHR1Tj9sZEYsmarJEQfMVYpd/Vyy/A8dqE=
 github.com/ryanuber/go-glob v0.0.0-20170128012129-256dc444b735/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc=
-github.com/sacloud/ftps v0.0.0-20171205062625-42fc0f9886fe h1:JSZLn4B8X9V1ynSEht3QdNJ13Stey0hR6asicabuEqU=
-github.com/sacloud/ftps v0.0.0-20171205062625-42fc0f9886fe/go.mod h1:sdVeG85LaUt1f+0meZqSf6hSQYlwdgFLI8tJqLZ58VM=
-github.com/sacloud/libsacloud/v2 v2.3.0 h1:ryRa9U87ZwhcCqWhqww8d1klPdg5J2iAfAV4VTGt0zM=
-github.com/sacloud/libsacloud/v2 v2.3.0/go.mod h1:BG2crADa3HJrADiZK2zK1/UxsVUtWSy6q7nd6YqleD4=
+github.com/sacloud/ftps v1.1.0 h1:cYv+b6qhrIT8msfx64XXRJzbv5S+Dqwb/rXa5Y641XA=
+github.com/sacloud/ftps v1.1.0/go.mod h1:h4awhOi3PEyhKLj1FpXjoVV5yVkmRUU+d5L95EwX2JU=
+github.com/sacloud/libsacloud/v2 v2.8.2 h1:/yjinczI9KBqWevu+so8+BVBs9v/OtPAvYlHDOTg5bg=
+github.com/sacloud/libsacloud/v2 v2.8.2/go.mod h1:gRNUdloSQqgQfTEMpot80TK7REly0TSME6dn5aZl3GY=
 github.com/saintfish/chardet v0.0.0-20120816061221-3af4cd4741ca/go.mod h1:uugorj2VCxiV1x+LzaIdVa9b4S4qGAcH6cbhh4qVxOU=
 github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
@@ -647,10 +651,6 @@ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/cheggaaa/pb.v1 v1.0.27 h1:kJdccidYzt3CaHD1crCFTS1hxyhSi059NhOFUf03YFo=
 gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
-gopkg.in/go-playground/assert.v1 v1.2.1 h1:xoYuJVE7KT85PYWrN730RguIQO0ePzVRfFMXadIrXTM=
-gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
-gopkg.in/go-playground/validator.v9 v9.29.0 h1:5ofssLNYgAA/inWn6rTZ4juWpRJUwEnXc1LG2IeXwgQ=
-gopkg.in/go-playground/validator.v9 v9.29.0/go.mod h1:+c9/zcJMFNgbLvly1L1V+PpxWdVbfP1avr/N00E2vyQ=
 gopkg.in/ini.v1 v1.42.0 h1:7N3gPTt50s8GuLortA00n8AqRTk75qOP98+mTPpgzRk=
 gopkg.in/ini.v1 v1.42.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/jarcoal/httpmock.v1 v1.0.0-20181117152235-275e9df93516/go.mod h1:d3R+NllX3X5e0zlG1Rful3uLvsGC/Q3OHut5464DEQw=

iaas/archive.go

@@ -6,9 +6,9 @@ import (
 	"github.com/sacloud/libsacloud/v2/sacloud"
 	"github.com/sacloud/libsacloud/v2/sacloud/accessor"
 	"github.com/sacloud/libsacloud/v2/sacloud/types"
-	archiveBuilder "github.com/sacloud/libsacloud/v2/utils/builder/archive"
-	"github.com/sacloud/libsacloud/v2/utils/query"
-	"github.com/sacloud/libsacloud/v2/utils/setup"
+	archiveBuilder "github.com/sacloud/libsacloud/v2/helper/builder/archive"
+	"github.com/sacloud/libsacloud/v2/helper/query"
+	"github.com/sacloud/libsacloud/v2/helper/setup"
 )
 
 // Archive is responsible for API calls of archive handling

sakuracloud/step_create_server.go

@@ -9,9 +9,9 @@ import (
 	"github.com/sacloud/libsacloud/v2/sacloud"
 	"github.com/sacloud/libsacloud/v2/sacloud/ostype"
 	"github.com/sacloud/libsacloud/v2/sacloud/types"
-	diskBuilders "github.com/sacloud/libsacloud/v2/utils/builder/disk"
-	serverBuilders "github.com/sacloud/libsacloud/v2/utils/builder/server"
-	"github.com/sacloud/libsacloud/v2/utils/power"
+	diskBuilders "github.com/sacloud/libsacloud/v2/helper/builder/disk"
+	serverBuilders "github.com/sacloud/libsacloud/v2/helper/builder/server"
+	"github.com/sacloud/libsacloud/v2/helper/power"
 	"github.com/sacloud/packer-builder-sakuracloud/iaas"
 	"github.com/sacloud/packer-builder-sakuracloud/sakuracloud/constants"
 )

sakuracloud/step_power_off.go

@@ -8,7 +8,7 @@ import (
 	"github.com/hashicorp/packer/packer"
 	"github.com/sacloud/libsacloud/v2/sacloud"
 	"github.com/sacloud/libsacloud/v2/sacloud/types"
-	"github.com/sacloud/libsacloud/v2/utils/power"
+	"github.com/sacloud/libsacloud/v2/helper/power"
 	"github.com/sacloud/packer-builder-sakuracloud/iaas"
 )