Skip to content

Commit 9eff4df

Browse files
authored
Merge pull request #108 from mbcse/final_fix
Final Changes and Issue's fixed(GSoC'21 Nodecloud Digital Ocean)
2 parents b6eae0f + 76ce69a commit 9eff4df

File tree

9 files changed

+55
-26
lines changed

9 files changed

+55
-26
lines changed

examples/compute/do-droplet.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ function launchInstance() {
3333
});
3434
}
3535

36+
//list Instances
3637
function listInstances() {
3738
droplet
3839
.list()
@@ -44,6 +45,7 @@ function listInstances() {
4445
});
4546
}
4647

48+
//destroy an Instance
4749
function destroyInstance() {
4850
let instanceId = "3164444";
4951
droplet

examples/compute/do-ks.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ const optionsProvider = {
55
const ncProviders = nodeCloud.getProviders(optionsProvider);
66
const kubernetes = ncProviders.do.kubernetes();
77

8+
//Create Kubernetes cluster
89
function createCluster() {
910
let clusterDetails = {
1011
name: "Nodecloud",
@@ -29,6 +30,7 @@ function createCluster() {
2930
);
3031
}
3132

33+
//Get Cluster details
3234
function getClusterDetails() {
3335
let clusterID = "bd5f5959-5e1e-4205-a714-a914373942af";
3436
kubernetes.describeCluster(clusterID).then(
@@ -41,6 +43,7 @@ function getClusterDetails() {
4143
);
4244
}
4345

46+
// Get all clusters
4447
function getAllClusters() {
4548
/* The nextToken value returned from a previous ListClusters request where maxResults was used and the results
4649
exceeded the value of that parameter. Pagination continues from the end of the previous results that returned the
@@ -63,6 +66,7 @@ function getAllClusters() {
6366
);
6467
}
6568

69+
//Delete cluster
6670
function deleteCluster() {
6771
let clusterID = "bd5f5959-5e1e-4205-a714-a914373942af";
6872
kubernetes.deleteCluster(clusterID).then(
@@ -75,6 +79,7 @@ function deleteCluster() {
7579
);
7680
}
7781

82+
//Create a Node Group
7883
function createNodeGroup() {
7984
let groupDetails = {
8085
size: "s-1vcpu-2gb",
@@ -96,6 +101,7 @@ function createNodeGroup() {
96101
);
97102
}
98103

104+
//Delete a node group
99105
function deleteNodeGroup() {
100106
let nodePoolID = "bd5f5959-5e1e-4205-a714-a914373942af";
101107
let clusterID = "bd5f5959-5e1e-4205-a714-a914373942af";
@@ -109,6 +115,7 @@ function deleteNodeGroup() {
109115
);
110116
}
111117

118+
//Get details of Node Group
112119
function describeNodeGroup() {
113120
let nodePoolID = "bd5f5959-5e1e-4205-a714-a914373942af";
114121
let clusterID = "bd5f5959-5e1e-4205-a714-a914373942af";
@@ -122,6 +129,7 @@ function describeNodeGroup() {
122129
);
123130
}
124131

132+
//Get all Nodegroups
125133
function listNodeGroups() {
126134
let clusterID = "bd5f5959-5e1e-4205-a714-a914373942af";
127135
kubernetes.listNodegroups(clusterID).then(

examples/management/do-keyManagement.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ const optionsProvider = {
55
const ncProviders = nodeCloud.getProviders(optionsProvider);
66
const keyManagement = ncProviders.do.keyManagement();
77

8+
//Craete a Key
89
function createKey() {
910
let options = {
1011
public_key:
@@ -20,7 +21,7 @@ function createKey() {
2021
console.log(`Oops something happened ${err}`);
2122
});
2223
}
23-
24+
//Delete a Key
2425
function deleteKey() {
2526
let keyIdentifier = "512189";
2627
keyManagement
@@ -33,6 +34,7 @@ function deleteKey() {
3334
});
3435
}
3536

37+
//Get details of a key
3638
function getKey() {
3739
let keyIdentifier = "512189";
3840
keyManagement
@@ -45,6 +47,7 @@ function getKey() {
4547
});
4648
}
4749

50+
//Get all keys
4851
function getAllKeys() {
4952
keyManagement
5053
.list()

examples/network/do-dns.js

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,23 @@ const ncProviders = nodeCloud.getProviders(optionsProvider);
66

77
const dns = ncProviders.do.dns();
88

9-
const domainCreateOptions = {
10-
type: "A",
11-
name: "www",
12-
data: "162.10.66.0",
13-
priority: null,
14-
port: null,
15-
ttl: 1800,
16-
weight: null,
17-
flags: null,
18-
tag: null
19-
};
20-
219
const domainName = "example.com";
2210

11+
12+
// Create a DNS Record
2313
function createRecord() {
14+
let domainCreateOptions = {
15+
type: "A",
16+
name: "www",
17+
data: "162.10.66.0",
18+
priority: null,
19+
port: null,
20+
ttl: 1800,
21+
weight: null,
22+
flags: null,
23+
tag: null
24+
};
25+
2426
dns
2527
.createRecord(domainName, domainCreateOptions)
2628
.then(result => {
@@ -31,6 +33,7 @@ function createRecord() {
3133
});
3234
}
3335

36+
//Get all DNS records
3437
function getAllRecords() {
3538
dns
3639
.getRecords(domainName)
@@ -42,6 +45,7 @@ function getAllRecords() {
4245
});
4346
}
4447

48+
//Get a DNS record
4549
function getRecord() {
4650
let recordID = "3352896";
4751
dns
@@ -54,6 +58,7 @@ function getRecord() {
5458
});
5559
}
5660

61+
//Delete a DNS record
5762
function deleteRecord() {
5863
let recordID = "3352896";
5964
dns
@@ -66,6 +71,7 @@ function deleteRecord() {
6671
});
6772
}
6873

74+
//Change a DNS record
6975
function changeRecord() {
7076
let recordID = "3352896";
7177
let options = {

examples/network/do-lb.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ const optionsProvider = {
55
const ncProviders = nodeCloud.getProviders(optionsProvider);
66
const lb = ncProviders.do.loadbalancer();
77

8+
//Create a LoadBalancer
89
function create() {
910
let options = {
1011
name: "example-lb-01",
@@ -36,6 +37,7 @@ function create() {
3637
});
3738
}
3839

40+
//List all loadbalancers
3941
function listAllLoadBalancers() {
4042
lb.list()
4143
.then(result => {
@@ -46,6 +48,7 @@ function listAllLoadBalancers() {
4648
});
4749
}
4850

51+
//Delete a loadbalancer
4952
function deleteLoadBalancer() {
5053
let lbId = "4de7ac8b-495b-4884-9a69-1050c6793cd6";
5154
lb.delete(lbId)
@@ -57,6 +60,7 @@ function deleteLoadBalancer() {
5760
});
5861
}
5962

63+
//Update a loadbalancer
6064
function updateLoadBalancer() {
6165
let lbId = "4de7ac8b-495b-4884-9a69-1050c6793cd6";
6266
let options = {

examples/storage/do-blockStorage.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ const ncProviders = nodeCloud.getProviders(optionsProvider);
66

77
const volume = ncProviders.do.blockStorage();
88

9+
//List all volumes
910
function listVolumes() {
1011
let region = "nyc1";
1112
volume
@@ -18,6 +19,7 @@ function listVolumes() {
1819
});
1920
}
2021

22+
//Create a volume
2123
function createVolume() {
2224
let option = {
2325
size_gigabytes: 10,
@@ -37,6 +39,7 @@ function createVolume() {
3739
});
3840
}
3941

42+
//Get details of a Volume
4043
function describeVolume() {
4144
let volumeId = "506f78a4-e098-11e5-ad9f-000f53306ae1";
4245
volume
@@ -49,6 +52,7 @@ function describeVolume() {
4952
});
5053
}
5154

55+
//Delete a volume
5256
function deleteVolume() {
5357
let volumeId = "506f78a4-e098-11e5-ad9f-000f53306ae1";
5458
volume

generator/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
"code-generation"
1111
],
1212
"scripts": {
13-
"test": "cross-env TS_NODE_FILES=true mocha --exit --require ts-node/register --colors test/**/*.ts"
13+
"test": "cross-env TS_NODE_FILES=true mocha --exit --require ts-node/register --colors test/**/*.ts",
14+
"tool": "tsc main && node main"
1415
},
1516
"dependencies": {
1617
"@azure/arm-appservice": "^6.0.0",

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
"lint": "lerna run lint",
1212
"prettier": "lerna run prettier",
1313
"format": "prettier --write",
14-
"doc": "jsdoc -c jsdoc.json"
14+
"doc": "jsdoc -c jsdoc.json",
15+
"generator": " cd generator && tsc main.ts && node main.js"
1516
},
1617
"repository": {
1718
"type": "git",

packages/do-plugin/do.js

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const doSql = require("./database/do-RDBMS");
44
const doNosql = require("./database/do-noSql");
55
const loadBalancer = require("./network/do-loadBalancer");
66
const doDNS = require("./network/do-DNS");
7-
const keyVault = require("./security/do-keyManagement");
7+
const keyVault = require("./management/do-keyManagement");
88
const volume = require("./storage/do-blockStorage");
99

1010
class Do {
@@ -18,48 +18,48 @@ class Do {
1818
this.token = process.env.DO_TOKEN;
1919
return {
2020
getSDK: () => this._dosdk,
21-
getToken: () => this._token,
21+
getToken: () => this.token,
2222
compute: this.droplet,
2323
blockStorage: this.volume,
2424
loadbalancer: this.loadBalancer,
2525
dns: this.doDNS,
2626
rdbms: this.doSql,
2727
noSql: this.doNosql,
2828
kubernetes: this.kubernetes,
29-
keyManagment: this.keyVault
29+
keyManagement: this.keyVault
3030
};
3131
}
3232

3333
droplet() {
34-
return new droplet(this.getSDK(), this.token);
34+
return new droplet(this.getSDK(), this.getToken());
3535
}
3636

3737
kubernetes() {
38-
return new kubernetes(this.getSDK(), this.token);
38+
return new kubernetes(this.getSDK(), this.getToken());
3939
}
4040

4141
doSql() {
42-
return new doSql(this.getSDK(), this.token);
42+
return new doSql(this.getSDK(), this.getToken());
4343
}
4444

4545
doDNS() {
46-
return new doDNS(this.getSDK(), this.token);
46+
return new doDNS(this.getSDK(), this.getToken());
4747
}
4848

4949
doNosql() {
50-
return new doNosql(this.getSDK(), this.token);
50+
return new doNosql(this.getSDK(), this.getToken());
5151
}
5252

5353
loadBalancer() {
54-
return new loadBalancer(this.getSDK(), this.token);
54+
return new loadBalancer(this.getSDK(), this.getToken());
5555
}
5656

5757
keyVault() {
58-
return new keyVault(this.getSDK(), this.token);
58+
return new keyVault(this.getSDK(), this.getToken());
5959
}
6060

6161
volume() {
62-
return new volume(this.getSDK(), this.token);
62+
return new volume(this.getSDK(), this.getToken());
6363
}
6464
}
6565

0 commit comments

Comments
 (0)