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.

Sign up for GitHub

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

Revert breaking change to client.NewClient function #3579

Merged
merged 2 commits into from
Aug 6, 2015
Merged

Revert breaking change to client.NewClient function #3579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
765509b
revert breaking change to `client.NewClient` function
corylanou Aug 6, 2015
9df04ec
changelog
corylanou Aug 6, 2015
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
- [#3511](https://github.com/influxdb/influxdb/issues/3511): Sending a large number of tag causes panic
- [#3288](https://github.com/influxdb/influxdb/issues/3288): Run go fuzz on the line-protocol input
- [#3545](https://github.com/influxdb/influxdb/issues/3545): Fix parsing string fields with newlines
- [#3579](https://github.com/influxdb/influxdb/issues/3579): Revert breaking change to `client.NewClient` function

## v0.9.2 [2015-07-24]

Expand Down
8 changes: 4 additions & 4 deletions client/example_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ func ExampleNewClient() {

// NOTE: this assumes you've setup a user and have setup shell env variables,
// namely INFLUX_USER/INFLUX_PWD. If not just ommit Username/Password below.
conf := &client.Config{
conf := client.Config{
URL: *host,
Username: os.Getenv("INFLUX_USER"),
Password: os.Getenv("INFLUX_PWD"),
Expand All @@ -37,7 +37,7 @@ func ExampleClient_Ping() {
if err != nil {
log.Fatal(err)
}
con, err := client.NewClient(&client.Config{URL: *host})
con, err := client.NewClient(client.Config{URL: *host})
if err != nil {
log.Fatal(err)
}
Expand All @@ -54,7 +54,7 @@ func ExampleClient_Query() {
if err != nil {
log.Fatal(err)
}
con, err := client.NewClient(&client.Config{URL: *host})
con, err := client.NewClient(client.Config{URL: *host})
if err != nil {
log.Fatal(err)
}
Expand All @@ -73,7 +73,7 @@ func ExampleClient_Write() {
if err != nil {
log.Fatal(err)
}
con, err := client.NewClient(&client.Config{URL: *host})
con, err := client.NewClient(client.Config{URL: *host})
if err != nil {
log.Fatal(err)
}
Expand Down
6 changes: 3 additions & 3 deletions client/influxdb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ type Config struct {
}

// NewConfig will create a config to be used in connecting to the client
func NewConfig() *Config {
return &Config{
func NewConfig() Config {
return Config{
Timeout: DefaultTimeout,
}
}
Expand All @@ -106,7 +106,7 @@ const (
)

// NewClient will instantiate and return a connected client to issue commands to the server.
func NewClient(c *Config) (*Client, error) {
func NewClient(c Config) (*Client, error) {
client := Client{
url: c.URL,
username: c.Username,
Expand Down
16 changes: 8 additions & 8 deletions client/influxdb_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ func BenchmarkUnmarshalJSON10Tags(b *testing.B) {
}

func TestNewClient(t *testing.T) {
config := &client.Config{}
config := client.Config{}
_, err := client.NewClient(config)
if err != nil {
t.Fatalf("unexpected error. expected %v, actual %v", nil, err)
Expand All @@ -96,7 +96,7 @@ func TestClient_Ping(t *testing.T) {
defer ts.Close()

u, _ := url.Parse(ts.URL)
config := &client.Config{URL: *u}
config := client.Config{URL: *u}
c, err := client.NewClient(config)
if err != nil {
t.Fatalf("unexpected error. expected %v, actual %v", nil, err)
Expand All @@ -122,7 +122,7 @@ func TestClient_Query(t *testing.T) {
defer ts.Close()

u, _ := url.Parse(ts.URL)
config := &client.Config{URL: *u}
config := client.Config{URL: *u}
c, err := client.NewClient(config)
if err != nil {
t.Fatalf("unexpected error. expected %v, actual %v", nil, err)
Expand Down Expand Up @@ -154,7 +154,7 @@ func TestClient_BasicAuth(t *testing.T) {

u, _ := url.Parse(ts.URL)
u.User = url.UserPassword("username", "password")
config := &client.Config{URL: *u, Username: "username", Password: "password"}
config := client.Config{URL: *u, Username: "username", Password: "password"}
c, err := client.NewClient(config)
if err != nil {
t.Fatalf("unexpected error. expected %v, actual %v", nil, err)
Expand All @@ -175,7 +175,7 @@ func TestClient_Write(t *testing.T) {
defer ts.Close()

u, _ := url.Parse(ts.URL)
config := &client.Config{URL: *u}
config := client.Config{URL: *u}
c, err := client.NewClient(config)
if err != nil {
t.Fatalf("unexpected error. expected %v, actual %v", nil, err)
Expand Down Expand Up @@ -226,7 +226,7 @@ func TestClient_UserAgent(t *testing.T) {

for _, test := range tests {
u, _ := url.Parse(ts.URL)
config := &client.Config{URL: *u, UserAgent: test.userAgent}
config := client.Config{URL: *u, UserAgent: test.userAgent}
c, err := client.NewClient(config)
if err != nil {
t.Fatalf("unexpected error. expected %v, actual %v", nil, err)
Expand Down Expand Up @@ -507,7 +507,7 @@ func TestClient_Timeout(t *testing.T) {
defer ts.Close()

u, _ := url.Parse(ts.URL)
config := &client.Config{URL: *u, Timeout: 500 * time.Millisecond}
config := client.Config{URL: *u, Timeout: 500 * time.Millisecond}
c, err := client.NewClient(config)
if err != nil {
t.Fatalf("unexpected error. expected %v, actual %v", nil, err)
Expand All @@ -521,7 +521,7 @@ func TestClient_Timeout(t *testing.T) {
t.Fatalf("unexpected error. expected 'use of closed network connection' error, got %v", err)
}

confignotimeout := &client.Config{URL: *u}
confignotimeout := client.Config{URL: *u}
cnotimeout, err := client.NewClient(confignotimeout)
_, err = cnotimeout.Query(query)
if err != nil {
Expand Down
4 changes: 2 additions & 2 deletions cmd/influx/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ func TestParseCommand_Insert(t *testing.T) {
defer ts.Close()

u, _ := url.Parse(ts.URL)
config := &client.Config{URL: *u}
config := client.Config{URL: *u}
c, err := client.NewClient(config)
if err != nil {
t.Fatalf("unexpected error. expected %v, actual %v", nil, err)
Expand Down Expand Up @@ -138,7 +138,7 @@ func TestParseCommand_InsertInto(t *testing.T) {
defer ts.Close()

u, _ := url.Parse(ts.URL)
config := &client.Config{URL: *u}
config := client.Config{URL: *u}
c, err := client.NewClient(config)
if err != nil {
t.Fatalf("unexpected error. expected %v, actual %v", nil, err)
Expand Down