Clean up variable names

Author: rogperez

packages/cdk-blue-green-container-deployment/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@verimatrix/cdk-blue-green-container-deployment",
-  "version": "1.46.0-rc.13",
+  "version": "1.46.0-rc.5",
   "description": "Blue green container deployment with CodeDeploy",
   "license": "MIT",
   "publishConfig": {

packages/cdk-blue-green-container-deployment/src/__tests__/lambdas/ecs-deployment-group/index.test.ts

@@ -1,32 +1,32 @@
-const mockCodeDeployCreate = jest.fn();
-const mockCodeDeployUpdate = jest.fn();
-const mockCodeDeployTagResource = jest.fn();
-const mockCodeDeployUntagResource = jest.fn();
+const mockCreateRequest = jest.fn();
+const mockUpdateRequest = jest.fn();
+const mockTagResourceRequest = jest.fn();
+const mockUntagResourceRequest = jest.fn();
 
 jest.mock('aws-sdk', () => {
   return {
     CodeDeploy: jest.fn().mockImplementation(() => {
       return {
-        createDeploymentGroup: mockCodeDeployCreate.mockReturnValue({
+        createDeploymentGroup: mockCreateRequest.mockReturnValue({
           promise: jest.fn().mockResolvedValue({
             service: {
               serviceArn: 'arn:aws:ecs:us-east-1:012345678910:service/MyCluster/MyService',
               serviceName: 'MyService',
             },
           }),
         }),
-        updateDeploymentGroup: mockCodeDeployUpdate.mockReturnValue({
+        updateDeploymentGroup: mockUpdateRequest.mockReturnValue({
           promise: jest.fn().mockResolvedValue({
             service: {
               serviceArn: 'arn:aws:ecs:us-east-1:012345678910:service/MyCluster/MyService',
               serviceName: 'MyService',
             },
           }),
         }),
-        tagResource: mockCodeDeployTagResource.mockReturnValue({
+        tagResource: mockTagResourceRequest.mockReturnValue({
           promise: jest.fn().mockResolvedValue({}),
         }),
-        untagResource: mockCodeDeployUntagResource.mockReturnValue({
+        untagResource: mockUntagResourceRequest.mockReturnValue({
           promise: jest.fn().mockResolvedValue({}),
         }),
       };
@@ -75,7 +75,7 @@ describe('createHandler', () => {
       defaultLogger,
     );
 
-    expect(mockCodeDeployCreate).toHaveBeenCalledWith(
+    expect(mockCreateRequest).toHaveBeenCalledWith(
       expect.objectContaining({
         tags: [
           { Key: 'foo', Value: 'bar' },
@@ -116,14 +116,14 @@ describe('updateHandler', () => {
       defaultLogger,
     );
 
-    expect(mockCodeDeployUpdate).toHaveBeenCalled();
+    expect(mockUpdateRequest).toHaveBeenCalled();
 
-    expect(mockCodeDeployUntagResource).toHaveBeenCalledWith({
+    expect(mockUntagResourceRequest).toHaveBeenCalledWith({
       ResourceArn: 'arn:aws:ecs:us-east-1:012345678910:service/MyCluster/MyService',
       TagKeys: ['foo'],
     });
 
-    expect(mockCodeDeployTagResource).toHaveBeenCalledWith(
+    expect(mockTagResourceRequest).toHaveBeenCalledWith(
       expect.objectContaining({
         ResourceArn: 'arn:aws:ecs:us-east-1:012345678910:service/MyCluster/MyService',
         Tags: [

packages/cdk-blue-green-container-deployment/src/__tests__/lambdas/ecs-service/index.test.ts

@@ -1,32 +1,32 @@
-const mockEcsCreate = jest.fn();
-const mockEcsUpdate = jest.fn();
-const mockEcsTagResource = jest.fn();
-const mockEcsUntagResource = jest.fn();
+const mockCreateRequest = jest.fn();
+const mockUpdateRequest = jest.fn();
+const mockTagResourceRequest = jest.fn();
+const mockUntagResourceRequest = jest.fn();
 
 jest.mock('aws-sdk', () => {
   return {
     ECS: jest.fn().mockImplementation(() => {
       return {
-        createService: mockEcsCreate.mockReturnValue({
+        createService: mockCreateRequest.mockReturnValue({
           promise: jest.fn().mockResolvedValue({
             service: {
               serviceArn: 'arn:aws:ecs:us-east-1:012345678910:service/MyCluster/MyService',
               serviceName: 'MyService',
             },
           }),
         }),
-        updateService: mockEcsUpdate.mockReturnValue({
+        updateService: mockUpdateRequest.mockReturnValue({
           promise: jest.fn().mockResolvedValue({
             service: {
               serviceArn: 'arn:aws:ecs:us-east-1:012345678910:service/MyCluster/MyService',
               serviceName: 'MyService',
             },
           }),
         }),
-        tagResource: mockEcsTagResource.mockReturnValue({
+        tagResource: mockTagResourceRequest.mockReturnValue({
           promise: jest.fn().mockResolvedValue({}),
         }),
-        untagResource: mockEcsUntagResource.mockReturnValue({
+        untagResource: mockUntagResourceRequest.mockReturnValue({
           promise: jest.fn().mockResolvedValue({}),
         }),
       };
@@ -41,10 +41,10 @@ import { defaultEvent } from '../__fixtures__/defaultEvent';
 import { defaultLogger } from '../__fixtures__/defaultLogger';
 
 afterEach(() => {
-  mockEcsCreate.mockClear();
-  mockEcsUpdate.mockClear();
-  mockEcsTagResource.mockClear();
-  mockEcsUntagResource.mockClear();
+  mockCreateRequest.mockClear();
+  mockUpdateRequest.mockClear();
+  mockTagResourceRequest.mockClear();
+  mockUntagResourceRequest.mockClear();
 });
 
 describe('createHandler', () => {
@@ -65,7 +65,7 @@ describe('createHandler', () => {
       defaultLogger,
     );
 
-    expect(mockEcsCreate).toHaveBeenCalledWith(
+    expect(mockCreateRequest).toHaveBeenCalledWith(
       expect.objectContaining({
         tags: [
           { key: 'foo', value: 'bar' },
@@ -111,7 +111,7 @@ describe('updateHandler', () => {
       defaultLogger,
     );
 
-    expect(mockEcsUpdate).toHaveBeenCalledWith(
+    expect(mockUpdateRequest).toHaveBeenCalledWith(
       expect.objectContaining({
         cluster: 'foo',
         deploymentConfiguration: {},
@@ -121,12 +121,12 @@ describe('updateHandler', () => {
       }),
     );
 
-    expect(mockEcsUntagResource).toHaveBeenCalledWith({
+    expect(mockUntagResourceRequest).toHaveBeenCalledWith({
       resourceArn: 'arn:aws:ecs:us-east-1:012345678910:service/MyCluster/MyService',
       tagKeys: ['foo'],
     });
 
-    expect(mockEcsTagResource).toHaveBeenCalledWith(
+    expect(mockTagResourceRequest).toHaveBeenCalledWith(
       expect.objectContaining({
         resourceArn: 'arn:aws:ecs:us-east-1:012345678910:service/MyCluster/MyService',
         tags: [
@@ -165,7 +165,7 @@ describe('updateHandler', () => {
       defaultLogger,
     );
 
-    expect(mockEcsUpdate).toHaveBeenCalledWith(
+    expect(mockUpdateRequest).toHaveBeenCalledWith(
       expect.objectContaining({
         cluster: 'foo',
         deploymentConfiguration: {},
@@ -175,9 +175,9 @@ describe('updateHandler', () => {
       }),
     );
 
-    expect(mockEcsUntagResource).not.toHaveBeenCalled();
+    expect(mockUntagResourceRequest).not.toHaveBeenCalled();
 
-    expect(mockEcsTagResource).toHaveBeenCalledWith(
+    expect(mockTagResourceRequest).toHaveBeenCalledWith(
       expect.objectContaining({
         resourceArn: 'arn:aws:ecs:us-east-1:012345678910:service/MyCluster/MyService',
         tags: [
@@ -208,7 +208,7 @@ describe('updateHandler', () => {
       defaultLogger,
     );
 
-    expect(mockEcsUpdate).toHaveBeenCalledWith(
+    expect(mockUpdateRequest).toHaveBeenCalledWith(
       expect.objectContaining({
         cluster: 'foo',
         deploymentConfiguration: {},
@@ -218,8 +218,8 @@ describe('updateHandler', () => {
       }),
     );
 
-    expect(mockEcsUntagResource).not.toHaveBeenCalled();
+    expect(mockUntagResourceRequest).not.toHaveBeenCalled();
 
-    expect(mockEcsTagResource).not.toHaveBeenCalled();
+    expect(mockTagResourceRequest).not.toHaveBeenCalled();
   });
 });