test: Ensure proper awsRequest use in integration setup scripts

Author: pgrzesik

scripts/test/integration-setup/index.js

@@ -9,6 +9,10 @@ const log = require('log').get('serverless');
 const awsRequest = require('@serverless/test/aws-request');
 const fsp = require('fs').promises;
 const path = require('path');
+const CloudFormationService = require('aws-sdk').CloudFormation;
+const SecretsManagerService = require('aws-sdk').SecretsManager;
+const KafkaService = require('aws-sdk').Kafka;
+
 const {
   SHARED_INFRA_TESTS_CLOUDFORMATION_STACK,
   SHARED_INFRA_TESTS_ACTIVE_MQ_CREDENTIALS_NAME,
@@ -22,7 +26,7 @@ const ensureActiveMQCredentialsSecret = async () => {
   };
   log.notice('Creating SecretsManager ActiveMQ Credentials secret...');
   try {
-    await awsRequest('SecretsManager', 'createSecret', {
+    await awsRequest(SecretsManagerService, 'createSecret', {
       Name: SHARED_INFRA_TESTS_ACTIVE_MQ_CREDENTIALS_NAME,
       SecretString: JSON.stringify(ssmMqCredentials),
     });
@@ -40,7 +44,7 @@ const ensureRabbitMQCredentialsSecret = async () => {
   };
   log.notice('Creating SecretsManager RabbitMQ Credentials secret...');
   try {
-    await awsRequest('SecretsManager', 'createSecret', {
+    await awsRequest(SecretsManagerService, 'createSecret', {
       Name: SHARED_INFRA_TESTS_RABBITMQ_CREDENTIALS_NAME,
       SecretString: JSON.stringify(ssmMqCredentials),
     });
@@ -67,7 +71,7 @@ async function handleInfrastructureCreation() {
   const clusterConfName = 'integration-tests-msk-cluster-configuration';
 
   log.notice('Creating MSK Cluster configuration...');
-  const clusterConfResponse = await awsRequest('Kafka', 'createConfiguration', {
+  const clusterConfResponse = await awsRequest(KafkaService, 'createConfiguration', {
     Name: clusterConfName,
     ServerProperties: kafkaServerProperties,
     KafkaVersions: ['2.2.1'],
@@ -77,7 +81,7 @@ async function handleInfrastructureCreation() {
   const clusterConfigurationRevision = clusterConfResponse.LatestRevision.Revision.toString();
 
   log.notice('Deploying integration tests CloudFormation stack...');
-  await awsRequest('CloudFormation', 'createStack', {
+  await awsRequest(CloudFormationService, 'createStack', {
     StackName: SHARED_INFRA_TESTS_CLOUDFORMATION_STACK,
     TemplateBody: cfnTemplate,
     Parameters: [
@@ -108,7 +112,7 @@ async function handleInfrastructureCreation() {
     ],
   });
 
-  await awsRequest('CloudFormation', 'waitFor', 'stackCreateComplete', {
+  await awsRequest(CloudFormationService, 'waitFor', 'stackCreateComplete', {
     StackName: SHARED_INFRA_TESTS_CLOUDFORMATION_STACK,
   });
   log.notice('Deployed integration tests CloudFormation stack!');
@@ -123,7 +127,7 @@ async function handleInfrastructureUpdate() {
   const cfnTemplate = await fsp.readFile(path.join(__dirname, 'cloudformation.yml'), 'utf8');
 
   try {
-    await awsRequest('CloudFormation', 'updateStack', {
+    await awsRequest(CloudFormationService, 'updateStack', {
       StackName: SHARED_INFRA_TESTS_CLOUDFORMATION_STACK,
       TemplateBody: cfnTemplate,
       Parameters: [
@@ -161,7 +165,7 @@ async function handleInfrastructureUpdate() {
     throw e;
   }
 
-  await awsRequest('CloudFormation', 'waitFor', 'stackUpdateComplete', {
+  await awsRequest(CloudFormationService, 'waitFor', 'stackUpdateComplete', {
     StackName: SHARED_INFRA_TESTS_CLOUDFORMATION_STACK,
   });
   log.notice('Updated integration tests CloudFormation stack!');
@@ -206,7 +210,7 @@ async function handleInfrastructureUpdate() {
 
   log.notice('Checking if integration tests CloudFormation stack already exists...');
   try {
-    describeResponse = await awsRequest('CloudFormation', 'describeStacks', {
+    describeResponse = await awsRequest(CloudFormationService, 'describeStacks', {
       StackName: SHARED_INFRA_TESTS_CLOUDFORMATION_STACK,
     });
     log.notice('Integration tests CloudFormation stack already exists');

scripts/test/integration-teardown.js

@@ -7,21 +7,25 @@ require('log-node')();
 
 const log = require('log').get('serverless');
 const awsRequest = require('@serverless/test/aws-request');
+const CloudFormationService = require('aws-sdk').CloudFormation;
+const EC2Service = require('aws-sdk').EC2;
+const KafkaService = require('aws-sdk').Kafka;
+
 const {
   SHARED_INFRA_TESTS_CLOUDFORMATION_STACK,
   getDependencyStackOutputMap,
 } = require('../../test/utils/cloudformation');
 
 (async () => {
   log.notice('Starting teardown of integration infrastructure...');
-  const describeClustersResponse = await awsRequest('Kafka', 'listClusters');
+  const describeClustersResponse = await awsRequest(KafkaService, 'listClusters');
   const clusterConfArn =
     describeClustersResponse.ClusterInfoList[0].CurrentBrokerSoftwareInfo.ConfigurationArn;
 
   const outputMap = await getDependencyStackOutputMap();
 
   log.notice('Removing leftover ENI...');
-  const describeResponse = await awsRequest('EC2', 'describeNetworkInterfaces', {
+  const describeResponse = await awsRequest(EC2Service, 'describeNetworkInterfaces', {
     Filters: [
       {
         Name: 'vpc-id',
@@ -36,7 +40,7 @@ const {
   try {
     await Promise.all(
       describeResponse.NetworkInterfaces.map((networkInterface) =>
-        awsRequest('EC2', 'deleteNetworkInterface', {
+        awsRequest(EC2Service, 'deleteNetworkInterface', {
           NetworkInterfaceId: networkInterface.NetworkInterfaceId,
         })
       )
@@ -45,15 +49,15 @@ const {
     log.error(`Error: ${e} while trying to remove leftover ENIs\n`);
   }
   log.notice('Removing integration tests CloudFormation stack...');
-  await awsRequest('CloudFormation', 'deleteStack', {
+  await awsRequest(CloudFormationService, 'deleteStack', {
     StackName: SHARED_INFRA_TESTS_CLOUDFORMATION_STACK,
   });
-  await awsRequest('CloudFormation', 'waitFor', 'stackDeleteComplete', {
+  await awsRequest(CloudFormationService, 'waitFor', 'stackDeleteComplete', {
     StackName: SHARED_INFRA_TESTS_CLOUDFORMATION_STACK,
   });
   log.notice('Removed integration tests CloudFormation stack!');
   log.notice('Removing MSK Cluster configuration...');
-  await awsRequest('Kafka', 'deleteConfiguration', {
+  await awsRequest(KafkaService, 'deleteConfiguration', {
     Arn: clusterConfArn,
   });
   log.notice('Removed MSK Cluster configuration');