Merge pull request #650 from yamamoto-febc/v1/fix-database

Use libsacloud v1.35.0
sacloud · Jan 23, 2020 · 9087cf0 · 9087cf0
2 parents 4c5a5fc + 0533194
commit 9087cf0
Show file tree

Hide file tree

Showing 204 changed files with 262 additions and 235 deletions.
diff --git a/go.mod b/go.mod
@@ -11,7 +11,7 @@ require (
 	github.com/motain/gocheck v0.0.0-20131023154940-9beb271d26e6 // indirect
 	github.com/sacloud/ftps v0.0.0-20171205062625-42fc0f9886fe
 	github.com/sacloud/iso9660wrap v0.0.0-20171031075302-eda21f77f6a8
-	github.com/sacloud/libsacloud v1.33.0
+	github.com/sacloud/libsacloud v1.35.0
 	github.com/skratchdot/open-golang v0.0.0-20190402232053-79abb63cd66e // indirect
 	github.com/stretchr/testify v1.3.0
 	github.com/vaughan0/go-ini v0.0.0-20130923145212-a98ad7ee00ec // indirect

diff --git a/go.sum b/go.sum
@@ -181,8 +181,8 @@ github.com/sacloud/ftps v0.0.0-20171205062625-42fc0f9886fe h1:JSZLn4B8X9V1ynSEht
 github.com/sacloud/ftps v0.0.0-20171205062625-42fc0f9886fe/go.mod h1:sdVeG85LaUt1f+0meZqSf6hSQYlwdgFLI8tJqLZ58VM=
 github.com/sacloud/iso9660wrap v0.0.0-20171031075302-eda21f77f6a8 h1:5piK7EELHKRxGqBjgVEHsdfsFwEzF/Kds/bMWLS6gCw=
 github.com/sacloud/iso9660wrap v0.0.0-20171031075302-eda21f77f6a8/go.mod h1:1jHHCa624cG5rODkWmourombJaNmkY9/SBHWhLJcg+w=
-github.com/sacloud/libsacloud v1.33.0 h1:QaPI08/hs9xNDDSI6zcXEwUzgEjHbfTnRG9yV8Vlv20=
-github.com/sacloud/libsacloud v1.33.0/go.mod h1:P7YAOVmnIn3DKHqCZcUKYUXmSwGBm3yS7IBEjKVSrjg=
+github.com/sacloud/libsacloud v1.35.0 h1:YKN67qTONcEf4qX5Fdzv2QA71kgqPO8UUa14QqRbdKo=
+github.com/sacloud/libsacloud v1.35.0/go.mod h1:P7YAOVmnIn3DKHqCZcUKYUXmSwGBm3yS7IBEjKVSrjg=
 github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
 github.com/skratchdot/open-golang v0.0.0-20160302144031-75fb7ed4208c/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog=

diff --git a/sakuracloud/resource_sakuracloud_database_read_replica.go b/sakuracloud/resource_sakuracloud_database_read_replica.go
@@ -281,7 +281,9 @@ func setDatabaseReadReplicaResourceData(d *schema.ResourceData, client *APIClien
 	d.Set("ipaddress1", data.Remark.Servers[0].(map[string]interface{})["IPAddress"])
 	d.Set("icon_id", data.GetIconStrID())
 	d.Set("description", data.Description)
-	d.Set("master_id", data.Settings.DBConf.Replication.Appliance.ID)
+	if data.Settings.DBConf.Replication != nil && data.Settings.DBConf.Replication.Appliance != nil {
+		d.Set("master_id", data.Settings.DBConf.Replication.Appliance.ID.String())
+	}
 	tags := []string{}
 	for _, t := range data.Tags {
 		if !(strings.HasPrefix(t, "@MariaDB-") || strings.HasPrefix(t, "@postgres-")) {

diff --git a/vendor/github.com/sacloud/libsacloud/.travis.yml b/vendor/github.com/sacloud/libsacloud/.travis.yml
diff --git a/vendor/github.com/sacloud/libsacloud/Dockerfile b/vendor/github.com/sacloud/libsacloud/Dockerfile
diff --git a/vendor/github.com/sacloud/libsacloud/Makefile b/vendor/github.com/sacloud/libsacloud/Makefile
diff --git a/vendor/github.com/sacloud/libsacloud/README.md b/vendor/github.com/sacloud/libsacloud/README.md
diff --git a/vendor/github.com/sacloud/libsacloud/api/archive.go b/vendor/github.com/sacloud/libsacloud/api/archive.go
diff --git a/vendor/github.com/sacloud/libsacloud/api/archive_gen.go b/vendor/github.com/sacloud/libsacloud/api/archive_gen.go
diff --git a/vendor/github.com/sacloud/libsacloud/api/auth_status.go b/vendor/github.com/sacloud/libsacloud/api/auth_status.go
diff --git a/vendor/github.com/sacloud/libsacloud/api/auto_backup.go b/vendor/github.com/sacloud/libsacloud/api/auto_backup.go
diff --git a/vendor/github.com/sacloud/libsacloud/api/auto_backup_gen.go b/vendor/github.com/sacloud/libsacloud/api/auto_backup_gen.go
diff --git a/vendor/github.com/sacloud/libsacloud/api/base_api.go b/vendor/github.com/sacloud/libsacloud/api/base_api.go
diff --git a/vendor/github.com/sacloud/libsacloud/api/bill.go b/vendor/github.com/sacloud/libsacloud/api/bill.go
diff --git a/vendor/github.com/sacloud/libsacloud/api/bridge.go b/vendor/github.com/sacloud/libsacloud/api/bridge.go
diff --git a/vendor/github.com/sacloud/libsacloud/api/bridge_gen.go b/vendor/github.com/sacloud/libsacloud/api/bridge_gen.go
diff --git a/vendor/github.com/sacloud/libsacloud/api/cdrom.go b/vendor/github.com/sacloud/libsacloud/api/cdrom.go
diff --git a/vendor/github.com/sacloud/libsacloud/api/cdrom_gen.go b/vendor/github.com/sacloud/libsacloud/api/cdrom_gen.go
diff --git a/vendor/github.com/sacloud/libsacloud/api/client.go b/vendor/github.com/sacloud/libsacloud/api/client.go
diff --git a/vendor/github.com/sacloud/libsacloud/api/coupon.go b/vendor/github.com/sacloud/libsacloud/api/coupon.go
diff --git a/vendor/github.com/sacloud/libsacloud/api/database.go b/vendor/github.com/sacloud/libsacloud/api/database.go
diff --git a/vendor/github.com/sacloud/libsacloud/api/database_gen.go b/vendor/github.com/sacloud/libsacloud/api/database_gen.go
diff --git a/vendor/github.com/sacloud/libsacloud/api/disk.go b/vendor/github.com/sacloud/libsacloud/api/disk.go
diff --git a/vendor/github.com/sacloud/libsacloud/api/disk_gen.go b/vendor/github.com/sacloud/libsacloud/api/disk_gen.go
diff --git a/vendor/github.com/sacloud/libsacloud/api/dns.go b/vendor/github.com/sacloud/libsacloud/api/dns.go
diff --git a/vendor/github.com/sacloud/libsacloud/api/dns_gen.go b/vendor/github.com/sacloud/libsacloud/api/dns_gen.go
diff --git a/vendor/github.com/sacloud/libsacloud/api/doc.go b/vendor/github.com/sacloud/libsacloud/api/doc.go
diff --git a/vendor/github.com/sacloud/libsacloud/api/error.go b/vendor/github.com/sacloud/libsacloud/api/error.go
diff --git a/vendor/github.com/sacloud/libsacloud/api/gslb.go b/vendor/github.com/sacloud/libsacloud/api/gslb.go
diff --git a/vendor/github.com/sacloud/libsacloud/api/gslb_gen.go b/vendor/github.com/sacloud/libsacloud/api/gslb_gen.go
diff --git a/vendor/github.com/sacloud/libsacloud/api/icon.go b/vendor/github.com/sacloud/libsacloud/api/icon.go
diff --git a/vendor/github.com/sacloud/libsacloud/api/icon_gen.go b/vendor/github.com/sacloud/libsacloud/api/icon_gen.go
diff --git a/vendor/github.com/sacloud/libsacloud/api/interface.go b/vendor/github.com/sacloud/libsacloud/api/interface.go
diff --git a/vendor/github.com/sacloud/libsacloud/api/interface_gen.go b/vendor/github.com/sacloud/libsacloud/api/interface_gen.go
diff --git a/vendor/github.com/sacloud/libsacloud/api/internet.go b/vendor/github.com/sacloud/libsacloud/api/internet.go
diff --git a/vendor/github.com/sacloud/libsacloud/api/internet_gen.go b/vendor/github.com/sacloud/libsacloud/api/internet_gen.go
diff --git a/vendor/github.com/sacloud/libsacloud/api/ipaddress.go b/vendor/github.com/sacloud/libsacloud/api/ipaddress.go
diff --git a/vendor/github.com/sacloud/libsacloud/api/ipaddress_gen.go b/vendor/github.com/sacloud/libsacloud/api/ipaddress_gen.go
diff --git a/vendor/github.com/sacloud/libsacloud/api/ipv6addr.go b/vendor/github.com/sacloud/libsacloud/api/ipv6addr.go
diff --git a/vendor/github.com/sacloud/libsacloud/api/ipv6addr_gen.go b/vendor/github.com/sacloud/libsacloud/api/ipv6addr_gen.go
diff --git a/vendor/github.com/sacloud/libsacloud/api/ipv6net.go b/vendor/github.com/sacloud/libsacloud/api/ipv6net.go
diff --git a/vendor/github.com/sacloud/libsacloud/api/ipv6net_gen.go b/vendor/github.com/sacloud/libsacloud/api/ipv6net_gen.go
diff --git a/vendor/github.com/sacloud/libsacloud/api/license.go b/vendor/github.com/sacloud/libsacloud/api/license.go
diff --git a/vendor/github.com/sacloud/libsacloud/api/license_gen.go b/vendor/github.com/sacloud/libsacloud/api/license_gen.go
diff --git a/vendor/github.com/sacloud/libsacloud/api/load_balancer.go b/vendor/github.com/sacloud/libsacloud/api/load_balancer.go
diff --git a/vendor/github.com/sacloud/libsacloud/api/load_balancer_gen.go b/vendor/github.com/sacloud/libsacloud/api/load_balancer_gen.go
diff --git a/vendor/github.com/sacloud/libsacloud/api/mobile_gateway.go b/vendor/github.com/sacloud/libsacloud/api/mobile_gateway.go
diff --git a/vendor/github.com/sacloud/libsacloud/api/mobile_gateway_gen.go b/vendor/github.com/sacloud/libsacloud/api/mobile_gateway_gen.go
diff --git a/vendor/github.com/sacloud/libsacloud/api/newsfeed.go b/vendor/github.com/sacloud/libsacloud/api/newsfeed.go
diff --git a/vendor/github.com/sacloud/libsacloud/api/nfs.go b/vendor/github.com/sacloud/libsacloud/api/nfs.go
diff --git a/vendor/github.com/sacloud/libsacloud/api/nfs_gen.go b/vendor/github.com/sacloud/libsacloud/api/nfs_gen.go
diff --git a/vendor/github.com/sacloud/libsacloud/api/note.go b/vendor/github.com/sacloud/libsacloud/api/note.go
diff --git a/vendor/github.com/sacloud/libsacloud/api/note_gen.go b/vendor/github.com/sacloud/libsacloud/api/note_gen.go
diff --git a/vendor/github.com/sacloud/libsacloud/api/packet_filter.go b/vendor/github.com/sacloud/libsacloud/api/packet_filter.go
diff --git a/vendor/github.com/sacloud/libsacloud/api/packet_filter_gen.go b/vendor/github.com/sacloud/libsacloud/api/packet_filter_gen.go
diff --git a/vendor/github.com/sacloud/libsacloud/api/polling.go b/vendor/github.com/sacloud/libsacloud/api/polling.go
diff --git a/vendor/github.com/sacloud/libsacloud/api/private_host.go b/vendor/github.com/sacloud/libsacloud/api/private_host.go
diff --git a/vendor/github.com/sacloud/libsacloud/api/private_host_gen.go b/vendor/github.com/sacloud/libsacloud/api/private_host_gen.go
diff --git a/vendor/github.com/sacloud/libsacloud/api/product_disk.go b/vendor/github.com/sacloud/libsacloud/api/product_disk.go
diff --git a/vendor/github.com/sacloud/libsacloud/api/product_disk_gen.go b/vendor/github.com/sacloud/libsacloud/api/product_disk_gen.go
diff --git a/vendor/github.com/sacloud/libsacloud/api/product_internet.go b/vendor/github.com/sacloud/libsacloud/api/product_internet.go