updated jobs

This commit is contained in:
Xinyun Zhou 2019-05-28 14:23:24 +10:00
parent 089b4580de
commit a56e84dcc4
5 changed files with 45 additions and 12 deletions

View File

@ -32,15 +32,17 @@ func (a JobsAPI) Create(jobSettings models.JobSettings) (models.Job, error) {
// List lists all jobs
func (a JobsAPI) List() ([]models.Job, error) {
var jobs []models.Job
var jobsList = struct {
Jobs []models.Job `json:"jobs,omitempty"`
}{}
resp, err := a.Client.performQuery(http.MethodGet, "/jobs/list", nil, nil)
if err != nil {
return jobs, err
return jobsList.Jobs, err
}
err = json.Unmarshal(resp, &jobs)
return jobs, err
err = json.Unmarshal(resp, &jobsList)
return jobsList.Jobs, err
}
// Delete deletes a job by ID

View File

@ -32,15 +32,17 @@ func (a JobsAPI) Create(jobSettings models.JobSettings) (models.Job, error) {
// List lists all jobs
func (a JobsAPI) List() ([]models.Job, error) {
var jobs []models.Job
var jobsList = struct {
Jobs []models.Job `json:"jobs,omitempty"`
}{}
resp, err := a.Client.performQuery(http.MethodGet, "/jobs/list", nil, nil)
if err != nil {
return jobs, err
return jobsList.Jobs, err
}
err = json.Unmarshal(resp, &jobs)
return jobs, err
err = json.Unmarshal(resp, &jobsList)
return jobsList.Jobs, err
}
// Delete deletes a job by ID

View File

@ -41,17 +41,17 @@ func (o *DBClientOption) getAuthHeader() map[string]string {
encodedAuth := []byte(o.User + ":" + o.Password)
userHeaderData := "Basic " + base64.StdEncoding.EncodeToString(encodedAuth)
auth["Authorization"] = userHeaderData
auth["Content-Type"] = "text/json"
auth["Content-Type"] = "application/json"
} else if o.Token != "" {
auth["Authorization"] = "Bearer " + o.Token
auth["Content-Type"] = "text/json"
auth["Content-Type"] = "application/json"
}
return auth
}
func (o *DBClientOption) getUserAgentHeader() map[string]string {
return map[string]string{
"user-agent": fmt.Sprintf("databricks-sdk-golang-%s", SdkVersion),
"User-Agent": fmt.Sprintf("databricks-sdk-golang-%s", SdkVersion),
}
}
@ -79,4 +79,4 @@ func (o *DBClientOption) getRequestURI(path string) (string, error) {
}
requestURI := fmt.Sprintf("%s://%s/api/%s%s", parsedURI.Scheme, parsedURI.Host, APIVersion, path)
return requestURI, nil
}
}

View File

@ -47,6 +47,9 @@ func PerformQuery(option DBClientOption, method, path string, data interface{},
if err != nil {
return nil, err
}
for k, v := range requestHeaders {
request.Header.Set(k, v)
}
resp, err := client.Do(request)
if err != nil {

View File

@ -0,0 +1,26 @@
package integration
import (
"os"
"testing"
databricks "github.com/xinsnake/databricks-sdk-golang"
dbAzure "github.com/xinsnake/databricks-sdk-golang/azure"
)
func setup() dbAzure.DBClient {
var c dbAzure.DBClient
var o databricks.DBClientOption
o.Host = os.Getenv("DBSDK_HOST")
o.Token = os.Getenv("DBSDK_TOKEN")
return c.Init(o)
}
func TestList(t *testing.T) {
c := setup()
jobs, err := c.Jobs().List()
if err != nil {
t.Errorf("%+v\n", err)
}
t.Logf("%+v\n", jobs)
}