Skip to content

Commit

Permalink
Merge branch 'master' into feat/options-timeout
Browse files Browse the repository at this point in the history
  • Loading branch information
vlastahajek authored Apr 24, 2020
2 parents b195fc1 + 4ca9d67 commit 15c35b7
Show file tree
Hide file tree
Showing 15 changed files with 986 additions and 43 deletions.
9 changes: 7 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
## 1.1.0
## 1.1.0
### Features
1. [#100](https://github.com/influxdata/influxdb-client-go/pull/100) HTTP request timeout made configurable

1. [#99](https://github.com/influxdata/influxdb-client-go/pull/99) Organizations API and Users API
1. [#96](https://github.com/influxdata/influxdb-client-go/pull/96) Authorization API

### Doc
1. [#101](https://github.com/influxdata/influxdb-client-go/pull/101) Added examples to API doc

## 1.0.0 [2020-04-01]
### Core

Expand Down
4 changes: 4 additions & 0 deletions api/authorizations.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// Copyright 2020 InfluxData, Inc. All rights reserved.
// Use of this source code is governed by MIT
// license that can be found in the LICENSE file.

package api

import (
Expand Down
139 changes: 139 additions & 0 deletions api/doc.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,139 @@
// Copyright 2020 InfluxData, Inc. All rights reserved.
// Use of this source code is governed by MIT
// license that can be found in the LICENSE file.

// Package api provides clients for InfluxDB server APIs
//
// Examples
//
// Users API
//
// // Create influxdb client
// client := influxdb2.NewClient("http://localhost:9999", "my-token")
//
// // Find organization
// org, err := client.OrganizationsApi().FindOrganizationByName(context.Background(), "my-org")
// if err != nil {
// panic(err)
// }
//
// // Get users API client
// usersApi := client.UsersApi()
//
// // Create new user
// user, err := usersApi.CreateUserWithName(context.Background(), "user-01")
// if err != nil {
// panic(err)
// }
//
// // Set user password
// err = usersApi.UpdateUserPassword(context.Background(), user, "pass-at-least-8-chars")
// if err != nil {
// panic(err)
// }
//
// // Add user to organization
// _, err = client.OrganizationsApi().AddMember(context.Background(), org, user)
// if err != nil {
// panic(err)
// }
//
// Organizations API
//
// // Create influxdb client
// client := influxdb2.NewClient("http://localhost:9999", "my-token")
//
// // Get Organizations API client
// orgApi := client.OrganizationsApi()
//
// // Create new organization
// org, err := orgApi.CreateOrganizationWithName(context.Background(), "org-2")
// if err != nil {
// panic(err)
// }
//
// orgDescription := "My second org "
// org.Description = &orgDescription
//
// org, err = orgApi.UpdateOrganization(context.Background(), org)
// if err != nil {
// panic(err)
// }
//
// // Find user to set owner
// user, err := client.UsersApi().FindUserByName(context.Background(), "user-01")
// if err != nil {
// panic(err)
// }
//
// // Add another owner (first owner is the one who create organization
// _, err = orgApi.AddOwner(context.Background(), org, user)
// if err != nil {
// panic(err)
// }
//
// // Create new user to add to org
// newUser, err := client.UsersApi().CreateUserWithName(context.Background(), "user-02")
// if err != nil {
// panic(err)
// }
//
// // Add new user to organization
// _, err = orgApi.AddMember(context.Background(), org, newUser)
// if err != nil {
// panic(err)
// }
//
// Authorizations API
//
// // Create influxdb client
// client := influxdb2.NewClient("http://localhost:9999", "my-token")
//
// // Find user to grant permission
// user, err := client.UsersApi().FindUserByName(context.Background(), "user-01")
// if err != nil {
// panic(err)
// }
//
// // Find organization
// org, err := client.OrganizationsApi().FindOrganizationByName(context.Background(), "my-org")
// if err != nil {
// panic(err)
// }
//
// // create write permission for buckets
// permissionWrite := &domain.Permission{
// Action: domain.PermissionActionWrite,
// Resource: domain.Resource{
// Type: domain.ResourceTypeBuckets,
// },
// }
//
// // create read permission for buckets
// permissionRead := &domain.Permission{
// Action: domain.PermissionActionRead,
// Resource: domain.Resource{
// Type: domain.ResourceTypeBuckets,
// },
// }
//
// // group permissions
// permissions := []domain.Permission{*permissionWrite, *permissionRead}
//
// // create authorization object using info above
// auth := &domain.Authorization{
// OrgID: org.Id,
// Permissions: &permissions,
// User: &user.Name,
// UserID: user.Id,
// }
//
// // grant permission and create token
// authCreated, err := client.AuthorizationsApi().CreateAuthorization(context.Background(), auth)
// if err != nil {
// panic(err)
// }
//
// // Use token
// fmt.Println("Token: ", *authCreated.Token)
package api
Loading

0 comments on commit 15c35b7

Please sign in to comment.