Merge pull request petoju#85 from terraform-providers/issue/upgrade-t…

…o-tf-0.12

Issue/upgrade to tf 0.12

CHANGELOG.md

@@ -1,4 +1,11 @@
 ## 1.6.0 (Unreleased)
+
+FEATURES:
+* **Terraform 0.12** compatibility ([#85](https://github.com/terraform-providers/terraform-provider-mysql/pull/85))
+
+IMPROVEMENTS:
+* Documentation fix-ups ([#84](https://github.com/terraform-providers/terraform-provider-mysql/pull/84) & [#81](https://github.com/terraform-providers/terraform-provider-mysql/pull/81))
+
 ## 1.5.2 (May 29, 2019)
 
 BUG FIXES:

README.md

@@ -12,8 +12,19 @@ Terraform Provider
 Requirements
 ------------
 
--	[Terraform](https://www.terraform.io/downloads.html) 0.10.x
--	[Go](https://golang.org/doc/install) 1.8 (to build the provider plugin)
+-	[Terraform](https://www.terraform.io/downloads.html) 0.12.x
+-	[Go](https://golang.org/doc/install) 1.12 (to build the provider plugin)
+
+Usage
+-----
+
+For Terraform 0.12+ compatibility, the configuration should specify version 2 or higher:
+
+```hcl
+provider "mysql" {
+  version = "~> 2.0"
+}
+```
 
 Building The Provider
 ---------------------
@@ -39,7 +50,7 @@ Using the provider
 Developing the Provider
 ---------------------------
 
-If you wish to work on the provider, you'll first need [Go](http://www.golang.org) installed on your machine (version 1.8+ is *required*). You'll also need to correctly setup a [GOPATH](http://golang.org/doc/code.html#GOPATH), as well as adding `$GOPATH/bin` to your `$PATH`.
+If you wish to work on the provider, you'll first need [Go](http://www.golang.org) installed on your machine (version 1.12+ is *required*). You'll also need to correctly setup a [GOPATH](http://golang.org/doc/code.html#GOPATH), as well as adding `$GOPATH/bin` to your `$PATH`.
 
 To compile the provider, run `make build`. This will build the provider and put the provider binary in the `$GOPATH/bin` directory.
 

go.mod

@@ -1,36 +1,13 @@
 module github.com/terraform-providers/terraform-provider-mysql
 
 require (
-	github.com/apparentlymart/go-cidr v1.0.0 // indirect
-	github.com/aws/aws-sdk-go v1.15.59 // indirect
-	github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
-	github.com/blang/semver v3.5.1+incompatible // indirect
 	github.com/go-sql-driver/mysql v1.4.0
-	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
-	github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db // indirect
-	github.com/hashicorp/go-cleanhttp v0.5.0 // indirect
-	github.com/hashicorp/go-getter v0.0.0-20180809191950-4bda8fa99001 // indirect
-	github.com/hashicorp/go-hclog v0.0.0-20181001195459-61d530d6c27f // indirect
-	github.com/hashicorp/go-plugin v0.0.0-20181004024435-314501b665e0 // indirect
-	github.com/hashicorp/go-safetemp v1.0.0 // indirect
-	github.com/hashicorp/go-uuid v1.0.0 // indirect
-	github.com/hashicorp/go-version v1.0.0
+	github.com/hashicorp/go-version v1.1.0
 	github.com/hashicorp/hcl v1.0.0 // indirect
-	github.com/hashicorp/hcl2 v0.0.0-20181001210626-3e4b7e0eb20e // indirect
-	github.com/hashicorp/hil v0.0.0-20170627220502-fa9f258a9250 // indirect
-	github.com/hashicorp/logutils v1.0.0 // indirect
-	github.com/hashicorp/terraform v0.11.9
+	github.com/hashicorp/terraform v0.12.0
 	github.com/hashicorp/vault v0.11.3 // indirect
 	github.com/keybase/go-crypto v0.0.0-20181017165231-e696c8039bba // indirect
-	github.com/mitchellh/cli v1.0.0 // indirect
-	github.com/mitchellh/copystructure v1.0.0 // indirect
-	github.com/mitchellh/go-homedir v1.0.0 // indirect
-	github.com/mitchellh/hashstructure v1.0.0 // indirect
-	github.com/mitchellh/mapstructure v1.1.2 // indirect
 	github.com/pierrec/lz4 v2.0.5+incompatible // indirect
 	github.com/satori/go.uuid v1.2.0
-	github.com/ulikunitz/xz v0.5.4 // indirect
-	github.com/zclconf/go-cty v0.0.0-20181017232614-01c5aba823a6 // indirect
-	golang.org/x/crypto v0.0.0-20181015023909-0c41d7ab0a0e // indirect
-	golang.org/x/net v0.0.0-20181017193950-04a2e542c03f
+	golang.org/x/net v0.0.0-20190502183928-7f726cade0ab
 )

mysql/resource_user_password_test.go

@@ -27,7 +27,8 @@ const testAccUserPasswordConfig_basic = `
 resource "mysql_user" "test" {
   user = "jdoe"
 }
- resource "mysql_user_password" "test" {
+
+resource "mysql_user_password" "test" {
   user    = "${mysql_user.test.user}"
   pgp_key = "keybase:joestump"
 }