Skip to content

Commit 5c3cccf

Browse files
Amplifiyerakshbhu
authored andcommitted
fix: all floating promises (aws-amplify#12293)
* fix: all floating promises * fix: make arrow functions async that have awaits
1 parent 9221544 commit 5c3cccf

File tree

12 files changed

+30
-40
lines changed

12 files changed

+30
-40
lines changed

packages/amplify-category-storage/src/provider-utils/awscloudformation/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ export const console = async (amplifyMeta: $TSMeta, provider: string, service: s
183183
}
184184
const { BucketName: bucket, Region: region } = s3Resource.output;
185185
const url = `https://s3.console.aws.amazon.com/s3/buckets/${bucket}?region=${region}`;
186-
open(url, { wait: false });
186+
await open(url, { wait: false });
187187
} else if (service === AmplifySupportedService.DYNAMODB) {
188188
type Pickchoice = { name: string; value: { tableName: string; region: string } };
189189
const tables: Pickchoice[] = Object.values<any>(amplifyMeta[categoryName])
@@ -199,6 +199,6 @@ export const console = async (amplifyMeta: $TSMeta, provider: string, service: s
199199
}
200200
const { tableName, region } = await prompter.pick<'one', Pickchoice['value']>('Select DynamoDB table to open on your browser', tables);
201201
const url = `https://${region}.console.aws.amazon.com/dynamodbv2/home?region=${region}#table?name=${tableName}&tab=overview`;
202-
open(url, { wait: false });
202+
await open(url, { wait: false });
203203
}
204204
};

packages/amplify-console-hosting/src/hosting/cicd/enable.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
// TODO disable lint until file is converted to TS
2-
/* eslint-disable */
31
const { open } = require('amplify-cli-core');
42
const fs = require('fs-extra');
53
const utils = require('../../utils/amplify-context-utils');

packages/amplify-console-hosting/src/hosting/cicd/index.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
/* eslint-disable */
21
const enableMod = require('./enable');
3-
const publshMod = require('./publish');
2+
const publishMod = require('./publish');
43
const initMod = require('./initEnv');
54
const serveMod = require('./serve');
65
const configureMod = require('./configure');
@@ -10,7 +9,7 @@ async function enable(context) {
109
}
1110

1211
async function publish(context) {
13-
await publshMod.publish(context);
12+
await publishMod.publish(context);
1413
}
1514

1615
async function initEnv(context) {

packages/amplify-console-hosting/src/hosting/cicd/initEnv.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* eslint-disable */
21
const constants = require('../../constants/plugin-constants');
32
const configUtils = require('../../utils/config-utils');
43
const utils = require('../../utils/amplify-context-utils');
@@ -16,7 +15,7 @@ async function initEnv(context) {
1615
context.amplify.updateamplifyMetaAfterResourceUpdate(category, resourceName, type, constants.TYPE_CICD);
1716
const metaContent = utils.getMetaInfo(context);
1817
const { lastPushTimeStamp } = metaContent[category][resourceName];
19-
configUtils.initCurrBackendMeta(context, category, resourceName, type, lastPushTimeStamp);
18+
await configUtils.initCurrBackendMeta(context, category, resourceName, type, lastPushTimeStamp);
2019
}
2120

2221
module.exports = {

packages/amplify-console-hosting/src/hosting/index.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// disabling eslint until this file is migrated to TS
2-
/* eslint-disable */
1+
/* eslint-disable spellcheck/spell-checker */
32
const constants = require('../constants/plugin-constants');
43
const pathManager = require('../utils/path-manager');
54
const fs = require('fs-extra');
@@ -8,7 +7,7 @@ const configUtils = require('../utils/config-utils');
87
const questions = require('../modules/questions/question-generator');
98
const ValidationError = require('../error/validation-error').default;
109
const clientFactory = require('../utils/client-factory');
11-
const tableUtis = require('../utils/table-utils');
10+
const tableUtils = require('../utils/table-utils');
1211
const { ensureEnvParamManager } = require('@aws-amplify/amplify-environment-parameters');
1312
const { spinner } = require('amplify-cli-core');
1413

@@ -63,7 +62,7 @@ async function initEnv(context) {
6362
// hosting is deleted. But current env config is not cleaned
6463
const { type } = consoleConfig;
6564
// clean team provider info
66-
await configUtils.deleteHostingEnvParams(context);
65+
await configUtils.deleteHostingEnvParams();
6766
// clean #current-backend-env for CICD.
6867
if (type === constants.TYPE_CICD) {
6968
await configUtils.deleteConsoleConfigFromCurrMeta(context);
@@ -133,7 +132,7 @@ async function status(context, mute) {
133132
}
134133

135134
const appId = utils.getAppIdForCurrEnv(context);
136-
await tableUtis.generateTableContentForApp(context, appId);
135+
await tableUtils.generateTableContentForApp(context, appId);
137136
}
138137

139138
function loadDeployType(context) {
@@ -184,4 +183,3 @@ module.exports = {
184183
configure,
185184
status,
186185
};
187-
/* eslint-enable */

packages/amplify-console-hosting/src/hosting/manual/enable.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* eslint-disable */
21
const path = require('path');
32
const constants = require('../../constants/plugin-constants');
43
const configUtils = require('../../utils/config-utils');

packages/amplify-console-hosting/src/hosting/manual/index.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
1-
/* eslint-disable */
21
const enableMod = require('./enable');
3-
const publshMod = require('./publish');
2+
const publishMod = require('./publish');
43
const initMod = require('./initEnv');
54
const serveMod = require('./serve');
65
const configureMod = require('./configure');
76

8-
function enable(context) {
9-
enableMod.enable(context);
7+
async function enable(context) {
8+
await enableMod.enable(context);
109
}
1110

1211
async function publish(context, doSkipBuild, doSkipPush) {
13-
await publshMod.publish(context, doSkipBuild, doSkipPush);
12+
await publishMod.publish(context, doSkipBuild, doSkipPush);
1413
}
1514

1615
async function initEnv(context) {

packages/amplify-console-hosting/src/hosting/manual/initEnv.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* eslint-disable */
21
const constants = require('../../constants/plugin-constants');
32
const configUtils = require('../../utils/config-utils');
43

packages/amplify-console-hosting/src/hosting/manual/publish.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,12 @@ async function publish(context, doSkipBuild, doSkipPush) {
2424
const appId = utils.getAppIdForCurrEnv(context);
2525
const env = utils.getCurrEnv(context);
2626
spinner.start(ZIPPING_MESSAGE);
27-
artifactsPath = await zipArtifacts(context).catch((err) => {
27+
try {
28+
artifactsPath = await zipArtifacts(context);
29+
} catch (err) {
2830
spinner.fail(ZIPPING_FAILURE_MESSAGE);
2931
throw err;
30-
});
32+
}
3133
spinner.succeed(ZIPPING_SUCCESS_MESSAGE);
3234
await amplifyUtils.publishFileToAmplify(appId, env, artifactsPath, amplifyClient);
3335
context.print.info(amplifyUtils.getDefaultDomainForBranch(appId, env));

packages/amplify-console-hosting/src/utils/amplify-context-utils.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
// disabling eslint until this file is migrated to TS
2-
/* eslint-disable */
31
const constants = require('../constants/plugin-constants');
42
const pathManager = require('../utils/path-manager');
53
const fs = require('fs-extra');
@@ -48,4 +46,3 @@ module.exports = {
4846
getRegionForCurrEnv,
4947
getMetaInfo,
5048
};
51-
/* eslint-enable */

0 commit comments

Comments
 (0)