Skip to content

Commit 0f42be7

Browse files
author
Ace Nassri
authored
First draft of removing gcloud (GoogleCloudPlatform#79)
1 parent bec07f3 commit 0f42be7

File tree

19 files changed

+39
-43
lines changed

19 files changed

+39
-43
lines changed

‎2-structured-data/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
"dependencies": {
4141
"body-parser": "^1.15.2",
4242
"express": "^4.14.0",
43-
"gcloud": "~0.37.0",
4443
"@google-cloud/datastore": "^0.1.1",
4544
"jade": "^1.11.0",
4645
"kerberos": "^0.0.21",

‎3-binary-data/lib/images.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313

1414
'use strict';
1515

16-
var gcloud = require('gcloud');
16+
var Storage = require('@google-cloud/storage');
1717
var config = require('../config');
1818

1919
var CLOUD_BUCKET = config.get('CLOUD_BUCKET');
2020

21-
var storage = gcloud.storage({
21+
var storage = Storage({
2222
projectId: config.get('GCLOUD_PROJECT')
2323
});
2424
var bucket = storage.bucket(CLOUD_BUCKET);

‎3-binary-data/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838
]
3939
},
4040
"dependencies": {
41+
"@google-cloud/storage": "^0.1.1",
4142
"body-parser": "^1.15.2",
4243
"express": "^4.14.0",
43-
"gcloud": "~0.37.0",
4444
"@google-cloud/datastore": "^0.1.1",
4545
"jade": "^1.11.0",
4646
"kerberos": "^0.0.21",

‎4-auth/lib/images.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313

1414
'use strict';
1515

16-
var gcloud = require('gcloud');
16+
var Storage = require('@google-cloud/storage');
1717
var config = require('../config');
1818

1919
var CLOUD_BUCKET = config.get('CLOUD_BUCKET');
2020

21-
var storage = gcloud.storage({
21+
var storage = Storage({
2222
projectId: config.get('GCLOUD_PROJECT')
2323
});
2424
var bucket = storage.bucket(CLOUD_BUCKET);

‎4-auth/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@
3838
]
3939
},
4040
"dependencies": {
41+
"@google-cloud/storage": "^0.1.1",
4142
"body-parser": "^1.15.2",
4243
"connect-memcached": "^0.2.0",
4344
"express": "^4.14.0",
4445
"express-session": "^1.14.0",
45-
"gcloud": "~0.37.0",
4646
"@google-cloud/datastore": "^0.1.1",
4747
"jade": "^1.11.0",
4848
"kerberos": "^0.0.21",

‎5-logging/lib/images.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313

1414
'use strict';
1515

16-
var gcloud = require('gcloud');
16+
var Storage = require('@google-cloud/storage');
1717
var config = require('../config');
1818

1919
var CLOUD_BUCKET = config.get('CLOUD_BUCKET');
2020

21-
var storage = gcloud.storage({
21+
var storage = Storage({
2222
projectId: config.get('GCLOUD_PROJECT')
2323
});
2424
var bucket = storage.bucket(CLOUD_BUCKET);

‎5-logging/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@
4141
"@google/cloud-debug": "^0.8.3",
4242
"@google/cloud-trace": "^0.5.5",
4343
"@google-cloud/datastore": "^0.1.1",
44+
"@google-cloud/storage": "^0.1.1",
4445
"body-parser": "^1.15.2",
4546
"connect-memcached": "^0.2.0",
4647
"express": "^4.14.0",
4748
"express-session": "^1.14.0",
4849
"express-winston": "^2.0.0",
49-
"gcloud": "~0.37.0",
5050
"jade": "^1.11.0",
5151
"kerberos": "^0.0.21",
5252
"lodash": "^4.14.2",

‎6-pubsub/lib/background.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313

1414
'use strict';
1515

16-
var gcloud = require('gcloud');
16+
var Pubsub = require('@google-cloud/pubsub');
1717
var config = require('../config');
1818
var logging = require('./logging');
1919

2020
var topicName = config.get('TOPIC_NAME');
2121
var subscriptionName = config.get('SUBSCRIPTION_NAME');
2222

23-
var pubsub = gcloud.pubsub({
23+
var pubsub = Pubsub({
2424
projectId: config.get('GCLOUD_PROJECT')
2525
});
2626

‎6-pubsub/lib/images.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
'use strict';
1515

1616
var request = require('request');
17-
var gcloud = require('gcloud');
17+
var Storage = require('@google-cloud/storage');
1818
var config = require('../config');
1919
var logging = require('./logging');
2020

2121
var CLOUD_BUCKET = config.get('CLOUD_BUCKET');
2222

23-
var storage = gcloud.storage({
23+
var storage = Storage({
2424
projectId: config.get('GCLOUD_PROJECT')
2525
});
2626
var bucket = storage.bucket(CLOUD_BUCKET);

‎6-pubsub/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,14 @@
4141
"@google/cloud-debug": "^0.8.3",
4242
"@google/cloud-trace": "^0.5.5",
4343
"@google-cloud/datastore": "^0.1.1",
44+
"@google-cloud/storage": "^0.1.1",
45+
"@google-cloud/pubsub": "^0.2.0",
4446
"async": "^2.0.1",
4547
"body-parser": "^1.15.2",
4648
"connect-memcached": "^0.2.0",
4749
"express": "^4.14.0",
4850
"express-session": "^1.14.0",
4951
"express-winston": "^2.0.0",
50-
"gcloud": "~0.37.0",
5152
"jade": "^1.11.0",
5253
"kerberos": "^0.0.21",
5354
"lodash": "^4.14.2",

‎6-pubsub/test/background.test.js

+4-6
Original file line numberDiff line numberDiff line change
@@ -41,23 +41,21 @@ describe('background.js', function () {
4141
createTopic: sinon.stub().callsArgWith(1, null, mocks.topic),
4242
topic: sinon.stub().returns(mocks.topic)
4343
};
44-
mocks.gcloud = {
45-
pubsub: sinon.stub().returns(mocks.pubsub)
46-
};
44+
mocks.Pubsub = sinon.stub().returns(mocks.pubsub);
4745
mocks.logging = {
4846
info: sinon.stub(),
4947
error: sinon.stub()
5048
};
5149
// Load background.js with provided mocks
5250
background = proxyquire('../lib/background', {
53-
gcloud: mocks.gcloud,
51+
'@google-cloud/pubsub': mocks.Pubsub,
5452
'../config': mocks.config,
5553
'./logging': mocks.logging
5654
});
5755

5856
assert.ok(
59-
mocks.gcloud.pubsub.calledOnce,
60-
'gcloud.pubsub() should have been called once'
57+
mocks.Pubsub.calledOnce,
58+
'Pubsub() should have been called once'
6159
);
6260
});
6361

‎7-gce/lib/background.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313

1414
'use strict';
1515

16-
var gcloud = require('gcloud');
16+
var Pubsub = require('@google-cloud/pubsub');
1717
var config = require('../config');
1818
var logging = require('./logging');
1919

2020
var topicName = config.get('TOPIC_NAME');
2121
var subscriptionName = config.get('SUBSCRIPTION_NAME');
2222

23-
var pubsub = gcloud.pubsub({
23+
var pubsub = Pubsub({
2424
projectId: config.get('GCLOUD_PROJECT')
2525
});
2626

‎7-gce/lib/images.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
'use strict';
1515

1616
var request = require('request');
17-
var gcloud = require('gcloud');
17+
var Storage = require('@google-cloud/storage');
1818
var config = require('../config');
1919
var logging = require('./logging');
2020

2121
var CLOUD_BUCKET = config.get('CLOUD_BUCKET');
2222

23-
var storage = gcloud.storage({
23+
var storage = Storage({
2424
projectId: config.get('GCLOUD_PROJECT')
2525
});
2626
var bucket = storage.bucket(CLOUD_BUCKET);

‎7-gce/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,14 @@
4141
"@google/cloud-debug": "^0.8.3",
4242
"@google/cloud-trace": "^0.5.5",
4343
"@google-cloud/datastore": "^0.1.1",
44+
"@google-cloud/storage": "^0.1.1",
45+
"@google-cloud/pubsub": "^0.2.0",
4446
"async": "^2.0.1",
4547
"body-parser": "^1.15.2",
4648
"connect-memcached": "^0.2.0",
4749
"express": "^4.14.0",
4850
"express-session": "^1.14.0",
4951
"express-winston": "^2.0.0",
50-
"gcloud": "~0.37.0",
5152
"jade": "^1.11.0",
5253
"kerberos": "^0.0.21",
5354
"lodash": "^4.14.2",

‎7-gce/test/background.test.js

+4-6
Original file line numberDiff line numberDiff line change
@@ -41,23 +41,21 @@ describe('background.js', function () {
4141
createTopic: sinon.stub().callsArgWith(1, null, mocks.topic),
4242
topic: sinon.stub().returns(mocks.topic)
4343
};
44-
mocks.gcloud = {
45-
pubsub: sinon.stub().returns(mocks.pubsub)
46-
};
44+
mocks.Pubsub = sinon.stub().returns(mocks.pubsub);
4745
mocks.logging = {
4846
info: sinon.stub(),
4947
error: sinon.stub()
5048
};
5149
// Load background.js with provided mocks
5250
background = proxyquire('../lib/background', {
53-
gcloud: mocks.gcloud,
51+
'@google-cloud/pubsub': mocks.Pubsub,
5452
'../config': mocks.config,
5553
'./logging': mocks.logging
5654
});
5755

5856
assert.ok(
59-
mocks.gcloud.pubsub.calledOnce,
60-
'gcloud.pubsub() should have been called once'
57+
mocks.Pubsub.calledOnce,
58+
'Pubsub() should have been called once'
6159
);
6260
});
6361

‎optional-container-engine/lib/background.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313

1414
'use strict';
1515

16-
var gcloud = require('gcloud');
16+
var Pubsub = require('@google-cloud/pubsub');
1717
var config = require('../config');
1818
var logging = require('./logging');
1919

2020
var topicName = config.get('TOPIC_NAME');
2121
var subscriptionName = config.get('SUBSCRIPTION_NAME');
2222

23-
var pubsub = gcloud.pubsub({
23+
var pubsub = Pubsub({
2424
projectId: config.get('GCLOUD_PROJECT')
2525
});
2626

‎optional-container-engine/lib/images.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
'use strict';
1515

1616
var request = require('request');
17-
var gcloud = require('gcloud');
17+
var Storage = require('@google-cloud/storage');
1818
var config = require('../config');
1919
var logging = require('./logging');
2020

2121
var CLOUD_BUCKET = config.get('CLOUD_BUCKET');
2222

23-
var storage = gcloud.storage({
23+
var storage = Storage({
2424
projectId: config.get('GCLOUD_PROJECT')
2525
});
2626
var bucket = storage.bucket(CLOUD_BUCKET);

‎optional-container-engine/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,14 @@
4343
"@google/cloud-debug": "^0.8.1",
4444
"@google/cloud-trace": "^0.5.1",
4545
"@google-cloud/datastore": "^0.1.1",
46+
"@google-cloud/storage": "^0.1.1",
47+
"@google-cloud/pubsub": "^0.2.0",
4648
"async": "^1.5.2",
4749
"body-parser": "^1.15.0",
4850
"connect-memcached": "^0.2.0",
4951
"express": "^4.13.4",
5052
"express-session": "^1.13.0",
5153
"express-winston": "^1.3.1",
52-
"gcloud": "~0.31.0",
5354
"jade": "^1.11.0",
5455
"kerberos": "^0.0.19",
5556
"lodash": "^4.11.1",

‎optional-container-engine/test/background.test.js

+4-6
Original file line numberDiff line numberDiff line change
@@ -41,23 +41,21 @@ describe('background.js', function () {
4141
createTopic: sinon.stub().callsArgWith(1, null, mocks.topic),
4242
topic: sinon.stub().returns(mocks.topic)
4343
};
44-
mocks.gcloud = {
45-
pubsub: sinon.stub().returns(mocks.pubsub)
46-
};
44+
mocks.Pubsub = sinon.stub().returns(mocks.pubsub);
4745
mocks.logging = {
4846
info: sinon.stub(),
4947
error: sinon.stub()
5048
};
5149
// Load background.js with provided mocks
5250
background = proxyquire('../lib/background', {
53-
gcloud: mocks.gcloud,
51+
'@google-cloud/pubsub': mocks.Pubsub,
5452
'../config': mocks.config,
5553
'./logging': mocks.logging
5654
});
5755

5856
assert.ok(
59-
mocks.gcloud.pubsub.calledOnce,
60-
'gcloud.pubsub() should have been called once'
57+
mocks.Pubsub.calledOnce,
58+
'Pubsub() should have been called once'
6159
);
6260
});
6361

0 commit comments

Comments
 (0)