Skip to content

misc: convert operationPromise .then calls to async/await syntax #1072

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

misc: convert operationPromise .then calls to async/await syntax #1072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
084bcdd
convert operationPromise to use async/await syntax
tawsifkamal Feb 14, 2025
73e0bd1
Merge branch 'main' into convert-promises-to-async-await
tawsifkamal Feb 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
26 changes: 16 additions & 10 deletions src/rest/accounts/v1/authTokenPromotion.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export class AuthTokenPromotionContextImpl
this._uri = `/AuthTokens/Promote`;
}

update(
async update(
callback?: (error: Error | null, item?: AuthTokenPromotionInstance) => any
): Promise<AuthTokenPromotionInstance> {
const headers: any = {};
Expand All @@ -64,15 +64,21 @@ export class AuthTokenPromotionContextImpl
headers,
});

operationPromise = operationPromise.then(
(payload) => new AuthTokenPromotionInstance(operationVersion, payload)
);

operationPromise = instance._version.setPromiseCallback(
operationPromise,
callback
);
return operationPromise;
try {
let payload = await operationPromise;
let operation = new AuthTokenPromotionInstance(operationVersion, payload);

if (callback) {
callback(null, operation);
}

return operation;
} catch (err: any) {
if (callback) {
callback(err);
}
throw err;
}
}

/**
Expand Down
62 changes: 40 additions & 22 deletions src/rest/accounts/v1/credential/aws.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ export class AwsContextImpl implements AwsContext {
return operationPromise;
}

fetch(
async fetch(
callback?: (error: Error | null, item?: AwsInstance) => any
): Promise<AwsInstance> {
const headers: any = {};
Expand All @@ -179,19 +179,28 @@ export class AwsContextImpl implements AwsContext {
headers,
});

operationPromise = operationPromise.then(
(payload) =>
new AwsInstance(operationVersion, payload, instance._solution.sid)
);

operationPromise = instance._version.setPromiseCallback(
operationPromise,
callback
);
return operationPromise;
try {
let payload = await operationPromise;
let operation = new AwsInstance(
operationVersion,
payload,
instance._solution.sid
);

if (callback) {
callback(null, operation);
}

return operation;
} catch (err: any) {
if (callback) {
callback(err);
}
throw err;
}
}

update(
async update(
params?:
| AwsContextUpdateOptions
| ((error: Error | null, item?: AwsInstance) => any),
Expand Down Expand Up @@ -222,16 +231,25 @@ export class AwsContextImpl implements AwsContext {
headers,
});

operationPromise = operationPromise.then(
(payload) =>
new AwsInstance(operationVersion, payload, instance._solution.sid)
);

operationPromise = instance._version.setPromiseCallback(
operationPromise,
callback
);
return operationPromise;
try {
let payload = await operationPromise;
let operation = new AwsInstance(
operationVersion,
payload,
instance._solution.sid
);

if (callback) {
callback(null, operation);
}

return operation;
} catch (err: any) {
if (callback) {
callback(err);
}
throw err;
}
}

/**
Expand Down
62 changes: 40 additions & 22 deletions src/rest/accounts/v1/credential/publicKey.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ export class PublicKeyContextImpl implements PublicKeyContext {
return operationPromise;
}

fetch(
async fetch(
callback?: (error: Error | null, item?: PublicKeyInstance) => any
): Promise<PublicKeyInstance> {
const headers: any = {};
Expand All @@ -179,19 +179,28 @@ export class PublicKeyContextImpl implements PublicKeyContext {
headers,
});

operationPromise = operationPromise.then(
(payload) =>
new PublicKeyInstance(operationVersion, payload, instance._solution.sid)
);

operationPromise = instance._version.setPromiseCallback(
operationPromise,
callback
);
return operationPromise;
try {
let payload = await operationPromise;
let operation = new PublicKeyInstance(
operationVersion,
payload,
instance._solution.sid
);

if (callback) {
callback(null, operation);
}

return operation;
} catch (err: any) {
if (callback) {
callback(err);
}
throw err;
}
}

update(
async update(
params?:
| PublicKeyContextUpdateOptions
| ((error: Error | null, item?: PublicKeyInstance) => any),
Expand Down Expand Up @@ -222,16 +231,25 @@ export class PublicKeyContextImpl implements PublicKeyContext {
headers,
});

operationPromise = operationPromise.then(
(payload) =>
new PublicKeyInstance(operationVersion, payload, instance._solution.sid)
);

operationPromise = instance._version.setPromiseCallback(
operationPromise,
callback
);
return operationPromise;
try {
let payload = await operationPromise;
let operation = new PublicKeyInstance(
operationVersion,
payload,
instance._solution.sid
);

if (callback) {
callback(null, operation);
}

return operation;
} catch (err: any) {
if (callback) {
callback(err);
}
throw err;
}
}

/**
Expand Down
26 changes: 16 additions & 10 deletions src/rest/accounts/v1/secondaryAuthToken.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export class SecondaryAuthTokenContextImpl
this._uri = `/AuthTokens/Secondary`;
}

create(
async create(
callback?: (error: Error | null, item?: SecondaryAuthTokenInstance) => any
): Promise<SecondaryAuthTokenInstance> {
const headers: any = {};
Expand All @@ -75,15 +75,21 @@ export class SecondaryAuthTokenContextImpl
headers,
});

operationPromise = operationPromise.then(
(payload) => new SecondaryAuthTokenInstance(operationVersion, payload)
);

operationPromise = instance._version.setPromiseCallback(
operationPromise,
callback
);
return operationPromise;
try {
let payload = await operationPromise;
let operation = new SecondaryAuthTokenInstance(operationVersion, payload);

if (callback) {
callback(null, operation);
}

return operation;
} catch (err: any) {
if (callback) {
callback(err);
}
throw err;
}
}

remove(
Expand Down
58 changes: 38 additions & 20 deletions src/rest/api/v2010/account.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ export class AccountContextImpl implements AccountContext {
return this._validationRequests;
}

fetch(
async fetch(
callback?: (error: Error | null, item?: AccountInstance) => any
): Promise<AccountInstance> {
const headers: any = {};
Expand All @@ -396,19 +396,28 @@ export class AccountContextImpl implements AccountContext {
headers,
});

operationPromise = operationPromise.then(
(payload) =>
new AccountInstance(operationVersion, payload, instance._solution.sid)
);
try {
let payload = await operationPromise;
let operation = new AccountInstance(
operationVersion,
payload,
instance._solution.sid
);

operationPromise = instance._version.setPromiseCallback(
operationPromise,
callback
);
return operationPromise;
if (callback) {
callback(null, operation);
}

return operation;
} catch (err: any) {
if (callback) {
callback(err);
}
throw err;
}
}

update(
async update(
params?:
| AccountContextUpdateOptions
| ((error: Error | null, item?: AccountInstance) => any),
Expand Down Expand Up @@ -440,16 +449,25 @@ export class AccountContextImpl implements AccountContext {
headers,
});

operationPromise = operationPromise.then(
(payload) =>
new AccountInstance(operationVersion, payload, instance._solution.sid)
);
try {
let payload = await operationPromise;
let operation = new AccountInstance(
operationVersion,
payload,
instance._solution.sid
);

operationPromise = instance._version.setPromiseCallback(
operationPromise,
callback
);
return operationPromise;
if (callback) {
callback(null, operation);
}

return operation;
} catch (err: any) {
if (callback) {
callback(err);
}
throw err;
}
}

/**
Expand Down
Loading