@ossy/deployment-tools 0.0.31 → 0.0.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/deployment-tools",
-  "version": "0.0.31",
+  "version": "0.0.33",
   "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

@@ -6,7 +6,7 @@ import { Credentials } from '@aws-sdk/types'
 
 export class AwsCredentialsClient {
 
-  static resolveAwsCredentials({ awsAccountId, awsRegion, awsRoleToAssume }: DeploymentPlatform): Promise<Credentials | undefined> {
+  static resolveAwsCredentials({ awsAccountId, awsRegion, awsRoleToAssume }: DeploymentPlatform) {
     // If awsRoleToAssume is present, then we assume we run in a github workflow
     // If awsRoleToAssume is not present, then we assume they are resolved localy by aws-sdk
     if (!awsRoleToAssume) {
@@ -20,6 +20,7 @@ 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',
@@ -27,12 +28,15 @@ export class AwsCredentialsClient {
           WebIdentityToken: webIdentityToken
         }))
       })
-      // .then(responseData => ({
-      //   AccessKeyId: responseData.Credentials.AccessKeyId,
-      //   SessionToken: responseData.Credentials.SessionToken,
-      //   SecretAccessKey: responseData.Credentials.SecretAccessKey,
-      // }))
-      .then(responseData => responseData.Credentials)
+      .then(responseData => ({
+        AccessKeyId: responseData.Credentials.AccessKeyId,
+        SessionToken: responseData.Credentials.SessionToken,
+        SecretAccessKey: responseData.Credentials.SecretAccessKey,
+        accessKeyId: responseData.Credentials.AccessKeyId,
+        sessionToken: responseData.Credentials.SessionToken,
+        secretAccessKey: responseData.Credentials.SecretAccessKey,
+      }))
+      // .then(responseData => responseData.Credentials)
       .then(data => {
         logDebug({ message: '[AwsCredentialsClient] AssumeRoleWithWebIdentityCommand responseData.Credentials', data })
         return data

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
 

package/src/log/index.ts

@@ -11,13 +11,8 @@ enum TypeOfMessage {
   Debug = 'DEBUG'
 }
 
-const log = (...params) => {
-  console.log(...params)
-}
-
-function prefixTo(prefix: string, message: string) {
-  `[${prefix}]${message.startsWith('[') ? '' : ': '}`
-}
+const log = (...params) => { console.log(...params) }
+const prefixTo = (prefix: string, message: string) => `[${prefix}]${message.startsWith('[') ? '' : ': '}`
 
 export const logInfo = logInput => {
   const messagePrefix = prefixTo(TypeOfMessage.Info, logInput.message)