Fix two bugs for terraform-provider-huaweicloud (#225)

* remove github.com/Unknwon/com in vendor github.com/Unknwon/com has changed to github.com/unknwon/com Signed-off-by: ShiChangkuo <[email protected]> * add github.com/unknwon/com in vendor github.com/Unknwon/com has changed to github.com/unknwon/com Signed-off-by: ShiChangkuo <[email protected]> * import github.com/unknwon/com in related files due to github.com/Unknwon/com has changed to github.com/unknwon/com, we should re-import it in huaweicloud/util.go * Log fault message when build compute instance failed
huaweicloud · Nov 6, 2019 · 93b2d63 · 93b2d63
1 parent 9ad7aa3
commit 93b2d63
Show file tree

Hide file tree

Showing 25 changed files with 145 additions and 58 deletions.
diff --git a/go.mod b/go.mod
@@ -1,17 +1,15 @@
 module github.com/terraform-providers/terraform-provider-huaweicloud
 
 require (
-	github.com/Unknwon/com v0.0.0-20151008135407-28b053d5a292
 	github.com/aws/aws-sdk-go v1.22.0
-	github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e // indirect
 	github.com/hashicorp/errwrap v1.0.0
 	github.com/hashicorp/go-cleanhttp v0.5.1
 	github.com/hashicorp/terraform-plugin-sdk v1.0.0
 	github.com/huaweicloud/golangsdk v0.0.0-20191105032058-c1a523be9414
 	github.com/jen20/awspolicyequivalence v0.0.0-20170831201602-3d48364a137a
 	github.com/mitchellh/go-homedir v1.1.0
-	github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304 // indirect
 	github.com/smartystreets/goconvey v0.0.0-20190222223459-a17d461953aa // indirect
 	github.com/stretchr/testify v1.3.0
+	github.com/unknwon/com v1.0.1
 	gopkg.in/yaml.v2 v2.2.2
 )
diff --git a/go.sum b/go.sum
@@ -9,8 +9,6 @@ cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbf
 cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/Unknwon/com v0.0.0-20151008135407-28b053d5a292 h1:tuQ7w+my8a8mkwN7x2TSd7OzTjkZ7rAeSyH4xncuAMI=
-github.com/Unknwon/com v0.0.0-20151008135407-28b053d5a292/go.mod h1:KYCjqMOeHpNuTOiFQU6WEcTG7poCJrUs0YgyHNtn1no=
 github.com/agext/levenshtein v1.2.1 h1:QmvMAjj2aEICytGiWzmxoE0x2KZvE0fvmqMOfy2tjT8=
 github.com/agext/levenshtein v1.2.1/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
 github.com/agext/levenshtein v1.2.2 h1:0S/Yg6LYmFJ5stwQeRp6EeOcCbj7xiqQSdNelsXvaqE=
@@ -188,6 +186,7 @@ github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAm
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304 h1:Jpy1PXuP99tXNrhbq2BaPz9B+jNAvH1JPQQpG/9GCXY=
 github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
+github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s=
 github.com/smartystreets/goconvey v0.0.0-20190222223459-a17d461953aa h1:E+gaaifzi2xF65PbDmuKI3PhLWY6G5opMLniFq8vmXA=
 github.com/smartystreets/goconvey v0.0.0-20190222223459-a17d461953aa/go.mod h1:2RVY1rIf+2J2o/IM9+vPq9RzmHDSseB7FoXiSNIUsoU=
 github.com/spf13/afero v1.2.2 h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc=
@@ -200,6 +199,8 @@ github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/ulikunitz/xz v0.5.5 h1:pFrO0lVpTBXLpYw+pnLj6TbvHuyjXMfjGeCwSqCVwok=
 github.com/ulikunitz/xz v0.5.5/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8=
+github.com/unknwon/com v1.0.1 h1:3d1LTxD+Lnf3soQiD4Cp/0BRB+Rsa/+RTvz8GMMzIXs=
+github.com/unknwon/com v1.0.1/go.mod h1:tOOxU81rwgoCLoOVVPHb6T/wt8HZygqH5id+GNnlCXM=
 github.com/vmihailenco/msgpack v3.3.3+incompatible h1:wapg9xDUZDzGCNFlwc5SqI1rvcciqcxEHac4CYj89xI=
 github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
 github.com/zclconf/go-cty v1.0.0/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s=

diff --git a/huaweicloud/resource_huaweicloud_compute_instance_v2.go b/huaweicloud/resource_huaweicloud_compute_instance_v2.go
@@ -823,6 +823,11 @@ func ServerV2StateRefreshFunc(client *golangsdk.ServiceClient, instanceID string
 			return nil, "", err
 		}
 
+		// get fault message when status is ERROR
+		if s.Status == "ERROR" {
+			fault := fmt.Errorf("[error code: %d, message: %s]", s.Fault.Code, s.Fault.Message)
+			return s, "ERROR", fault
+		}
 		return s, s.Status, nil
 	}
 }

diff --git a/huaweicloud/util.go b/huaweicloud/util.go
@@ -7,10 +7,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/Unknwon/com"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/huaweicloud/golangsdk"
+	"github.com/unknwon/com"
 )
 
 // BuildRequest takes an opts struct and builds a request body for

diff --git a/vendor/github.com/Unknwon/com/.travis.yml b/vendor/github.com/Unknwon/com/.travis.yml
diff --git a/vendor/github.com/Unknwon/com/.gitignore → vendor/github.com/unknwon/com/.gitignore b/vendor/github.com/Unknwon/com/.gitignore → vendor/github.com/unknwon/com/.gitignore
diff --git a/vendor/github.com/unknwon/com/.travis.yml b/vendor/github.com/unknwon/com/.travis.yml
diff --git a/vendor/github.com/Unknwon/com/LICENSE → vendor/github.com/unknwon/com/LICENSE b/vendor/github.com/Unknwon/com/LICENSE → vendor/github.com/unknwon/com/LICENSE
diff --git a/vendor/github.com/Unknwon/com/README.md → vendor/github.com/unknwon/com/README.md b/vendor/github.com/Unknwon/com/README.md → vendor/github.com/unknwon/com/README.md
diff --git a/vendor/github.com/Unknwon/com/cmd.go → vendor/github.com/unknwon/com/cmd.go b/vendor/github.com/Unknwon/com/cmd.go → vendor/github.com/unknwon/com/cmd.go
diff --git a/vendor/github.com/Unknwon/com/convert.go → vendor/github.com/unknwon/com/convert.go b/vendor/github.com/Unknwon/com/convert.go → vendor/github.com/unknwon/com/convert.go
diff --git a/vendor/github.com/Unknwon/com/dir.go → vendor/github.com/unknwon/com/dir.go b/vendor/github.com/Unknwon/com/dir.go → vendor/github.com/unknwon/com/dir.go
diff --git a/vendor/github.com/Unknwon/com/file.go → vendor/github.com/unknwon/com/file.go b/vendor/github.com/Unknwon/com/file.go → vendor/github.com/unknwon/com/file.go
diff --git a/vendor/github.com/unknwon/com/go.mod b/vendor/github.com/unknwon/com/go.mod
diff --git a/vendor/github.com/unknwon/com/go.sum b/vendor/github.com/unknwon/com/go.sum
diff --git a/vendor/github.com/Unknwon/com/html.go → vendor/github.com/unknwon/com/html.go b/vendor/github.com/Unknwon/com/html.go → vendor/github.com/unknwon/com/html.go
diff --git a/vendor/github.com/Unknwon/com/http.go → vendor/github.com/unknwon/com/http.go b/vendor/github.com/Unknwon/com/http.go → vendor/github.com/unknwon/com/http.go
diff --git a/vendor/github.com/Unknwon/com/math.go → vendor/github.com/unknwon/com/math.go b/vendor/github.com/Unknwon/com/math.go → vendor/github.com/unknwon/com/math.go
diff --git a/vendor/github.com/Unknwon/com/path.go → vendor/github.com/unknwon/com/path.go b/vendor/github.com/Unknwon/com/path.go → vendor/github.com/unknwon/com/path.go
diff --git a/vendor/github.com/Unknwon/com/regex.go → vendor/github.com/unknwon/com/regex.go b/vendor/github.com/Unknwon/com/regex.go → vendor/github.com/unknwon/com/regex.go
diff --git a/vendor/github.com/Unknwon/com/slice.go → vendor/github.com/unknwon/com/slice.go b/vendor/github.com/Unknwon/com/slice.go → vendor/github.com/unknwon/com/slice.go
diff --git a/vendor/github.com/Unknwon/com/string.go → vendor/github.com/unknwon/com/string.go b/vendor/github.com/Unknwon/com/string.go → vendor/github.com/unknwon/com/string.go
diff --git a/vendor/github.com/Unknwon/com/time.go → vendor/github.com/unknwon/com/time.go b/vendor/github.com/Unknwon/com/time.go → vendor/github.com/unknwon/com/time.go
diff --git a/vendor/github.com/Unknwon/com/url.go → vendor/github.com/unknwon/com/url.go b/vendor/github.com/Unknwon/com/url.go → vendor/github.com/unknwon/com/url.go