Merge pull request #21 from tlvince/scheme

feat: add configurable http scheme

docs/syntax.md

@@ -5,20 +5,22 @@
 ```
 # Configure the NiFi provider
 provider "nifi" {
-  host       = "localhost:8080"
-  api_path   = "nifi-api"
-  admin_cert = "certs/nifi.crt"
-  admin_key  = "certs/nifi.key"
+  host        = "localhost:8080"
+  api_path    = "nifi-api"
+  admin_cert  = "certs/nifi.crt"
+  admin_key   = "certs/nifi.key"
+  http_scheme = "http"
 }
 ```
 
 ## Argument Reference
 
 The following arguments are supported:
 
-Argument       | Required | Description
----------------|----------|------------
-**host**       | Yes      | NiFi host including port, e.g. `localhost:8080`.
-**api_path**   | No       | API path prefix, e.g. `nifi-api`. Defaults to that.
-**admin_cert** | No       | Path to certificate used to access admin. Provider will use HTTPS only if this is specified. 
-**admin_key**  | No       | Path to certificate's key, required if `admin_cert` is specified.
+Argument         | Required | Description
+-----------------|----------|------------
+**host**         | Yes      | NiFi host including port, e.g. `localhost:8080`.
+**api_path**     | No       | API path prefix, e.g. `nifi-api`. Defaults to that.
+**admin_cert**   | No       | Path to certificate used to access admin. Provider will use HTTPS only if this is specified.
+**admin_key**    | No       | Path to certificate's key, required if `admin_cert` is specified.
+**http_scheme**  | No       | Force a HTTP scheme. Useful if NiFi does not handle SSL termination. Defaults to `http`, unless `admin_cert` and `admin_key` are set, in which case `https` is used.

nifi/client.go

@@ -26,7 +26,7 @@ type Client struct {
 
 func NewClient(config Config) *Client {
 	httpClient := &http.Client{}
-	scheme := "http"
+	scheme := config.HttpScheme
 	if config.AdminCertPath != "" && config.AdminKeyPath != "" {
 		cert, err := tls.LoadX509KeyPair(config.AdminCertPath, config.AdminKeyPath)
 		if err != nil {

nifi/config.go

@@ -7,4 +7,5 @@ type Config struct {
 	ApiPath       string
 	AdminCertPath string
 	AdminKeyPath  string
+	HttpScheme    string
 }

nifi/provider.go

@@ -14,7 +14,11 @@ func Provider() terraform.ResourceProvider {
 				Required:    true,
 				DefaultFunc: schema.EnvDefaultFunc("NIFI_HOST", nil),
 			},
-
+			"http_scheme": &schema.Schema{
+				Type:        schema.TypeString,
+				Optional:    true,
+				DefaultFunc: schema.EnvDefaultFunc("NIFI_HTTP_SCHEME", "http"),
+			},
 			"api_path": &schema.Schema{
 				Type:        schema.TypeString,
 				Optional:    true,
@@ -52,6 +56,7 @@ func Provider() terraform.ResourceProvider {
 func providerConfigure(d *schema.ResourceData) (interface{}, error) {
 	config := Config{
 		Host:          d.Get("host").(string),
+		HttpScheme:    d.Get("http_scheme").(string),
 		ApiPath:       d.Get("api_path").(string),
 		AdminCertPath: d.Get("admin_cert").(string),
 		AdminKeyPath:  d.Get("admin_key").(string),