remove unused VNC params (#265)

* remove unused VNC params

* removed old console SDK methods and fields

* fix vnc

Author: alessandroargentieri

fake_client.go

@@ -83,7 +83,6 @@ type Clienter interface {
 	SoftRebootInstance(id string) (*SimpleResponse, error)
 	StopInstance(id string) (*SimpleResponse, error)
 	StartInstance(id string) (*SimpleResponse, error)
-	GetInstanceConsoleURL(id string) (string, error)
 	UpgradeInstance(id, newSize string) (*SimpleResponse, error)
 	MovePublicIPToInstance(id, ipAddress string) (*SimpleResponse, error)
 	SetInstanceFirewall(id, firewallID string) (*SimpleResponse, error)

instance.go

@@ -60,22 +60,18 @@ type Instance struct {
 	AllowedIPs               []string         `json:"allowed_ips,omitempty"`
 }
 
-//"cpu_cores":1,"ram_mb":2048,"disk_gb":25
-
-// InstanceConsole represents a link to a webconsole for an instances
-type InstanceConsole struct {
-	URL string `json:"url"`
-}
-
 // InstanceVnc represents VNC information for an instances
 type InstanceVnc struct {
 	URI        string `json:"uri,omitempty"`
-	Result     string `json:"result,omitempty"`
-	Name       string `json:"name,omitempty"`
-	Label      string `json:"label,omitempty"`
 	Expiration string `json:"expiration,omitempty"`
 }
 
+// CreateInstanceVncResp represents VNC information for a new instance console
+type CreateInstanceVncResp struct {
+	URI      string `json:"uri,omitempty"`
+	Duration string `json:"duration,omitempty"`
+}
+
 // PaginatedInstanceList returns a paginated list of Instance object
 type PaginatedInstanceList struct {
 	Page    int        `json:"page"`
@@ -291,7 +287,7 @@ func (c *Client) UpdateInstance(i *Instance) (*SimpleResponse, error) {
 
 // GetInstanceVnc enables and gets the VNC information for an instance
 // duration is optional and follows Go's duration string format (e.g. "30m", "1h", "24h")
-func (c *Client) GetInstanceVnc(id string, duration ...string) (InstanceVnc, error) {
+func (c *Client) GetInstanceVnc(id string, duration ...string) (CreateInstanceVncResp, error) {
 	url := fmt.Sprintf("/v2/instances/%s/vnc", id)
 	if len(duration) > 0 && duration[0] != "" {
 		url = fmt.Sprintf("%s?duration=%s", url, duration[0])
@@ -300,7 +296,7 @@ func (c *Client) GetInstanceVnc(id string, duration ...string) (InstanceVnc, err
 	resp, err := c.SendPutRequest(url, map[string]string{
 		"region": c.Region,
 	})
-	vnc := InstanceVnc{}
+	vnc := CreateInstanceVncResp{}
 
 	if err != nil {
 		return vnc, decodeError(err)
@@ -402,18 +398,6 @@ func (c *Client) StartInstance(id string) (*SimpleResponse, error) {
 	return response, err
 }
 
-// GetInstanceConsoleURL gets the web URL for an instance's console
-func (c *Client) GetInstanceConsoleURL(id string) (string, error) {
-	resp, err := c.SendGetRequest(fmt.Sprintf("/v2/instances/%s/console", id))
-	if err != nil {
-		return "", decodeError(err)
-	}
-
-	console := InstanceConsole{}
-	err = json.NewDecoder(bytes.NewReader(resp)).Decode(&console)
-	return console.URL, err
-}
-
 // UpgradeInstance resizes the instance up to the new specification
 // it's not possible to resize the instance to a smaller size
 func (c *Client) UpgradeInstance(id, newSize string) (*SimpleResponse, error) {

instance_test.go

@@ -442,28 +442,6 @@ func TestGetInstanceVncStatus(t *testing.T) {
 	}
 }
 
-func TestGetInstanceConsoleURL(t *testing.T) {
-	client, server, _ := NewAdvancedClientForTesting([]ConfigAdvanceClientForTesting{
-		{
-			Method: "GET",
-			Value: []ValueAdvanceClientForTesting{
-				{
-					RequestBody:  `""`,
-					URL:          "/v2/instances/12345/console",
-					ResponseBody: `{"url": "https://console.example.com/12345"}`,
-				},
-			},
-		},
-	})
-	defer server.Close()
-
-	got, _ := client.GetInstanceConsoleURL("12345")
-
-	if got != "https://console.example.com/12345" {
-		t.Errorf("Expected %s, got %s", "https://console.example.com/12345", got)
-	}
-}
-
 func TestSetInstanceFirewall(t *testing.T) {
 	client, server, _ := NewAdvancedClientForTesting([]ConfigAdvanceClientForTesting{
 		{