Skip to content

Commit f23bf42

Browse files
JustinBeckwithJustinBeckwith
committed
chore: update cloud tasks
1 parent a80574c commit f23bf42

File tree

7 files changed

+68
-128
lines changed

7 files changed

+68
-128
lines changed

‎appengine/cloudtasks/createTask.js‎

Lines changed: 9 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,17 @@
1515

1616
'use strict';
1717

18-
const google = require('googleapis').google;
18+
const {google} = require('googleapis');
1919
const cloudtasks = google.cloudtasks('v2beta2');
2020

2121
/**
2222
* Create a task for a given queue with an arbitrary payload.
2323
*/
2424
function createTask (project, location, queue, options) {
2525
// [START cloud_tasks_appengine_create_task]
26-
authorize((authClient) => {
26+
google.auth.getClient({
27+
scopes: ['https://www.googleapis.com/auth/cloud-platform']
28+
}).then(authClient => {
2729
const task = {
2830
app_engine_http_request: {
2931
http_method: 'POST',
@@ -48,31 +50,11 @@ function createTask (project, location, queue, options) {
4850
};
4951

5052
console.log('Sending task %j', task);
51-
52-
cloudtasks.projects.locations.queues.tasks.create(request, (err, response) => {
53-
if (err) {
54-
console.error(err);
55-
return;
56-
}
57-
58-
console.log('Created task.', response.name);
59-
console.log(JSON.stringify(response, null, 2));
60-
});
61-
});
62-
63-
function authorize (callback) {
64-
google.auth.getApplicationDefault(function (err, authClient) {
65-
if (err) {
66-
console.error('authentication failed: ', err);
67-
return;
68-
}
69-
if (authClient.createScopedRequired && authClient.createScopedRequired()) {
70-
var scopes = ['https://www.googleapis.com/auth/cloud-platform'];
71-
authClient = authClient.createScoped(scopes);
72-
}
73-
callback(authClient);
74-
});
75-
}
53+
return cloudtasks.projects.locations.queues.tasks.create(request);
54+
}).then(response => {
55+
console.log('Created task.', response.name);
56+
console.log(JSON.stringify(response, null, 2));
57+
}).catch(console.error);
7658
// [END cloud_tasks_appengine_create_task]
7759
}
7860

@@ -121,9 +103,7 @@ const cli = require(`yargs`)
121103

122104
if (module === require.main) {
123105
const opts = cli.help().parse(process.argv.slice(2));
124-
125106
process.env.GCLOUD_PROJECT = opts.project;
126-
127107
createTask(opts.project, opts.location, opts.queue, opts);
128108
}
129109

‎appengine/cloudtasks/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"dependencies": {
2121
"body-parser": "1.18.2",
2222
"express": "4.16.2",
23-
"googleapis": "27.0.0",
23+
"googleapis": "29.0.0",
2424
"yargs": "11.0.0"
2525
},
2626
"devDependencies": {

‎appengine/loopback/server/boot/root.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
module.exports = function(server) {
44
// Install a `/` route that returns server status
5-
var router = server.loopback.Router();
5+
const router = server.loopback.Router();
66
router.get('/', server.loopback.status());
77
server.use(router);
88
};

‎cloudtasks/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"test": "repo-tools test run --cmd npm -- run system-test"
1616
},
1717
"dependencies": {
18-
"googleapis": "27.0.0",
18+
"googleapis": "29.0.0",
1919
"yargs": "11.0.0"
2020
},
2121
"devDependencies": {

‎cloudtasks/tasks.js‎

Lines changed: 54 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
function createTask (project, location, queue) {
1919
// [START cloud_tasks_create_task]
20-
const google = require('googleapis').google;
20+
const {google} = require('googleapis');
2121
const cloudtasks = google.cloudtasks('v2beta2');
2222

2323
/**
@@ -27,56 +27,43 @@ function createTask (project, location, queue) {
2727
// const location = 'Location of queue, e.g. us-central1';
2828
// const queue = 'Queue ID, e.g. queue-1';
2929

30-
authorize((authClient) => {
31-
// Schedule the task for 2 minutes from now
32-
const scheduleTime = new Date();
33-
scheduleTime.setUTCMinutes(scheduleTime.getUTCMinutes() + 2);
34-
35-
const task = {
36-
scheduleTime: scheduleTime,
37-
pull_message: {
38-
payload: Buffer.from('a message for the recipient').toString('base64')
39-
}
40-
};
41-
42-
const request = {
43-
parent: `projects/${project}/locations/${location}/queues/${queue}`,
44-
resource: {
45-
task: task
46-
},
47-
auth: authClient
48-
};
49-
50-
cloudtasks.projects.locations.queues.tasks.create(request, (err, response) => {
51-
if (err) {
52-
console.error('ERROR:', err);
53-
return;
54-
}
55-
30+
return google.auth.getClient({
31+
scopes: ['https://www.googleapis.com/auth/cloud-platform']
32+
})
33+
.then(authClient => {
34+
35+
// Schedule the task for 2 minutes from now
36+
const scheduleTime = new Date();
37+
scheduleTime.setUTCMinutes(scheduleTime.getUTCMinutes() + 2);
38+
39+
const task = {
40+
scheduleTime: scheduleTime,
41+
pull_message: {
42+
payload: Buffer.from('a message for the recipient').toString('base64')
43+
}
44+
};
45+
46+
const request = {
47+
parent: `projects/${project}/locations/${location}/queues/${queue}`,
48+
resource: {
49+
task: task
50+
},
51+
auth: authClient
52+
};
53+
54+
return cloudtasks.projects.locations.queues.tasks.create(request);
55+
})
56+
.then(response => {
5657
console.log(`Created task ${response.data.name}.`);
5758
console.log(JSON.stringify(response.data, null, 2));
58-
});
59-
});
60-
61-
function authorize (callback) {
62-
google.auth.getApplicationDefault(function (err, authClient) {
63-
if (err) {
64-
console.error('authentication failed: ', err);
65-
return;
66-
}
67-
if (authClient.createScopedRequired && authClient.createScopedRequired()) {
68-
var scopes = ['https://www.googleapis.com/auth/cloud-platform'];
69-
authClient = authClient.createScoped(scopes);
70-
}
71-
callback(authClient);
72-
});
73-
}
59+
})
60+
.catch(console.error);
7461
// [END cloud_tasks_create_task]
7562
}
7663

7764
function pullTask (project, location, queue) {
7865
// [START cloud_tasks_pull_and_acknowledge_task]
79-
const google = require('googleapis').google;
66+
const {google} = require('googleapis');
8067
const cloudtasks = google.cloudtasks('v2beta2');
8168

8269
/**
@@ -86,42 +73,29 @@ function pullTask (project, location, queue) {
8673
// const location = 'Location of queue, e.g. us-central1';
8774
// const queue = 'Queue ID, e.g. queue-1';
8875

89-
authorize((authClient) => {
76+
return google.auth.getClient({
77+
scopes: ['https://www.googleapis.com/auth/cloud-platform']
78+
})
79+
.then(authClient => {
80+
9081
const request = {
9182
parent: `projects/${project}/locations/${location}/queues/${queue}`,
9283
responseView: 'FULL',
9384
pageSize: 1,
9485
auth: authClient
9586
};
9687

97-
cloudtasks.projects.locations.queues.tasks.list(request, (err, response) => {
98-
if (err) {
99-
console.error(err);
100-
return;
101-
}
102-
103-
const task = response.data.tasks[0];
104-
console.log('Pulled task %j', task);
105-
});
106-
});
107-
108-
function authorize (callback) {
109-
google.auth.getApplicationDefault(function (err, authClient) {
110-
if (err) {
111-
console.error('authentication failed: ', err);
112-
return;
113-
}
114-
if (authClient.createScopedRequired && authClient.createScopedRequired()) {
115-
var scopes = ['https://www.googleapis.com/auth/cloud-platform'];
116-
authClient = authClient.createScoped(scopes);
117-
}
118-
callback(authClient);
119-
});
120-
}
88+
return cloudtasks.projects.locations.queues.tasks.list(request);
89+
})
90+
.then(response => {
91+
const task = response.data.tasks[0];
92+
console.log('Pulled task %j', task);
93+
})
94+
.catch(console.error);
12195
}
12296

12397
function acknowledgeTask (task) {
124-
const google = require('googleapis').google;
98+
const {google} = require('googleapis');
12599
const cloudtasks = google.cloudtasks('v2beta2');
126100

127101
/**
@@ -132,36 +106,22 @@ function acknowledgeTask (task) {
132106
// scheduleTime: '2017-11-01T21:02:28.994Z' // TODO(developer): set this to your task's scheduled time
133107
// };
134108

135-
authorize((authClient) => {
109+
return google.auth.getClient({
110+
scopes: ['https://www.googleapis.com/auth/cloud-platform']
111+
})
112+
.then(authClient => {
136113
const request = {
137114
name: task.name,
138115
scheduleTime: task.scheduleTime,
139116
auth: authClient
140117
};
141118

142-
cloudtasks.projects.locations.queues.tasks.acknowledge(request, (err, response) => {
143-
if (err) {
144-
console.error(err);
145-
return;
146-
}
147-
148-
console.log(`Acknowledged task ${task.name}.`);
149-
});
150-
});
151-
152-
function authorize (callback) {
153-
google.auth.getApplicationDefault(function (err, authClient) {
154-
if (err) {
155-
console.error('authentication failed: ', err);
156-
return;
157-
}
158-
if (authClient.createScopedRequired && authClient.createScopedRequired()) {
159-
var scopes = ['https://www.googleapis.com/auth/cloud-platform'];
160-
authClient = authClient.createScoped(scopes);
161-
}
162-
callback(authClient);
163-
});
164-
}
119+
return cloudtasks.projects.locations.queues.tasks.acknowledge(request);
120+
})
121+
.then(response => {
122+
console.log(`Acknowledged task ${task.name}.`);
123+
})
124+
.catch(console.error);
165125
// [END cloud_tasks_pull_and_acknowledge_task]
166126
}
167127

‎kms/keys.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1249,7 +1249,7 @@ function disableCryptoKeyVersion (projectId, locationId, keyRingId, cryptoKeyId,
12491249

12501250
function buildAndAuthorizeService (callback) {
12511251
// Imports the Google APIs client library
1252-
const google = require('googleapis').google;
1252+
const {google} = require('googleapis');
12531253

12541254
// Acquires credentials
12551255
google.auth.getApplicationDefault((err, authClient) => {

‎kms/quickstart.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
// [START kms_quickstart]
1919
// Imports the Google APIs client library
20-
const google = require('googleapis').google;
20+
const {google} = require('googleapis');
2121

2222
// Your Google Cloud Platform project ID
2323
const projectId = process.env.GCLOUD_PROJECT;

0 commit comments

Comments
 (0)