Merge remote-tracking branch 'origin/master'

RimacTechnology · Jan 2, 2025 · 39cb4e9 · 39cb4e9
2 parents 5379068 + eb4f007
commit 39cb4e9
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@rimac-technology/semantic-release-ecr",
-    "version": "2.0.12",
+    "version": "2.1.0",
     "description": "Semantic-release plugin to publish a docker image to the AWS Elastic Container Registry",
     "keywords": [
         "release",

diff --git a/src/aws.ts b/src/aws.ts
@@ -11,6 +11,7 @@ export class AWS {
         let region: string | null = null
         let accessKeyId: string | null = null
         let secretAccessKey: string | null = null
+        let sessionToken: string | null = null
 
         if (context.env.AWS_DEFAULT_REGION) {
             region = context.env.AWS_DEFAULT_REGION
@@ -24,20 +25,26 @@ export class AWS {
             secretAccessKey = context.env.AWS_SECRET_ACCESS_KEY
         }
 
+        if (context.env.AWS_SESSION_TOKEN) {
+            sessionToken = context.env.AWS_SESSION_TOKEN
+        }
+
         return {
             accessKeyId,
             region,
             secretAccessKey,
+            sessionToken
         }
     }
 
     public readonly awsEcr: InstanceType<typeof ECRClient>
 
-    constructor(accessKeyId: string, region: string, secretAccessKey: string) {
+    constructor(accessKeyId: string, region: string, secretAccessKey: string, sessionToken: string) {
         this.awsEcr = new ECRClient({
             credentials: {
                 accessKeyId,
                 secretAccessKey,
+                sessionToken
             },
             region,
         })

diff --git a/src/aws.types.ts b/src/aws.types.ts
@@ -17,6 +17,13 @@ export type AWSConfigType = {
      * @default ""
      */
     secretAccessKey: string | null
+
+    /**
+     * (optional) AWS session token for the provided credentials
+     *
+     * @default ""
+     */
+    sessionToken: string | null
 }
 
 export type AWSLoginValueType = {

diff --git a/src/publish.ts b/src/publish.ts
@@ -8,7 +8,7 @@ import type { PluginConfig, WithoutNullableKeysType } from './types.js'
 
 export async function publish(pluginConfig: PluginConfig, context: PublishContext): Promise<void> {
     const awsConfig = AWS.loadConfig(context) as WithoutNullableKeysType<AWSConfigType>
-    const aws = new AWS(awsConfig.accessKeyId, awsConfig.region, awsConfig.secretAccessKey)
+    const aws = new AWS(awsConfig.accessKeyId, awsConfig.region, awsConfig.secretAccessKey, awsConfig.sessionToken)
 
     const awsLoginValue = await aws.login()