@ossy/deployment-tools 0.0.32 → 0.0.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/deployment-tools",
-  "version": "0.0.32",
+  "version": "0.0.34",
   "description": "Collection of scripts and tools to aid deployment of containers and static files",
   "main": "dist/index.js",
   "type": "module",

package/src/aws-credentials-client.ts

@@ -1,8 +1,7 @@
 import * as core from '@actions/core'
 import { STSClient, AssumeRoleWithWebIdentityCommand } from '@aws-sdk/client-sts'
 import { DeploymentPlatform } from 'types'
-import { logDebug, logInfo, logError } from 'log'
-import { Credentials } from '@aws-sdk/types'
+import { logInfo, logError } from 'log'
 
 export class AwsCredentialsClient {
 
@@ -20,7 +19,6 @@ export class AwsCredentialsClient {
     return core.getIDToken('sts.amazonaws.com')
       .then(webIdentityToken => {
         logInfo({ message: `[AwsCredentialsClient] Attempting to resolve aws credentials by assuming the role: ${awsRoleToAssume}` })
-        logDebug({ message: '[AwsCredentialsClient] webIdentityToken', data: webIdentityToken })
         return stsClient.send(new AssumeRoleWithWebIdentityCommand({
           RoleArn: `arn:aws:iam::${awsAccountId}:role/${awsRoleToAssume}`,
           RoleSessionName: 'GitHubActions',
@@ -29,6 +27,7 @@ export class AwsCredentialsClient {
         }))
       })
       .then(responseData => ({
+        // Don't ask
         AccessKeyId: responseData.Credentials.AccessKeyId,
         SessionToken: responseData.Credentials.SessionToken,
         SecretAccessKey: responseData.Credentials.SecretAccessKey,
@@ -36,11 +35,6 @@ export class AwsCredentialsClient {
         sessionToken: responseData.Credentials.SessionToken,
         secretAccessKey: responseData.Credentials.SecretAccessKey,
       }))
-      // .then(responseData => responseData.Credentials)
-      .then(data => {
-        logDebug({ message: '[AwsCredentialsClient] AssumeRoleWithWebIdentityCommand responseData.Credentials', data })
-        return data
-      })
       .catch(error => {
         logError({ message: '[AwsCredentialsClient] Could not resolve temporary credentials', error })
         return undefined

package/src/deployment-platform-client.ts

@@ -58,17 +58,19 @@ export class DeploymentPlatformClient {
 
           logInfo({ message: `[DeploymentPlatformClient]: Found deployment platforms [${platforms.map(x => x.platformName).join(', ')}]` })
 
-          const deploymentPlatform = platforms.find(platform => platform.platformName === deploymentTemplate.targetDeploymentPlatform)
+          const deploymentPlatform = platforms
+            .map(platform => ({ ...platform, activeEnvironment: targetEnvironment }))
+            .find(platform => platform.platformName === deploymentTemplate.targetDeploymentPlatform)
 
           if (!deploymentPlatform) {
-            logError({  message: `[DeploymentPlatformClient] Could not find a deployment platform with the name ${deploymentTemplate.targetDeploymentPlatform}` })
+            logError({ message: `[DeploymentPlatformClient] Could not find a deployment platform with the name ${deploymentTemplate.targetDeploymentPlatform}` })
             return Promise.reject()
           }
 
           process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'
 
           if (deploymentTemplate.type !== SupportedDeploymentTypes.Container) {
-            logError({  message: `[DeploymentPlatformClient] Unsupported deployment type of ${deploymentTemplate.type}` })
+            logError({ message: `[DeploymentPlatformClient] Unsupported deployment type of ${deploymentTemplate.type}` })
             return Promise.reject()
           }
 
@@ -83,7 +85,7 @@ export class DeploymentPlatformClient {
 
         })
       })
-      .catch(error => logError({  message: '[DeploymentPlatformClient] Could not send deployment request', error }))
+      .catch(error => logError({ message: '[DeploymentPlatformClient] Could not send deployment request', error }))
   }
 
   static getDeploymentTemplates(pathToOssyFile: string): Promise<DeploymentTemplate[]> {

package/src/deployment-queue-client.ts

@@ -6,29 +6,32 @@ import {
 } from '@aws-sdk/client-sqs'
 import { DeploymentPlatform, ContainerDeploymentRequest } from 'types'
 import { AwsCredentialsClient } from 'aws-credentials-client'
-import { logInfo, logError } from 'log'
+import { logInfo, logError, logDebug } from 'log'
 
 export class DeploymentQueueClient {
 
   static sendDeploymentRequest(deploymentPlatform: DeploymentPlatform, deploymentRequest: ContainerDeploymentRequest) {
-    logInfo({  message: '[DeploymentQueueClient] Starting deployment sequence' })
+    logInfo({ message: '[DeploymentQueueClient] Starting deployment sequence' })
     return DeploymentQueueClient.createAwsSqsClient(deploymentPlatform)
       .then(sqsClient => {
 
-        const command = new SendMessageCommand({
+        const sendMessageParams = {
           QueueUrl: deploymentPlatform.awsDeploymentSqsArn,
           MessageBody: JSON.stringify(deploymentRequest)
-        })
+        }
+
+        logDebug({ message: '[DeploymentQueueClient] SendMessageCommand params', data: sendMessageParams })
+        const command = new SendMessageCommand(sendMessageParams)
 
         return sqsClient.send(command)
-          .then(() => logInfo({  message: '[DeploymentQueueClient] Deployment request sent' }))
+          .then(() => logInfo({ message: '[DeploymentQueueClient] Deployment request sent' }))
           .catch(error => logError({ message: '[DeploymentQueueClient] Could not send deployment request', error }))
       })
 
   }
 
   static pollForDeploymentRequests(deploymentPlatform: DeploymentPlatform, handleDeploymentRequest: (deploymentRequest: ContainerDeploymentRequest) => Promise<void>) {
-    logInfo({  message: '[DeploymentQueueClient] Starting polling for deployment requests' })
+    logInfo({ message: '[DeploymentQueueClient] Starting polling for deployment requests' })
     DeploymentQueueClient.createAwsSqsClient(deploymentPlatform).then(sqsClient => {
       const FIVE_MINUTES = 3000