Skip to content

Commit

Permalink
Lotsa changes so that the sdk now handles multiple connections to nov…
Browse files Browse the repository at this point in the history 
…i and edges
  • Loading branch information
Steve Manweiler committed May 13, 2016
1 parent a98fa59 commit a70196f
Show file tree
Hide file tree
Showing 11 changed files with 174 additions and 102 deletions.
22 changes: 11 additions & 11 deletions codeadmin.go
View file
Expand Up @@ -31,7 +31,7 @@ func (d *DevClient) GetServiceNames(systemKey string) ([]string, error) {
if err != nil {
return nil, err
}
resp, err := get(_CODE_ADMIN_PREAMBLE+"/"+systemKey, nil, creds, nil)
resp, err := get(d, _CODE_ADMIN_PREAMBLE+"/"+systemKey, nil, creds, nil)
if err != nil {
return nil, fmt.Errorf("Error getting services: %v", err)
}
Expand All @@ -56,7 +56,7 @@ func (d *DevClient) GetService(systemKey, name string) (*Service, error) {
if err != nil {
return nil, err
}
resp, err := get(_CODE_PREAMBLE+"/"+systemKey+"/"+name, nil, creds, nil)
resp, err := get(d, _CODE_PREAMBLE+"/"+systemKey+"/"+name, nil, creds, nil)
if err != nil {
return nil, fmt.Errorf("Error getting service: %v", err)
}
Expand Down Expand Up @@ -84,7 +84,7 @@ func (d *DevClient) GetServiceRaw(systemKey, name string) (map[string]interface{
if err != nil {
return nil, err
}
resp, err := get(_CODE_PREAMBLE+"/"+systemKey+"/"+name, nil, creds, nil)
resp, err := get(d, _CODE_PREAMBLE+"/"+systemKey+"/"+name, nil, creds, nil)
if err != nil {
return nil, fmt.Errorf("Error getting service: %v", err)
}
Expand All @@ -108,7 +108,7 @@ func (d *DevClient) SetServiceEffectiveUser(systemKey, name, userid string) erro
if err != nil {
return err
}
resp, err := put(_CODE_ADMIN_PREAMBLE+"/"+systemKey+"/"+name, map[string]interface{}{
resp, err := put(d, _CODE_ADMIN_PREAMBLE+"/"+systemKey+"/"+name, map[string]interface{}{
"run_user": userid,
}, creds, nil)
if err != nil {
Expand Down Expand Up @@ -137,7 +137,7 @@ func (d *DevClient) updateService(sysKey, name, code string, extra map[string]in
return err
}

resp, err := put(_CODE_ADMIN_PREAMBLE+"/"+sysKey+"/"+name, extra, creds, nil)
resp, err := put(d, _CODE_ADMIN_PREAMBLE+"/"+sysKey+"/"+name, extra, creds, nil)
if err != nil {
return fmt.Errorf("Error updating service: %v\n", err)
}
Expand Down Expand Up @@ -166,7 +166,7 @@ func (d *DevClient) EnableLogsForService(systemKey, name string) error {
if err != nil {
return err
}
_, err = post(_CODE_ADMIN_PREAMBLE_V2+"/logs/"+systemKey+"/"+name, map[string]interface{}{"logging": "true"}, creds, nil)
_, err = post(d, _CODE_ADMIN_PREAMBLE_V2+"/logs/"+systemKey+"/"+name, map[string]interface{}{"logging": "true"}, creds, nil)
return err
}

Expand All @@ -176,7 +176,7 @@ func (d *DevClient) DisableLogsForService(systemKey, name string) error {
if err != nil {
return err
}
_, err = post(_CODE_ADMIN_PREAMBLE_V2+"/logs/"+systemKey+"/"+name, map[string]interface{}{"logging": false}, creds, nil)
_, err = post(d, _CODE_ADMIN_PREAMBLE_V2+"/logs/"+systemKey+"/"+name, map[string]interface{}{"logging": false}, creds, nil)
return err
}

Expand All @@ -186,7 +186,7 @@ func (d *DevClient) AreServiceLogsEnabled(systemKey, name string) (bool, error)
if err != nil {
return false, err
}
resp, err := get(_CODE_ADMIN_PREAMBLE_V2+"/logs/"+systemKey+"/"+name+"/active", nil, creds, nil)
resp, err := get(d, _CODE_ADMIN_PREAMBLE_V2+"/logs/"+systemKey+"/"+name+"/active", nil, creds, nil)
if err != nil {
return false, err
}
Expand All @@ -204,7 +204,7 @@ func (d *DevClient) GetLogsForService(systemKey, name string) ([]CodeLog, error)
if err != nil {
return nil, err
}
resp, err := get(_CODE_ADMIN_PREAMBLE_V2+"/logs/"+systemKey+"/"+name, nil, creds, nil)
resp, err := get(d, _CODE_ADMIN_PREAMBLE_V2+"/logs/"+systemKey+"/"+name, nil, creds, nil)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -238,7 +238,7 @@ func (d *DevClient) newService(systemKey, name, code string, extra map[string]in
return err
}
extra["code"] = code
resp, err := post(_CODE_ADMIN_PREAMBLE+"/"+systemKey+"/"+name, extra, creds, nil)
resp, err := post(d, _CODE_ADMIN_PREAMBLE+"/"+systemKey+"/"+name, extra, creds, nil)
if err != nil {
return fmt.Errorf("Error creating new service: %v", err)
}
Expand All @@ -253,7 +253,7 @@ func (d *DevClient) DeleteService(systemKey, name string) error {
if err != nil {
return err
}
resp, err := delete(_CODE_ADMIN_PREAMBLE+"/"+systemKey+"/"+name, nil, creds, nil)
resp, err := delete(d, _CODE_ADMIN_PREAMBLE+"/"+systemKey+"/"+name, nil, creds, nil)
if err != nil {
return fmt.Errorf("Error deleting service: %v", err)
}
Expand Down
4 changes: 2 additions & 2 deletions codecalls.go
View file
Expand Up @@ -16,9 +16,9 @@ func callService(c cbClient, systemKey, name string, params map[string]interface
var resp *CbResp
if log {

resp, err = post(_CODE_PREAMBLE+"/"+systemKey+"/"+name, params, creds, map[string][]string{"Logging-enabled": []string{"true"}})
resp, err = post(c, _CODE_PREAMBLE+"/"+systemKey+"/"+name, params, creds, map[string][]string{"Logging-enabled": []string{"true"}})
} else {
resp, err = post(_CODE_PREAMBLE+"/"+systemKey+"/"+name, params, creds, nil)
resp, err = post(c, _CODE_PREAMBLE+"/"+systemKey+"/"+name, params, creds, nil)
}
if err != nil {
return nil, fmt.Errorf("Error calling %s service: %v", name, err)
Expand Down
16 changes: 8 additions & 8 deletions datacalls.go
View file
Expand Up @@ -46,7 +46,7 @@ func insertdata(c cbClient, collection_id string, data interface{}) ([]interface
if err != nil {
return nil, err
}
resp, err := post(_DATA_PREAMBLE+collection_id, data, creds, nil)
resp, err := post(c, _DATA_PREAMBLE+collection_id, data, creds, nil)
if err != nil {
return nil, fmt.Errorf("Error inserting: %v", err)
}
Expand Down Expand Up @@ -98,7 +98,7 @@ func getItemCount(c cbClient, collection_id string) (int, error) {
if err != nil {
return -1, err
}
resp, err := get(_DATA_PREAMBLE+collection_id+"/count", nil, creds, nil)
resp, err := get(c, _DATA_PREAMBLE+collection_id+"/count", nil, creds, nil)
if err != nil {
return -1, fmt.Errorf("Error getting count: %v", err)
}
Expand Down Expand Up @@ -129,7 +129,7 @@ func getDataByName(c cbClient, sysKey string, collectionName string, query *Quer
} else {
qry = nil
}
resp, err := get(_DATA_NAME_PREAMBLE+sysKey+"/"+collectionName, qry, creds, nil)
resp, err := get(c, _DATA_NAME_PREAMBLE+sysKey+"/"+collectionName, qry, creds, nil)
if err != nil {
return nil, fmt.Errorf("Error getting data: %v", err)
}
Expand Down Expand Up @@ -157,7 +157,7 @@ func getdata(c cbClient, collection_id string, query *Query) (map[string]interfa
} else {
qry = nil
}
resp, err := get(_DATA_PREAMBLE+collection_id, qry, creds, nil)
resp, err := get(c, _DATA_PREAMBLE+collection_id, qry, creds, nil)
if err != nil {
return nil, fmt.Errorf("Error getting data: %v", err)
}
Expand Down Expand Up @@ -186,7 +186,7 @@ func getdatatotal(c cbClient, collection_id string, query *Query) (map[string]in
} else {
qry = nil
}
resp, err := get(_DATA_PREAMBLE+collection_id+"/count", qry, creds, nil)
resp, err := get(c, _DATA_PREAMBLE+collection_id+"/count", qry, creds, nil)
if err != nil {
return nil, fmt.Errorf("Error getting data: %v", err)
}
Expand Down Expand Up @@ -221,7 +221,7 @@ func updatedata(c cbClient, collection_id string, query *Query, changes map[stri
if err != nil {
return err
}
resp, err := put(_DATA_PREAMBLE+collection_id, body, creds, nil)
resp, err := put(c, _DATA_PREAMBLE+collection_id, body, creds, nil)
if err != nil {
return fmt.Errorf("Error updating data: %v", err)
}
Expand Down Expand Up @@ -259,7 +259,7 @@ func deletedata(c cbClient, collection_id string, query *Query) error {
} else {
qry = nil
}
resp, err := delete(_DATA_PREAMBLE+collection_id, qry, creds, nil)
resp, err := delete(c, _DATA_PREAMBLE+collection_id, qry, creds, nil)
if err != nil {
return fmt.Errorf("Error deleting data: %v", err)
}
Expand Down Expand Up @@ -295,7 +295,7 @@ func getColumns(c cbClient, collection_id, systemKey, systemSecret string) ([]in
}
}

resp, err := get(_DATA_PREAMBLE+collection_id+"/columns", nil, creds, headers)
resp, err := get(c, _DATA_PREAMBLE+collection_id+"/columns", nil, creds, headers)
if err != nil {
return nil, fmt.Errorf("Error getting collection columns: %v", err)
}
Expand Down

0 comments on commit a70196f

Please sign in to comment.