Merge with clarinet

README.md

@@ -1,6 +1,8 @@
 # Go zabbix api
 
-[![GoDoc](https://godoc.org/github.com/claranet/go-zabbix-api?status.svg)](https://godoc.org/github.com/claranet/go-zabbix-api) [![MIT License](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE) [![Build Status](https://travis-ci.org/claranet/go-zabbix-api.svg?branch=master)](https://travis-ci.org/claranet/go-zabbix-api)
+Note, this is not tested and is adjusted for use of tpretz/terraform-provider-zabbix
+
+[![GoDoc](https://godoc.org/github.com/tpretz/go-zabbix-api?status.svg)](https://godoc.org/github.com/tpretz/go-zabbix-api) [![MIT License](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE) [![Build Status](https://travis-ci.org/tpretz/go-zabbix-api.svg?branch=master)](https://travis-ci.org/tpretz/go-zabbix-api)
 
 This Go package provides access to Zabbix API.
 
@@ -10,7 +12,7 @@ This package aims to support multiple zabbix resources from its API like trigger
 
 ## Install
 
-Install it: `go get github.com/claranet/go-zabbix-api`
+Install it: `go get github.com/tpretz/go-zabbix-api`
 
 ## Getting started
 
@@ -20,7 +22,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/claranet/go-zabbix-api"
+	"github.com/tpretz/go-zabbix-api"
 )
 
 func main() {
@@ -67,7 +69,7 @@ go test -v
 
 ## References
 
-Documentation is available on [godoc.org](https://godoc.org/github.com/claranet/go-zabbix-api).
+Documentation is available on [godoc.org](https://godoc.org/github.com/tpretz/go-zabbix-api).
 Also, Rafael Fernandes dos Santos wrote a [great article](http://www.sourcecode.net.br/2014/02/zabbix-api-with-golang.html) about using and extending this package.
 
 License: Simplified BSD License (see [LICENSE](LICENSE)).

application_test.go

@@ -6,7 +6,7 @@ import (
 	"reflect"
 	"testing"
 
-	zapi "github.com/claranet/go-zabbix-api"
+	zapi "github.com/tpretz/go-zabbix-api"
 )
 
 func CreateApplication(host *zapi.Host, t *testing.T) *zapi.Application {

base.go

@@ -2,11 +2,13 @@ package zabbix
 
 import (
 	"bytes"
+	"crypto/tls"
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
 	"log"
 	"net/http"
+	"sync"
 	"sync/atomic"
 )
 
@@ -75,14 +77,44 @@ type API struct {
 	url       string
 	c         http.Client
 	id        int32
+	ex        sync.Mutex
+	Config    Config
+}
+
+type Config struct {
+	Url         string
+	TlsNoVerify bool
+	Log         *log.Logger
+	Serialize   bool
+	Version     int
 }
 
 // NewAPI Creates new API access object.
 // Typical URL is http://host/api_jsonrpc.php or http://host/zabbix/api_jsonrpc.php.
 // It also may contain HTTP basic auth username and password like
 // http://username:password@host/api_jsonrpc.php.
-func NewAPI(url string) (api *API) {
-	return &API{url: url, c: http.Client{}, UserAgent: "github.com/claranet/zabbix"}
+func NewAPI(c Config) (api *API) {
+	api = &API{
+		url:       c.Url,
+		c:         http.Client{},
+		UserAgent: "github.com/tpretz/go-zabbix-api",
+		Logger:    c.Log,
+		Config:    c,
+	}
+
+	if c.TlsNoVerify {
+		tr := &http.Transport{
+			TLSClientConfig: &tls.Config{
+				InsecureSkipVerify: true,
+			},
+		}
+		api.c = http.Client{
+			Transport: tr,
+		}
+		api.printf("TLS running in insecure mode, do not use this configuration in production")
+	}
+
+	return
 }
 
 // SetClient Allows one to use specific http.Client, for example with InsecureSkipVerify transport.
@@ -113,6 +145,11 @@ func (api *API) callBytes(method string, params interface{}) (b []byte, err erro
 	req.Header.Add("Content-Type", "application/json-rpc")
 	req.Header.Add("User-Agent", api.UserAgent)
 
+	if api.Config.Serialize {
+		api.ex.Lock()
+		defer api.ex.Unlock()
+	}
+
 	res, err := api.c.Do(req)
 	if err != nil {
 		api.printf("Error   : %s", err)

base_test.go

@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	zapi "github.com/claranet/go-zabbix-api"
+	zapi "github.com/tpretz/go-zabbix-api"
 )
 
 var (
@@ -42,7 +42,12 @@ func getAPI(t *testing.T) *zapi.API {
 	}
 
 	url, user, password := os.Getenv("TEST_ZABBIX_URL"), os.Getenv("TEST_ZABBIX_USER"), os.Getenv("TEST_ZABBIX_PASSWORD")
-	_api = zapi.NewAPI(url)
+
+	// Zabbix client connection configuration
+	var c zapi.Config
+	c.Url = url
+
+	_api = zapi.NewAPI(c)
 	_api.SetClient(http.DefaultClient)
 	v := os.Getenv("TEST_ZABBIX_VERBOSE")
 	if v != "" && v != "0" {
@@ -84,10 +89,3 @@ func TestVersion(t *testing.T) {
 		t.Errorf("Unexpected version: %s", v)
 	}
 }
-
-func ExampleAPI_Call() {
-	api := zapi.NewAPI("http://host/api_jsonrpc.php")
-	api.Login("user", "password")
-	res, _ := api.Call("item.get", zapi.Params{"itemids": "23970", "output": "extend"})
-	log.Print(res)
-}

doc.go

@@ -5,7 +5,7 @@ language and the Zabbix monitoring API.
 Tested on Zabbix 3.2 but should work since 2.0 version.
 This package aims to support multiple zabbix resources from its API like trigger, application, host group, host, item, template..
 
-Install it: `go get github.com/claranet/go-zabbix-api`
+Install it: `go get github.com/tpretz/go-zabbix-api`
 
 Getting started
 
@@ -14,7 +14,7 @@ Getting started
 	import (
 		"fmt"
 
-		"github.com/claranet/go-zabbix-api"
+		"github.com/tpretz/go-zabbix-api"
 	)
 
 	func main() {

go.mod

@@ -0,0 +1,5 @@
+module github.com/tpretz/go-zabbix-api
+
+go 1.12
+
+require github.com/AlekSi/reflector v0.4.1 // indirect

go.sum

@@ -0,0 +1,4 @@
+github.com/AlekSi/reflector v0.4.1/go.mod h1:K9Yt9Jbte9Xw4QZ3e/ovaWduyRSlKVmwnze4z3+bVxs=
+github.com/tpretz/go-zabbix-api v0.3.1/go.mod h1:vCzbm8q1QYUHmeWisZSfJzt5MfPj+JeRoNW5o4sG72o=
+github.com/tpretz/go-zabbix-api v0.8.0 h1:5xlz9QCcwApIvrPru/WzTUkPltlo+x8tBpbExW9mrjU=
+github.com/tpretz/go-zabbix-api v0.8.0/go.mod h1:SFemU2FNM7aeT3/NinjDw0SQEZGVOoU5d+CqXKTetbw=