Skip to content

chore: migrate AWS SDK for JavaScript v2 APIs to v3 #113

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
trivikr wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore: migrate AWS SDK for JavaScript v2 APIs to v3 #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 32 additions & 36 deletions apps/firelens-stability/lib/cloud/ecs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
import { getJsonFromFile, sleep } from "../utils/utils.js";
import * as ECS from "@aws-sdk/client-ecs";
import AWS from 'aws-sdk'; /* We really should be migrating to v3, but for now use v2 */
import { ECS, RunTaskCommandOutput } from "@aws-sdk/client-ecs";
import { getTestCaseTaskDefinition } from "../utils/config-utils.js";
import { PromiseResult } from "aws-sdk/lib/request";
process.env.AWS_SDK_JS_SUPPRESS_MAINTENANCE_MODE_MESSAGE = '1';
import * as Constants from "../constants.js"

let ecsTestCaseTaskQueue: Array<IEcsTestTask> = [];
Expand Down Expand Up @@ -61,22 +58,21 @@ async function processEcsTestTaskQueue() {
async function startECSTask(task: IEcsTestTask) {
const testCase = task.testCase;

// Set the region name
AWS.config.update({ region: testCase.config.region });

// Create an ECS client
const ecs = new AWS.ECS();
const ecs = new ECS({
region: testCase.config.region,
});

// Create fargate cluster if it doesn't already exist
const clusters = await ecs.listClusters().promise();
const clusters = await ecs.listClusters();
if (!clusters.clusterArns.some(c => c.endsWith(`/${testCase.config.cluster}`))) {
await ecs.createCluster({
settings: [{
name: "containerInsights",
value: "enabled"
}],
clusterName: testCase.config.cluster
}).promise();
});
console.log(`🍇 Created cluster: ${testCase.config.cluster}\n`)
await sleep(2000); /* Wait for the container to be ready to accept new tasks */
}
Expand All @@ -85,9 +81,9 @@ async function startECSTask(task: IEcsTestTask) {
const taskDefinition = await getTestCaseTaskDefinition(testCase);

// Register task definition
let taskDefinitionArn;
let taskDefinitionArn: string;
try {
taskDefinitionArn = (await ecs.registerTaskDefinition(taskDefinition).promise()).taskDefinition!.taskDefinitionArn;
taskDefinitionArn = (await ecs.registerTaskDefinition(taskDefinition)).taskDefinition!.taskDefinitionArn;
}
catch (err) {
console.error(`Error registering task definition: ${err}`);
Expand Down Expand Up @@ -133,11 +129,10 @@ function ecsTaskReturn(ecsTestTask: IEcsTestTask) {
async function validateAndRetryECSTask(ecsTestTask: IEcsTestTask) {
const testCase = ecsTestTask.testCase;

// Set the region name
AWS.config.update({ region: ecsTestTask.testCase.config.region });

// Create an ECS client
const ecs = new AWS.ECS();
const ecs = new ECS({
region: testCase.config.region,
});

const {
currentTasks,
Expand Down Expand Up @@ -182,11 +177,10 @@ async function validateAndRetryECSTask(ecsTestTask: IEcsTestTask) {
async function outOfRetriesECSTask(ecsTestTask: IEcsTestTask) {
const testCase = ecsTestTask.testCase;

// Set the region name
AWS.config.update({ region: ecsTestTask.testCase.config.region });

// Create an ECS client
const ecs = new AWS.ECS();
const ecs = new ECS({
region: testCase.config.region,
});

const {
runningTasksCount,
Expand All @@ -212,26 +206,26 @@ async function outOfRetriesECSTask(ecsTestTask: IEcsTestTask) {
}


async function launchECSTasks(testCase: ITestCase, taskCount: number, ecs: AWS.ECS, taskDefinitionArn: string): Promise<string[]> {
async function launchECSTasks(testCase: ITestCase, taskCount: number, ecs: ECS, taskDefinitionArn: string): Promise<string[]> {
let launchedTasks = [];
while (launchedTasks.length < taskCount) {
const launchCount = Math.min(10, taskCount - launchedTasks.length);
let result: PromiseResult<AWS.ECS.RunTaskResponse, AWS.AWSError>;
let result: RunTaskCommandOutput;
try {
result = await ecs.runTask({
enableExecuteCommand: true,
cluster: testCase.config.cluster,
taskDefinition: taskDefinitionArn!,
count: launchCount,
launchType: "FARGATE",
networkConfiguration: {
awsvpcConfiguration: {
subnets: testCase.config.taskVpcSubnets,
assignPublicIp: "DISABLED",
securityGroups: testCase.config.taskVpcSecurityGroups,
enableExecuteCommand: true,
cluster: testCase.config.cluster,
taskDefinition: taskDefinitionArn!,
count: launchCount,
launchType: "FARGATE",
networkConfiguration: {
awsvpcConfiguration: {
subnets: testCase.config.taskVpcSubnets,
assignPublicIp: "DISABLED",
securityGroups: testCase.config.taskVpcSecurityGroups,
}
}
}
}).promise();
});
}
catch (err) {
console.error(`Error launching task: ${err}`);
Expand All @@ -254,8 +248,10 @@ async function launchECSTasks(testCase: ITestCase, taskCount: number, ecs: AWS.E
return launchedTasks;
}

async function validateECSTestTask(ecs: AWS.ECS, ecsTestTask: IEcsTestTask) {
const currentTasks = await ecs.describeTasks({cluster: ecsTestTask.testCase.config.cluster, tasks: ecsTestTask.executionRecord.taskArns}).promise();
async function validateECSTestTask(ecs: ECS, ecsTestTask: IEcsTestTask) {
const currentTasks = await ecs.describeTasks(
{cluster: ecsTestTask.testCase.config.cluster, tasks: ecsTestTask.executionRecord.taskArns},
);
const startingTasks = currentTasks.tasks
.filter(t => (t.taskDefinitionArn === ecsTestTask.taskDefinitionArn) &&
(t.lastStatus === "PROVISIONING" || t.lastStatus === "PENDING" || t.lastStatus === "ACTIVATING"))
Expand Down
Loading