Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add HTTP Proxy capability #46

Merged
merged 2 commits into from
Apr 11, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"fmt"
"io"
"io/ioutil"
"log"
"net/http"
"net/url"

Expand Down Expand Up @@ -51,6 +52,7 @@ type Credentials struct {
Endpoint string
Port string
Insecure bool
ProxyURL string
}

// NewClient returns a new Nutanix API client.
Expand All @@ -61,6 +63,16 @@ func NewClient(credentials *Credentials) (*Client, error) {
TLSClientConfig: &tls.Config{InsecureSkipVerify: credentials.Insecure}, // ignore expired SSL certificates
}

if credentials.ProxyURL != "" {
log.Printf("[DEBUG] Using proxy: %s\n", credentials.ProxyURL)
proxy, err := url.Parse(credentials.ProxyURL)
thetonymaster marked this conversation as resolved.
Show resolved Hide resolved
if err != nil {
return nil, fmt.Errorf("error parsing proxy url: %s", err)
}

transCfg.Proxy = http.ProxyURL(proxy)
}

httpClient := http.DefaultClient

httpClient.Transport = transCfg
Expand Down
6 changes: 3 additions & 3 deletions client/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func setup() {
mux = http.NewServeMux()
server = httptest.NewServer(mux)

client, _ = NewClient(&Credentials{"", "username", "password", "", "", true})
client, _ = NewClient(&Credentials{"", "username", "password", "", "", true, ""})
client.BaseURL, _ = url.Parse(server.URL)
}

Expand All @@ -35,7 +35,7 @@ func teardown() {
}

func TestNewClient(t *testing.T) {
c, err := NewClient(&Credentials{"foo.com", "username", "password", "", "", true})
c, err := NewClient(&Credentials{"foo.com", "username", "password", "", "", true, ""})

if err != nil {
t.Errorf("Unexpected Error: %v", err)
Expand All @@ -53,7 +53,7 @@ func TestNewClient(t *testing.T) {
}

func TestNewRequest(t *testing.T) {
c, err := NewClient(&Credentials{"foo.com", "username", "password", "", "", true})
c, err := NewClient(&Credentials{"foo.com", "username", "password", "", "", true, ""})

if err != nil {
t.Errorf("Unexpected Error: %v", err)
Expand Down
4 changes: 3 additions & 1 deletion nutanix/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"

"github.com/terraform-providers/terraform-provider-nutanix/client"
"github.com/terraform-providers/terraform-provider-nutanix/client/v3"
v3 "github.com/terraform-providers/terraform-provider-nutanix/client/v3"
)

// Version represents api version
Expand All @@ -18,6 +18,7 @@ type Config struct {
Port string
Insecure bool
WaitTimeout int64
ProxyURL string
}

// Client ...
Expand All @@ -30,6 +31,7 @@ func (c *Config) Client() (*Client, error) {
Password: c.Password,
Port: c.Port,
Insecure: c.Insecure,
ProxyURL: c.ProxyURL,
}

v3, err := v3.NewV3Client(configCreds)
Expand Down
9 changes: 9 additions & 0 deletions nutanix/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,12 @@ func Provider() terraform.ResourceProvider {
DefaultFunc: schema.EnvDefaultFunc("NUTANIX_WAIT_TIMEOUT", nil),
Description: descriptions["wait_timeout"],
},
"proxy_url": {
Type: schema.TypeString,
Optional: true,
DefaultFunc: schema.EnvDefaultFunc("NUTANIX_PROXY_URL", nil),
Description: descriptions["proxy_url"],
},
},
DataSourcesMap: map[string]*schema.Resource{
"nutanix_image": dataSourceNutanixImage(),
Expand Down Expand Up @@ -95,6 +101,8 @@ func init() {
"cluster lifecycle management operations, such as AOS upgrades.",

"wait_timeout": "Set if you know that the creation o update of a resource may take long time (minutes)",

"proxy_url": "Use this to connect Nutanix API through the proxy server.",
}
}

Expand All @@ -110,6 +118,7 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) {
Insecure: d.Get("insecure").(bool),
Port: d.Get("port").(string),
WaitTimeout: int64(d.Get("wait_timeout").(int)),
ProxyURL: d.Get("proxy_url").(string),
}

return config.Client()
Expand Down
4 changes: 3 additions & 1 deletion website/docs/index.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ provider "nutanix" {
endpoint = "xxxx"
insecure = true
port = 9440
wait_timeout = 10
wait_timeout = 10 //Optional
proxy_url = "xxxx" //Optional
}
```

Expand All @@ -68,6 +69,7 @@ $ export NUTANIX_INSECURE="xxxx"
$ export NUTANIX_PORT="xxxx"
$ export NUTANIX_ENDPOINT="xxxx"
$ export NUTANIX_WAIT_TIMEOUT = "xxx"
$ export NUTANIX_PROXY_URL = "xxx"

$ terraform plan
```