Skip to content

Commit 5792092

Browse files
author
weilong.pwl
committed
add method to client interface
1 parent bfb55c9 commit 5792092

File tree

4 files changed

+200
-18
lines changed

4 files changed

+200
-18
lines changed

‎client_interface.go

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,4 +266,24 @@ type ClientInterface interface {
266266
GetScheduledSQLJobInstance(projectName, jobName, instanceId string, result bool) (instance *ScheduledSQLJobInstance, err error)
267267
ModifyScheduledSQLJobInstanceState(projectName, jobName, instanceId string, state ScheduledSQLState) error
268268
ListScheduledSQLJobInstances(projectName, jobName string, status *InstanceStatus) (instances []*ScheduledSQLJobInstance, total, count int64, err error)
269+
270+
// #################### Resource Operations #####################
271+
ListResource(resourceType string, resourceName string, offset, size int) (resourceList []*Resource, count, total int, err error)
272+
GetResource(name string) (resource *Resource, err error)
273+
GetResourceString(name string) (resource string, err error)
274+
DeleteResource(name string) error
275+
UpdateResource(resource *Resource) error
276+
UpdateResourceString(resourceName, resourceStr string) error
277+
CreateResource(resource *Resource) error
278+
CreateResourceString(resourceStr string) error
279+
280+
// #################### Resource Record Operations #####################
281+
ListResourceRecord(resourceName string, offset, size int) (recordList []*ResourceRecord, count, total int, err error)
282+
GetResourceRecord(resourceName, recordId string) (record *ResourceRecord, err error)
283+
GetResourceRecordString(resourceName, name string) (record string, err error)
284+
DeleteResourceRecord(resourceName, recordId string) error
285+
UpdateResourceRecord(resourceName string, record *ResourceRecord) error
286+
UpdateResourceRecordString(resourceName, recordStr string) error
287+
CreateResourceRecord(resourceName string, record *ResourceRecord) error
288+
CreateResourceRecordString(resourceName, recordStr string) error
269289
}

‎client_resource.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ func (c *Client) ListResource(resourceType string, resourceName string, offset,
177177
}
178178
defer r.Body.Close()
179179
type ListResourceResponse struct {
180-
ResourceList []*Resource `json:"Items"`
180+
ResourceList []*Resource `json:"items"`
181181
Total int `json:"total"`
182182
Count int `json:"count"`
183183
}

‎client_resource_record.go

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ type ResourceRecord struct {
1515
LastModifyTime int64 `json:"lastModifyTime"`
1616
}
1717

18-
func (c *Client) CreateResourceRecordString(resourceName, resourceStr string) error {
19-
body := []byte(resourceStr)
18+
func (c *Client) CreateResourceRecordString(resourceName, recordStr string) error {
19+
body := []byte(recordStr)
2020

2121
h := map[string]string{
2222
"x-log-bodyrawsize": fmt.Sprintf("%v", len(body)),
@@ -32,8 +32,8 @@ func (c *Client) CreateResourceRecordString(resourceName, resourceStr string) er
3232
return nil
3333
}
3434

35-
func (c *Client) CreateResourceRecord(resourceName string, resource *ResourceRecord) error {
36-
body, err := json.Marshal(resource)
35+
func (c *Client) CreateResourceRecord(resourceName string, record *ResourceRecord) error {
36+
body, err := json.Marshal(record)
3737
if err != nil {
3838
return NewClientError(err)
3939
}
@@ -51,8 +51,8 @@ func (c *Client) CreateResourceRecord(resourceName string, resource *ResourceRec
5151
return nil
5252
}
5353

54-
func (c *Client) UpdateResourceRecord(resourceName string, resource *ResourceRecord) error {
55-
body, err := json.Marshal(resource)
54+
func (c *Client) UpdateResourceRecord(resourceName string, record *ResourceRecord) error {
55+
body, err := json.Marshal(record)
5656
if err != nil {
5757
return NewClientError(err)
5858
}
@@ -62,7 +62,7 @@ func (c *Client) UpdateResourceRecord(resourceName string, resource *ResourceRec
6262
"Content-Type": "application/json",
6363
}
6464

65-
uri := fmt.Sprintf("/resources/%s/records/%s", resourceName, resource.Id)
65+
uri := fmt.Sprintf("/resources/%s/records/%s", resourceName, record.Id)
6666
r, err := c.request("", "PUT", uri, h, body)
6767
if err != nil {
6868
return err
@@ -71,8 +71,8 @@ func (c *Client) UpdateResourceRecord(resourceName string, resource *ResourceRec
7171
return nil
7272
}
7373

74-
func (c *Client) UpdateResourceRecordString(resourceName, resourceStr string) error {
75-
body := []byte(resourceStr)
74+
func (c *Client) UpdateResourceRecordString(resourceName, recordStr string) error {
75+
body := []byte(recordStr)
7676

7777
h := map[string]string{
7878
"x-log-bodyrawsize": fmt.Sprintf("%v", len(body)),
@@ -104,7 +104,7 @@ func (c *Client) DeleteResourceRecord(resourceName, recordId string) error {
104104
return nil
105105
}
106106

107-
func (c *Client) GetResourceRecord(resourceName, recordId string) (resource *ResourceRecord, err error) {
107+
func (c *Client) GetResourceRecord(resourceName, recordId string) (record *ResourceRecord, err error) {
108108
h := map[string]string{
109109
"x-log-bodyrawsize": "0",
110110
"Content-Type": "application/json",
@@ -116,19 +116,19 @@ func (c *Client) GetResourceRecord(resourceName, recordId string) (resource *Res
116116
}
117117
defer r.Body.Close()
118118
buf, _ := ioutil.ReadAll(r.Body)
119-
resource = &ResourceRecord{}
120-
if err = json.Unmarshal(buf, resource); err != nil {
119+
record = &ResourceRecord{}
120+
if err = json.Unmarshal(buf, record); err != nil {
121121
err = NewClientError(err)
122122
}
123-
return resource, err
123+
return record, err
124124
}
125125

126-
func (c *Client) GetResourceRecordString(resourceName, name string) (resource string, err error) {
126+
func (c *Client) GetResourceRecordString(resourceName, recordId string) (recordStr string, err error) {
127127
h := map[string]string{
128128
"x-log-bodyrawsize": "0",
129129
"Content-Type": "application/json",
130130
}
131-
uri := fmt.Sprintf("/resources/%s/records", resourceName)
131+
uri := fmt.Sprintf("/resources/%s/records/%s", resourceName, recordId)
132132
r, err := c.request("", "GET", uri, h, nil)
133133
if err != nil {
134134
return "", err
@@ -138,7 +138,7 @@ func (c *Client) GetResourceRecordString(resourceName, name string) (resource st
138138
return string(buf), err
139139
}
140140

141-
func (c *Client) ListResourceRecord(resourceName string, offset, size int) (resourceList []*ResourceRecord, count, total int, err error) {
141+
func (c *Client) ListResourceRecord(resourceName string, offset, size int) (recordList []*ResourceRecord, count, total int, err error) {
142142
h := map[string]string{
143143
"x-log-bodyrawsize": "0",
144144
"Content-Type": "application/json",
@@ -152,7 +152,7 @@ func (c *Client) ListResourceRecord(resourceName string, offset, size int) (reso
152152
}
153153
defer r.Body.Close()
154154
type ListResourceRecordResponse struct {
155-
ResourceRecordList []*ResourceRecord `json:"Items"`
155+
ResourceRecordList []*ResourceRecord `json:"items"`
156156
Total int `json:"total"`
157157
Count int `json:"count"`
158158
}

‎token_auto_update_client.go

Lines changed: 162 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1260,3 +1260,165 @@ func (c *TokenAutoUpdateClient) ListScheduledSQLJobInstances(projectName, jobNam
12601260
}
12611261
return instances, total, count, err
12621262
}
1263+
1264+
// ####################### Resource API ######################
1265+
func (c *TokenAutoUpdateClient) ListResource(resourceType string, resourceName string, offset, size int) (resourceList []*Resource, count, total int, err error) {
1266+
for i := 0; i < c.maxTryTimes; i++ {
1267+
resourceList, total, count, err = c.logClient.ListResource(resourceType, resourceName, offset, size)
1268+
if !c.processError(err) {
1269+
return
1270+
}
1271+
}
1272+
return
1273+
}
1274+
1275+
func (c *TokenAutoUpdateClient) GetResource(name string) (resource *Resource, err error) {
1276+
for i := 0; i < c.maxTryTimes; i++ {
1277+
resource, err = c.logClient.GetResource(name)
1278+
if !c.processError(err) {
1279+
return
1280+
}
1281+
}
1282+
return
1283+
}
1284+
1285+
func (c *TokenAutoUpdateClient) GetResourceString(name string) (resource string, err error) {
1286+
for i := 0; i < c.maxTryTimes; i++ {
1287+
resource, err = c.logClient.GetResourceString(name)
1288+
if !c.processError(err) {
1289+
return
1290+
}
1291+
}
1292+
return
1293+
}
1294+
1295+
func (c *TokenAutoUpdateClient) DeleteResource(name string) (err error) {
1296+
for i := 0; i < c.maxTryTimes; i++ {
1297+
err = c.logClient.DeleteResource(name)
1298+
if !c.processError(err) {
1299+
return
1300+
}
1301+
}
1302+
return
1303+
}
1304+
1305+
func (c *TokenAutoUpdateClient) UpdateResource(resource *Resource) (err error) {
1306+
for i := 0; i < c.maxTryTimes; i++ {
1307+
err = c.logClient.UpdateResource(resource)
1308+
if !c.processError(err) {
1309+
return
1310+
}
1311+
}
1312+
return
1313+
}
1314+
1315+
func (c *TokenAutoUpdateClient) UpdateResourceString(resourceName, resourceStr string) (err error) {
1316+
for i := 0; i < c.maxTryTimes; i++ {
1317+
err = c.logClient.UpdateResourceString(resourceName, resourceStr)
1318+
if !c.processError(err) {
1319+
return
1320+
}
1321+
}
1322+
return
1323+
}
1324+
1325+
func (c *TokenAutoUpdateClient) CreateResource(resource *Resource) (err error) {
1326+
for i := 0; i < c.maxTryTimes; i++ {
1327+
err = c.logClient.CreateResource(resource)
1328+
if !c.processError(err) {
1329+
return
1330+
}
1331+
}
1332+
return
1333+
}
1334+
1335+
func (c *TokenAutoUpdateClient) CreateResourceString(resourceStr string) (err error) {
1336+
for i := 0; i < c.maxTryTimes; i++ {
1337+
err = c.logClient.CreateResourceString(resourceStr)
1338+
if !c.processError(err) {
1339+
return
1340+
}
1341+
}
1342+
return
1343+
}
1344+
1345+
// ####################### Resource Record API ######################
1346+
func (c *TokenAutoUpdateClient) ListResourceRecord(resourceName string, offset, size int) (recordList []*ResourceRecord, count, total int, err error) {
1347+
for i := 0; i < c.maxTryTimes; i++ {
1348+
recordList, total, count, err = c.logClient.ListResourceRecord(resourceName, offset, size)
1349+
if !c.processError(err) {
1350+
return
1351+
}
1352+
}
1353+
return
1354+
}
1355+
1356+
func (c *TokenAutoUpdateClient) GetResourceRecord(resourceName, recordId string) (record *ResourceRecord, err error) {
1357+
for i := 0; i < c.maxTryTimes; i++ {
1358+
record, err = c.logClient.GetResourceRecord(resourceName, recordId)
1359+
if !c.processError(err) {
1360+
return
1361+
}
1362+
}
1363+
return
1364+
}
1365+
1366+
func (c *TokenAutoUpdateClient) GetResourceRecordString(resourceName, name string) (record string, err error) {
1367+
for i := 0; i < c.maxTryTimes; i++ {
1368+
record, err = c.logClient.GetResourceRecordString(resourceName, name)
1369+
if !c.processError(err) {
1370+
return
1371+
}
1372+
}
1373+
return
1374+
}
1375+
1376+
func (c *TokenAutoUpdateClient) DeleteResourceRecord(resourceName, recordId string) (err error) {
1377+
for i := 0; i < c.maxTryTimes; i++ {
1378+
err = c.logClient.DeleteResourceRecord(resourceName, recordId)
1379+
if !c.processError(err) {
1380+
return
1381+
}
1382+
}
1383+
return
1384+
}
1385+
1386+
func (c *TokenAutoUpdateClient) UpdateResourceRecord(resourceName string, record *ResourceRecord) (err error) {
1387+
for i := 0; i < c.maxTryTimes; i++ {
1388+
err = c.logClient.UpdateResourceRecord(resourceName, record)
1389+
if !c.processError(err) {
1390+
return
1391+
}
1392+
}
1393+
return
1394+
}
1395+
1396+
func (c *TokenAutoUpdateClient) UpdateResourceRecordString(resourceName, recordStr string) (err error) {
1397+
for i := 0; i < c.maxTryTimes; i++ {
1398+
err = c.logClient.UpdateResourceString(resourceName, recordStr)
1399+
if !c.processError(err) {
1400+
return
1401+
}
1402+
}
1403+
return
1404+
}
1405+
1406+
func (c *TokenAutoUpdateClient) CreateResourceRecord(resourceName string, record *ResourceRecord) (err error) {
1407+
for i := 0; i < c.maxTryTimes; i++ {
1408+
err = c.logClient.CreateResourceRecord(resourceName, record)
1409+
if !c.processError(err) {
1410+
return
1411+
}
1412+
}
1413+
return
1414+
}
1415+
1416+
func (c *TokenAutoUpdateClient) CreateResourceRecordString(resourceName, recordStr string) (err error) {
1417+
for i := 0; i < c.maxTryTimes; i++ {
1418+
err = c.logClient.CreateResourceRecordString(resourceName, recordStr)
1419+
if !c.processError(err) {
1420+
return
1421+
}
1422+
}
1423+
return
1424+
}

0 commit comments

Comments
 (0)