diff --git a/.projen/deps.json b/.projen/deps.json index 3c4b6880..74e43a9f 100644 --- a/.projen/deps.json +++ b/.projen/deps.json @@ -210,9 +210,13 @@ "version": "^5", "type": "build" }, + { + "name": "@aws-cdk/aws-imagebuilder-alpha", + "type": "peer" + }, { "name": "aws-cdk-lib", - "version": "^2.155.0", + "version": "^2.231.0", "type": "peer" }, { diff --git a/.projen/tasks.json b/.projen/tasks.json index d95c4849..ad51c97a 100644 --- a/.projen/tasks.json +++ b/.projen/tasks.json @@ -672,13 +672,13 @@ }, "steps": [ { - "exec": "npx npm-check-updates@18 --upgrade --target=minor --peer --no-deprecated --dep=dev,peer,prod,optional --filter=@aws-sdk/client-cloudformation,@aws-sdk/client-codebuild,@aws-sdk/client-ec2,@aws-sdk/client-ecr,@aws-sdk/client-imagebuilder,@aws-sdk/client-lambda,@aws-sdk/client-secrets-manager,@aws-sdk/client-sfn,@aws-sdk/client-sns,@aws-sdk/client-ssm,@octokit/auth-app,@octokit/core,@octokit/request-error,@octokit/rest,@types/aws-lambda,@types/jest,esbuild,eslint-import-resolver-typescript,eslint-plugin-import,jest,jsii-diff,jsii-pacmak,projen,ts-jest,ts-node" + "exec": "npx npm-check-updates@18 --upgrade --target=minor --peer --no-deprecated --dep=dev,peer,prod,optional --filter=@aws-sdk/client-cloudformation,@aws-sdk/client-codebuild,@aws-sdk/client-ec2,@aws-sdk/client-ecr,@aws-sdk/client-imagebuilder,@aws-sdk/client-lambda,@aws-sdk/client-secrets-manager,@aws-sdk/client-sfn,@aws-sdk/client-sns,@aws-sdk/client-ssm,@octokit/auth-app,@octokit/core,@octokit/request-error,@octokit/rest,@types/aws-lambda,@types/jest,esbuild,eslint-import-resolver-typescript,eslint-plugin-import,jest,jsii-diff,jsii-pacmak,projen,ts-jest,ts-node,@aws-cdk/aws-imagebuilder-alpha" }, { "exec": "yarn install --check-files" }, { - "exec": "yarn upgrade @aws-sdk/client-cloudformation @aws-sdk/client-codebuild @aws-sdk/client-ec2 @aws-sdk/client-ecr @aws-sdk/client-imagebuilder @aws-sdk/client-lambda @aws-sdk/client-secrets-manager @aws-sdk/client-sfn @aws-sdk/client-sns @aws-sdk/client-ssm @octokit/auth-app @octokit/core @octokit/request-error @octokit/rest @stylistic/eslint-plugin @sveltejs/vite-plugin-svelte @tsconfig/svelte @types/aws-lambda @types/jest @types/node @typescript-eslint/eslint-plugin @typescript-eslint/parser aws-cdk bootstrap commit-and-tag-version esbuild eslint-import-resolver-typescript eslint-plugin-import eslint-plugin-svelte eslint jest jest-junit jsii-diff jsii-docgen jsii-pacmak jsii-rosetta jsii projen sass svelte-check svelte-preprocess svelte ts-jest ts-node typescript vite-plugin-singlefile vite aws-cdk-lib constructs" + "exec": "yarn upgrade @aws-sdk/client-cloudformation @aws-sdk/client-codebuild @aws-sdk/client-ec2 @aws-sdk/client-ecr @aws-sdk/client-imagebuilder @aws-sdk/client-lambda @aws-sdk/client-secrets-manager @aws-sdk/client-sfn @aws-sdk/client-sns @aws-sdk/client-ssm @octokit/auth-app @octokit/core @octokit/request-error @octokit/rest @stylistic/eslint-plugin @sveltejs/vite-plugin-svelte @tsconfig/svelte @types/aws-lambda @types/jest @types/node @typescript-eslint/eslint-plugin @typescript-eslint/parser aws-cdk bootstrap commit-and-tag-version esbuild eslint-import-resolver-typescript eslint-plugin-import eslint-plugin-svelte eslint jest jest-junit jsii-diff jsii-docgen jsii-pacmak jsii-rosetta jsii projen sass svelte-check svelte-preprocess svelte ts-jest ts-node typescript vite-plugin-singlefile vite @aws-cdk/aws-imagebuilder-alpha aws-cdk-lib constructs" }, { "exec": "npx projen" diff --git a/.projenrc.js b/.projenrc.js index 32185ad2..fcd4387f 100644 --- a/.projenrc.js +++ b/.projenrc.js @@ -7,7 +7,7 @@ const project = new awscdk.AwsCdkConstructLibrary({ author: 'Amir Szekely', authorAddress: 'amir@cloudsnorkel.com', stability: Stability.EXPERIMENTAL, - cdkVersion: '2.155.0', // 2.21.1 for lambda url, 2.29.0 for Names.uniqueResourceName(), 2.50.0 for JsonPath.base64Encode, 2.77.0 for node 16, 2.110.0 for ib lifecycle, 2.123.0 for lambda logs, 2.155.0 for launch template throughput + cdkVersion: '2.231.0', // 2.21.1 for lambda url, 2.29.0 for Names.uniqueResourceName(), 2.50.0 for JsonPath.base64Encode, 2.77.0 for node 16, 2.110.0 for ib lifecycle, 2.123.0 for lambda logs, 2.155.0 for launch template throughput, 2.231.0 for imagebuilder defaultReleaseBranch: 'main', name: '@cloudsnorkel/cdk-github-runners', repositoryUrl: 'https://github.com/CloudSnorkel/cdk-github-runners.git', @@ -44,6 +44,9 @@ const project = new awscdk.AwsCdkConstructLibrary({ ], deps: [ ], + peerDeps: [ + '@aws-cdk/aws-imagebuilder-alpha', + ], jsiiVersion: '5.8.x', typescriptVersion: '5.6.x', lambdaOptions: { runtime: awscdk.LambdaRuntime.NODEJS_22_X }, diff --git a/API.md b/API.md index b7c8c70d..b1442345 100644 --- a/API.md +++ b/API.md @@ -3720,12 +3720,12 @@ Grants read permissions to the principal on the assets buckets. ##### ~~`prefixCommandsWithErrorHandling`~~ ```typescript -public prefixCommandsWithErrorHandling(platform: string, commands: string[]): string[] +public prefixCommandsWithErrorHandling(platform: Platform, commands: string[]): string[] ``` ###### `platform`Required -- *Type:* string +- *Type:* @aws-cdk/aws-imagebuilder-alpha.Platform --- @@ -3814,10 +3814,10 @@ Check whether the given construct is a Resource. | **Name** | **Type** | **Description** | | --- | --- | --- | | node | constructs.Node | The tree node. | -| env | aws-cdk-lib.ResourceEnvironment | The environment this resource belongs to. | +| env | aws-cdk-lib.interfaces.ResourceEnvironment | The environment this resource belongs to. | | stack | aws-cdk-lib.Stack | The stack in which this resource is defined. | -| arn | string | Component ARN. | -| platform | string | Supported platform for the component. | +| component | @aws-cdk/aws-imagebuilder-alpha.Component | Actual component resource. | +| platform | @aws-cdk/aws-imagebuilder-alpha.Platform | Supported platform for the component. | --- @@ -3843,16 +3843,17 @@ The tree node. public readonly env: ResourceEnvironment; ``` -- *Type:* aws-cdk-lib.ResourceEnvironment +- *Type:* aws-cdk-lib.interfaces.ResourceEnvironment The environment this resource belongs to. -For resources that are created and managed by the CDK -(generally, those created by creating new class instances like Role, Bucket, etc.), -this is always the same as the environment of the stack they belong to; -however, for imported resources -(those obtained from static methods like fromRoleArn, fromBucketName, etc.), -that might be different than the stack they were imported into. +For resources that are created and managed in a Stack (those created by +creating new class instances like `new Role()`, `new Bucket()`, etc.), this +is always the same as the environment of the stack they belong to. + +For referenced resources (those obtained from referencing methods like +`Role.fromRoleArn()`, `Bucket.fromBucketName()`, etc.), they might be +different than the stack they were imported into. --- @@ -3870,17 +3871,19 @@ The stack in which this resource is defined. --- -##### ~~`arn`~~Required +##### ~~`component`~~Required - *Deprecated:* Use `RunnerImageComponent` instead as this be internal soon. ```typescript -public readonly arn: string; +public readonly component: Component; ``` -- *Type:* string +- *Type:* @aws-cdk/aws-imagebuilder-alpha.Component -Component ARN. +Actual component resource. + +TODO replace this whole class with the new resource --- @@ -3889,10 +3892,10 @@ Component ARN. - *Deprecated:* Use `RunnerImageComponent` instead as this be internal soon. ```typescript -public readonly platform: string; +public readonly platform: Platform; ``` -- *Type:* string +- *Type:* @aws-cdk/aws-imagebuilder-alpha.Platform Supported platform for the component. @@ -7536,7 +7539,7 @@ const imageBuilderComponentProperties: ImageBuilderComponentProperties = { ... } | commands | string[] | Shell commands to run when adding this component to the image. | | description | string | Component description. | | displayName | string | Component display name. | -| platform | string | Component platform. | +| platform | @aws-cdk/aws-imagebuilder-alpha.Platform | Component platform. | | assets | ImageBuilderAsset[] | Optional assets to add to the built image. | | reboot | boolean | Require a reboot after installing this component. | @@ -7583,10 +7586,10 @@ Component display name. ##### `platform`Required ```typescript -public readonly platform: string; +public readonly platform: Platform; ``` -- *Type:* string +- *Type:* @aws-cdk/aws-imagebuilder-alpha.Platform Component platform. diff --git a/package.json b/package.json index 8bc79c20..8e87743a 100644 --- a/package.json +++ b/package.json @@ -70,16 +70,17 @@ "organization": false }, "devDependencies": { - "@aws-sdk/client-cloudformation": "^3.948.0", - "@aws-sdk/client-codebuild": "^3.948.0", - "@aws-sdk/client-ec2": "^3.948.0", - "@aws-sdk/client-ecr": "^3.948.0", - "@aws-sdk/client-imagebuilder": "^3.948.0", - "@aws-sdk/client-lambda": "^3.950.0", - "@aws-sdk/client-secrets-manager": "^3.950.0", - "@aws-sdk/client-sfn": "^3.948.0", - "@aws-sdk/client-sns": "^3.948.0", - "@aws-sdk/client-ssm": "^3.948.0", + "@aws-cdk/aws-imagebuilder-alpha": "2.231.0-alpha.0", + "@aws-sdk/client-cloudformation": "^3.940.0", + "@aws-sdk/client-codebuild": "^3.940.0", + "@aws-sdk/client-ec2": "^3.940.0", + "@aws-sdk/client-ecr": "^3.940.0", + "@aws-sdk/client-imagebuilder": "^3.940.0", + "@aws-sdk/client-lambda": "^3.940.0", + "@aws-sdk/client-secrets-manager": "^3.940.0", + "@aws-sdk/client-sfn": "^3.940.0", + "@aws-sdk/client-sns": "^3.940.0", + "@aws-sdk/client-ssm": "^3.940.0", "@octokit/auth-app": "^4.0.13", "@octokit/core": "^4.2.4", "@octokit/request-error": "^3.0.3", @@ -93,7 +94,7 @@ "@typescript-eslint/eslint-plugin": "^8", "@typescript-eslint/parser": "^8", "aws-cdk": "^2", - "aws-cdk-lib": "2.155.0", + "aws-cdk-lib": "2.231.0", "bootstrap": "^5.2.0", "commit-and-tag-version": "^12", "constructs": "10.0.5", @@ -121,7 +122,8 @@ "vite-plugin-singlefile": "^2" }, "peerDependencies": { - "aws-cdk-lib": "^2.155.0", + "@aws-cdk/aws-imagebuilder-alpha": "^2.231.0-alpha.0", + "aws-cdk-lib": "^2.231.0", "constructs": "^10.0.5" }, "keywords": [ diff --git a/src/image-builders/aws-image-builder/ami.ts b/src/image-builders/aws-image-builder/ami.ts index 5742403a..69908bff 100644 --- a/src/image-builders/aws-image-builder/ami.ts +++ b/src/image-builders/aws-image-builder/ami.ts @@ -1,9 +1,8 @@ +import * as imagebuilder2 from '@aws-cdk/aws-imagebuilder-alpha'; import * as cdk from 'aws-cdk-lib'; -import { aws_imagebuilder as imagebuilder } from 'aws-cdk-lib'; import { Construct } from 'constructs'; import { ImageBuilderComponent } from './builder'; import { amiRootDevice, Architecture, Os } from '../../providers'; -import { uniqueImageBuilderName } from '../common'; /** * Properties for AmiRecipe construct. @@ -48,6 +47,7 @@ interface AmiRecipeProperties { * @internal */ export class AmiRecipe extends cdk.Resource { + public readonly recipe: imagebuilder2.ImageRecipe; public readonly arn: string; public readonly name: string; public readonly version: string; @@ -57,22 +57,22 @@ export class AmiRecipe extends cdk.Resource { let components = props.components.map(component => { return { - componentArn: component.arn, + component: component.component, }; }); const blockDeviceMappings = props.storageSize ? [ { deviceName: amiRootDevice(this, props.baseAmi).ref, - ebs: { - volumeSize: props.storageSize.toGibibytes(), - deleteOnTermination: true, + volume: { + ebsDevice: { + volumeSize: props.storageSize.toGibibytes(), + deleteOnTermination: true, + }, }, }, ] : undefined; - this.name = uniqueImageBuilderName(this); - let workingDirectory; if (props.platform == 'Linux') { workingDirectory = '/home/runner'; @@ -82,18 +82,18 @@ export class AmiRecipe extends cdk.Resource { throw new Error(`Unsupported AMI recipe platform: ${props.platform}`); } - const recipe = new imagebuilder.CfnImageRecipe(this, 'Recipe', { - name: this.name, - version: '1.0.x', - parentImage: props.baseAmi, + const recipe = new imagebuilder2.ImageRecipe(this, 'Recipe', { + baseImage: imagebuilder2.BaseImage.fromAmiId(props.baseAmi), components, workingDirectory, tags: props.tags, - blockDeviceMappings, + blockDevices: blockDeviceMappings, }); - this.arn = recipe.attrArn; - this.version = recipe.getAtt('Version', cdk.ResolutionTypeHint.STRING).toString(); + this.recipe = recipe; + this.arn = recipe.imageRecipeArn; + this.name = recipe.imageRecipeName; + this.version = recipe.imageRecipeVersion; } } diff --git a/src/image-builders/aws-image-builder/builder.ts b/src/image-builders/aws-image-builder/builder.ts index ef1074d8..6a195859 100644 --- a/src/image-builders/aws-image-builder/builder.ts +++ b/src/image-builders/aws-image-builder/builder.ts @@ -1,3 +1,4 @@ +import * as imagebuilder2 from '@aws-cdk/aws-imagebuilder-alpha'; import * as cdk from 'aws-cdk-lib'; import { Annotations, @@ -20,15 +21,15 @@ import { TagMutability } from 'aws-cdk-lib/aws-ecr'; import { RetentionDays } from 'aws-cdk-lib/aws-logs'; import { Construct, IConstruct } from 'constructs'; import { AmiRecipe, defaultBaseAmi } from './ami'; -import { ContainerRecipe, defaultBaseDockerImage } from './container'; +import { defaultBaseDockerImage } from './container'; import { DeleteResourcesFunction } from './delete-resources-function'; import { DeleteResourcesProps } from './delete-resources.lambda'; import { FilterFailedBuildsFunction } from './filter-failed-builds-function'; import { generateBuildWorkflowWithDockerSetupCommands } from './workflow'; import { Architecture, Os, RunnerAmi, RunnerImage, RunnerVersion } from '../../providers'; -import { singletonLogGroup, singletonLambda, SingletonLogType } from '../../utils'; +import { singletonLambda, singletonLogGroup, SingletonLogType } from '../../utils'; import { BuildImageFunction } from '../build-image-function'; -import { RunnerImageBuilderBase, RunnerImageBuilderProps, uniqueImageBuilderName } from '../common'; +import { RunnerImageBuilderBase, RunnerImageBuilderProps } from '../common'; export interface AwsImageBuilderRunnerImageBuilderProps { /** @@ -112,7 +113,7 @@ export interface ImageBuilderComponentProperties { /** * Component platform. Must match the builder platform. */ - readonly platform: 'Linux' | 'Windows'; + readonly platform: imagebuilder2.Platform; /** * Component display name. @@ -165,14 +166,16 @@ export interface ImageBuilderComponentProperties { */ export class ImageBuilderComponent extends cdk.Resource { /** - * Component ARN. + * Actual component resource. + * + * TODO replace this whole class with the new resource */ - public readonly arn: string; + public readonly component: imagebuilder2.Component; /** * Supported platform for the component. */ - public readonly platform: 'Windows' | 'Linux'; + public readonly platform: imagebuilder2.Platform; private readonly assets: s3_assets.Asset[] = []; @@ -180,6 +183,8 @@ export class ImageBuilderComponent extends cdk.Resource { super(scope, id); this.platform = props.platform; + const execAction = props.platform === imagebuilder2.Platform.LINUX ? + imagebuilder2.ComponentAction.EXECUTE_BASH : imagebuilder2.ComponentAction.EXECUTE_POWERSHELL; let steps: any[] = []; @@ -199,7 +204,7 @@ export class ImageBuilderComponent extends cdk.Resource { source: asset.asset.s3ObjectUrl, destination: `${asset.path}.zip`, }); - if (props.platform === 'Windows') { + if (props.platform === imagebuilder2.Platform.WINDOWS) { extractCommands.push(`Expand-Archive "${asset.path}.zip" -DestinationPath "${asset.path}"`); extractCommands.push(`del "${asset.path}.zip"`); } else { @@ -213,14 +218,14 @@ export class ImageBuilderComponent extends cdk.Resource { steps.push({ name: 'Download', - action: 'S3Download', + action: imagebuilder2.ComponentAction.S3_DOWNLOAD, inputs, }); if (extractCommands.length > 0) { steps.push({ name: 'Extract', - action: props.platform === 'Linux' ? 'ExecuteBash' : 'ExecutePowerShell', + action: execAction, inputs: { commands: this.prefixCommandsWithErrorHandling(props.platform, extractCommands), }, @@ -231,7 +236,7 @@ export class ImageBuilderComponent extends cdk.Resource { if (props.commands.length > 0) { steps.push({ name: 'Run', - action: props.platform === 'Linux' ? 'ExecuteBash' : 'ExecutePowerShell', + action: execAction, inputs: { commands: this.prefixCommandsWithErrorHandling(props.platform, props.commands), }, @@ -241,32 +246,27 @@ export class ImageBuilderComponent extends cdk.Resource { if (props.reboot ?? false) { steps.push({ name: 'Reboot', - action: 'Reboot', + action: imagebuilder2.ComponentAction.REBOOT, inputs: {}, }); } const data = { name: props.displayName, - schemaVersion: '1.0', + schemaVersion: imagebuilder2.ComponentSchemaVersion.V1_0, phases: [ { - name: 'build', + name: imagebuilder2.ComponentPhaseName.BUILD, steps, }, ], }; - const name = uniqueImageBuilderName(this); - const component = new imagebuilder.CfnComponent(this, 'Component', { - name: name, + this.component = new imagebuilder2.Component(this, 'Component', { description: props.description, platform: props.platform, - version: '1.0.0', - data: JSON.stringify(data), + data: imagebuilder2.ComponentData.fromJsonObject(data), }); - - this.arn = component.attrArn; } /** @@ -280,8 +280,8 @@ export class ImageBuilderComponent extends cdk.Resource { } } - prefixCommandsWithErrorHandling(platform: 'Windows' | 'Linux', commands: string[]) { - if (platform == 'Windows') { + prefixCommandsWithErrorHandling(platform: imagebuilder2.Platform, commands: string[]) { + if (platform == imagebuilder2.Platform.WINDOWS) { return [ '$ErrorActionPreference = \'Stop\'', '$ProgressPreference = \'SilentlyContinue\'', @@ -313,7 +313,7 @@ export class AwsImageBuilderRunnerImageBuilder extends RunnerImageBuilderBase { private readonly rebuildInterval: cdk.Duration; private readonly boundComponents: ImageBuilderComponent[] = []; private readonly instanceType: ec2.InstanceType; - private infrastructure: imagebuilder.CfnInfrastructureConfiguration | undefined; + private infrastructure: imagebuilder2.InfrastructureConfiguration | undefined; private readonly role: iam.Role; private readonly fastLaunchOptions?: FastLaunchOptions; public readonly storageSize?: cdk.Size; @@ -369,10 +369,10 @@ export class AwsImageBuilderRunnerImageBuilder extends RunnerImageBuilderBase { private platform() { if (this.os.is(Os.WINDOWS)) { - return 'Windows'; + return imagebuilder2.Platform.WINDOWS; } if (this.os.isIn(Os._ALL_LINUX_VERSIONS)) { - return 'Linux'; + return imagebuilder2.Platform.LINUX; } throw new Error(`OS ${this.os.name} is not supported by AWS Image Builder`); } @@ -393,21 +393,13 @@ export class AwsImageBuilderRunnerImageBuilder extends RunnerImageBuilderBase { emptyOnDelete: true, }); - const dist = new imagebuilder.CfnDistributionConfiguration(this, 'Docker Distribution', { - name: uniqueImageBuilderName(this), + const dist = new imagebuilder2.DistributionConfiguration(this, 'Docker Distribution', { // description: this.description, - distributions: [ - { - region: Stack.of(this).region, - containerDistributionConfiguration: { - ContainerTags: ['latest'], - TargetRepository: { - Service: 'ECR', - RepositoryName: repository.repositoryName, - }, - }, - }, - ], + containerDistributions: [{ + region: Stack.of(this).region, + containerTags: ['latest'], + containerRepository: imagebuilder2.Repository.fromEcr(repository), + }], tags: this.tags, }); @@ -422,27 +414,29 @@ export class AwsImageBuilderRunnerImageBuilder extends RunnerImageBuilderBase { } } - const recipe = new ContainerRecipe(this, 'Container Recipe', { - platform: this.platform(), - components: this.bindComponents(), - targetRepository: repository, - dockerfileTemplate: dockerfileTemplate, - parentImage: this.baseImage, + const recipe = new imagebuilder2.ContainerRecipe(this, 'Recipe', { + baseImage: imagebuilder2.BaseContainerImage.fromString(this.baseImage), + osVersion: this.os.isIn(Os._ALL_LINUX_VERSIONS) ? imagebuilder2.OSVersion.LINUX : undefined, + components: this.bindComponents().map(c => { + return { component: c.component }; + }), + targetRepository: imagebuilder2.Repository.fromEcr(repository), + dockerfile: imagebuilder2.DockerfileData.fromInline(dockerfileTemplate), tags: this.tags, }); - const log = this.createLog('Docker Log', recipe.name); + const log = this.createLog('Docker Log', recipe.containerRecipeName); const infra = this.createInfrastructure([ iam.ManagedPolicy.fromAwsManagedPolicyName('AmazonSSMManagedInstanceCore'), iam.ManagedPolicy.fromAwsManagedPolicyName('EC2InstanceProfileForImageBuilderECRContainerBuilds'), ]); if (this.waitOnDeploy) { - this.createImage(infra, dist, log, undefined, recipe.arn); + this.createImage(infra, dist, log, undefined, recipe); } this.dockerImageCleaner(recipe, repository); - this.createPipeline(infra, dist, log, undefined, recipe.arn); + this.createPipeline(infra, dist, log, undefined, recipe); this.boundDockerImage = { imageRepository: repository, @@ -457,7 +451,7 @@ export class AwsImageBuilderRunnerImageBuilder extends RunnerImageBuilderBase { return this.boundDockerImage; } - private dockerImageCleaner(recipe: ContainerRecipe, repository: ecr.IRepository) { + private dockerImageCleaner(recipe: imagebuilder2.ContainerRecipe, repository: ecr.IRepository) { // this is here to provide safe upgrade from old cdk-github-runners versions // this lambda was used by a custom resource to delete all images builds on cleanup // if we remove the custom resource and the lambda, the old images will be deleted on update @@ -475,11 +469,10 @@ export class AwsImageBuilderRunnerImageBuilder extends RunnerImageBuilderBase { })); // delete old version on update and on stack deletion - this.imageCleaner('Container', recipe.name.toLowerCase(), recipe.version); + this.imageCleaner('Container', recipe.containerRecipeName, recipe.containerRecipeVersion); // delete old docker images + IB resources daily - new imagebuilder.CfnLifecyclePolicy(this, 'Lifecycle Policy Docker', { - name: uniqueImageBuilderName(this), + new imagebuilder2.LifecyclePolicy(this, 'Lifecycle Policy Docker', { description: `Delete old GitHub Runner Docker images for ${this.node.path}`, executionRole: new iam.Role(this, 'Lifecycle Policy Docker Role', { assumedBy: new iam.ServicePrincipal('imagebuilder.amazonaws.com'), @@ -501,27 +494,21 @@ export class AwsImageBuilderRunnerImageBuilder extends RunnerImageBuilderBase { ], }), }, - }).roleArn, - policyDetails: [{ + }), + details: [{ action: { - type: 'DELETE', - includeResources: { - containers: true, - }, + type: imagebuilder2.LifecyclePolicyActionType.DELETE, + includeContainers: true, }, filter: { - type: 'COUNT', - value: 2, + countFilter: { + count: 2, + }, }, }], - resourceType: 'CONTAINER_IMAGE', + resourceType: imagebuilder2.LifecyclePolicyResourceType.CONTAINER_IMAGE, resourceSelection: { - recipes: [ - { - name: recipe.name, - semanticVersion: recipe.version, - }, - ], + recipes: [recipe], }, }); } @@ -534,7 +521,7 @@ export class AwsImageBuilderRunnerImageBuilder extends RunnerImageBuilderBase { }); } - protected createInfrastructure(managedPolicies: iam.IManagedPolicy[]): imagebuilder.CfnInfrastructureConfiguration { + protected createInfrastructure(managedPolicies: iam.IManagedPolicy[]): imagebuilder2.InfrastructureConfiguration { if (this.infrastructure) { return this.infrastructure; } @@ -547,37 +534,27 @@ export class AwsImageBuilderRunnerImageBuilder extends RunnerImageBuilderBase { component.grantAssetsRead(this.role); } - this.infrastructure = new imagebuilder.CfnInfrastructureConfiguration(this, 'Infrastructure', { - name: uniqueImageBuilderName(this), + this.infrastructure = new imagebuilder2.InfrastructureConfiguration(this, 'Infrastructure', { // description: this.description, - subnetId: this.vpc?.selectSubnets(this.subnetSelection).subnetIds[0], - securityGroupIds: this.securityGroups?.map(sg => sg.securityGroupId), - instanceTypes: [this.instanceType.toString()], - instanceMetadataOptions: { - httpTokens: 'required', - // Container builds require a minimum of two hops. - httpPutResponseHopLimit: 2, - }, - instanceProfileName: new iam.CfnInstanceProfile(this, 'Instance Profile', { - roles: [ - this.role.roleName, - ], - }).ref, + vpc: this.vpc, + subnetSelection: this.subnetSelection, + securityGroups: this.securityGroups, + instanceTypes: [this.instanceType], + httpTokens: imagebuilder2.HttpTokens.REQUIRED, + httpPutResponseHopLimit: 2, // Container builds require a minimum of two hops. + role: this.role, }); return this.infrastructure; } - protected createImage(infra: imagebuilder.CfnInfrastructureConfiguration, dist: imagebuilder.CfnDistributionConfiguration, log: logs.LogGroup, - imageRecipeArn?: string, containerRecipeArn?: string): imagebuilder.CfnImage { - const image = new imagebuilder.CfnImage(this, this.amiOrContainerId('Image', imageRecipeArn, containerRecipeArn), { - infrastructureConfigurationArn: infra.attrArn, - distributionConfigurationArn: dist.attrArn, - imageRecipeArn, - containerRecipeArn, - imageTestsConfiguration: { - imageTestsEnabled: false, - }, + protected createImage(infra: imagebuilder2.InfrastructureConfiguration, dist: imagebuilder2.DistributionConfiguration, log: logs.LogGroup, + imageRecipe?: imagebuilder2.ImageRecipe, containerRecipe?: imagebuilder2.ContainerRecipe): imagebuilder2.Image { + const image = new imagebuilder2.Image(this, this.amiOrContainerId('Image', imageRecipe !== undefined), { + infrastructureConfiguration: infra, + distributionConfiguration: dist, + recipe: imageRecipe ?? containerRecipe!, + imageTestsEnabled: false, tags: this.tags, }); image.node.addDependency(infra); @@ -592,56 +569,42 @@ export class AwsImageBuilderRunnerImageBuilder extends RunnerImageBuilderBase { return image; } - private amiOrContainerId(baseId: string, imageRecipeArn?: string, containerRecipeArn?: string) { - if (imageRecipeArn) { + private amiOrContainerId(baseId: string, ami: boolean) { + if (ami) { return `AMI ${baseId}`; - } - if (containerRecipeArn) { + } else { return `Docker ${baseId}`; } - throw new Error('Either imageRecipeArn or containerRecipeArn must be defined'); } - protected createPipeline(infra: imagebuilder.CfnInfrastructureConfiguration, dist: imagebuilder.CfnDistributionConfiguration, log: logs.LogGroup, - imageRecipeArn?: string, containerRecipeArn?: string): imagebuilder.CfnImagePipeline { + protected createPipeline(infra: imagebuilder2.InfrastructureConfiguration, dist: imagebuilder2.DistributionConfiguration, log: logs.LogGroup, + imageRecipe?: imagebuilder2.ImageRecipe, containerRecipe?: imagebuilder2.ContainerRecipe) { // set schedule - let scheduleOptions: imagebuilder.CfnImagePipeline.ScheduleProperty | undefined; + let scheduleOptions: imagebuilder2.ImagePipelineSchedule | undefined; if (this.rebuildInterval.toDays() > 0) { scheduleOptions = { - scheduleExpression: events.Schedule.rate(this.rebuildInterval).expressionString, - pipelineExecutionStartCondition: 'EXPRESSION_MATCH_ONLY', + expression: events.Schedule.rate(this.rebuildInterval), + startCondition: imagebuilder2.ScheduleStartCondition.EXPRESSION_MATCH_ONLY, }; } // generate workflows, if needed - let workflows: imagebuilder.CfnImagePipeline.WorkflowConfigurationProperty[] | undefined; - let executionRole: iam.IRole | undefined; - if (this.dockerSetupCommands.length > 0 && containerRecipeArn) { + let workflows: imagebuilder2.WorkflowConfiguration[] | undefined; + if (this.dockerSetupCommands.length > 0 && containerRecipe) { workflows = [{ - workflowArn: generateBuildWorkflowWithDockerSetupCommands(this, 'Build', this.dockerSetupCommands).arn, + workflow: generateBuildWorkflowWithDockerSetupCommands(this, 'Build', this.dockerSetupCommands), }]; - executionRole = iam.Role.fromRoleArn(this, 'Image Builder Role', cdk.Stack.of(this).formatArn({ - service: 'iam', - region: '', - resource: 'role', - resourceName: 'aws-service-role/imagebuilder.amazonaws.com/AWSServiceRoleForImageBuilder', - })); } // generate pipeline - const pipeline = new imagebuilder.CfnImagePipeline(this, this.amiOrContainerId('Pipeline', imageRecipeArn, containerRecipeArn), { - name: uniqueImageBuilderName(this), + const pipeline = new imagebuilder2.ImagePipeline(this, this.amiOrContainerId('Pipeline', imageRecipe !== undefined), { // description: this.description, - infrastructureConfigurationArn: infra.attrArn, - distributionConfigurationArn: dist.attrArn, - imageRecipeArn, - containerRecipeArn, + infrastructureConfiguration: infra, + distributionConfiguration: dist, + recipe: imageRecipe ?? containerRecipe!, schedule: scheduleOptions, - imageTestsConfiguration: { - imageTestsEnabled: false, - }, + imageTestsEnabled: false, workflows: workflows, - executionRole: executionRole?.roleArn, tags: this.tags, }); pipeline.node.addDependency(infra); @@ -670,11 +633,11 @@ export class AwsImageBuilderRunnerImageBuilder extends RunnerImageBuilderBase { requireImdsv2: true, }); - const launchTemplateConfigs: imagebuilder.CfnDistributionConfiguration.LaunchTemplateConfigurationProperty[] = [{ - launchTemplateId: launchTemplate.launchTemplateId, + const launchTemplateConfigs: imagebuilder2.LaunchTemplateConfiguration[] = [{ + launchTemplate: launchTemplate, setDefaultVersion: true, }]; - const fastLaunchConfigs: imagebuilder.CfnDistributionConfiguration.FastLaunchConfigurationProperty[] = []; + const fastLaunchConfigs: imagebuilder2.FastLaunchConfiguration[] = []; if (this.fastLaunchOptions?.enabled ?? false) { if (!this.os.is(Os.WINDOWS)) { @@ -722,48 +685,36 @@ export class AwsImageBuilderRunnerImageBuilder extends RunnerImageBuilderBase { }], }], }); + const fastLaunchTemplateL2 = ec2.LaunchTemplate.fromLaunchTemplateAttributes(this, 'Fast Launch Template L2', { + launchTemplateId: fastLaunchTemplate.ref, + }); launchTemplateConfigs.push({ - launchTemplateId: fastLaunchTemplate.attrLaunchTemplateId, + launchTemplate: fastLaunchTemplateL2, setDefaultVersion: true, }); fastLaunchConfigs.push({ - enabled: true, - launchTemplate: { - launchTemplateId: fastLaunchTemplate.attrLaunchTemplateId, - }, + launchTemplate: fastLaunchTemplateL2, maxParallelLaunches: this.fastLaunchOptions?.maxParallelLaunches ?? 6, - snapshotConfiguration: { - targetResourceCount: this.fastLaunchOptions?.targetResourceCount ?? 1, - }, + targetSnapshotCount: this.fastLaunchOptions?.targetResourceCount ?? 1, }); } const stackName = cdk.Stack.of(this).stackName; const builderName = this.node.path; - const dist = new imagebuilder.CfnDistributionConfiguration(this, 'AMI Distribution', { - name: uniqueImageBuilderName(this), + const dist = new imagebuilder2.DistributionConfiguration(this, 'AMI Distribution', { // description: this.description, - distributions: [ - { - region: Stack.of(this).region, - amiDistributionConfiguration: { - Name: `${cdk.Names.uniqueResourceName(this, { - maxLength: 100, - separator: '-', - allowedSpecialCharacters: '_-', - })}-{{ imagebuilder:buildDate }}`, - AmiTags: { - 'Name': this.node.id, - 'GitHubRunners:Stack': stackName, - 'GitHubRunners:Builder': builderName, - }, - }, - launchTemplateConfigurations: launchTemplateConfigs, - fastLaunchConfigurations: fastLaunchConfigs.length > 0 ? fastLaunchConfigs : undefined, + amiDistributions: [{ + region: Stack.of(this).region, + amiTags: { + 'Name': this.node.id, + 'GitHubRunners:Stack': stackName, + 'GitHubRunners:Builder': builderName, }, - ], + launchTemplates: launchTemplateConfigs, + fastLaunchConfigurations: fastLaunchConfigs.length > 0 ? fastLaunchConfigs : undefined, + }], tags: this.tags, }); @@ -782,9 +733,9 @@ export class AwsImageBuilderRunnerImageBuilder extends RunnerImageBuilderBase { iam.ManagedPolicy.fromAwsManagedPolicyName('EC2InstanceProfileForImageBuilder'), ]); if (this.waitOnDeploy) { - this.createImage(infra, dist, log, recipe.arn, undefined); + this.createImage(infra, dist, log, recipe.recipe, undefined); } - this.createPipeline(infra, dist, log, recipe.arn, undefined); + this.createPipeline(infra, dist, log, recipe.recipe, undefined); this.boundAmi = { launchTemplate: launchTemplate, @@ -826,11 +777,10 @@ export class AwsImageBuilderRunnerImageBuilder extends RunnerImageBuilderBase { } // delete old version on update and on stack deletion - this.imageCleaner('Image', recipe.name.toLowerCase(), recipe.version); + this.imageCleaner('Image', recipe.name, recipe.version); // delete old AMIs + IB resources daily - new imagebuilder.CfnLifecyclePolicy(this, 'Lifecycle Policy AMI', { - name: uniqueImageBuilderName(this), + new imagebuilder2.LifecyclePolicy(this, 'Lifecycle Policy AMI', { description: `Delete old GitHub Runner AMIs for ${this.node.path}`, executionRole: new iam.Role(this, 'Lifecycle Policy AMI Role', { assumedBy: new iam.ServicePrincipal('imagebuilder.amazonaws.com'), @@ -862,28 +812,22 @@ export class AwsImageBuilderRunnerImageBuilder extends RunnerImageBuilderBase { ], }), }, - }).roleArn, - policyDetails: [{ + }), + details: [{ action: { - type: 'DELETE', - includeResources: { - amis: true, - snapshots: true, - }, + type: imagebuilder2.LifecyclePolicyActionType.DELETE, + includeAmis: true, + includeSnapshots: true, }, filter: { - type: 'COUNT', - value: 2, + countFilter: { + count: 2, + }, }, }], - resourceType: 'AMI_IMAGE', + resourceType: imagebuilder2.LifecyclePolicyResourceType.AMI_IMAGE, resourceSelection: { - recipes: [ - { - name: recipe.name, - semanticVersion: recipe.version, // docs say it's optional, but it's not - }, - ], + recipes: [recipe.recipe], }, }); } @@ -973,11 +917,23 @@ export class AwsImageBuilderFailedBuildNotifier implements cdk.IAspect { const builder = node as AwsImageBuilderRunnerImageBuilder; const infraNode = builder.node.tryFindChild('Infrastructure'); if (infraNode) { - const infra = infraNode as imagebuilder.CfnInfrastructureConfiguration; + const infra = infraNode.node.defaultChild as imagebuilder.CfnInfrastructureConfiguration; infra.snsTopicArn = this.topic.topicArn; } else { cdk.Annotations.of(builder).addWarning('Unused builder cannot get notifications of failed builds'); } } } + + // AWS dev says we can also use this filter on EventBridge directly + // We will have to filter it further down by recipe + // { + // "detail-type": ["EC2 Image Builder Image State Change"], + // "source": ["aws.imagebuilder"], + // "detail": { + // "state": { + // "status": ["FAILED"] + // } + // } + // } } diff --git a/src/image-builders/aws-image-builder/container.ts b/src/image-builders/aws-image-builder/container.ts index 1baee1d8..b148b324 100644 --- a/src/image-builders/aws-image-builder/container.ts +++ b/src/image-builders/aws-image-builder/container.ts @@ -1,95 +1,4 @@ -import * as cdk from 'aws-cdk-lib'; -import { aws_ecr as ecr, aws_imagebuilder as imagebuilder } from 'aws-cdk-lib'; -import { Construct } from 'constructs'; -import { ImageBuilderComponent } from './builder'; import { Os } from '../../providers'; -import { uniqueImageBuilderName } from '../common'; - -/** - * Properties for ContainerRecipe construct. - * - * @internal - */ -export interface ContainerRecipeProperties { - /** - * Target platform. Must match builder platform. - */ - readonly platform: 'Linux' | 'Windows'; - - /** - * Components to add to target container image. - */ - readonly components: ImageBuilderComponent[]; - - /** - * ECR repository where resulting container image will be uploaded. - */ - readonly targetRepository: ecr.IRepository; - - /** - * Dockerfile template where all the components will be added. - * - * Must contain at least the following placeholders: - * - * ``` - * FROM {{{ imagebuilder:parentImage }}} - * {{{ imagebuilder:environments }}} - * {{{ imagebuilder:components }}} - * ``` - */ - readonly dockerfileTemplate: string; - - /** - * Parent image for the new Docker Image. - */ - readonly parentImage: string; - - /** - * Tags to apply to the recipe and image. - */ - readonly tags: { [key: string]: string }; -} - -/** - * Image builder recipe for a Docker container image. - * - * @internal - */ -export class ContainerRecipe extends cdk.Resource { - public readonly arn: string; - public readonly name: string; - public readonly version: string; - - constructor(scope: Construct, id: string, props: ContainerRecipeProperties) { - super(scope, id); - - let components = props.components.map(component => { - return { - componentArn: component.arn, - }; - }); - - this.name = uniqueImageBuilderName(this); - - const recipe = new imagebuilder.CfnContainerRecipe(this, 'Recipe', { - name: this.name, - version: '1.0.x', - parentImage: props.parentImage, - platformOverride: props.platform == 'Linux' ? 'Linux' : undefined, - components, - containerType: 'DOCKER', - targetRepository: { - service: 'ECR', - repositoryName: props.targetRepository.repositoryName, - }, - dockerfileTemplateData: props.dockerfileTemplate, - tags: props.tags, - }); - - this.arn = recipe.attrArn; - this.version = recipe.getAtt('Version', cdk.ResolutionTypeHint.STRING).toString(); - } -} /** * Default base Docker image for given OS. diff --git a/src/image-builders/aws-image-builder/deprecated/container.ts b/src/image-builders/aws-image-builder/deprecated/container.ts index 34eb7f2e..59a7f77a 100644 --- a/src/image-builders/aws-image-builder/deprecated/container.ts +++ b/src/image-builders/aws-image-builder/deprecated/container.ts @@ -1,3 +1,4 @@ +import * as imagebuilder2 from '@aws-cdk/aws-imagebuilder-alpha'; import * as cdk from 'aws-cdk-lib'; import { aws_ec2 as ec2, @@ -19,7 +20,6 @@ import { singletonLambda } from '../../../utils'; import { BuildImageFunction } from '../../build-image-function'; import { uniqueImageBuilderName } from '../../common'; import { ImageBuilderComponent } from '../builder'; -import { ContainerRecipe } from '../container'; const dockerfileTemplate = `FROM {{{ imagebuilder:parentImage }}} ENV RUNNER_VERSION=___RUNNER_VERSION___ @@ -267,22 +267,23 @@ export class ContainerImageBuilder extends ImageBuilderBase { ], }); - const recipe = new ContainerRecipe(this, 'Container Recipe', { - platform: this.platform, - components: this.components, - targetRepository: this.repository, - dockerfileTemplate: dockerfileTemplate.replace('___RUNNER_VERSION___', this.runnerVersion.version), - parentImage: this.parentImage, - tags: {}, + const recipe = new imagebuilder2.ContainerRecipe(this, 'Recipe', { + baseImage: imagebuilder2.BaseContainerImage.fromString(this.parentImage), + osVersion: this.os.isIn(Os._ALL_LINUX_VERSIONS) ? imagebuilder2.OSVersion.LINUX : undefined, + components: this.components.map(c => { + return { component: c.component }; + }), + targetRepository: imagebuilder2.Repository.fromEcr(this.repository), + dockerfile: imagebuilder2.DockerfileData.fromInline(dockerfileTemplate.replace('___RUNNER_VERSION___', this.runnerVersion.version)), }); - const log = this.createLog(recipe.name); + const log = this.createLog(recipe.containerRecipeName); const infra = this.createInfrastructure([ iam.ManagedPolicy.fromAwsManagedPolicyName('AmazonSSMManagedInstanceCore'), iam.ManagedPolicy.fromAwsManagedPolicyName('EC2InstanceProfileForImageBuilderECRContainerBuilds'), ]); - this.createImage(infra, dist, log, undefined, recipe.arn); - this.createPipeline(infra, dist, log, undefined, recipe.arn); + this.createImage(infra, dist, log, undefined, recipe.containerRecipeArn); + this.createPipeline(infra, dist, log, undefined, recipe.containerRecipeArn); this.imageCleaner(); diff --git a/src/image-builders/aws-image-builder/deprecated/linux-components.ts b/src/image-builders/aws-image-builder/deprecated/linux-components.ts index 94342b0a..d8d7591f 100644 --- a/src/image-builders/aws-image-builder/deprecated/linux-components.ts +++ b/src/image-builders/aws-image-builder/deprecated/linux-components.ts @@ -1,3 +1,4 @@ +import * as imagebuilder2 from '@aws-cdk/aws-imagebuilder-alpha'; import { aws_s3_assets as s3_assets } from 'aws-cdk-lib'; import { Construct } from 'constructs'; import { Architecture, RunnerVersion } from '../../../providers'; @@ -20,7 +21,7 @@ export class LinuxUbuntuComponents { } return new ImageBuilderComponent(scope, id, { - platform: 'Linux', + platform: imagebuilder2.Platform.LINUX, displayName: 'Required packages', description: 'Install packages required for GitHub Runner and upgrade all packages', commands: [ @@ -36,7 +37,7 @@ export class LinuxUbuntuComponents { public static runnerUser(scope: Construct, id: string, _architecture: Architecture) { return new ImageBuilderComponent(scope, id, { - platform: 'Linux', + platform: imagebuilder2.Platform.LINUX, displayName: 'GitHub Runner user', description: 'Install latest version of AWS CLI', commands: [ @@ -58,7 +59,7 @@ export class LinuxUbuntuComponents { } return new ImageBuilderComponent(scope, id, { - platform: 'Linux', + platform: imagebuilder2.Platform.LINUX, displayName: 'AWS CLI', description: 'Install latest version of AWS CLI', commands: [ @@ -72,7 +73,7 @@ export class LinuxUbuntuComponents { public static githubCli(scope: Construct, id: string, _architecture: Architecture) { return new ImageBuilderComponent(scope, id, { - platform: 'Linux', + platform: imagebuilder2.Platform.LINUX, displayName: 'GitHub CLI', description: 'Install latest version of gh', commands: [ @@ -87,7 +88,7 @@ export class LinuxUbuntuComponents { public static git(scope: Construct, id: string, _architecture: Architecture) { return new ImageBuilderComponent(scope, id, { - platform: 'Linux', + platform: imagebuilder2.Platform.LINUX, displayName: 'Git', description: 'Install latest version of git', commands: [ @@ -116,7 +117,7 @@ export class LinuxUbuntuComponents { } return new ImageBuilderComponent(scope, id, { - platform: 'Linux', + platform: imagebuilder2.Platform.LINUX, displayName: 'GitHub Actions Runner', description: 'Install latest version of GitHub Actions Runner', commands: [ @@ -132,7 +133,7 @@ export class LinuxUbuntuComponents { public static docker(scope: Construct, id: string, _architecture: Architecture) { return new ImageBuilderComponent(scope, id, { - platform: 'Linux', + platform: imagebuilder2.Platform.LINUX, displayName: 'Docker', description: 'Install latest version of Docker', commands: [ @@ -150,7 +151,7 @@ export class LinuxUbuntuComponents { public static extraCertificates(scope: Construct, id: string, path: string) { return new ImageBuilderComponent(scope, id, { - platform: 'Linux', + platform: imagebuilder2.Platform.LINUX, displayName: 'Extra certificates', description: 'Install self-signed certificates to provide access to GitHub Enterprise Server', commands: [ diff --git a/src/image-builders/aws-image-builder/deprecated/windows-components.ts b/src/image-builders/aws-image-builder/deprecated/windows-components.ts index bf4fd640..479b8553 100644 --- a/src/image-builders/aws-image-builder/deprecated/windows-components.ts +++ b/src/image-builders/aws-image-builder/deprecated/windows-components.ts @@ -1,3 +1,4 @@ +import * as imagebuilder2 from '@aws-cdk/aws-imagebuilder-alpha'; import { aws_s3_assets as s3_assets } from 'aws-cdk-lib'; import { Construct } from 'constructs'; import { Architecture, Os, RunnerVersion } from '../../../providers'; @@ -12,7 +13,7 @@ import { ImageBuilderComponent } from '../builder'; export class WindowsComponents { public static cloudwatchAgent(scope: Construct, id: string) { return new ImageBuilderComponent(scope, id, { - platform: 'Windows', + platform: imagebuilder2.Platform.WINDOWS, displayName: 'CloudWatch agent', description: 'Install latest version of CloudWatch agent for sending logs to CloudWatch', commands: [ @@ -24,7 +25,7 @@ export class WindowsComponents { public static awsCli(scope: Construct, id: string) { return new ImageBuilderComponent(scope, id, { - platform: 'Windows', + platform: imagebuilder2.Platform.WINDOWS, displayName: 'AWS CLI', description: 'Install latest version of AWS CLI', commands: [ @@ -36,7 +37,7 @@ export class WindowsComponents { public static githubCli(scope: Construct, id: string) { return new ImageBuilderComponent(scope, id, { - platform: 'Windows', + platform: imagebuilder2.Platform.WINDOWS, displayName: 'GitHub CLI', description: 'Install latest version of gh', commands: [ @@ -53,7 +54,7 @@ export class WindowsComponents { public static git(scope: Construct, id: string) { return new ImageBuilderComponent(scope, id, { - platform: 'Windows', + platform: imagebuilder2.Platform.WINDOWS, displayName: 'Git', description: 'Install latest version of git', commands: [ @@ -84,7 +85,7 @@ export class WindowsComponents { } return new ImageBuilderComponent(scope, id, { - platform: 'Windows', + platform: imagebuilder2.Platform.WINDOWS, displayName: 'GitHub Actions Runner', description: 'Install latest version of GitHub Actions Runner', commands: runnerCommands.concat([ @@ -98,7 +99,7 @@ export class WindowsComponents { public static docker(scope: Construct, id: string) { return new ImageBuilderComponent(scope, id, { - platform: 'Windows', + platform: imagebuilder2.Platform.WINDOWS, displayName: 'Docker', description: 'Install latest version of Docker', commands: RunnerImageComponent.docker().getCommands(Os.WINDOWS, Architecture.X86_64), @@ -108,7 +109,7 @@ export class WindowsComponents { public static extraCertificates(scope: Construct, id: string, path: string) { return new ImageBuilderComponent(scope, id, { - platform: 'Windows', + platform: imagebuilder2.Platform.WINDOWS, displayName: 'Extra certificates', description: 'Install self-signed certificates to provide access to GitHub Enterprise Server', commands: [ diff --git a/src/image-builders/aws-image-builder/workflow.ts b/src/image-builders/aws-image-builder/workflow.ts index 7fe2b921..af225398 100644 --- a/src/image-builders/aws-image-builder/workflow.ts +++ b/src/image-builders/aws-image-builder/workflow.ts @@ -1,49 +1,6 @@ -import * as cdk from 'aws-cdk-lib'; -import { aws_imagebuilder as imagebuilder } from 'aws-cdk-lib'; +import * as imagebuilder2 from '@aws-cdk/aws-imagebuilder-alpha'; import { Construct } from 'constructs'; -import { uniqueImageBuilderName } from '../common'; -/** - * Properties for Workflow construct. - * - * @internal - */ -export interface WorkflowProperties { - /** - * Workflow type. - */ - readonly type: 'BUILD' | 'TEST' | 'DISTRIBUTION'; - - /** - * YAML or JSON data for the workflow. - */ - readonly data: any; -} - -/** - * Image builder workflow. - * - * @internal - */ -export class Workflow extends cdk.Resource { - public readonly arn: string; - public readonly name: string; - - constructor(scope: Construct, id: string, props: WorkflowProperties) { - super(scope, id); - - this.name = uniqueImageBuilderName(this); - - const workflow = new imagebuilder.CfnWorkflow(this, 'Workflow', { - name: uniqueImageBuilderName(this), - version: '1.0.0', - type: props.type, - data: JSON.stringify(props.data), - }); - - this.arn = workflow.attrArn; - } -} /** * Returns a new build workflow based on arn:aws:imagebuilder:us-east-1:aws:workflow/build/build-container/1.0.1/1. @@ -53,9 +10,9 @@ export class Workflow extends cdk.Resource { * @internal */ export function generateBuildWorkflowWithDockerSetupCommands(scope: Construct, id: string, dockerSetupCommands: string[]) { - return new Workflow(scope, id, { - type: 'BUILD', - data: { + return new imagebuilder2.Workflow(scope, id, { + workflowType: imagebuilder2.WorkflowType.BUILD, + data: imagebuilder2.WorkflowData.fromJsonObject({ name: 'build-container', description: 'Workflow to build a container image', schemaVersion: 1, @@ -112,6 +69,6 @@ export function generateBuildWorkflowWithDockerSetupCommands(scope: Construct, i value: '$.stepOutputs.LaunchBuildInstance.instanceId', }, ], - }, + }), }); } diff --git a/src/image-builders/common.ts b/src/image-builders/common.ts index d6602920..63ff20f0 100644 --- a/src/image-builders/common.ts +++ b/src/image-builders/common.ts @@ -8,6 +8,7 @@ import { Architecture, Os, RunnerAmi, RunnerImage, RunnerVersion } from '../prov /** * @internal + * @deprecated */ export function uniqueImageBuilderName(scope: Construct): string { return cdk.Names.uniqueResourceName(scope, { diff --git a/src/image-builders/components.ts b/src/image-builders/components.ts index 1087feca..6d2cb5a2 100644 --- a/src/image-builders/components.ts +++ b/src/image-builders/components.ts @@ -1,4 +1,5 @@ import * as path from 'path'; +import * as imagebuilder2 from '@aws-cdk/aws-imagebuilder-alpha'; import { aws_s3_assets as s3_assets } from 'aws-cdk-lib'; import { Construct } from 'constructs'; import { ImageBuilderComponent } from './aws-image-builder'; @@ -640,11 +641,11 @@ export abstract class RunnerImageComponent { * @internal */ _asAwsImageBuilderComponent(scope: Construct, id: string, os: Os, architecture: Architecture) { - let platform: 'Linux' | 'Windows'; + let platform: imagebuilder2.Platform; if (os.isIn(Os._ALL_LINUX_UBUNTU_VERSIONS) || os.isIn(Os._ALL_LINUX_AMAZON_VERSIONS)) { - platform = 'Linux'; + platform = imagebuilder2.Platform.LINUX; } else if (os.is(Os.WINDOWS)) { - platform = 'Windows'; + platform = imagebuilder2.Platform.WINDOWS; } else { throw new Error(`Unknown os/architecture combo for image builder component: ${os.name}/${architecture.name}`); } diff --git a/test/default.integ.snapshot/github-runners-test.assets.json b/test/default.integ.snapshot/github-runners-test.assets.json index d59e092e..83216a62 100644 --- a/test/default.integ.snapshot/github-runners-test.assets.json +++ b/test/default.integ.snapshot/github-runners-test.assets.json @@ -1,13 +1,14 @@ { - "version": "36.3.0", + "version": "48.0.0", "files": { "64f83fc47e69ce862669fca14d759c3034fdbed3686b66dcf7bf9ff166f65c68": { + "displayName": "CodeBuild Image Builder/Component 7 Custom-Undefined Asset 0", "source": { "path": "asset.64f83fc47e69ce862669fca14d759c3034fdbed3686b66dcf7bf9ff166f65c68.yml", "packaging": "file" }, "destinations": { - "current_account-current_region": { + "current_account-current_region-ddf90974": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", "objectKey": "64f83fc47e69ce862669fca14d759c3034fdbed3686b66dcf7bf9ff166f65c68.yml", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" @@ -15,12 +16,13 @@ } }, "2c61df9d7754f7f3edb5a4779da56c846513991ec9a4b73bb8a76ab1dfeb45f0": { + "displayName": "build-image-dcc036c8-876b-451e-a2c1-552f9e06e9e1/Code", "source": { "path": "asset.2c61df9d7754f7f3edb5a4779da56c846513991ec9a4b73bb8a76ab1dfeb45f0.lambda", "packaging": "zip" }, "destinations": { - "current_account-current_region": { + "current_account-current_region-022085c0": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", "objectKey": "2c61df9d7754f7f3edb5a4779da56c846513991ec9a4b73bb8a76ab1dfeb45f0.zip", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" @@ -28,12 +30,13 @@ } }, "b97c8701d090be54cf447e094fd55ece7c99b860476949ee5db7ceca6eeb2f6a": { + "displayName": "aws-image-builder-delete-resources-dcc036c8-876b-451e-a2c1-552f9e06e9e1/Code", "source": { "path": "asset.b97c8701d090be54cf447e094fd55ece7c99b860476949ee5db7ceca6eeb2f6a.lambda", "packaging": "zip" }, "destinations": { - "current_account-current_region": { + "current_account-current_region-d6a52ecd": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", "objectKey": "b97c8701d090be54cf447e094fd55ece7c99b860476949ee5db7ceca6eeb2f6a.zip", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" @@ -41,12 +44,13 @@ } }, "88cc171bf3103a3b98ba0006fc7e5c6fdfd338c03591b344bb4cf60f1a9da18c": { + "displayName": "AMI Root Device Reader-dcc036c8-876b-451e-a2c1-552f9e06e9e1/Code", "source": { "path": "asset.88cc171bf3103a3b98ba0006fc7e5c6fdfd338c03591b344bb4cf60f1a9da18c.lambda", "packaging": "zip" }, "destinations": { - "current_account-current_region": { + "current_account-current_region-d9353ac7": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", "objectKey": "88cc171bf3103a3b98ba0006fc7e5c6fdfd338c03591b344bb4cf60f1a9da18c.zip", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" @@ -54,12 +58,13 @@ } }, "2fc3b84da69dcc5adb6dc4721b50c1166474fa7e5fd5f242e833d12ac28e09d9": { + "displayName": "Lambda Image Builder x64/Component 6 Lambda-Entrypoint Asset 0", "source": { "path": "asset.2fc3b84da69dcc5adb6dc4721b50c1166474fa7e5fd5f242e833d12ac28e09d9.sh", "packaging": "file" }, "destinations": { - "current_account-current_region": { + "current_account-current_region-07fa966c": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", "objectKey": "2fc3b84da69dcc5adb6dc4721b50c1166474fa7e5fd5f242e833d12ac28e09d9.sh", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" @@ -67,38 +72,41 @@ } }, "d4d0d96c5b566f0a3ac0a1e539ba4c128b07704ec2678b99ce89af13b422a331": { + "displayName": "Lambda Image Builder x64/Component 6 Lambda-Entrypoint Asset 1", "source": { "path": "asset.d4d0d96c5b566f0a3ac0a1e539ba4c128b07704ec2678b99ce89af13b422a331.sh", "packaging": "file" }, "destinations": { - "current_account-current_region": { + "current_account-current_region-53455d71": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", "objectKey": "d4d0d96c5b566f0a3ac0a1e539ba4c128b07704ec2678b99ce89af13b422a331.sh", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } }, - "97f30e67419a1676a2215492723e5add1aa491caf0cbe2dd878fc4fab0468cd4": { + "bc8ef58951f4c88e641dd23090e9d2e2e61c7530a07960e767522941e959b625": { + "displayName": "AWS679f53fac002430cb0da5b7982bd2287/Code", "source": { - "path": "asset.97f30e67419a1676a2215492723e5add1aa491caf0cbe2dd878fc4fab0468cd4", + "path": "asset.bc8ef58951f4c88e641dd23090e9d2e2e61c7530a07960e767522941e959b625", "packaging": "zip" }, "destinations": { - "current_account-current_region": { + "current_account-current_region-d28f70a5": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "97f30e67419a1676a2215492723e5add1aa491caf0cbe2dd878fc4fab0468cd4.zip", + "objectKey": "bc8ef58951f4c88e641dd23090e9d2e2e61c7530a07960e767522941e959b625.zip", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } }, "aa9b0a3f0625b484074bb9cb369382960e95d5721493cc6f1c6dc46797cd3aea": { + "displayName": "update-lambda-dcc036c8-876b-451e-a2c1-552f9e06e9e1/Code", "source": { "path": "asset.aa9b0a3f0625b484074bb9cb369382960e95d5721493cc6f1c6dc46797cd3aea.lambda", "packaging": "zip" }, "destinations": { - "current_account-current_region": { + "current_account-current_region-01742b58": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", "objectKey": "aa9b0a3f0625b484074bb9cb369382960e95d5721493cc6f1c6dc46797cd3aea.zip", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" @@ -106,12 +114,13 @@ } }, "6323cb15eaaa23e6d34ee9d8047db277fa4a4fbea8edbcade9b9ee3f71d342a8": { + "displayName": "runners/token-retriever/Code", "source": { "path": "asset.6323cb15eaaa23e6d34ee9d8047db277fa4a4fbea8edbcade9b9ee3f71d342a8.lambda", "packaging": "zip" }, "destinations": { - "current_account-current_region": { + "current_account-current_region-7a630fd1": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", "objectKey": "6323cb15eaaa23e6d34ee9d8047db277fa4a4fbea8edbcade9b9ee3f71d342a8.zip", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" @@ -119,12 +128,13 @@ } }, "4c359dec0e0331f05befe2f591f9b883552b5e779b297ec4352a3eba2285cd2a": { + "displayName": "runners/delete-runner/Code", "source": { "path": "asset.4c359dec0e0331f05befe2f591f9b883552b5e779b297ec4352a3eba2285cd2a.lambda", "packaging": "zip" }, "destinations": { - "current_account-current_region": { + "current_account-current_region-348111e6": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", "objectKey": "4c359dec0e0331f05befe2f591f9b883552b5e779b297ec4352a3eba2285cd2a.zip", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" @@ -132,12 +142,13 @@ } }, "23e6c88079a4fbc4037b4d849374e28a724f595c6d728c12ce844ab9d2724252": { + "displayName": "runners/Idle Reaper/Code", "source": { "path": "asset.23e6c88079a4fbc4037b4d849374e28a724f595c6d728c12ce844ab9d2724252.lambda", "packaging": "zip" }, "destinations": { - "current_account-current_region": { + "current_account-current_region-b28658b6": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", "objectKey": "23e6c88079a4fbc4037b4d849374e28a724f595c6d728c12ce844ab9d2724252.zip", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" @@ -145,12 +156,13 @@ } }, "f128cf206ce33204478543b36fe4533f8b571de71fc1757329a2abe9b9746f95": { + "displayName": "runners/Webhook Handler/webhook-handler/Code", "source": { "path": "asset.f128cf206ce33204478543b36fe4533f8b571de71fc1757329a2abe9b9746f95.lambda", "packaging": "zip" }, "destinations": { - "current_account-current_region": { + "current_account-current_region-bfee49ac": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", "objectKey": "f128cf206ce33204478543b36fe4533f8b571de71fc1757329a2abe9b9746f95.zip", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" @@ -158,12 +170,13 @@ } }, "672d18f042a2870677d5cf37252b151d5bb9e7563033c6b0f58d7c450df0073d": { + "displayName": "runners/Webhook Redelivery/Lambda/Code", "source": { "path": "asset.672d18f042a2870677d5cf37252b151d5bb9e7563033c6b0f58d7c450df0073d.lambda", "packaging": "zip" }, "destinations": { - "current_account-current_region": { + "current_account-current_region-98168c5c": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", "objectKey": "672d18f042a2870677d5cf37252b151d5bb9e7563033c6b0f58d7c450df0073d.zip", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" @@ -171,12 +184,13 @@ } }, "3a5ed6524013a1c94760dad265222d3b9bdfdc087283c4aaf3d6a6e5d82124a9": { + "displayName": "runners/setup/Code", "source": { "path": "asset.3a5ed6524013a1c94760dad265222d3b9bdfdc087283c4aaf3d6a6e5d82124a9.lambda", "packaging": "zip" }, "destinations": { - "current_account-current_region": { + "current_account-current_region-a18235fc": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", "objectKey": "3a5ed6524013a1c94760dad265222d3b9bdfdc087283c4aaf3d6a6e5d82124a9.zip", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" @@ -184,12 +198,13 @@ } }, "7c02b208b40e73533f7a72004156f6c34d5c223ef4afae0e099168bd88422397": { + "displayName": "runners/status/Code", "source": { "path": "asset.7c02b208b40e73533f7a72004156f6c34d5c223ef4afae0e099168bd88422397.lambda", "packaging": "zip" }, "destinations": { - "current_account-current_region": { + "current_account-current_region-05b6aec9": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", "objectKey": "7c02b208b40e73533f7a72004156f6c34d5c223ef4afae0e099168bd88422397.zip", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" @@ -197,27 +212,29 @@ } }, "f07c60cc451d4f0c652f687a1c8cd6cf21a2a8f6cd7ab6807e6ee06606ea4122": { + "displayName": "runners/Image Builder Builds Filter/Code", "source": { "path": "asset.f07c60cc451d4f0c652f687a1c8cd6cf21a2a8f6cd7ab6807e6ee06606ea4122.lambda", "packaging": "zip" }, "destinations": { - "current_account-current_region": { + "current_account-current_region-017eb7bb": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", "objectKey": "f07c60cc451d4f0c652f687a1c8cd6cf21a2a8f6cd7ab6807e6ee06606ea4122.zip", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } }, - "4171d1c2bdf41dbdc37ff18bdd2e208a5000932b7412f8408de8565c01e53179": { + "98c4538c3e00cc6a05b91c145314afd373f7c1f8c4a1c5f45653c41154a85291": { + "displayName": "github-runners-test Template", "source": { "path": "github-runners-test.template.json", "packaging": "file" }, "destinations": { - "current_account-current_region": { + "current_account-current_region-cadfab7c": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "4171d1c2bdf41dbdc37ff18bdd2e208a5000932b7412f8408de8565c01e53179.json", + "objectKey": "98c4538c3e00cc6a05b91c145314afd373f7c1f8c4a1c5f45653c41154a85291.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/test/default.integ.snapshot/github-runners-test.template.json b/test/default.integ.snapshot/github-runners-test.template.json index d20222a2..8fce1d13 100644 --- a/test/default.integ.snapshot/github-runners-test.template.json +++ b/test/default.integ.snapshot/github-runners-test.template.json @@ -1982,7 +1982,7 @@ "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, - "WindowsImageBuilderDockerDistributionCDE69DC2": { + "WindowsImageBuilderDockerDistributionE6B7F2F2": { "Type": "AWS::ImageBuilder::DistributionConfiguration", "Properties": { "Distributions": [ @@ -1992,10 +1992,10 @@ "latest" ], "TargetRepository": { - "Service": "ECR", "RepositoryName": { "Ref": "WindowsImageBuilderRepositoryA4CBB6D8" - } + }, + "Service": "ECR" } }, "Region": { @@ -2003,112 +2003,112 @@ } } ], - "Name": "github-runners-test-WindowsImageBuilder-18C0E1B2", + "Name": "github-runners-test-windowsimagebuilder-dockerdistribution-8c41c0cd", "Tags": { "GitHubRunners:Builder": "github-runners-test/Windows Image Builder", "GitHubRunners:Stack": "github-runners-test" } } }, - "WindowsImageBuilderComponent0RequiredPackagesComponent490D1D26": { + "WindowsImageBuilderComponent0RequiredPackagesComponentD2E668F3": { "Type": "AWS::ImageBuilder::Component", "Properties": { - "Data": "{\"name\":\"Component 0 RequiredPackages\",\"schemaVersion\":\"1.0\",\"phases\":[{\"name\":\"build\",\"steps\":[{\"name\":\"Download\",\"action\":\"S3Download\",\"inputs\":[]}]}]}", + "Data": "name: Component 0 RequiredPackages\nschemaVersion: \"1.0\"\nphases:\n - name: build\n steps:\n - name: Download\n action: S3Download\n inputs: []\n", "Description": "Component 0 RequiredPackages", - "Name": "github-runners-test-WindowsImageBuilder-Component0RequiredPackages-1A3E0E7C", + "Name": "github-runners-test-windowsimagebuilder-component0requiredpackages-component-963beb47", "Platform": "Windows", "Version": "1.0.0" } }, - "WindowsImageBuilderComponent1RunnerUserComponentCB0163EE": { + "WindowsImageBuilderComponent1RunnerUserComponent0F4D4032": { "Type": "AWS::ImageBuilder::Component", "Properties": { - "Data": "{\"name\":\"Component 1 RunnerUser\",\"schemaVersion\":\"1.0\",\"phases\":[{\"name\":\"build\",\"steps\":[{\"name\":\"Download\",\"action\":\"S3Download\",\"inputs\":[]}]}]}", + "Data": "name: Component 1 RunnerUser\nschemaVersion: \"1.0\"\nphases:\n - name: build\n steps:\n - name: Download\n action: S3Download\n inputs: []\n", "Description": "Component 1 RunnerUser", - "Name": "github-runners-test-WindowsImageBuilder-Component1RunnerUser-F040C0BA", + "Name": "github-runners-test-windowsimagebuilder-component1runneruser-component-c4a9efb2", "Platform": "Windows", "Version": "1.0.0" } }, - "WindowsImageBuilderComponent2GitComponentD5E90F74": { + "WindowsImageBuilderComponent2GitComponent92ACFEF5": { "Type": "AWS::ImageBuilder::Component", "Properties": { - "Data": "{\"name\":\"Component 2 Git\",\"schemaVersion\":\"1.0\",\"phases\":[{\"name\":\"build\",\"steps\":[{\"name\":\"Download\",\"action\":\"S3Download\",\"inputs\":[]},{\"name\":\"Run\",\"action\":\"ExecutePowerShell\",\"inputs\":{\"commands\":[\"$ErrorActionPreference = 'Stop'\",\"$ProgressPreference = 'SilentlyContinue'\",\"Set-PSDebug -Trace 1\",\"cmd /c curl -w \\\"%{redirect_url}\\\" -fsS https://github.com/git-for-windows/git/releases/latest > $Env:TEMP\\\\latest-git\",\"$LatestUrl = Get-Content $Env:TEMP\\\\latest-git\",\"$GIT_VERSION = ($LatestUrl -Split '/')[-1].substring(1)\",\"$GIT_VERSION_SHORT = ($GIT_VERSION -Split '.windows.')[0]\",\"$GIT_REVISION = ($GIT_VERSION -Split '.windows.')[1]\",\"If ($GIT_REVISION -gt 1) {$GIT_VERSION_SHORT = \\\"$GIT_VERSION_SHORT.$GIT_REVISION\\\"}\",\"Invoke-WebRequest -UseBasicParsing -Uri https://github.com/git-for-windows/git/releases/download/v${GIT_VERSION}/Git-${GIT_VERSION_SHORT}-64-bit.exe -OutFile git-setup.exe\",\"$p = Start-Process git-setup.exe -PassThru -Wait -ArgumentList '/VERYSILENT'\",\"if ($p.ExitCode -ne 0) { throw \\\"Exit code is $p.ExitCode\\\" }\",\"del git-setup.exe\"]}}]}]}", + "Data": "name: Component 2 Git\nschemaVersion: \"1.0\"\nphases:\n - name: build\n steps:\n - name: Download\n action: S3Download\n inputs: []\n - name: Run\n action: ExecutePowerShell\n inputs:\n commands:\n - $ErrorActionPreference = 'Stop'\n - $ProgressPreference = 'SilentlyContinue'\n - Set-PSDebug -Trace 1\n - cmd /c curl -w \"%{redirect_url}\" -fsS\n https://github.com/git-for-windows/git/releases/latest >\n $Env:TEMP\\latest-git\n - $LatestUrl = Get-Content $Env:TEMP\\latest-git\n - $GIT_VERSION = ($LatestUrl -Split '/')[-1].substring(1)\n - $GIT_VERSION_SHORT = ($GIT_VERSION -Split '.windows.')[0]\n - $GIT_REVISION = ($GIT_VERSION -Split '.windows.')[1]\n - If ($GIT_REVISION -gt 1) {$GIT_VERSION_SHORT =\n \"$GIT_VERSION_SHORT.$GIT_REVISION\"}\n - Invoke-WebRequest -UseBasicParsing -Uri\n https://github.com/git-for-windows/git/releases/download/v${GIT_VERSION}/Git-${GIT_VERSION_SHORT}-64-bit.exe\n -OutFile git-setup.exe\n - $p = Start-Process git-setup.exe -PassThru -Wait -ArgumentList\n '/VERYSILENT'\n - if ($p.ExitCode -ne 0) { throw \"Exit code is $p.ExitCode\" }\n - del git-setup.exe\n", "Description": "Component 2 Git", - "Name": "github-runners-test-WindowsImageBuilder-Component2Git-316DB12E", + "Name": "github-runners-test-windowsimagebuilder-component2git-component-f09bbd59", "Platform": "Windows", "Version": "1.0.0" } }, - "WindowsImageBuilderComponent3GithubCliComponent3D6C7BCE": { + "WindowsImageBuilderComponent3GithubCliComponentF18685D5": { "Type": "AWS::ImageBuilder::Component", "Properties": { - "Data": "{\"name\":\"Component 3 GithubCli\",\"schemaVersion\":\"1.0\",\"phases\":[{\"name\":\"build\",\"steps\":[{\"name\":\"Download\",\"action\":\"S3Download\",\"inputs\":[]},{\"name\":\"Run\",\"action\":\"ExecutePowerShell\",\"inputs\":{\"commands\":[\"$ErrorActionPreference = 'Stop'\",\"$ProgressPreference = 'SilentlyContinue'\",\"Set-PSDebug -Trace 1\",\"cmd /c curl -w \\\"%{redirect_url}\\\" -fsS https://github.com/cli/cli/releases/latest > $Env:TEMP\\\\latest-gh\",\"$LatestUrl = Get-Content $Env:TEMP\\\\latest-gh\",\"$GH_VERSION = ($LatestUrl -Split '/')[-1].substring(1)\",\"Invoke-WebRequest -UseBasicParsing -Uri \\\"https://github.com/cli/cli/releases/download/v${GH_VERSION}/gh_${GH_VERSION}_windows_amd64.msi\\\" -OutFile gh.msi\",\"$p = Start-Process msiexec.exe -PassThru -Wait -ArgumentList '/i gh.msi /qn'\",\"if ($p.ExitCode -ne 0) { throw \\\"Exit code is $p.ExitCode\\\" }\",\"del gh.msi\"]}}]}]}", + "Data": "name: Component 3 GithubCli\nschemaVersion: \"1.0\"\nphases:\n - name: build\n steps:\n - name: Download\n action: S3Download\n inputs: []\n - name: Run\n action: ExecutePowerShell\n inputs:\n commands:\n - $ErrorActionPreference = 'Stop'\n - $ProgressPreference = 'SilentlyContinue'\n - Set-PSDebug -Trace 1\n - cmd /c curl -w \"%{redirect_url}\" -fsS\n https://github.com/cli/cli/releases/latest > $Env:TEMP\\latest-gh\n - $LatestUrl = Get-Content $Env:TEMP\\latest-gh\n - $GH_VERSION = ($LatestUrl -Split '/')[-1].substring(1)\n - Invoke-WebRequest -UseBasicParsing -Uri\n \"https://github.com/cli/cli/releases/download/v${GH_VERSION}/gh_${GH_VERSION}_windows_amd64.msi\"\n -OutFile gh.msi\n - $p = Start-Process msiexec.exe -PassThru -Wait -ArgumentList '/i\n gh.msi /qn'\n - if ($p.ExitCode -ne 0) { throw \"Exit code is $p.ExitCode\" }\n - del gh.msi\n", "Description": "Component 3 GithubCli", - "Name": "github-runners-test-WindowsImageBuilder-Component3GithubCli-8D855BAC", + "Name": "github-runners-test-windowsimagebuilder-component3githubcli-component-a0ec305e", "Platform": "Windows", "Version": "1.0.0" } }, - "WindowsImageBuilderComponent4AwsCliComponentE42A66BF": { + "WindowsImageBuilderComponent4AwsCliComponent6654838D": { "Type": "AWS::ImageBuilder::Component", "Properties": { - "Data": "{\"name\":\"Component 4 AwsCli\",\"schemaVersion\":\"1.0\",\"phases\":[{\"name\":\"build\",\"steps\":[{\"name\":\"Download\",\"action\":\"S3Download\",\"inputs\":[]},{\"name\":\"Run\",\"action\":\"ExecutePowerShell\",\"inputs\":{\"commands\":[\"$ErrorActionPreference = 'Stop'\",\"$ProgressPreference = 'SilentlyContinue'\",\"Set-PSDebug -Trace 1\",\"$p = Start-Process msiexec.exe -PassThru -Wait -ArgumentList '/i https://awscli.amazonaws.com/AWSCLIV2.msi /qn'\",\"if ($p.ExitCode -ne 0) { throw \\\"Exit code is $p.ExitCode\\\" }\"]}}]}]}", + "Data": "name: Component 4 AwsCli\nschemaVersion: \"1.0\"\nphases:\n - name: build\n steps:\n - name: Download\n action: S3Download\n inputs: []\n - name: Run\n action: ExecutePowerShell\n inputs:\n commands:\n - $ErrorActionPreference = 'Stop'\n - $ProgressPreference = 'SilentlyContinue'\n - Set-PSDebug -Trace 1\n - $p = Start-Process msiexec.exe -PassThru -Wait -ArgumentList '/i\n https://awscli.amazonaws.com/AWSCLIV2.msi /qn'\n - if ($p.ExitCode -ne 0) { throw \"Exit code is $p.ExitCode\" }\n", "Description": "Component 4 AwsCli", - "Name": "github-runners-test-WindowsImageBuilder-Component4AwsCli-1B2DBBE1", + "Name": "github-runners-test-windowsimagebuilder-component4awscli-component-c1cc638a", "Platform": "Windows", "Version": "1.0.0" } }, - "WindowsImageBuilderComponent5GithubRunnerComponent34C12ED4": { + "WindowsImageBuilderComponent5GithubRunnerComponentD618D2D1": { "Type": "AWS::ImageBuilder::Component", "Properties": { - "Data": "{\"name\":\"Component 5 GithubRunner\",\"schemaVersion\":\"1.0\",\"phases\":[{\"name\":\"build\",\"steps\":[{\"name\":\"Download\",\"action\":\"S3Download\",\"inputs\":[]},{\"name\":\"Run\",\"action\":\"ExecutePowerShell\",\"inputs\":{\"commands\":[\"$ErrorActionPreference = 'Stop'\",\"$ProgressPreference = 'SilentlyContinue'\",\"Set-PSDebug -Trace 1\",\"cmd /c curl -w \\\"%{redirect_url}\\\" -fsS https://github.com/actions/runner/releases/latest > $Env:TEMP\\\\latest-gha\",\"$LatestUrl = Get-Content $Env:TEMP\\\\latest-gha\",\"$RUNNER_VERSION = ($LatestUrl -Split '/')[-1].substring(1)\",\"mkdir C:\\\\hostedtoolcache\\\\windows\",\"mkdir C:\\\\tools\",\"cmd /c curl -w \\\"%{redirect_url}\\\" -fsS https://github.com/facebook/zstd/releases/latest > $Env:TEMP\\\\latest-zstd\",\"$LatestUrl = Get-Content $Env:TEMP\\\\latest-zstd\",\"$ZSTD_VERSION = ($LatestUrl -Split '/')[-1].substring(1)\",\"Invoke-WebRequest -UseBasicParsing -Uri \\\"https://github.com/facebook/zstd/releases/download/v$ZSTD_VERSION/zstd-v$ZSTD_VERSION-win64.zip\\\" -OutFile zstd.zip\",\"Expand-Archive zstd.zip -DestinationPath C:\\\\tools\",\"Move-Item -Path C:\\\\tools\\\\zstd-v$ZSTD_VERSION-win64\\\\zstd.exe C:\\\\tools\",\"Remove-Item -LiteralPath \\\"C:\\\\tools\\\\zstd-v$ZSTD_VERSION-win64\\\" -Force -Recurse\",\"del zstd.zip\",\"$persistedPaths = [Environment]::GetEnvironmentVariable('Path', [EnvironmentVariableTarget]::Machine)\",\"[Environment]::SetEnvironmentVariable(\\\"PATH\\\", $persistedPaths + \\\";C:\\\\tools\\\", [EnvironmentVariableTarget]::Machine)\",\"Invoke-WebRequest -UseBasicParsing -Uri \\\"https://github.com/actions/runner/releases/download/v${RUNNER_VERSION}/actions-runner-win-x64-${RUNNER_VERSION}.zip\\\" -OutFile actions.zip\",\"Expand-Archive actions.zip -DestinationPath C:\\\\actions\",\"del actions.zip\",\"echo latest | Out-File -Encoding ASCII -NoNewline C:\\\\actions\\\\RUNNER_VERSION\"]}}]}]}", + "Data": "name: Component 5 GithubRunner\nschemaVersion: \"1.0\"\nphases:\n - name: build\n steps:\n - name: Download\n action: S3Download\n inputs: []\n - name: Run\n action: ExecutePowerShell\n inputs:\n commands:\n - $ErrorActionPreference = 'Stop'\n - $ProgressPreference = 'SilentlyContinue'\n - Set-PSDebug -Trace 1\n - cmd /c curl -w \"%{redirect_url}\" -fsS\n https://github.com/actions/runner/releases/latest >\n $Env:TEMP\\latest-gha\n - $LatestUrl = Get-Content $Env:TEMP\\latest-gha\n - $RUNNER_VERSION = ($LatestUrl -Split '/')[-1].substring(1)\n - mkdir C:\\hostedtoolcache\\windows\n - mkdir C:\\tools\n - cmd /c curl -w \"%{redirect_url}\" -fsS\n https://github.com/facebook/zstd/releases/latest >\n $Env:TEMP\\latest-zstd\n - $LatestUrl = Get-Content $Env:TEMP\\latest-zstd\n - $ZSTD_VERSION = ($LatestUrl -Split '/')[-1].substring(1)\n - Invoke-WebRequest -UseBasicParsing -Uri\n \"https://github.com/facebook/zstd/releases/download/v$ZSTD_VERSION/zstd-v$ZSTD_VERSION-win64.zip\"\n -OutFile zstd.zip\n - Expand-Archive zstd.zip -DestinationPath C:\\tools\n - Move-Item -Path C:\\tools\\zstd-v$ZSTD_VERSION-win64\\zstd.exe\n C:\\tools\n - Remove-Item -LiteralPath \"C:\\tools\\zstd-v$ZSTD_VERSION-win64\"\n -Force -Recurse\n - del zstd.zip\n - $persistedPaths = [Environment]::GetEnvironmentVariable('Path',\n [EnvironmentVariableTarget]::Machine)\n - '[Environment]::SetEnvironmentVariable(\"PATH\", $persistedPaths +\n \";C:\\tools\", [EnvironmentVariableTarget]::Machine)'\n - Invoke-WebRequest -UseBasicParsing -Uri\n \"https://github.com/actions/runner/releases/download/v${RUNNER_VERSION}/actions-runner-win-x64-${RUNNER_VERSION}.zip\"\n -OutFile actions.zip\n - Expand-Archive actions.zip -DestinationPath C:\\actions\n - del actions.zip\n - echo latest | Out-File -Encoding ASCII -NoNewline\n C:\\actions\\RUNNER_VERSION\n", "Description": "Component 5 GithubRunner", - "Name": "github-runners-test-WindowsImageBuilder-Component5GithubRunner-7AC775C5", + "Name": "github-runners-test-windowsimagebuilder-component5githubrunner-component-c7c81d8e", "Platform": "Windows", "Version": "1.0.0" } }, - "WindowsImageBuilderComponent6CustomUndefinedComponentC1AEB345": { + "WindowsImageBuilderComponent6CustomUndefinedComponent5A5D8BCD": { "Type": "AWS::ImageBuilder::Component", "Properties": { "Data": { "Fn::Join": [ "", [ - "{\"name\":\"Component 6 Custom-Undefined\",\"schemaVersion\":\"1.0\",\"phases\":[{\"name\":\"build\",\"steps\":[{\"name\":\"Download\",\"action\":\"S3Download\",\"inputs\":[{\"source\":\"", + "name: Component 6 Custom-Undefined\nschemaVersion: \"1.0\"\nphases:\n - name: build\n steps:\n - name: Download\n action: S3Download\n inputs:\n - source: ", { "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/64f83fc47e69ce862669fca14d759c3034fdbed3686b66dcf7bf9ff166f65c68.yml" }, - "\",\"destination\":\"FUNDING.yml\"}]},{\"name\":\"Run\",\"action\":\"ExecutePowerShell\",\"inputs\":{\"commands\":[\"$ErrorActionPreference = 'Stop'\",\"$ProgressPreference = 'SilentlyContinue'\",\"Set-PSDebug -Trace 1\",\"New-Item -ItemType file -Path / -Name custom-file\",\"New-Item -ItemType directory -Path / -Name custom-dir\",\"Move-Item FUNDING.yml /custom-dir\"]}}]}]}" + "\n destination: FUNDING.yml\n - name: Run\n action: ExecutePowerShell\n inputs:\n commands:\n - $ErrorActionPreference = 'Stop'\n - $ProgressPreference = 'SilentlyContinue'\n - Set-PSDebug -Trace 1\n - New-Item -ItemType file -Path / -Name custom-file\n - New-Item -ItemType directory -Path / -Name custom-dir\n - Move-Item FUNDING.yml /custom-dir\n" ] ] }, "Description": "Component 6 Custom-Undefined", - "Name": "github-runners-test-WindowsImageBuilder-Component6Custom-Undefined-0A739BAE", + "Name": "github-runners-test-windowsimagebuilder-component6custom-undefined-component-955efea2", "Platform": "Windows", "Version": "1.0.0" } }, - "WindowsImageBuilderComponent7EnvironmentVariablesComponentE150D95A": { + "WindowsImageBuilderComponent7EnvironmentVariablesComponent9A931F09": { "Type": "AWS::ImageBuilder::Component", "Properties": { - "Data": "{\"name\":\"Component 7 EnvironmentVariables\",\"schemaVersion\":\"1.0\",\"phases\":[{\"name\":\"build\",\"steps\":[{\"name\":\"Download\",\"action\":\"S3Download\",\"inputs\":[]},{\"name\":\"Run\",\"action\":\"ExecutePowerShell\",\"inputs\":{\"commands\":[\"$ErrorActionPreference = 'Stop'\",\"$ProgressPreference = 'SilentlyContinue'\",\"Set-PSDebug -Trace 1\",\"Add-Content -Path C:\\\\actions\\\\.env -Value 'HELLO=world'\",\"Add-Content -Path C:\\\\actions\\\\.env -Value 'FOO=bar'\"]}}]}]}", + "Data": "name: Component 7 EnvironmentVariables\nschemaVersion: \"1.0\"\nphases:\n - name: build\n steps:\n - name: Download\n action: S3Download\n inputs: []\n - name: Run\n action: ExecutePowerShell\n inputs:\n commands:\n - $ErrorActionPreference = 'Stop'\n - $ProgressPreference = 'SilentlyContinue'\n - Set-PSDebug -Trace 1\n - Add-Content -Path C:\\actions\\.env -Value 'HELLO=world'\n - Add-Content -Path C:\\actions\\.env -Value 'FOO=bar'\n", "Description": "Component 7 EnvironmentVariables", - "Name": "github-runners-test-WindowsImageBuilder-Component7EnvironmentVariables-40E688D7", + "Name": "github-runners-test-windowsimagebuilder-component7environmentvariables-component-f73418d2", "Platform": "Windows", "Version": "1.0.0" } }, - "WindowsImageBuilderContainerRecipeB2A421D7": { + "WindowsImageBuilderRecipeB7F00629": { "Type": "AWS::ImageBuilder::ContainerRecipe", "Properties": { "Components": [ { "ComponentArn": { "Fn::GetAtt": [ - "WindowsImageBuilderComponent0RequiredPackagesComponent490D1D26", + "WindowsImageBuilderComponent0RequiredPackagesComponentD2E668F3", "Arn" ] } @@ -2116,7 +2116,7 @@ { "ComponentArn": { "Fn::GetAtt": [ - "WindowsImageBuilderComponent1RunnerUserComponentCB0163EE", + "WindowsImageBuilderComponent1RunnerUserComponent0F4D4032", "Arn" ] } @@ -2124,7 +2124,7 @@ { "ComponentArn": { "Fn::GetAtt": [ - "WindowsImageBuilderComponent2GitComponentD5E90F74", + "WindowsImageBuilderComponent2GitComponent92ACFEF5", "Arn" ] } @@ -2132,7 +2132,7 @@ { "ComponentArn": { "Fn::GetAtt": [ - "WindowsImageBuilderComponent3GithubCliComponent3D6C7BCE", + "WindowsImageBuilderComponent3GithubCliComponentF18685D5", "Arn" ] } @@ -2140,7 +2140,7 @@ { "ComponentArn": { "Fn::GetAtt": [ - "WindowsImageBuilderComponent4AwsCliComponentE42A66BF", + "WindowsImageBuilderComponent4AwsCliComponent6654838D", "Arn" ] } @@ -2148,7 +2148,7 @@ { "ComponentArn": { "Fn::GetAtt": [ - "WindowsImageBuilderComponent5GithubRunnerComponent34C12ED4", + "WindowsImageBuilderComponent5GithubRunnerComponentD618D2D1", "Arn" ] } @@ -2156,7 +2156,7 @@ { "ComponentArn": { "Fn::GetAtt": [ - "WindowsImageBuilderComponent6CustomUndefinedComponentC1AEB345", + "WindowsImageBuilderComponent6CustomUndefinedComponent5A5D8BCD", "Arn" ] } @@ -2164,7 +2164,7 @@ { "ComponentArn": { "Fn::GetAtt": [ - "WindowsImageBuilderComponent7EnvironmentVariablesComponentE150D95A", + "WindowsImageBuilderComponent7EnvironmentVariablesComponent9A931F09", "Arn" ] } @@ -2172,7 +2172,7 @@ ], "ContainerType": "DOCKER", "DockerfileTemplateData": "FROM {{{ imagebuilder:parentImage }}}\n{{{ imagebuilder:environments }}}\n{{{ imagebuilder:components }}}\nENV RUNNER_VERSION=latest\n", - "Name": "github-runners-test-WindowsImageBuilder-ContainerRecipe-C577A80B", + "Name": "github-runners-test-windowsimagebuilder-recipe-f7042c5a", "ParentImage": "mcr.microsoft.com/windows/servercore:ltsc2019-amd64", "Tags": { "GitHubRunners:Builder": "github-runners-test/Windows Image Builder", @@ -2190,13 +2190,26 @@ "WindowsImageBuilderDockerLogE660E23E": { "Type": "AWS::Logs::LogGroup", "Properties": { - "LogGroupName": "/aws/imagebuilder/github-runners-test-WindowsImageBuilder-ContainerRecipe-C577A80B", + "LogGroupName": { + "Fn::Join": [ + "", + [ + "/aws/imagebuilder/", + { + "Fn::GetAtt": [ + "WindowsImageBuilderRecipeB7F00629", + "Name" + ] + } + ] + ] + }, "RetentionInDays": 30 }, "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, - "WindowsImageBuilderInstanceProfileBFCCEC08": { + "WindowsImageBuilderInfrastructureInstanceProfile253C95CE": { "Type": "AWS::IAM::InstanceProfile", "Properties": { "Roles": [ @@ -2206,7 +2219,7 @@ ] } }, - "WindowsImageBuilderInfrastructureFF99A30B": { + "WindowsImageBuilderInfrastructure14D24F2C": { "Type": "AWS::ImageBuilder::InfrastructureConfiguration", "Properties": { "InstanceMetadataOptions": { @@ -2214,12 +2227,12 @@ "HttpTokens": "required" }, "InstanceProfileName": { - "Ref": "WindowsImageBuilderInstanceProfileBFCCEC08" + "Ref": "WindowsImageBuilderInfrastructureInstanceProfile253C95CE" }, "InstanceTypes": [ "m6i.large" ], - "Name": "github-runners-test-WindowsImageBuilder-18C0E1B2", + "Name": "github-runners-test-windowsimagebuilder-infrastructure-17f3ac1c", "SecurityGroupIds": [ { "Fn::GetAtt": [ @@ -2236,18 +2249,18 @@ } } }, - "WindowsImageBuilderDockerImage8672CA3E": { + "WindowsImageBuilderDockerImage7F3526EA": { "Type": "AWS::ImageBuilder::Image", "Properties": { "ContainerRecipeArn": { "Fn::GetAtt": [ - "WindowsImageBuilderContainerRecipeB2A421D7", + "WindowsImageBuilderRecipeB7F00629", "Arn" ] }, "DistributionConfigurationArn": { "Fn::GetAtt": [ - "WindowsImageBuilderDockerDistributionCDE69DC2", + "WindowsImageBuilderDockerDistributionE6B7F2F2", "Arn" ] }, @@ -2256,7 +2269,7 @@ }, "InfrastructureConfigurationArn": { "Fn::GetAtt": [ - "WindowsImageBuilderInfrastructureFF99A30B", + "WindowsImageBuilderInfrastructure14D24F2C", "Arn" ] }, @@ -2267,7 +2280,8 @@ }, "DependsOn": [ "WindowsImageBuilderDockerLogE660E23E", - "WindowsImageBuilderInfrastructureFF99A30B" + "WindowsImageBuilderInfrastructureInstanceProfile253C95CE", + "WindowsImageBuilderInfrastructure14D24F2C" ], "UpdateReplacePolicy": "Retain", "DeletionPolicy": "RetainExceptOnCreate" @@ -2297,10 +2311,17 @@ { "Ref": "AWS::AccountId" }, - ":image/github-runners-test-windowsimagebuilder-containerrecipe-c577a80b/", + ":image/", { "Fn::GetAtt": [ - "WindowsImageBuilderContainerRecipeB2A421D7", + "WindowsImageBuilderRecipeB7F00629", + "Name" + ] + }, + "/", + { + "Fn::GetAtt": [ + "WindowsImageBuilderRecipeB7F00629", "Version" ] } @@ -2367,7 +2388,7 @@ ] } }, - "WindowsImageBuilderLifecyclePolicyDockerB9CE4B0A": { + "WindowsImageBuilderLifecyclePolicyDockerA66ED7F5": { "Type": "AWS::ImageBuilder::LifecyclePolicy", "Properties": { "Description": "Delete old GitHub Runner Docker images for github-runners-test/Windows Image Builder", @@ -2377,7 +2398,7 @@ "Arn" ] }, - "Name": "github-runners-test-WindowsImageBuilder-18C0E1B2", + "Name": "github-runners-test-windowsimagebuilder-lifecyclepolicydocker-9b0d4781", "PolicyDetails": [ { "Action": { @@ -2395,10 +2416,15 @@ "ResourceSelection": { "Recipes": [ { - "Name": "github-runners-test-WindowsImageBuilder-ContainerRecipe-C577A80B", + "Name": { + "Fn::GetAtt": [ + "WindowsImageBuilderRecipeB7F00629", + "Name" + ] + }, "SemanticVersion": { "Fn::GetAtt": [ - "WindowsImageBuilderContainerRecipeB2A421D7", + "WindowsImageBuilderRecipeB7F00629", "Version" ] } @@ -2408,18 +2434,18 @@ "ResourceType": "CONTAINER_IMAGE" } }, - "WindowsImageBuilderDockerPipeline3613721A": { + "WindowsImageBuilderDockerPipeline28661C47": { "Type": "AWS::ImageBuilder::ImagePipeline", "Properties": { "ContainerRecipeArn": { "Fn::GetAtt": [ - "WindowsImageBuilderContainerRecipeB2A421D7", + "WindowsImageBuilderRecipeB7F00629", "Arn" ] }, "DistributionConfigurationArn": { "Fn::GetAtt": [ - "WindowsImageBuilderDockerDistributionCDE69DC2", + "WindowsImageBuilderDockerDistributionE6B7F2F2", "Arn" ] }, @@ -2428,11 +2454,11 @@ }, "InfrastructureConfigurationArn": { "Fn::GetAtt": [ - "WindowsImageBuilderInfrastructureFF99A30B", + "WindowsImageBuilderInfrastructure14D24F2C", "Arn" ] }, - "Name": "github-runners-test-WindowsImageBuilder-18C0E1B2", + "Name": "github-runners-test-windowsimagebuilder-dockerpipeline-5343f5e8", "Schedule": { "PipelineExecutionStartCondition": "EXPRESSION_MATCH_ONLY", "ScheduleExpression": "rate(7 days)" @@ -2444,7 +2470,8 @@ }, "DependsOn": [ "WindowsImageBuilderDockerLogE660E23E", - "WindowsImageBuilderInfrastructureFF99A30B" + "WindowsImageBuilderInfrastructureInstanceProfile253C95CE", + "WindowsImageBuilderInfrastructure14D24F2C" ] }, "AMILinuxBuilderSGEDC86329": { @@ -2604,13 +2631,12 @@ ] } }, - "AMILinuxBuilderAMIDistribution46435AF5": { + "AMILinuxBuilderAMIDistribution215F3A5C": { "Type": "AWS::ImageBuilder::DistributionConfiguration", "Properties": { "Distributions": [ { "AmiDistributionConfiguration": { - "Name": "github-runners-test-AMILinuxBuilder-67243E6D-{{ imagebuilder:buildDate }}", "AmiTags": { "Name": "AMI Linux Builder", "GitHubRunners:Stack": "github-runners-test", @@ -2630,120 +2656,120 @@ } } ], - "Name": "github-runners-test-AMILinuxBuilder-67243E6D", + "Name": "github-runners-test-amilinuxbuilder-amidistribution-f27cc043", "Tags": { "GitHubRunners:Builder": "github-runners-test/AMI Linux Builder", "GitHubRunners:Stack": "github-runners-test" } } }, - "AMILinuxBuilderComponent0RequiredPackagesComponent6D0029EE": { + "AMILinuxBuilderComponent0RequiredPackagesComponent74077CC6": { "Type": "AWS::ImageBuilder::Component", "Properties": { - "Data": "{\"name\":\"Component 0 RequiredPackages\",\"schemaVersion\":\"1.0\",\"phases\":[{\"name\":\"build\",\"steps\":[{\"name\":\"Download\",\"action\":\"S3Download\",\"inputs\":[]},{\"name\":\"Run\",\"action\":\"ExecuteBash\",\"inputs\":{\"commands\":[\"set -ex\",\"apt-get update\",\"DEBIAN_FRONTEND=noninteractive apt-get upgrade -y\",\"DEBIAN_FRONTEND=noninteractive apt-get install -y curl sudo jq bash zip unzip iptables software-properties-common ca-certificates\"]}}]}]}", + "Data": "name: Component 0 RequiredPackages\nschemaVersion: \"1.0\"\nphases:\n - name: build\n steps:\n - name: Download\n action: S3Download\n inputs: []\n - name: Run\n action: ExecuteBash\n inputs:\n commands:\n - set -ex\n - apt-get update\n - DEBIAN_FRONTEND=noninteractive apt-get upgrade -y\n - DEBIAN_FRONTEND=noninteractive apt-get install -y curl sudo jq\n bash zip unzip iptables software-properties-common ca-certificates\n", "Description": "Component 0 RequiredPackages", - "Name": "github-runners-test-AMILinuxBuilder-Component0RequiredPackages-DD92E049", + "Name": "github-runners-test-amilinuxbuilder-component0requiredpackages-component-ccd42ff5", "Platform": "Linux", "Version": "1.0.0" } }, - "AMILinuxBuilderComponent1CloudWatchAgentComponentEF606A78": { + "AMILinuxBuilderComponent1CloudWatchAgentComponentE997701A": { "Type": "AWS::ImageBuilder::Component", "Properties": { - "Data": "{\"name\":\"Component 1 CloudWatchAgent\",\"schemaVersion\":\"1.0\",\"phases\":[{\"name\":\"build\",\"steps\":[{\"name\":\"Download\",\"action\":\"S3Download\",\"inputs\":[]},{\"name\":\"Run\",\"action\":\"ExecuteBash\",\"inputs\":{\"commands\":[\"set -ex\",\"curl -sfLo /tmp/amazon-cloudwatch-agent.deb https://s3.amazonaws.com/amazoncloudwatch-agent/ubuntu/amd64/latest/amazon-cloudwatch-agent.deb\",\"dpkg -i -E /tmp/amazon-cloudwatch-agent.deb\",\"rm /tmp/amazon-cloudwatch-agent.deb\"]}}]}]}", + "Data": "name: Component 1 CloudWatchAgent\nschemaVersion: \"1.0\"\nphases:\n - name: build\n steps:\n - name: Download\n action: S3Download\n inputs: []\n - name: Run\n action: ExecuteBash\n inputs:\n commands:\n - set -ex\n - curl -sfLo /tmp/amazon-cloudwatch-agent.deb\n https://s3.amazonaws.com/amazoncloudwatch-agent/ubuntu/amd64/latest/amazon-cloudwatch-agent.deb\n - dpkg -i -E /tmp/amazon-cloudwatch-agent.deb\n - rm /tmp/amazon-cloudwatch-agent.deb\n", "Description": "Component 1 CloudWatchAgent", - "Name": "github-runners-test-AMILinuxBuilder-Component1CloudWatchAgent-793897CE", + "Name": "github-runners-test-amilinuxbuilder-component1cloudwatchagent-component-5545ba1f", "Platform": "Linux", "Version": "1.0.0" } }, - "AMILinuxBuilderComponent2RunnerUserComponentEE2EFAA9": { + "AMILinuxBuilderComponent2RunnerUserComponentCDE71073": { "Type": "AWS::ImageBuilder::Component", "Properties": { - "Data": "{\"name\":\"Component 2 RunnerUser\",\"schemaVersion\":\"1.0\",\"phases\":[{\"name\":\"build\",\"steps\":[{\"name\":\"Download\",\"action\":\"S3Download\",\"inputs\":[]},{\"name\":\"Run\",\"action\":\"ExecuteBash\",\"inputs\":{\"commands\":[\"set -ex\",\"addgroup runner\",\"adduser --system --disabled-password --home /home/runner --ingroup runner runner\",\"echo \\\"%runner ALL=(ALL:ALL) NOPASSWD: ALL\\\" > /etc/sudoers.d/runner\"]}}]}]}", + "Data": "name: Component 2 RunnerUser\nschemaVersion: \"1.0\"\nphases:\n - name: build\n steps:\n - name: Download\n action: S3Download\n inputs: []\n - name: Run\n action: ExecuteBash\n inputs:\n commands:\n - set -ex\n - addgroup runner\n - adduser --system --disabled-password --home /home/runner --ingroup\n runner runner\n - 'echo \"%runner ALL=(ALL:ALL) NOPASSWD: ALL\" >\n /etc/sudoers.d/runner'\n", "Description": "Component 2 RunnerUser", - "Name": "github-runners-test-AMILinuxBuilder-Component2RunnerUser-2C772040", + "Name": "github-runners-test-amilinuxbuilder-component2runneruser-component-b84742f0", "Platform": "Linux", "Version": "1.0.0" } }, - "AMILinuxBuilderComponent3GitComponent11319ECE": { + "AMILinuxBuilderComponent3GitComponent9011E3AB": { "Type": "AWS::ImageBuilder::Component", "Properties": { - "Data": "{\"name\":\"Component 3 Git\",\"schemaVersion\":\"1.0\",\"phases\":[{\"name\":\"build\",\"steps\":[{\"name\":\"Download\",\"action\":\"S3Download\",\"inputs\":[]},{\"name\":\"Run\",\"action\":\"ExecuteBash\",\"inputs\":{\"commands\":[\"set -ex\",\"add-apt-repository ppa:git-core/ppa\",\"apt-get update\",\"DEBIAN_FRONTEND=noninteractive apt-get install -y git\"]}}]}]}", + "Data": "name: Component 3 Git\nschemaVersion: \"1.0\"\nphases:\n - name: build\n steps:\n - name: Download\n action: S3Download\n inputs: []\n - name: Run\n action: ExecuteBash\n inputs:\n commands:\n - set -ex\n - add-apt-repository ppa:git-core/ppa\n - apt-get update\n - DEBIAN_FRONTEND=noninteractive apt-get install -y git\n", "Description": "Component 3 Git", - "Name": "github-runners-test-AMILinuxBuilder-Component3Git-8C35E49F", + "Name": "github-runners-test-amilinuxbuilder-component3git-component-5532a5f4", "Platform": "Linux", "Version": "1.0.0" } }, - "AMILinuxBuilderComponent4GithubCliComponent21834DCF": { + "AMILinuxBuilderComponent4GithubCliComponent602EE471": { "Type": "AWS::ImageBuilder::Component", "Properties": { - "Data": "{\"name\":\"Component 4 GithubCli\",\"schemaVersion\":\"1.0\",\"phases\":[{\"name\":\"build\",\"steps\":[{\"name\":\"Download\",\"action\":\"S3Download\",\"inputs\":[]},{\"name\":\"Run\",\"action\":\"ExecuteBash\",\"inputs\":{\"commands\":[\"set -ex\",\"curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg\",\"echo \\\"deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main\\\" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null\",\"apt-get update\",\"DEBIAN_FRONTEND=noninteractive apt-get install -y gh\"]}}]}]}", + "Data": "name: Component 4 GithubCli\nschemaVersion: \"1.0\"\nphases:\n - name: build\n steps:\n - name: Download\n action: S3Download\n inputs: []\n - name: Run\n action: ExecuteBash\n inputs:\n commands:\n - set -ex\n - curl -fsSL\n https://cli.github.com/packages/githubcli-archive-keyring.gpg |\n sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg\n - echo \"deb [arch=$(dpkg --print-architecture)\n signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages\n stable main\" | sudo tee /etc/apt/sources.list.d/github-cli.list >\n /dev/null\n - apt-get update\n - DEBIAN_FRONTEND=noninteractive apt-get install -y gh\n", "Description": "Component 4 GithubCli", - "Name": "github-runners-test-AMILinuxBuilder-Component4GithubCli-F89A69D6", + "Name": "github-runners-test-amilinuxbuilder-component4githubcli-component-7925b347", "Platform": "Linux", "Version": "1.0.0" } }, - "AMILinuxBuilderComponent5AwsCliComponent3AA64EA2": { + "AMILinuxBuilderComponent5AwsCliComponent72637C19": { "Type": "AWS::ImageBuilder::Component", "Properties": { - "Data": "{\"name\":\"Component 5 AwsCli\",\"schemaVersion\":\"1.0\",\"phases\":[{\"name\":\"build\",\"steps\":[{\"name\":\"Download\",\"action\":\"S3Download\",\"inputs\":[]},{\"name\":\"Run\",\"action\":\"ExecuteBash\",\"inputs\":{\"commands\":[\"set -ex\",\"curl -fsSL \\\"https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip\\\" -o awscliv2.zip\",\"unzip -q awscliv2.zip\",\"./aws/install\",\"rm -rf awscliv2.zip aws\"]}}]}]}", + "Data": "name: Component 5 AwsCli\nschemaVersion: \"1.0\"\nphases:\n - name: build\n steps:\n - name: Download\n action: S3Download\n inputs: []\n - name: Run\n action: ExecuteBash\n inputs:\n commands:\n - set -ex\n - curl -fsSL\n \"https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip\" -o\n awscliv2.zip\n - unzip -q awscliv2.zip\n - ./aws/install\n - rm -rf awscliv2.zip aws\n", "Description": "Component 5 AwsCli", - "Name": "github-runners-test-AMILinuxBuilder-Component5AwsCli-BE8AC06E", + "Name": "github-runners-test-amilinuxbuilder-component5awscli-component-ea3524b1", "Platform": "Linux", "Version": "1.0.0" } }, - "AMILinuxBuilderComponent6DockerComponentD5E4165F": { + "AMILinuxBuilderComponent6DockerComponent9E523A42": { "Type": "AWS::ImageBuilder::Component", "Properties": { - "Data": "{\"name\":\"Component 6 Docker\",\"schemaVersion\":\"1.0\",\"phases\":[{\"name\":\"build\",\"steps\":[{\"name\":\"Download\",\"action\":\"S3Download\",\"inputs\":[]},{\"name\":\"Run\",\"action\":\"ExecuteBash\",\"inputs\":{\"commands\":[\"set -ex\",\"curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker.gpg\",\"echo \\\"deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable\\\" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null\",\"apt-get update\",\"DEBIAN_FRONTEND=noninteractive apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin\",\"usermod -aG docker runner\",\"ln -s /usr/libexec/docker/cli-plugins/docker-compose /usr/bin/docker-compose\"]}}]}]}", + "Data": "name: Component 6 Docker\nschemaVersion: \"1.0\"\nphases:\n - name: build\n steps:\n - name: Download\n action: S3Download\n inputs: []\n - name: Run\n action: ExecuteBash\n inputs:\n commands:\n - set -ex\n - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg\n --dearmor -o /usr/share/keyrings/docker.gpg\n - echo \"deb [arch=$(dpkg --print-architecture)\n signed-by=/usr/share/keyrings/docker.gpg]\n https://download.docker.com/linux/ubuntu $(lsb_release -cs)\n stable\" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null\n - apt-get update\n - DEBIAN_FRONTEND=noninteractive apt-get install -y docker-ce\n docker-ce-cli containerd.io docker-compose-plugin\n - usermod -aG docker runner\n - ln -s /usr/libexec/docker/cli-plugins/docker-compose\n /usr/bin/docker-compose\n", "Description": "Component 6 Docker", - "Name": "github-runners-test-AMILinuxBuilder-Component6Docker-75C7B53C", + "Name": "github-runners-test-amilinuxbuilder-component6docker-component-c57d02ec", "Platform": "Linux", "Version": "1.0.0" } }, - "AMILinuxBuilderComponent7GithubRunnerComponent898B6A50": { + "AMILinuxBuilderComponent7GithubRunnerComponentD0CD7066": { "Type": "AWS::ImageBuilder::Component", "Properties": { - "Data": "{\"name\":\"Component 7 GithubRunner\",\"schemaVersion\":\"1.0\",\"phases\":[{\"name\":\"build\",\"steps\":[{\"name\":\"Download\",\"action\":\"S3Download\",\"inputs\":[]},{\"name\":\"Run\",\"action\":\"ExecuteBash\",\"inputs\":{\"commands\":[\"set -ex\",\"RUNNER_VERSION=`curl -w \\\"%{redirect_url}\\\" -fsS https://github.com/actions/runner/releases/latest | grep -oE \\\"[^/v]+$\\\"`\",\"curl -fsSLO \\\"https://github.com/actions/runner/releases/download/v${RUNNER_VERSION}/actions-runner-linux-x64-${RUNNER_VERSION}.tar.gz\\\"\",\"tar -C /home/runner -xzf \\\"actions-runner-linux-x64-${RUNNER_VERSION}.tar.gz\\\"\",\"rm actions-runner-linux-x64-${RUNNER_VERSION}.tar.gz\",\"echo -n latest > /home/runner/RUNNER_VERSION\",\"/home/runner/bin/installdependencies.sh\",\"mkdir -p /opt/hostedtoolcache\",\"chown runner /opt/hostedtoolcache\"]}}]}]}", + "Data": "name: Component 7 GithubRunner\nschemaVersion: \"1.0\"\nphases:\n - name: build\n steps:\n - name: Download\n action: S3Download\n inputs: []\n - name: Run\n action: ExecuteBash\n inputs:\n commands:\n - set -ex\n - RUNNER_VERSION=`curl -w \"%{redirect_url}\" -fsS\n https://github.com/actions/runner/releases/latest | grep -oE\n \"[^/v]+$\"`\n - curl -fsSLO\n \"https://github.com/actions/runner/releases/download/v${RUNNER_VERSION}/actions-runner-linux-x64-${RUNNER_VERSION}.tar.gz\"\n - tar -C /home/runner -xzf\n \"actions-runner-linux-x64-${RUNNER_VERSION}.tar.gz\"\n - rm actions-runner-linux-x64-${RUNNER_VERSION}.tar.gz\n - echo -n latest > /home/runner/RUNNER_VERSION\n - /home/runner/bin/installdependencies.sh\n - mkdir -p /opt/hostedtoolcache\n - chown runner /opt/hostedtoolcache\n", "Description": "Component 7 GithubRunner", - "Name": "github-runners-test-AMILinuxBuilder-Component7GithubRunner-57FB75A5", + "Name": "github-runners-test-amilinuxbuilder-component7githubrunner-component-dd50b576", "Platform": "Linux", "Version": "1.0.0" } }, - "AMILinuxBuilderComponent8CustomUndefinedComponentCF5507D3": { + "AMILinuxBuilderComponent8CustomUndefinedComponent746EA99F": { "Type": "AWS::ImageBuilder::Component", "Properties": { "Data": { "Fn::Join": [ "", [ - "{\"name\":\"Component 8 Custom-Undefined\",\"schemaVersion\":\"1.0\",\"phases\":[{\"name\":\"build\",\"steps\":[{\"name\":\"Download\",\"action\":\"S3Download\",\"inputs\":[{\"source\":\"", + "name: Component 8 Custom-Undefined\nschemaVersion: \"1.0\"\nphases:\n - name: build\n steps:\n - name: Download\n action: S3Download\n inputs:\n - source: ", { "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/64f83fc47e69ce862669fca14d759c3034fdbed3686b66dcf7bf9ff166f65c68.yml" }, - "\",\"destination\":\"FUNDING.yml\"}]},{\"name\":\"Run\",\"action\":\"ExecuteBash\",\"inputs\":{\"commands\":[\"set -ex\",\"touch /custom-file\",\"mkdir /custom-dir\",\"mv FUNDING.yml /custom-dir\"]}}]}]}" + "\n destination: FUNDING.yml\n - name: Run\n action: ExecuteBash\n inputs:\n commands:\n - set -ex\n - touch /custom-file\n - mkdir /custom-dir\n - mv FUNDING.yml /custom-dir\n" ] ] }, "Description": "Component 8 Custom-Undefined", - "Name": "github-runners-test-AMILinuxBuilder-Component8Custom-Undefined-2AC0870D", + "Name": "github-runners-test-amilinuxbuilder-component8custom-undefined-component-35d68e99", "Platform": "Linux", "Version": "1.0.0" } }, - "AMILinuxBuilderComponent9EnvironmentVariablesComponent59394D7E": { + "AMILinuxBuilderComponent9EnvironmentVariablesComponent31538DDD": { "Type": "AWS::ImageBuilder::Component", "Properties": { - "Data": "{\"name\":\"Component 9 EnvironmentVariables\",\"schemaVersion\":\"1.0\",\"phases\":[{\"name\":\"build\",\"steps\":[{\"name\":\"Download\",\"action\":\"S3Download\",\"inputs\":[]},{\"name\":\"Run\",\"action\":\"ExecuteBash\",\"inputs\":{\"commands\":[\"set -ex\",\"echo 'HELLO=world' >> /home/runner/.env\",\"echo 'FOO=bar' >> /home/runner/.env\"]}}]}]}", + "Data": "name: Component 9 EnvironmentVariables\nschemaVersion: \"1.0\"\nphases:\n - name: build\n steps:\n - name: Download\n action: S3Download\n inputs: []\n - name: Run\n action: ExecuteBash\n inputs:\n commands:\n - set -ex\n - echo 'HELLO=world' >> /home/runner/.env\n - echo 'FOO=bar' >> /home/runner/.env\n", "Description": "Component 9 EnvironmentVariables", - "Name": "github-runners-test-AMILinuxBuilder-Component9EnvironmentVariables-7237997F", + "Name": "github-runners-test-amilinuxbuilder-component9environmentvariables-component-c760ab8d", "Platform": "Linux", "Version": "1.0.0" } @@ -2777,7 +2803,7 @@ "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, - "AMILinuxBuilderAmiRecipe7C7ED6C7": { + "AMILinuxBuilderAmiRecipeB7CF9599": { "Type": "AWS::ImageBuilder::ImageRecipe", "Properties": { "BlockDeviceMappings": [ @@ -2795,7 +2821,7 @@ { "ComponentArn": { "Fn::GetAtt": [ - "AMILinuxBuilderComponent0RequiredPackagesComponent6D0029EE", + "AMILinuxBuilderComponent0RequiredPackagesComponent74077CC6", "Arn" ] } @@ -2803,7 +2829,7 @@ { "ComponentArn": { "Fn::GetAtt": [ - "AMILinuxBuilderComponent1CloudWatchAgentComponentEF606A78", + "AMILinuxBuilderComponent1CloudWatchAgentComponentE997701A", "Arn" ] } @@ -2811,7 +2837,7 @@ { "ComponentArn": { "Fn::GetAtt": [ - "AMILinuxBuilderComponent2RunnerUserComponentEE2EFAA9", + "AMILinuxBuilderComponent2RunnerUserComponentCDE71073", "Arn" ] } @@ -2819,7 +2845,7 @@ { "ComponentArn": { "Fn::GetAtt": [ - "AMILinuxBuilderComponent3GitComponent11319ECE", + "AMILinuxBuilderComponent3GitComponent9011E3AB", "Arn" ] } @@ -2827,7 +2853,7 @@ { "ComponentArn": { "Fn::GetAtt": [ - "AMILinuxBuilderComponent4GithubCliComponent21834DCF", + "AMILinuxBuilderComponent4GithubCliComponent602EE471", "Arn" ] } @@ -2835,7 +2861,7 @@ { "ComponentArn": { "Fn::GetAtt": [ - "AMILinuxBuilderComponent5AwsCliComponent3AA64EA2", + "AMILinuxBuilderComponent5AwsCliComponent72637C19", "Arn" ] } @@ -2843,7 +2869,7 @@ { "ComponentArn": { "Fn::GetAtt": [ - "AMILinuxBuilderComponent6DockerComponentD5E4165F", + "AMILinuxBuilderComponent6DockerComponent9E523A42", "Arn" ] } @@ -2851,7 +2877,7 @@ { "ComponentArn": { "Fn::GetAtt": [ - "AMILinuxBuilderComponent7GithubRunnerComponent898B6A50", + "AMILinuxBuilderComponent7GithubRunnerComponentD0CD7066", "Arn" ] } @@ -2859,7 +2885,7 @@ { "ComponentArn": { "Fn::GetAtt": [ - "AMILinuxBuilderComponent8CustomUndefinedComponentCF5507D3", + "AMILinuxBuilderComponent8CustomUndefinedComponent746EA99F", "Arn" ] } @@ -2867,13 +2893,13 @@ { "ComponentArn": { "Fn::GetAtt": [ - "AMILinuxBuilderComponent9EnvironmentVariablesComponent59394D7E", + "AMILinuxBuilderComponent9EnvironmentVariablesComponent31538DDD", "Arn" ] } } ], - "Name": "github-runners-test-AMILinuxBuilder-AmiRecipe-2B5C5A8B", + "Name": "github-runners-test-amilinuxbuilder-amirecipe-711bc2a3", "ParentImage": { "Fn::Join": [ "", @@ -2901,13 +2927,26 @@ "AMILinuxBuilderAmiLog0DB16E38": { "Type": "AWS::Logs::LogGroup", "Properties": { - "LogGroupName": "/aws/imagebuilder/github-runners-test-AMILinuxBuilder-AmiRecipe-2B5C5A8B", + "LogGroupName": { + "Fn::Join": [ + "", + [ + "/aws/imagebuilder/", + { + "Fn::GetAtt": [ + "AMILinuxBuilderAmiRecipeB7CF9599", + "Name" + ] + } + ] + ] + }, "RetentionInDays": 30 }, "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, - "AMILinuxBuilderInstanceProfile3CA638BE": { + "AMILinuxBuilderInfrastructureInstanceProfileB423D304": { "Type": "AWS::IAM::InstanceProfile", "Properties": { "Roles": [ @@ -2917,7 +2956,7 @@ ] } }, - "AMILinuxBuilderInfrastructure6FCD154A": { + "AMILinuxBuilderInfrastructure069F0561": { "Type": "AWS::ImageBuilder::InfrastructureConfiguration", "Properties": { "InstanceMetadataOptions": { @@ -2925,12 +2964,12 @@ "HttpTokens": "required" }, "InstanceProfileName": { - "Ref": "AMILinuxBuilderInstanceProfile3CA638BE" + "Ref": "AMILinuxBuilderInfrastructureInstanceProfileB423D304" }, "InstanceTypes": [ "m6i.large" ], - "Name": "github-runners-test-AMILinuxBuilder-67243E6D", + "Name": "github-runners-test-amilinuxbuilder-infrastructure-52c63716", "SecurityGroupIds": [ { "Fn::GetAtt": [ @@ -2947,18 +2986,18 @@ } } }, - "AMILinuxBuilderAMIImage93D83DE5": { + "AMILinuxBuilderAMIImage8609B129": { "Type": "AWS::ImageBuilder::Image", "Properties": { "DistributionConfigurationArn": { "Fn::GetAtt": [ - "AMILinuxBuilderAMIDistribution46435AF5", + "AMILinuxBuilderAMIDistribution215F3A5C", "Arn" ] }, "ImageRecipeArn": { "Fn::GetAtt": [ - "AMILinuxBuilderAmiRecipe7C7ED6C7", + "AMILinuxBuilderAmiRecipeB7CF9599", "Arn" ] }, @@ -2967,7 +3006,7 @@ }, "InfrastructureConfigurationArn": { "Fn::GetAtt": [ - "AMILinuxBuilderInfrastructure6FCD154A", + "AMILinuxBuilderInfrastructure069F0561", "Arn" ] }, @@ -2978,23 +3017,24 @@ }, "DependsOn": [ "AMILinuxBuilderAmiLog0DB16E38", - "AMILinuxBuilderInfrastructure6FCD154A" + "AMILinuxBuilderInfrastructureInstanceProfileB423D304", + "AMILinuxBuilderInfrastructure069F0561" ], "UpdateReplacePolicy": "Retain", "DeletionPolicy": "RetainExceptOnCreate" }, - "AMILinuxBuilderAMIPipelineEC5051DF": { + "AMILinuxBuilderAMIPipeline77F9C0F7": { "Type": "AWS::ImageBuilder::ImagePipeline", "Properties": { "DistributionConfigurationArn": { "Fn::GetAtt": [ - "AMILinuxBuilderAMIDistribution46435AF5", + "AMILinuxBuilderAMIDistribution215F3A5C", "Arn" ] }, "ImageRecipeArn": { "Fn::GetAtt": [ - "AMILinuxBuilderAmiRecipe7C7ED6C7", + "AMILinuxBuilderAmiRecipeB7CF9599", "Arn" ] }, @@ -3003,11 +3043,11 @@ }, "InfrastructureConfigurationArn": { "Fn::GetAtt": [ - "AMILinuxBuilderInfrastructure6FCD154A", + "AMILinuxBuilderInfrastructure069F0561", "Arn" ] }, - "Name": "github-runners-test-AMILinuxBuilder-67243E6D", + "Name": "github-runners-test-amilinuxbuilder-amipipeline-c87c140b", "Schedule": { "PipelineExecutionStartCondition": "EXPRESSION_MATCH_ONLY", "ScheduleExpression": "rate(7 days)" @@ -3019,7 +3059,8 @@ }, "DependsOn": [ "AMILinuxBuilderAmiLog0DB16E38", - "AMILinuxBuilderInfrastructure6FCD154A" + "AMILinuxBuilderInfrastructureInstanceProfileB423D304", + "AMILinuxBuilderInfrastructure069F0561" ] }, "AMILinuxBuilderImageCleanerF1745EF6": { @@ -3047,10 +3088,17 @@ { "Ref": "AWS::AccountId" }, - ":image/github-runners-test-amilinuxbuilder-amirecipe-2b5c5a8b/", + ":image/", { "Fn::GetAtt": [ - "AMILinuxBuilderAmiRecipe7C7ED6C7", + "AMILinuxBuilderAmiRecipeB7CF9599", + "Name" + ] + }, + "/", + { + "Fn::GetAtt": [ + "AMILinuxBuilderAmiRecipeB7CF9599", "Version" ] } @@ -3126,7 +3174,7 @@ ] } }, - "AMILinuxBuilderLifecyclePolicyAMIFB556CB2": { + "AMILinuxBuilderLifecyclePolicyAMI9EC6A562": { "Type": "AWS::ImageBuilder::LifecyclePolicy", "Properties": { "Description": "Delete old GitHub Runner AMIs for github-runners-test/AMI Linux Builder", @@ -3136,7 +3184,7 @@ "Arn" ] }, - "Name": "github-runners-test-AMILinuxBuilder-67243E6D", + "Name": "github-runners-test-amilinuxbuilder-lifecyclepolicyami-b13f2c24", "PolicyDetails": [ { "Action": { @@ -3155,10 +3203,15 @@ "ResourceSelection": { "Recipes": [ { - "Name": "github-runners-test-AMILinuxBuilder-AmiRecipe-2B5C5A8B", + "Name": { + "Fn::GetAtt": [ + "AMILinuxBuilderAmiRecipeB7CF9599", + "Name" + ] + }, "SemanticVersion": { "Fn::GetAtt": [ - "AMILinuxBuilderAmiRecipe7C7ED6C7", + "AMILinuxBuilderAmiRecipeB7CF9599", "Version" ] } @@ -5488,13 +5541,12 @@ ] } }, - "AMILinuxarm64BuilderAMIDistribution2BDAF717": { + "AMILinuxarm64BuilderAMIDistributionE6989D01": { "Type": "AWS::ImageBuilder::DistributionConfiguration", "Properties": { "Distributions": [ { "AmiDistributionConfiguration": { - "Name": "github-runners-test-AMILinuxarm64Builder-3F449283-{{ imagebuilder:buildDate }}", "AmiTags": { "Name": "AMI Linux arm64 Builder", "GitHubRunners:Stack": "github-runners-test", @@ -5514,132 +5566,132 @@ } } ], - "Name": "github-runners-test-AMILinuxarm64Builder-3F449283", + "Name": "github-runners-test-amilinuxarm64builder-amidistribution-64ec726d", "Tags": { "GitHubRunners:Builder": "github-runners-test/AMI Linux arm64 Builder", "GitHubRunners:Stack": "github-runners-test" } } }, - "AMILinuxarm64BuilderComponent0RequiredPackagesComponent2ABFFC8F": { + "AMILinuxarm64BuilderComponent0RequiredPackagesComponentBADF7D60": { "Type": "AWS::ImageBuilder::Component", "Properties": { - "Data": "{\"name\":\"Component 0 RequiredPackages\",\"schemaVersion\":\"1.0\",\"phases\":[{\"name\":\"build\",\"steps\":[{\"name\":\"Download\",\"action\":\"S3Download\",\"inputs\":[]},{\"name\":\"Run\",\"action\":\"ExecuteBash\",\"inputs\":{\"commands\":[\"set -ex\",\"apt-get update\",\"DEBIAN_FRONTEND=noninteractive apt-get upgrade -y\",\"DEBIAN_FRONTEND=noninteractive apt-get install -y curl sudo jq bash zip unzip iptables software-properties-common ca-certificates\"]}}]}]}", + "Data": "name: Component 0 RequiredPackages\nschemaVersion: \"1.0\"\nphases:\n - name: build\n steps:\n - name: Download\n action: S3Download\n inputs: []\n - name: Run\n action: ExecuteBash\n inputs:\n commands:\n - set -ex\n - apt-get update\n - DEBIAN_FRONTEND=noninteractive apt-get upgrade -y\n - DEBIAN_FRONTEND=noninteractive apt-get install -y curl sudo jq\n bash zip unzip iptables software-properties-common ca-certificates\n", "Description": "Component 0 RequiredPackages", - "Name": "github-runners-test-AMILinuxarm64Builder-Component0RequiredPackages-2E0C774A", + "Name": "github-runners-test-amilinuxarm64builder-component0requiredpackages-component-24f2e247", "Platform": "Linux", "Version": "1.0.0" } }, - "AMILinuxarm64BuilderComponent1CloudWatchAgentComponentE8D7E944": { + "AMILinuxarm64BuilderComponent1CloudWatchAgentComponentC4EC4BFB": { "Type": "AWS::ImageBuilder::Component", "Properties": { - "Data": "{\"name\":\"Component 1 CloudWatchAgent\",\"schemaVersion\":\"1.0\",\"phases\":[{\"name\":\"build\",\"steps\":[{\"name\":\"Download\",\"action\":\"S3Download\",\"inputs\":[]},{\"name\":\"Run\",\"action\":\"ExecuteBash\",\"inputs\":{\"commands\":[\"set -ex\",\"curl -sfLo /tmp/amazon-cloudwatch-agent.deb https://s3.amazonaws.com/amazoncloudwatch-agent/ubuntu/arm64/latest/amazon-cloudwatch-agent.deb\",\"dpkg -i -E /tmp/amazon-cloudwatch-agent.deb\",\"rm /tmp/amazon-cloudwatch-agent.deb\"]}}]}]}", + "Data": "name: Component 1 CloudWatchAgent\nschemaVersion: \"1.0\"\nphases:\n - name: build\n steps:\n - name: Download\n action: S3Download\n inputs: []\n - name: Run\n action: ExecuteBash\n inputs:\n commands:\n - set -ex\n - curl -sfLo /tmp/amazon-cloudwatch-agent.deb\n https://s3.amazonaws.com/amazoncloudwatch-agent/ubuntu/arm64/latest/amazon-cloudwatch-agent.deb\n - dpkg -i -E /tmp/amazon-cloudwatch-agent.deb\n - rm /tmp/amazon-cloudwatch-agent.deb\n", "Description": "Component 1 CloudWatchAgent", - "Name": "github-runners-test-AMILinuxarm64Builder-Component1CloudWatchAgent-0EF6E92C", + "Name": "github-runners-test-amilinuxarm64builder-component1cloudwatchagent-component-9127095a", "Platform": "Linux", "Version": "1.0.0" } }, - "AMILinuxarm64BuilderComponent2RunnerUserComponent81DDD70D": { + "AMILinuxarm64BuilderComponent2RunnerUserComponent50218DEA": { "Type": "AWS::ImageBuilder::Component", "Properties": { - "Data": "{\"name\":\"Component 2 RunnerUser\",\"schemaVersion\":\"1.0\",\"phases\":[{\"name\":\"build\",\"steps\":[{\"name\":\"Download\",\"action\":\"S3Download\",\"inputs\":[]},{\"name\":\"Run\",\"action\":\"ExecuteBash\",\"inputs\":{\"commands\":[\"set -ex\",\"addgroup runner\",\"adduser --system --disabled-password --home /home/runner --ingroup runner runner\",\"echo \\\"%runner ALL=(ALL:ALL) NOPASSWD: ALL\\\" > /etc/sudoers.d/runner\"]}}]}]}", + "Data": "name: Component 2 RunnerUser\nschemaVersion: \"1.0\"\nphases:\n - name: build\n steps:\n - name: Download\n action: S3Download\n inputs: []\n - name: Run\n action: ExecuteBash\n inputs:\n commands:\n - set -ex\n - addgroup runner\n - adduser --system --disabled-password --home /home/runner --ingroup\n runner runner\n - 'echo \"%runner ALL=(ALL:ALL) NOPASSWD: ALL\" >\n /etc/sudoers.d/runner'\n", "Description": "Component 2 RunnerUser", - "Name": "github-runners-test-AMILinuxarm64Builder-Component2RunnerUser-0681B87A", + "Name": "github-runners-test-amilinuxarm64builder-component2runneruser-component-360117bd", "Platform": "Linux", "Version": "1.0.0" } }, - "AMILinuxarm64BuilderComponent3GitComponent341EEEFC": { + "AMILinuxarm64BuilderComponent3GitComponent4F72CDB4": { "Type": "AWS::ImageBuilder::Component", "Properties": { - "Data": "{\"name\":\"Component 3 Git\",\"schemaVersion\":\"1.0\",\"phases\":[{\"name\":\"build\",\"steps\":[{\"name\":\"Download\",\"action\":\"S3Download\",\"inputs\":[]},{\"name\":\"Run\",\"action\":\"ExecuteBash\",\"inputs\":{\"commands\":[\"set -ex\",\"add-apt-repository ppa:git-core/ppa\",\"apt-get update\",\"DEBIAN_FRONTEND=noninteractive apt-get install -y git\"]}}]}]}", + "Data": "name: Component 3 Git\nschemaVersion: \"1.0\"\nphases:\n - name: build\n steps:\n - name: Download\n action: S3Download\n inputs: []\n - name: Run\n action: ExecuteBash\n inputs:\n commands:\n - set -ex\n - add-apt-repository ppa:git-core/ppa\n - apt-get update\n - DEBIAN_FRONTEND=noninteractive apt-get install -y git\n", "Description": "Component 3 Git", - "Name": "github-runners-test-AMILinuxarm64Builder-Component3Git-60F51A23", + "Name": "github-runners-test-amilinuxarm64builder-component3git-component-c3215149", "Platform": "Linux", "Version": "1.0.0" } }, - "AMILinuxarm64BuilderComponent4GithubCliComponentBB29E40E": { + "AMILinuxarm64BuilderComponent4GithubCliComponent8F555A41": { "Type": "AWS::ImageBuilder::Component", "Properties": { - "Data": "{\"name\":\"Component 4 GithubCli\",\"schemaVersion\":\"1.0\",\"phases\":[{\"name\":\"build\",\"steps\":[{\"name\":\"Download\",\"action\":\"S3Download\",\"inputs\":[]},{\"name\":\"Run\",\"action\":\"ExecuteBash\",\"inputs\":{\"commands\":[\"set -ex\",\"curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg\",\"echo \\\"deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main\\\" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null\",\"apt-get update\",\"DEBIAN_FRONTEND=noninteractive apt-get install -y gh\"]}}]}]}", + "Data": "name: Component 4 GithubCli\nschemaVersion: \"1.0\"\nphases:\n - name: build\n steps:\n - name: Download\n action: S3Download\n inputs: []\n - name: Run\n action: ExecuteBash\n inputs:\n commands:\n - set -ex\n - curl -fsSL\n https://cli.github.com/packages/githubcli-archive-keyring.gpg |\n sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg\n - echo \"deb [arch=$(dpkg --print-architecture)\n signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages\n stable main\" | sudo tee /etc/apt/sources.list.d/github-cli.list >\n /dev/null\n - apt-get update\n - DEBIAN_FRONTEND=noninteractive apt-get install -y gh\n", "Description": "Component 4 GithubCli", - "Name": "github-runners-test-AMILinuxarm64Builder-Component4GithubCli-3AC99B64", + "Name": "github-runners-test-amilinuxarm64builder-component4githubcli-component-585d1ee4", "Platform": "Linux", "Version": "1.0.0" } }, - "AMILinuxarm64BuilderComponent5AwsCliComponentDFF10DCB": { + "AMILinuxarm64BuilderComponent5AwsCliComponentA8EC9E97": { "Type": "AWS::ImageBuilder::Component", "Properties": { - "Data": "{\"name\":\"Component 5 AwsCli\",\"schemaVersion\":\"1.0\",\"phases\":[{\"name\":\"build\",\"steps\":[{\"name\":\"Download\",\"action\":\"S3Download\",\"inputs\":[]},{\"name\":\"Run\",\"action\":\"ExecuteBash\",\"inputs\":{\"commands\":[\"set -ex\",\"curl -fsSL \\\"https://awscli.amazonaws.com/awscli-exe-linux-aarch64.zip\\\" -o awscliv2.zip\",\"unzip -q awscliv2.zip\",\"./aws/install\",\"rm -rf awscliv2.zip aws\"]}}]}]}", + "Data": "name: Component 5 AwsCli\nschemaVersion: \"1.0\"\nphases:\n - name: build\n steps:\n - name: Download\n action: S3Download\n inputs: []\n - name: Run\n action: ExecuteBash\n inputs:\n commands:\n - set -ex\n - curl -fsSL\n \"https://awscli.amazonaws.com/awscli-exe-linux-aarch64.zip\" -o\n awscliv2.zip\n - unzip -q awscliv2.zip\n - ./aws/install\n - rm -rf awscliv2.zip aws\n", "Description": "Component 5 AwsCli", - "Name": "github-runners-test-AMILinuxarm64Builder-Component5AwsCli-30A943D2", + "Name": "github-runners-test-amilinuxarm64builder-component5awscli-component-706b4769", "Platform": "Linux", "Version": "1.0.0" } }, - "AMILinuxarm64BuilderComponent6DockerComponent1A04C1F4": { + "AMILinuxarm64BuilderComponent6DockerComponentE31D0222": { "Type": "AWS::ImageBuilder::Component", "Properties": { - "Data": "{\"name\":\"Component 6 Docker\",\"schemaVersion\":\"1.0\",\"phases\":[{\"name\":\"build\",\"steps\":[{\"name\":\"Download\",\"action\":\"S3Download\",\"inputs\":[]},{\"name\":\"Run\",\"action\":\"ExecuteBash\",\"inputs\":{\"commands\":[\"set -ex\",\"curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker.gpg\",\"echo \\\"deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable\\\" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null\",\"apt-get update\",\"DEBIAN_FRONTEND=noninteractive apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin\",\"usermod -aG docker runner\",\"ln -s /usr/libexec/docker/cli-plugins/docker-compose /usr/bin/docker-compose\"]}}]}]}", + "Data": "name: Component 6 Docker\nschemaVersion: \"1.0\"\nphases:\n - name: build\n steps:\n - name: Download\n action: S3Download\n inputs: []\n - name: Run\n action: ExecuteBash\n inputs:\n commands:\n - set -ex\n - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg\n --dearmor -o /usr/share/keyrings/docker.gpg\n - echo \"deb [arch=$(dpkg --print-architecture)\n signed-by=/usr/share/keyrings/docker.gpg]\n https://download.docker.com/linux/ubuntu $(lsb_release -cs)\n stable\" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null\n - apt-get update\n - DEBIAN_FRONTEND=noninteractive apt-get install -y docker-ce\n docker-ce-cli containerd.io docker-compose-plugin\n - usermod -aG docker runner\n - ln -s /usr/libexec/docker/cli-plugins/docker-compose\n /usr/bin/docker-compose\n", "Description": "Component 6 Docker", - "Name": "github-runners-test-AMILinuxarm64Builder-Component6Docker-F2A09CCF", + "Name": "github-runners-test-amilinuxarm64builder-component6docker-component-4c582cde", "Platform": "Linux", "Version": "1.0.0" } }, - "AMILinuxarm64BuilderComponent7GithubRunnerComponentE1EF4281": { + "AMILinuxarm64BuilderComponent7GithubRunnerComponentAFBEE3CB": { "Type": "AWS::ImageBuilder::Component", "Properties": { - "Data": "{\"name\":\"Component 7 GithubRunner\",\"schemaVersion\":\"1.0\",\"phases\":[{\"name\":\"build\",\"steps\":[{\"name\":\"Download\",\"action\":\"S3Download\",\"inputs\":[]},{\"name\":\"Run\",\"action\":\"ExecuteBash\",\"inputs\":{\"commands\":[\"set -ex\",\"RUNNER_VERSION=`curl -w \\\"%{redirect_url}\\\" -fsS https://github.com/actions/runner/releases/latest | grep -oE \\\"[^/v]+$\\\"`\",\"curl -fsSLO \\\"https://github.com/actions/runner/releases/download/v${RUNNER_VERSION}/actions-runner-linux-arm64-${RUNNER_VERSION}.tar.gz\\\"\",\"tar -C /home/runner -xzf \\\"actions-runner-linux-arm64-${RUNNER_VERSION}.tar.gz\\\"\",\"rm actions-runner-linux-arm64-${RUNNER_VERSION}.tar.gz\",\"echo -n latest > /home/runner/RUNNER_VERSION\",\"/home/runner/bin/installdependencies.sh\",\"mkdir -p /opt/hostedtoolcache\",\"chown runner /opt/hostedtoolcache\"]}}]}]}", + "Data": "name: Component 7 GithubRunner\nschemaVersion: \"1.0\"\nphases:\n - name: build\n steps:\n - name: Download\n action: S3Download\n inputs: []\n - name: Run\n action: ExecuteBash\n inputs:\n commands:\n - set -ex\n - RUNNER_VERSION=`curl -w \"%{redirect_url}\" -fsS\n https://github.com/actions/runner/releases/latest | grep -oE\n \"[^/v]+$\"`\n - curl -fsSLO\n \"https://github.com/actions/runner/releases/download/v${RUNNER_VERSION}/actions-runner-linux-arm64-${RUNNER_VERSION}.tar.gz\"\n - tar -C /home/runner -xzf\n \"actions-runner-linux-arm64-${RUNNER_VERSION}.tar.gz\"\n - rm actions-runner-linux-arm64-${RUNNER_VERSION}.tar.gz\n - echo -n latest > /home/runner/RUNNER_VERSION\n - /home/runner/bin/installdependencies.sh\n - mkdir -p /opt/hostedtoolcache\n - chown runner /opt/hostedtoolcache\n", "Description": "Component 7 GithubRunner", - "Name": "github-runners-test-AMILinuxarm64Builder-Component7GithubRunner-F14E4EA6", + "Name": "github-runners-test-amilinuxarm64builder-component7githubrunner-component-bdc80137", "Platform": "Linux", "Version": "1.0.0" } }, - "AMILinuxarm64BuilderComponent8CustomUndefinedComponent8BF2DD41": { + "AMILinuxarm64BuilderComponent8CustomUndefinedComponent08FD8437": { "Type": "AWS::ImageBuilder::Component", "Properties": { "Data": { "Fn::Join": [ "", [ - "{\"name\":\"Component 8 Custom-Undefined\",\"schemaVersion\":\"1.0\",\"phases\":[{\"name\":\"build\",\"steps\":[{\"name\":\"Download\",\"action\":\"S3Download\",\"inputs\":[{\"source\":\"", + "name: Component 8 Custom-Undefined\nschemaVersion: \"1.0\"\nphases:\n - name: build\n steps:\n - name: Download\n action: S3Download\n inputs:\n - source: ", { "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/64f83fc47e69ce862669fca14d759c3034fdbed3686b66dcf7bf9ff166f65c68.yml" }, - "\",\"destination\":\"FUNDING.yml\"}]},{\"name\":\"Run\",\"action\":\"ExecuteBash\",\"inputs\":{\"commands\":[\"set -ex\",\"touch /custom-file\",\"mkdir /custom-dir\",\"mv FUNDING.yml /custom-dir\"]}}]}]}" + "\n destination: FUNDING.yml\n - name: Run\n action: ExecuteBash\n inputs:\n commands:\n - set -ex\n - touch /custom-file\n - mkdir /custom-dir\n - mv FUNDING.yml /custom-dir\n" ] ] }, "Description": "Component 8 Custom-Undefined", - "Name": "github-runners-test-AMILinuxarm64Builder-Component8Custom-Undefined-6E825627", + "Name": "github-runners-test-amilinuxarm64builder-component8custom-undefined-component-e23d33b6", "Platform": "Linux", "Version": "1.0.0" } }, - "AMILinuxarm64BuilderComponent9EnvironmentVariablesComponent99728C6D": { + "AMILinuxarm64BuilderComponent9EnvironmentVariablesComponent589AD395": { "Type": "AWS::ImageBuilder::Component", "Properties": { - "Data": "{\"name\":\"Component 9 EnvironmentVariables\",\"schemaVersion\":\"1.0\",\"phases\":[{\"name\":\"build\",\"steps\":[{\"name\":\"Download\",\"action\":\"S3Download\",\"inputs\":[]},{\"name\":\"Run\",\"action\":\"ExecuteBash\",\"inputs\":{\"commands\":[\"set -ex\",\"echo 'HELLO=world' >> /home/runner/.env\",\"echo 'FOO=bar' >> /home/runner/.env\"]}}]}]}", + "Data": "name: Component 9 EnvironmentVariables\nschemaVersion: \"1.0\"\nphases:\n - name: build\n steps:\n - name: Download\n action: S3Download\n inputs: []\n - name: Run\n action: ExecuteBash\n inputs:\n commands:\n - set -ex\n - echo 'HELLO=world' >> /home/runner/.env\n - echo 'FOO=bar' >> /home/runner/.env\n", "Description": "Component 9 EnvironmentVariables", - "Name": "github-runners-test-AMILinuxarm64Builder-Component9EnvironmentVariables-70B09CB2", + "Name": "github-runners-test-amilinuxarm64builder-component9environmentvariables-component-25ee7189", "Platform": "Linux", "Version": "1.0.0" } }, - "AMILinuxarm64BuilderAmiRecipe6A6ED38F": { + "AMILinuxarm64BuilderAmiRecipe4287E320": { "Type": "AWS::ImageBuilder::ImageRecipe", "Properties": { "Components": [ { "ComponentArn": { "Fn::GetAtt": [ - "AMILinuxarm64BuilderComponent0RequiredPackagesComponent2ABFFC8F", + "AMILinuxarm64BuilderComponent0RequiredPackagesComponentBADF7D60", "Arn" ] } @@ -5647,7 +5699,7 @@ { "ComponentArn": { "Fn::GetAtt": [ - "AMILinuxarm64BuilderComponent1CloudWatchAgentComponentE8D7E944", + "AMILinuxarm64BuilderComponent1CloudWatchAgentComponentC4EC4BFB", "Arn" ] } @@ -5655,7 +5707,7 @@ { "ComponentArn": { "Fn::GetAtt": [ - "AMILinuxarm64BuilderComponent2RunnerUserComponent81DDD70D", + "AMILinuxarm64BuilderComponent2RunnerUserComponent50218DEA", "Arn" ] } @@ -5663,7 +5715,7 @@ { "ComponentArn": { "Fn::GetAtt": [ - "AMILinuxarm64BuilderComponent3GitComponent341EEEFC", + "AMILinuxarm64BuilderComponent3GitComponent4F72CDB4", "Arn" ] } @@ -5671,7 +5723,7 @@ { "ComponentArn": { "Fn::GetAtt": [ - "AMILinuxarm64BuilderComponent4GithubCliComponentBB29E40E", + "AMILinuxarm64BuilderComponent4GithubCliComponent8F555A41", "Arn" ] } @@ -5679,7 +5731,7 @@ { "ComponentArn": { "Fn::GetAtt": [ - "AMILinuxarm64BuilderComponent5AwsCliComponentDFF10DCB", + "AMILinuxarm64BuilderComponent5AwsCliComponentA8EC9E97", "Arn" ] } @@ -5687,7 +5739,7 @@ { "ComponentArn": { "Fn::GetAtt": [ - "AMILinuxarm64BuilderComponent6DockerComponent1A04C1F4", + "AMILinuxarm64BuilderComponent6DockerComponentE31D0222", "Arn" ] } @@ -5695,7 +5747,7 @@ { "ComponentArn": { "Fn::GetAtt": [ - "AMILinuxarm64BuilderComponent7GithubRunnerComponentE1EF4281", + "AMILinuxarm64BuilderComponent7GithubRunnerComponentAFBEE3CB", "Arn" ] } @@ -5703,7 +5755,7 @@ { "ComponentArn": { "Fn::GetAtt": [ - "AMILinuxarm64BuilderComponent8CustomUndefinedComponent8BF2DD41", + "AMILinuxarm64BuilderComponent8CustomUndefinedComponent08FD8437", "Arn" ] } @@ -5711,13 +5763,13 @@ { "ComponentArn": { "Fn::GetAtt": [ - "AMILinuxarm64BuilderComponent9EnvironmentVariablesComponent99728C6D", + "AMILinuxarm64BuilderComponent9EnvironmentVariablesComponent589AD395", "Arn" ] } } ], - "Name": "github-runners-test-AMILinuxarm64Builder-AmiRecipe-9167B5EF", + "Name": "github-runners-test-amilinuxarm64builder-amirecipe-841295f9", "ParentImage": { "Fn::Join": [ "", @@ -5745,13 +5797,26 @@ "AMILinuxarm64BuilderAmiLog84A9D94A": { "Type": "AWS::Logs::LogGroup", "Properties": { - "LogGroupName": "/aws/imagebuilder/github-runners-test-AMILinuxarm64Builder-AmiRecipe-9167B5EF", + "LogGroupName": { + "Fn::Join": [ + "", + [ + "/aws/imagebuilder/", + { + "Fn::GetAtt": [ + "AMILinuxarm64BuilderAmiRecipe4287E320", + "Name" + ] + } + ] + ] + }, "RetentionInDays": 30 }, "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, - "AMILinuxarm64BuilderInstanceProfileCE3B6B09": { + "AMILinuxarm64BuilderInfrastructureInstanceProfile7C4D69A7": { "Type": "AWS::IAM::InstanceProfile", "Properties": { "Roles": [ @@ -5761,7 +5826,7 @@ ] } }, - "AMILinuxarm64BuilderInfrastructure80FA16D6": { + "AMILinuxarm64BuilderInfrastructureA97EB3DD": { "Type": "AWS::ImageBuilder::InfrastructureConfiguration", "Properties": { "InstanceMetadataOptions": { @@ -5769,12 +5834,12 @@ "HttpTokens": "required" }, "InstanceProfileName": { - "Ref": "AMILinuxarm64BuilderInstanceProfileCE3B6B09" + "Ref": "AMILinuxarm64BuilderInfrastructureInstanceProfile7C4D69A7" }, "InstanceTypes": [ "m6g.large" ], - "Name": "github-runners-test-AMILinuxarm64Builder-3F449283", + "Name": "github-runners-test-amilinuxarm64builder-infrastructure-4dd30f96", "SecurityGroupIds": [ { "Fn::GetAtt": [ @@ -5791,18 +5856,18 @@ } } }, - "AMILinuxarm64BuilderAMIImage40078F9E": { + "AMILinuxarm64BuilderAMIImageC529A482": { "Type": "AWS::ImageBuilder::Image", "Properties": { "DistributionConfigurationArn": { "Fn::GetAtt": [ - "AMILinuxarm64BuilderAMIDistribution2BDAF717", + "AMILinuxarm64BuilderAMIDistributionE6989D01", "Arn" ] }, "ImageRecipeArn": { "Fn::GetAtt": [ - "AMILinuxarm64BuilderAmiRecipe6A6ED38F", + "AMILinuxarm64BuilderAmiRecipe4287E320", "Arn" ] }, @@ -5811,7 +5876,7 @@ }, "InfrastructureConfigurationArn": { "Fn::GetAtt": [ - "AMILinuxarm64BuilderInfrastructure80FA16D6", + "AMILinuxarm64BuilderInfrastructureA97EB3DD", "Arn" ] }, @@ -5822,23 +5887,24 @@ }, "DependsOn": [ "AMILinuxarm64BuilderAmiLog84A9D94A", - "AMILinuxarm64BuilderInfrastructure80FA16D6" + "AMILinuxarm64BuilderInfrastructureInstanceProfile7C4D69A7", + "AMILinuxarm64BuilderInfrastructureA97EB3DD" ], "UpdateReplacePolicy": "Retain", "DeletionPolicy": "RetainExceptOnCreate" }, - "AMILinuxarm64BuilderAMIPipeline9CC1354C": { + "AMILinuxarm64BuilderAMIPipeline462B4E1B": { "Type": "AWS::ImageBuilder::ImagePipeline", "Properties": { "DistributionConfigurationArn": { "Fn::GetAtt": [ - "AMILinuxarm64BuilderAMIDistribution2BDAF717", + "AMILinuxarm64BuilderAMIDistributionE6989D01", "Arn" ] }, "ImageRecipeArn": { "Fn::GetAtt": [ - "AMILinuxarm64BuilderAmiRecipe6A6ED38F", + "AMILinuxarm64BuilderAmiRecipe4287E320", "Arn" ] }, @@ -5847,11 +5913,11 @@ }, "InfrastructureConfigurationArn": { "Fn::GetAtt": [ - "AMILinuxarm64BuilderInfrastructure80FA16D6", + "AMILinuxarm64BuilderInfrastructureA97EB3DD", "Arn" ] }, - "Name": "github-runners-test-AMILinuxarm64Builder-3F449283", + "Name": "github-runners-test-amilinuxarm64builder-amipipeline-7f59e36e", "Schedule": { "PipelineExecutionStartCondition": "EXPRESSION_MATCH_ONLY", "ScheduleExpression": "rate(7 days)" @@ -5863,7 +5929,8 @@ }, "DependsOn": [ "AMILinuxarm64BuilderAmiLog84A9D94A", - "AMILinuxarm64BuilderInfrastructure80FA16D6" + "AMILinuxarm64BuilderInfrastructureInstanceProfile7C4D69A7", + "AMILinuxarm64BuilderInfrastructureA97EB3DD" ] }, "AMILinuxarm64BuilderImageCleanerA5DDFE7A": { @@ -5891,10 +5958,17 @@ { "Ref": "AWS::AccountId" }, - ":image/github-runners-test-amilinuxarm64builder-amirecipe-9167b5ef/", + ":image/", { "Fn::GetAtt": [ - "AMILinuxarm64BuilderAmiRecipe6A6ED38F", + "AMILinuxarm64BuilderAmiRecipe4287E320", + "Name" + ] + }, + "/", + { + "Fn::GetAtt": [ + "AMILinuxarm64BuilderAmiRecipe4287E320", "Version" ] } @@ -5970,7 +6044,7 @@ ] } }, - "AMILinuxarm64BuilderLifecyclePolicyAMI44B6EABD": { + "AMILinuxarm64BuilderLifecyclePolicyAMI1941512F": { "Type": "AWS::ImageBuilder::LifecyclePolicy", "Properties": { "Description": "Delete old GitHub Runner AMIs for github-runners-test/AMI Linux arm64 Builder", @@ -5980,7 +6054,7 @@ "Arn" ] }, - "Name": "github-runners-test-AMILinuxarm64Builder-3F449283", + "Name": "github-runners-test-amilinuxarm64builder-lifecyclepolicyami-80d1039e", "PolicyDetails": [ { "Action": { @@ -5999,10 +6073,15 @@ "ResourceSelection": { "Recipes": [ { - "Name": "github-runners-test-AMILinuxarm64Builder-AmiRecipe-9167B5EF", + "Name": { + "Fn::GetAtt": [ + "AMILinuxarm64BuilderAmiRecipe4287E320", + "Name" + ] + }, "SemanticVersion": { "Fn::GetAtt": [ - "AMILinuxarm64BuilderAmiRecipe6A6ED38F", + "AMILinuxarm64BuilderAmiRecipe4287E320", "Version" ] } @@ -6169,13 +6248,12 @@ ] } }, - "WindowsEC2BuilderAMIDistributionC7E428C1": { + "WindowsEC2BuilderAMIDistribution6B33DD89": { "Type": "AWS::ImageBuilder::DistributionConfiguration", "Properties": { "Distributions": [ { "AmiDistributionConfiguration": { - "Name": "github-runners-test-WindowsEC2Builder-5FAF8285-{{ imagebuilder:buildDate }}", "AmiTags": { "Name": "Windows EC2 Builder", "GitHubRunners:Stack": "github-runners-test", @@ -6195,132 +6273,132 @@ } } ], - "Name": "github-runners-test-WindowsEC2Builder-5FAF8285", + "Name": "github-runners-test-windowsec2builder-amidistribution-f20c96b4", "Tags": { "GitHubRunners:Builder": "github-runners-test/Windows EC2 Builder", "GitHubRunners:Stack": "github-runners-test" } } }, - "WindowsEC2BuilderComponent0RequiredPackagesComponent42A20182": { + "WindowsEC2BuilderComponent0RequiredPackagesComponentC058987B": { "Type": "AWS::ImageBuilder::Component", "Properties": { - "Data": "{\"name\":\"Component 0 RequiredPackages\",\"schemaVersion\":\"1.0\",\"phases\":[{\"name\":\"build\",\"steps\":[{\"name\":\"Download\",\"action\":\"S3Download\",\"inputs\":[]}]}]}", + "Data": "name: Component 0 RequiredPackages\nschemaVersion: \"1.0\"\nphases:\n - name: build\n steps:\n - name: Download\n action: S3Download\n inputs: []\n", "Description": "Component 0 RequiredPackages", - "Name": "github-runners-test-WindowsEC2Builder-Component0RequiredPackages-29E311EC", + "Name": "github-runners-test-windowsec2builder-component0requiredpackages-component-bee13031", "Platform": "Windows", "Version": "1.0.0" } }, - "WindowsEC2BuilderComponent1CloudWatchAgentComponent0259F61E": { + "WindowsEC2BuilderComponent1CloudWatchAgentComponent7BB918AA": { "Type": "AWS::ImageBuilder::Component", "Properties": { - "Data": "{\"name\":\"Component 1 CloudWatchAgent\",\"schemaVersion\":\"1.0\",\"phases\":[{\"name\":\"build\",\"steps\":[{\"name\":\"Download\",\"action\":\"S3Download\",\"inputs\":[]},{\"name\":\"Run\",\"action\":\"ExecutePowerShell\",\"inputs\":{\"commands\":[\"$ErrorActionPreference = 'Stop'\",\"$ProgressPreference = 'SilentlyContinue'\",\"Set-PSDebug -Trace 1\",\"$p = Start-Process msiexec.exe -PassThru -Wait -ArgumentList '/i https://s3.amazonaws.com/amazoncloudwatch-agent/windows/amd64/latest/amazon-cloudwatch-agent.msi /qn'\",\"if ($p.ExitCode -ne 0) { throw \\\"Exit code is $p.ExitCode\\\" }\"]}}]}]}", + "Data": "name: Component 1 CloudWatchAgent\nschemaVersion: \"1.0\"\nphases:\n - name: build\n steps:\n - name: Download\n action: S3Download\n inputs: []\n - name: Run\n action: ExecutePowerShell\n inputs:\n commands:\n - $ErrorActionPreference = 'Stop'\n - $ProgressPreference = 'SilentlyContinue'\n - Set-PSDebug -Trace 1\n - $p = Start-Process msiexec.exe -PassThru -Wait -ArgumentList '/i\n https://s3.amazonaws.com/amazoncloudwatch-agent/windows/amd64/latest/amazon-cloudwatch-agent.msi\n /qn'\n - if ($p.ExitCode -ne 0) { throw \"Exit code is $p.ExitCode\" }\n", "Description": "Component 1 CloudWatchAgent", - "Name": "github-runners-test-WindowsEC2Builder-Component1CloudWatchAgent-1AA08FD8", + "Name": "github-runners-test-windowsec2builder-component1cloudwatchagent-component-64d3d72a", "Platform": "Windows", "Version": "1.0.0" } }, - "WindowsEC2BuilderComponent2RunnerUserComponentB482ECD9": { + "WindowsEC2BuilderComponent2RunnerUserComponentDF4429CD": { "Type": "AWS::ImageBuilder::Component", "Properties": { - "Data": "{\"name\":\"Component 2 RunnerUser\",\"schemaVersion\":\"1.0\",\"phases\":[{\"name\":\"build\",\"steps\":[{\"name\":\"Download\",\"action\":\"S3Download\",\"inputs\":[]}]}]}", + "Data": "name: Component 2 RunnerUser\nschemaVersion: \"1.0\"\nphases:\n - name: build\n steps:\n - name: Download\n action: S3Download\n inputs: []\n", "Description": "Component 2 RunnerUser", - "Name": "github-runners-test-WindowsEC2Builder-Component2RunnerUser-9F617778", + "Name": "github-runners-test-windowsec2builder-component2runneruser-component-91981b9f", "Platform": "Windows", "Version": "1.0.0" } }, - "WindowsEC2BuilderComponent3GitComponent71764393": { + "WindowsEC2BuilderComponent3GitComponent4F86AE54": { "Type": "AWS::ImageBuilder::Component", "Properties": { - "Data": "{\"name\":\"Component 3 Git\",\"schemaVersion\":\"1.0\",\"phases\":[{\"name\":\"build\",\"steps\":[{\"name\":\"Download\",\"action\":\"S3Download\",\"inputs\":[]},{\"name\":\"Run\",\"action\":\"ExecutePowerShell\",\"inputs\":{\"commands\":[\"$ErrorActionPreference = 'Stop'\",\"$ProgressPreference = 'SilentlyContinue'\",\"Set-PSDebug -Trace 1\",\"cmd /c curl -w \\\"%{redirect_url}\\\" -fsS https://github.com/git-for-windows/git/releases/latest > $Env:TEMP\\\\latest-git\",\"$LatestUrl = Get-Content $Env:TEMP\\\\latest-git\",\"$GIT_VERSION = ($LatestUrl -Split '/')[-1].substring(1)\",\"$GIT_VERSION_SHORT = ($GIT_VERSION -Split '.windows.')[0]\",\"$GIT_REVISION = ($GIT_VERSION -Split '.windows.')[1]\",\"If ($GIT_REVISION -gt 1) {$GIT_VERSION_SHORT = \\\"$GIT_VERSION_SHORT.$GIT_REVISION\\\"}\",\"Invoke-WebRequest -UseBasicParsing -Uri https://github.com/git-for-windows/git/releases/download/v${GIT_VERSION}/Git-${GIT_VERSION_SHORT}-64-bit.exe -OutFile git-setup.exe\",\"$p = Start-Process git-setup.exe -PassThru -Wait -ArgumentList '/VERYSILENT'\",\"if ($p.ExitCode -ne 0) { throw \\\"Exit code is $p.ExitCode\\\" }\",\"del git-setup.exe\"]}}]}]}", + "Data": "name: Component 3 Git\nschemaVersion: \"1.0\"\nphases:\n - name: build\n steps:\n - name: Download\n action: S3Download\n inputs: []\n - name: Run\n action: ExecutePowerShell\n inputs:\n commands:\n - $ErrorActionPreference = 'Stop'\n - $ProgressPreference = 'SilentlyContinue'\n - Set-PSDebug -Trace 1\n - cmd /c curl -w \"%{redirect_url}\" -fsS\n https://github.com/git-for-windows/git/releases/latest >\n $Env:TEMP\\latest-git\n - $LatestUrl = Get-Content $Env:TEMP\\latest-git\n - $GIT_VERSION = ($LatestUrl -Split '/')[-1].substring(1)\n - $GIT_VERSION_SHORT = ($GIT_VERSION -Split '.windows.')[0]\n - $GIT_REVISION = ($GIT_VERSION -Split '.windows.')[1]\n - If ($GIT_REVISION -gt 1) {$GIT_VERSION_SHORT =\n \"$GIT_VERSION_SHORT.$GIT_REVISION\"}\n - Invoke-WebRequest -UseBasicParsing -Uri\n https://github.com/git-for-windows/git/releases/download/v${GIT_VERSION}/Git-${GIT_VERSION_SHORT}-64-bit.exe\n -OutFile git-setup.exe\n - $p = Start-Process git-setup.exe -PassThru -Wait -ArgumentList\n '/VERYSILENT'\n - if ($p.ExitCode -ne 0) { throw \"Exit code is $p.ExitCode\" }\n - del git-setup.exe\n", "Description": "Component 3 Git", - "Name": "github-runners-test-WindowsEC2Builder-Component3Git-73F699B0", + "Name": "github-runners-test-windowsec2builder-component3git-component-cc6f418c", "Platform": "Windows", "Version": "1.0.0" } }, - "WindowsEC2BuilderComponent4GithubCliComponent4C5B4A15": { + "WindowsEC2BuilderComponent4GithubCliComponent0B2AA45F": { "Type": "AWS::ImageBuilder::Component", "Properties": { - "Data": "{\"name\":\"Component 4 GithubCli\",\"schemaVersion\":\"1.0\",\"phases\":[{\"name\":\"build\",\"steps\":[{\"name\":\"Download\",\"action\":\"S3Download\",\"inputs\":[]},{\"name\":\"Run\",\"action\":\"ExecutePowerShell\",\"inputs\":{\"commands\":[\"$ErrorActionPreference = 'Stop'\",\"$ProgressPreference = 'SilentlyContinue'\",\"Set-PSDebug -Trace 1\",\"cmd /c curl -w \\\"%{redirect_url}\\\" -fsS https://github.com/cli/cli/releases/latest > $Env:TEMP\\\\latest-gh\",\"$LatestUrl = Get-Content $Env:TEMP\\\\latest-gh\",\"$GH_VERSION = ($LatestUrl -Split '/')[-1].substring(1)\",\"Invoke-WebRequest -UseBasicParsing -Uri \\\"https://github.com/cli/cli/releases/download/v${GH_VERSION}/gh_${GH_VERSION}_windows_amd64.msi\\\" -OutFile gh.msi\",\"$p = Start-Process msiexec.exe -PassThru -Wait -ArgumentList '/i gh.msi /qn'\",\"if ($p.ExitCode -ne 0) { throw \\\"Exit code is $p.ExitCode\\\" }\",\"del gh.msi\"]}}]}]}", + "Data": "name: Component 4 GithubCli\nschemaVersion: \"1.0\"\nphases:\n - name: build\n steps:\n - name: Download\n action: S3Download\n inputs: []\n - name: Run\n action: ExecutePowerShell\n inputs:\n commands:\n - $ErrorActionPreference = 'Stop'\n - $ProgressPreference = 'SilentlyContinue'\n - Set-PSDebug -Trace 1\n - cmd /c curl -w \"%{redirect_url}\" -fsS\n https://github.com/cli/cli/releases/latest > $Env:TEMP\\latest-gh\n - $LatestUrl = Get-Content $Env:TEMP\\latest-gh\n - $GH_VERSION = ($LatestUrl -Split '/')[-1].substring(1)\n - Invoke-WebRequest -UseBasicParsing -Uri\n \"https://github.com/cli/cli/releases/download/v${GH_VERSION}/gh_${GH_VERSION}_windows_amd64.msi\"\n -OutFile gh.msi\n - $p = Start-Process msiexec.exe -PassThru -Wait -ArgumentList '/i\n gh.msi /qn'\n - if ($p.ExitCode -ne 0) { throw \"Exit code is $p.ExitCode\" }\n - del gh.msi\n", "Description": "Component 4 GithubCli", - "Name": "github-runners-test-WindowsEC2Builder-Component4GithubCli-57AD0DA2", + "Name": "github-runners-test-windowsec2builder-component4githubcli-component-860aefc0", "Platform": "Windows", "Version": "1.0.0" } }, - "WindowsEC2BuilderComponent5AwsCliComponentA5AD7E67": { + "WindowsEC2BuilderComponent5AwsCliComponent4CFA39A7": { "Type": "AWS::ImageBuilder::Component", "Properties": { - "Data": "{\"name\":\"Component 5 AwsCli\",\"schemaVersion\":\"1.0\",\"phases\":[{\"name\":\"build\",\"steps\":[{\"name\":\"Download\",\"action\":\"S3Download\",\"inputs\":[]},{\"name\":\"Run\",\"action\":\"ExecutePowerShell\",\"inputs\":{\"commands\":[\"$ErrorActionPreference = 'Stop'\",\"$ProgressPreference = 'SilentlyContinue'\",\"Set-PSDebug -Trace 1\",\"$p = Start-Process msiexec.exe -PassThru -Wait -ArgumentList '/i https://awscli.amazonaws.com/AWSCLIV2.msi /qn'\",\"if ($p.ExitCode -ne 0) { throw \\\"Exit code is $p.ExitCode\\\" }\"]}}]}]}", + "Data": "name: Component 5 AwsCli\nschemaVersion: \"1.0\"\nphases:\n - name: build\n steps:\n - name: Download\n action: S3Download\n inputs: []\n - name: Run\n action: ExecutePowerShell\n inputs:\n commands:\n - $ErrorActionPreference = 'Stop'\n - $ProgressPreference = 'SilentlyContinue'\n - Set-PSDebug -Trace 1\n - $p = Start-Process msiexec.exe -PassThru -Wait -ArgumentList '/i\n https://awscli.amazonaws.com/AWSCLIV2.msi /qn'\n - if ($p.ExitCode -ne 0) { throw \"Exit code is $p.ExitCode\" }\n", "Description": "Component 5 AwsCli", - "Name": "github-runners-test-WindowsEC2Builder-Component5AwsCli-9A139D36", + "Name": "github-runners-test-windowsec2builder-component5awscli-component-c6a315bd", "Platform": "Windows", "Version": "1.0.0" } }, - "WindowsEC2BuilderComponent6DockerComponent0A5C21D2": { + "WindowsEC2BuilderComponent6DockerComponent3B0B9BA0": { "Type": "AWS::ImageBuilder::Component", "Properties": { - "Data": "{\"name\":\"Component 6 Docker\",\"schemaVersion\":\"1.0\",\"phases\":[{\"name\":\"build\",\"steps\":[{\"name\":\"Download\",\"action\":\"S3Download\",\"inputs\":[]},{\"name\":\"Run\",\"action\":\"ExecutePowerShell\",\"inputs\":{\"commands\":[\"$ErrorActionPreference = 'Stop'\",\"$ProgressPreference = 'SilentlyContinue'\",\"Set-PSDebug -Trace 1\",\"$BaseUrl = \\\"https://download.docker.com/win/static/stable/x86_64/\\\"\",\"$html = Invoke-WebRequest -UseBasicParsing -Uri $BaseUrl\",\"$files = $html.Links.href | Where-Object { $_ -match '^docker-[0-9\\\\.]+\\\\.zip$' }\",\"if (-not $files) { Write-Error \\\"No docker-*.zip files found.\\\" ; exit 1 }\",\"$latest = $files | Sort-Object { try { [Version]($_ -replace '^docker-|\\\\.zip$') } catch { [Version]\\\"0.0.0\\\" } } -Descending | Select-Object -First 1\",\"Invoke-WebRequest -UseBasicParsing -Uri $BaseUrl$latest -OutFile docker.zip\",\"Expand-Archive docker.zip -DestinationPath \\\"$Env:ProgramFiles\\\"\",\"del docker.zip\",\"$persistedPaths = [Environment]::GetEnvironmentVariable('Path', [EnvironmentVariableTarget]::Machine)\",\"[Environment]::SetEnvironmentVariable(\\\"PATH\\\", $persistedPaths + \\\";$Env:ProgramFiles\\\\Docker\\\", [EnvironmentVariableTarget]::Machine)\",\"$env:PATH = $env:PATH + \\\";$Env:ProgramFiles\\\\Docker\\\"\",\"dockerd --register-service\",\"if ($LASTEXITCODE -ne 0) { throw \\\"Exit code is $LASTEXITCODE\\\" }\",\"Enable-WindowsOptionalFeature -Online -FeatureName containers -All -NoRestart\",\"cmd /c curl -w \\\"%{redirect_url}\\\" -fsS https://github.com/docker/compose/releases/latest > $Env:TEMP\\\\latest-docker-compose\",\"$LatestUrl = Get-Content $Env:TEMP\\\\latest-docker-compose\",\"$LatestDockerCompose = ($LatestUrl -Split '/')[-1]\",\"Invoke-WebRequest -UseBasicParsing -Uri \\\"https://github.com/docker/compose/releases/download/${LatestDockerCompose}/docker-compose-Windows-x86_64.exe\\\" -OutFile $Env:ProgramFiles\\\\Docker\\\\docker-compose.exe\",\"New-Item -ItemType directory -Path \\\"$Env:ProgramFiles\\\\Docker\\\\cli-plugins\\\"\",\"Copy-Item -Path \\\"$Env:ProgramFiles\\\\Docker\\\\docker-compose.exe\\\" -Destination \\\"$Env:ProgramFiles\\\\Docker\\\\cli-plugins\\\\docker-compose.exe\\\"\"]}},{\"name\":\"Reboot\",\"action\":\"Reboot\",\"inputs\":{}}]}]}", + "Data": "name: Component 6 Docker\nschemaVersion: \"1.0\"\nphases:\n - name: build\n steps:\n - name: Download\n action: S3Download\n inputs: []\n - name: Run\n action: ExecutePowerShell\n inputs:\n commands:\n - $ErrorActionPreference = 'Stop'\n - $ProgressPreference = 'SilentlyContinue'\n - Set-PSDebug -Trace 1\n - $BaseUrl = \"https://download.docker.com/win/static/stable/x86_64/\"\n - $html = Invoke-WebRequest -UseBasicParsing -Uri $BaseUrl\n - $files = $html.Links.href | Where-Object { $_ -match\n '^docker-[0-9\\.]+\\.zip$' }\n - if (-not $files) { Write-Error \"No docker-*.zip files found.\" ;\n exit 1 }\n - $latest = $files | Sort-Object { try { [Version]($_ -replace\n '^docker-|\\.zip$') } catch { [Version]\"0.0.0\" } } -Descending |\n Select-Object -First 1\n - Invoke-WebRequest -UseBasicParsing -Uri $BaseUrl$latest -OutFile\n docker.zip\n - Expand-Archive docker.zip -DestinationPath \"$Env:ProgramFiles\"\n - del docker.zip\n - $persistedPaths = [Environment]::GetEnvironmentVariable('Path',\n [EnvironmentVariableTarget]::Machine)\n - '[Environment]::SetEnvironmentVariable(\"PATH\", $persistedPaths +\n \";$Env:ProgramFiles\\Docker\",\n [EnvironmentVariableTarget]::Machine)'\n - $env:PATH = $env:PATH + \";$Env:ProgramFiles\\Docker\"\n - dockerd --register-service\n - if ($LASTEXITCODE -ne 0) { throw \"Exit code is $LASTEXITCODE\" }\n - Enable-WindowsOptionalFeature -Online -FeatureName containers -All\n -NoRestart\n - cmd /c curl -w \"%{redirect_url}\" -fsS\n https://github.com/docker/compose/releases/latest >\n $Env:TEMP\\latest-docker-compose\n - $LatestUrl = Get-Content $Env:TEMP\\latest-docker-compose\n - $LatestDockerCompose = ($LatestUrl -Split '/')[-1]\n - Invoke-WebRequest -UseBasicParsing\n -Uri \"https://github.com/docker/compose/releases/download/${LatestDockerCompose}/docker-compose-Windows-x86_64.exe\"\n -OutFile $Env:ProgramFiles\\Docker\\docker-compose.exe\n - New-Item -ItemType directory -Path\n \"$Env:ProgramFiles\\Docker\\cli-plugins\"\n - Copy-Item -Path \"$Env:ProgramFiles\\Docker\\docker-compose.exe\"\n -Destination\n \"$Env:ProgramFiles\\Docker\\cli-plugins\\docker-compose.exe\"\n - name: Reboot\n action: Reboot\n inputs: {}\n", "Description": "Component 6 Docker", - "Name": "github-runners-test-WindowsEC2Builder-Component6Docker-A5CAA74F", + "Name": "github-runners-test-windowsec2builder-component6docker-component-69981091", "Platform": "Windows", "Version": "1.0.0" } }, - "WindowsEC2BuilderComponent7GithubRunnerComponentB05EF94B": { + "WindowsEC2BuilderComponent7GithubRunnerComponentB34D30BC": { "Type": "AWS::ImageBuilder::Component", "Properties": { - "Data": "{\"name\":\"Component 7 GithubRunner\",\"schemaVersion\":\"1.0\",\"phases\":[{\"name\":\"build\",\"steps\":[{\"name\":\"Download\",\"action\":\"S3Download\",\"inputs\":[]},{\"name\":\"Run\",\"action\":\"ExecutePowerShell\",\"inputs\":{\"commands\":[\"$ErrorActionPreference = 'Stop'\",\"$ProgressPreference = 'SilentlyContinue'\",\"Set-PSDebug -Trace 1\",\"cmd /c curl -w \\\"%{redirect_url}\\\" -fsS https://github.com/actions/runner/releases/latest > $Env:TEMP\\\\latest-gha\",\"$LatestUrl = Get-Content $Env:TEMP\\\\latest-gha\",\"$RUNNER_VERSION = ($LatestUrl -Split '/')[-1].substring(1)\",\"mkdir C:\\\\hostedtoolcache\\\\windows\",\"mkdir C:\\\\tools\",\"cmd /c curl -w \\\"%{redirect_url}\\\" -fsS https://github.com/facebook/zstd/releases/latest > $Env:TEMP\\\\latest-zstd\",\"$LatestUrl = Get-Content $Env:TEMP\\\\latest-zstd\",\"$ZSTD_VERSION = ($LatestUrl -Split '/')[-1].substring(1)\",\"Invoke-WebRequest -UseBasicParsing -Uri \\\"https://github.com/facebook/zstd/releases/download/v$ZSTD_VERSION/zstd-v$ZSTD_VERSION-win64.zip\\\" -OutFile zstd.zip\",\"Expand-Archive zstd.zip -DestinationPath C:\\\\tools\",\"Move-Item -Path C:\\\\tools\\\\zstd-v$ZSTD_VERSION-win64\\\\zstd.exe C:\\\\tools\",\"Remove-Item -LiteralPath \\\"C:\\\\tools\\\\zstd-v$ZSTD_VERSION-win64\\\" -Force -Recurse\",\"del zstd.zip\",\"$persistedPaths = [Environment]::GetEnvironmentVariable('Path', [EnvironmentVariableTarget]::Machine)\",\"[Environment]::SetEnvironmentVariable(\\\"PATH\\\", $persistedPaths + \\\";C:\\\\tools\\\", [EnvironmentVariableTarget]::Machine)\",\"Invoke-WebRequest -UseBasicParsing -Uri \\\"https://github.com/actions/runner/releases/download/v${RUNNER_VERSION}/actions-runner-win-x64-${RUNNER_VERSION}.zip\\\" -OutFile actions.zip\",\"Expand-Archive actions.zip -DestinationPath C:\\\\actions\",\"del actions.zip\",\"echo latest | Out-File -Encoding ASCII -NoNewline C:\\\\actions\\\\RUNNER_VERSION\"]}}]}]}", + "Data": "name: Component 7 GithubRunner\nschemaVersion: \"1.0\"\nphases:\n - name: build\n steps:\n - name: Download\n action: S3Download\n inputs: []\n - name: Run\n action: ExecutePowerShell\n inputs:\n commands:\n - $ErrorActionPreference = 'Stop'\n - $ProgressPreference = 'SilentlyContinue'\n - Set-PSDebug -Trace 1\n - cmd /c curl -w \"%{redirect_url}\" -fsS\n https://github.com/actions/runner/releases/latest >\n $Env:TEMP\\latest-gha\n - $LatestUrl = Get-Content $Env:TEMP\\latest-gha\n - $RUNNER_VERSION = ($LatestUrl -Split '/')[-1].substring(1)\n - mkdir C:\\hostedtoolcache\\windows\n - mkdir C:\\tools\n - cmd /c curl -w \"%{redirect_url}\" -fsS\n https://github.com/facebook/zstd/releases/latest >\n $Env:TEMP\\latest-zstd\n - $LatestUrl = Get-Content $Env:TEMP\\latest-zstd\n - $ZSTD_VERSION = ($LatestUrl -Split '/')[-1].substring(1)\n - Invoke-WebRequest -UseBasicParsing -Uri\n \"https://github.com/facebook/zstd/releases/download/v$ZSTD_VERSION/zstd-v$ZSTD_VERSION-win64.zip\"\n -OutFile zstd.zip\n - Expand-Archive zstd.zip -DestinationPath C:\\tools\n - Move-Item -Path C:\\tools\\zstd-v$ZSTD_VERSION-win64\\zstd.exe\n C:\\tools\n - Remove-Item -LiteralPath \"C:\\tools\\zstd-v$ZSTD_VERSION-win64\"\n -Force -Recurse\n - del zstd.zip\n - $persistedPaths = [Environment]::GetEnvironmentVariable('Path',\n [EnvironmentVariableTarget]::Machine)\n - '[Environment]::SetEnvironmentVariable(\"PATH\", $persistedPaths +\n \";C:\\tools\", [EnvironmentVariableTarget]::Machine)'\n - Invoke-WebRequest -UseBasicParsing -Uri\n \"https://github.com/actions/runner/releases/download/v${RUNNER_VERSION}/actions-runner-win-x64-${RUNNER_VERSION}.zip\"\n -OutFile actions.zip\n - Expand-Archive actions.zip -DestinationPath C:\\actions\n - del actions.zip\n - echo latest | Out-File -Encoding ASCII -NoNewline\n C:\\actions\\RUNNER_VERSION\n", "Description": "Component 7 GithubRunner", - "Name": "github-runners-test-WindowsEC2Builder-Component7GithubRunner-B919BFBF", + "Name": "github-runners-test-windowsec2builder-component7githubrunner-component-a31c580e", "Platform": "Windows", "Version": "1.0.0" } }, - "WindowsEC2BuilderComponent8CustomUndefinedComponent1B25F637": { + "WindowsEC2BuilderComponent8CustomUndefinedComponent4833E552": { "Type": "AWS::ImageBuilder::Component", "Properties": { "Data": { "Fn::Join": [ "", [ - "{\"name\":\"Component 8 Custom-Undefined\",\"schemaVersion\":\"1.0\",\"phases\":[{\"name\":\"build\",\"steps\":[{\"name\":\"Download\",\"action\":\"S3Download\",\"inputs\":[{\"source\":\"", + "name: Component 8 Custom-Undefined\nschemaVersion: \"1.0\"\nphases:\n - name: build\n steps:\n - name: Download\n action: S3Download\n inputs:\n - source: ", { "Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/64f83fc47e69ce862669fca14d759c3034fdbed3686b66dcf7bf9ff166f65c68.yml" }, - "\",\"destination\":\"FUNDING.yml\"}]},{\"name\":\"Run\",\"action\":\"ExecutePowerShell\",\"inputs\":{\"commands\":[\"$ErrorActionPreference = 'Stop'\",\"$ProgressPreference = 'SilentlyContinue'\",\"Set-PSDebug -Trace 1\",\"New-Item -ItemType file -Path / -Name custom-file\",\"New-Item -ItemType directory -Path / -Name custom-dir\",\"Move-Item FUNDING.yml /custom-dir\"]}}]}]}" + "\n destination: FUNDING.yml\n - name: Run\n action: ExecutePowerShell\n inputs:\n commands:\n - $ErrorActionPreference = 'Stop'\n - $ProgressPreference = 'SilentlyContinue'\n - Set-PSDebug -Trace 1\n - New-Item -ItemType file -Path / -Name custom-file\n - New-Item -ItemType directory -Path / -Name custom-dir\n - Move-Item FUNDING.yml /custom-dir\n" ] ] }, "Description": "Component 8 Custom-Undefined", - "Name": "github-runners-test-WindowsEC2Builder-Component8Custom-Undefined-82FF61E0", + "Name": "github-runners-test-windowsec2builder-component8custom-undefined-component-c961cd3a", "Platform": "Windows", "Version": "1.0.0" } }, - "WindowsEC2BuilderComponent9EnvironmentVariablesComponentF10003FD": { + "WindowsEC2BuilderComponent9EnvironmentVariablesComponentB3C3A7C0": { "Type": "AWS::ImageBuilder::Component", "Properties": { - "Data": "{\"name\":\"Component 9 EnvironmentVariables\",\"schemaVersion\":\"1.0\",\"phases\":[{\"name\":\"build\",\"steps\":[{\"name\":\"Download\",\"action\":\"S3Download\",\"inputs\":[]},{\"name\":\"Run\",\"action\":\"ExecutePowerShell\",\"inputs\":{\"commands\":[\"$ErrorActionPreference = 'Stop'\",\"$ProgressPreference = 'SilentlyContinue'\",\"Set-PSDebug -Trace 1\",\"Add-Content -Path C:\\\\actions\\\\.env -Value 'HELLO=world'\",\"Add-Content -Path C:\\\\actions\\\\.env -Value 'FOO=bar'\"]}}]}]}", + "Data": "name: Component 9 EnvironmentVariables\nschemaVersion: \"1.0\"\nphases:\n - name: build\n steps:\n - name: Download\n action: S3Download\n inputs: []\n - name: Run\n action: ExecutePowerShell\n inputs:\n commands:\n - $ErrorActionPreference = 'Stop'\n - $ProgressPreference = 'SilentlyContinue'\n - Set-PSDebug -Trace 1\n - Add-Content -Path C:\\actions\\.env -Value 'HELLO=world'\n - Add-Content -Path C:\\actions\\.env -Value 'FOO=bar'\n", "Description": "Component 9 EnvironmentVariables", - "Name": "github-runners-test-WindowsEC2Builder-Component9EnvironmentVariables-06A82763", + "Name": "github-runners-test-windowsec2builder-component9environmentvariables-component-9fb8d548", "Platform": "Windows", "Version": "1.0.0" } }, - "WindowsEC2BuilderAmiRecipe41A137FF": { + "WindowsEC2BuilderAmiRecipe9D687A09": { "Type": "AWS::ImageBuilder::ImageRecipe", "Properties": { "Components": [ { "ComponentArn": { "Fn::GetAtt": [ - "WindowsEC2BuilderComponent0RequiredPackagesComponent42A20182", + "WindowsEC2BuilderComponent0RequiredPackagesComponentC058987B", "Arn" ] } @@ -6328,7 +6406,7 @@ { "ComponentArn": { "Fn::GetAtt": [ - "WindowsEC2BuilderComponent1CloudWatchAgentComponent0259F61E", + "WindowsEC2BuilderComponent1CloudWatchAgentComponent7BB918AA", "Arn" ] } @@ -6336,7 +6414,7 @@ { "ComponentArn": { "Fn::GetAtt": [ - "WindowsEC2BuilderComponent2RunnerUserComponentB482ECD9", + "WindowsEC2BuilderComponent2RunnerUserComponentDF4429CD", "Arn" ] } @@ -6344,7 +6422,7 @@ { "ComponentArn": { "Fn::GetAtt": [ - "WindowsEC2BuilderComponent3GitComponent71764393", + "WindowsEC2BuilderComponent3GitComponent4F86AE54", "Arn" ] } @@ -6352,7 +6430,7 @@ { "ComponentArn": { "Fn::GetAtt": [ - "WindowsEC2BuilderComponent4GithubCliComponent4C5B4A15", + "WindowsEC2BuilderComponent4GithubCliComponent0B2AA45F", "Arn" ] } @@ -6360,7 +6438,7 @@ { "ComponentArn": { "Fn::GetAtt": [ - "WindowsEC2BuilderComponent5AwsCliComponentA5AD7E67", + "WindowsEC2BuilderComponent5AwsCliComponent4CFA39A7", "Arn" ] } @@ -6368,7 +6446,7 @@ { "ComponentArn": { "Fn::GetAtt": [ - "WindowsEC2BuilderComponent6DockerComponent0A5C21D2", + "WindowsEC2BuilderComponent6DockerComponent3B0B9BA0", "Arn" ] } @@ -6376,7 +6454,7 @@ { "ComponentArn": { "Fn::GetAtt": [ - "WindowsEC2BuilderComponent7GithubRunnerComponentB05EF94B", + "WindowsEC2BuilderComponent7GithubRunnerComponentB34D30BC", "Arn" ] } @@ -6384,7 +6462,7 @@ { "ComponentArn": { "Fn::GetAtt": [ - "WindowsEC2BuilderComponent8CustomUndefinedComponent1B25F637", + "WindowsEC2BuilderComponent8CustomUndefinedComponent4833E552", "Arn" ] } @@ -6392,13 +6470,13 @@ { "ComponentArn": { "Fn::GetAtt": [ - "WindowsEC2BuilderComponent9EnvironmentVariablesComponentF10003FD", + "WindowsEC2BuilderComponent9EnvironmentVariablesComponentB3C3A7C0", "Arn" ] } } ], - "Name": "github-runners-test-WindowsEC2Builder-AmiRecipe-BEDA5750", + "Name": "github-runners-test-windowsec2builder-amirecipe-a290749e", "ParentImage": { "Fn::Join": [ "", @@ -6426,13 +6504,26 @@ "WindowsEC2BuilderAmiLog126E54B2": { "Type": "AWS::Logs::LogGroup", "Properties": { - "LogGroupName": "/aws/imagebuilder/github-runners-test-WindowsEC2Builder-AmiRecipe-BEDA5750", + "LogGroupName": { + "Fn::Join": [ + "", + [ + "/aws/imagebuilder/", + { + "Fn::GetAtt": [ + "WindowsEC2BuilderAmiRecipe9D687A09", + "Name" + ] + } + ] + ] + }, "RetentionInDays": 30 }, "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, - "WindowsEC2BuilderInstanceProfileA8DBA763": { + "WindowsEC2BuilderInfrastructureInstanceProfile8A9DECBA": { "Type": "AWS::IAM::InstanceProfile", "Properties": { "Roles": [ @@ -6442,7 +6533,7 @@ ] } }, - "WindowsEC2BuilderInfrastructure757D4FD7": { + "WindowsEC2BuilderInfrastructure4289B6D2": { "Type": "AWS::ImageBuilder::InfrastructureConfiguration", "Properties": { "InstanceMetadataOptions": { @@ -6450,12 +6541,12 @@ "HttpTokens": "required" }, "InstanceProfileName": { - "Ref": "WindowsEC2BuilderInstanceProfileA8DBA763" + "Ref": "WindowsEC2BuilderInfrastructureInstanceProfile8A9DECBA" }, "InstanceTypes": [ "m6i.large" ], - "Name": "github-runners-test-WindowsEC2Builder-5FAF8285", + "Name": "github-runners-test-windowsec2builder-infrastructure-8e08e175", "SecurityGroupIds": [ { "Fn::GetAtt": [ @@ -6472,18 +6563,18 @@ } } }, - "WindowsEC2BuilderAMIImage9D812188": { + "WindowsEC2BuilderAMIImageD1C73439": { "Type": "AWS::ImageBuilder::Image", "Properties": { "DistributionConfigurationArn": { "Fn::GetAtt": [ - "WindowsEC2BuilderAMIDistributionC7E428C1", + "WindowsEC2BuilderAMIDistribution6B33DD89", "Arn" ] }, "ImageRecipeArn": { "Fn::GetAtt": [ - "WindowsEC2BuilderAmiRecipe41A137FF", + "WindowsEC2BuilderAmiRecipe9D687A09", "Arn" ] }, @@ -6492,7 +6583,7 @@ }, "InfrastructureConfigurationArn": { "Fn::GetAtt": [ - "WindowsEC2BuilderInfrastructure757D4FD7", + "WindowsEC2BuilderInfrastructure4289B6D2", "Arn" ] }, @@ -6503,23 +6594,24 @@ }, "DependsOn": [ "WindowsEC2BuilderAmiLog126E54B2", - "WindowsEC2BuilderInfrastructure757D4FD7" + "WindowsEC2BuilderInfrastructureInstanceProfile8A9DECBA", + "WindowsEC2BuilderInfrastructure4289B6D2" ], "UpdateReplacePolicy": "Retain", "DeletionPolicy": "RetainExceptOnCreate" }, - "WindowsEC2BuilderAMIPipelineE3836949": { + "WindowsEC2BuilderAMIPipeline445918BA": { "Type": "AWS::ImageBuilder::ImagePipeline", "Properties": { "DistributionConfigurationArn": { "Fn::GetAtt": [ - "WindowsEC2BuilderAMIDistributionC7E428C1", + "WindowsEC2BuilderAMIDistribution6B33DD89", "Arn" ] }, "ImageRecipeArn": { "Fn::GetAtt": [ - "WindowsEC2BuilderAmiRecipe41A137FF", + "WindowsEC2BuilderAmiRecipe9D687A09", "Arn" ] }, @@ -6528,11 +6620,11 @@ }, "InfrastructureConfigurationArn": { "Fn::GetAtt": [ - "WindowsEC2BuilderInfrastructure757D4FD7", + "WindowsEC2BuilderInfrastructure4289B6D2", "Arn" ] }, - "Name": "github-runners-test-WindowsEC2Builder-5FAF8285", + "Name": "github-runners-test-windowsec2builder-amipipeline-fef0bbd5", "Schedule": { "PipelineExecutionStartCondition": "EXPRESSION_MATCH_ONLY", "ScheduleExpression": "rate(7 days)" @@ -6544,7 +6636,8 @@ }, "DependsOn": [ "WindowsEC2BuilderAmiLog126E54B2", - "WindowsEC2BuilderInfrastructure757D4FD7" + "WindowsEC2BuilderInfrastructureInstanceProfile8A9DECBA", + "WindowsEC2BuilderInfrastructure4289B6D2" ] }, "WindowsEC2BuilderImageCleanerEF537850": { @@ -6572,10 +6665,17 @@ { "Ref": "AWS::AccountId" }, - ":image/github-runners-test-windowsec2builder-amirecipe-beda5750/", + ":image/", { "Fn::GetAtt": [ - "WindowsEC2BuilderAmiRecipe41A137FF", + "WindowsEC2BuilderAmiRecipe9D687A09", + "Name" + ] + }, + "/", + { + "Fn::GetAtt": [ + "WindowsEC2BuilderAmiRecipe9D687A09", "Version" ] } @@ -6651,7 +6751,7 @@ ] } }, - "WindowsEC2BuilderLifecyclePolicyAMIF732B3A7": { + "WindowsEC2BuilderLifecyclePolicyAMI73E24E7A": { "Type": "AWS::ImageBuilder::LifecyclePolicy", "Properties": { "Description": "Delete old GitHub Runner AMIs for github-runners-test/Windows EC2 Builder", @@ -6661,7 +6761,7 @@ "Arn" ] }, - "Name": "github-runners-test-WindowsEC2Builder-5FAF8285", + "Name": "github-runners-test-windowsec2builder-lifecyclepolicyami-964d181f", "PolicyDetails": [ { "Action": { @@ -6680,10 +6780,15 @@ "ResourceSelection": { "Recipes": [ { - "Name": "github-runners-test-WindowsEC2Builder-AmiRecipe-BEDA5750", + "Name": { + "Fn::GetAtt": [ + "WindowsEC2BuilderAmiRecipe9D687A09", + "Name" + ] + }, "SemanticVersion": { "Fn::GetAtt": [ - "WindowsEC2BuilderAmiRecipe41A137FF", + "WindowsEC2BuilderAmiRecipe9D687A09", "Version" ] } @@ -11106,7 +11211,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "97f30e67419a1676a2215492723e5add1aa491caf0cbe2dd878fc4fab0468cd4.zip" + "S3Key": "bc8ef58951f4c88e641dd23090e9d2e2e61c7530a07960e767522941e959b625.zip" }, "Handler": "index.handler", "LoggingConfig": { @@ -11120,15 +11225,7 @@ "Arn" ] }, - "Runtime": { - "Fn::FindInMap": [ - "LatestNodeRuntimeMap", - { - "Ref": "AWS::Region" - }, - "value" - ] - }, + "Runtime": "nodejs22.x", "Timeout": 120 }, "DependsOn": [ @@ -13135,28 +13232,28 @@ } }, "DependsOn": [ - "AMILinuxBuilderAMIDistribution46435AF5", - "AMILinuxBuilderAMIImage93D83DE5", + "AMILinuxBuilderAMIDistribution215F3A5C", + "AMILinuxBuilderAMIImage8609B129", "AMILinuxBuilderAmiLog0DB16E38", - "AMILinuxBuilderAMIPipelineEC5051DF", + "AMILinuxBuilderAMIPipeline77F9C0F7", "AMILinuxBuilderAmiRecipeAMIRootDevice7FF39374", - "AMILinuxBuilderAmiRecipe7C7ED6C7", - "AMILinuxBuilderComponent0RequiredPackagesComponent6D0029EE", - "AMILinuxBuilderComponent1CloudWatchAgentComponentEF606A78", - "AMILinuxBuilderComponent2RunnerUserComponentEE2EFAA9", - "AMILinuxBuilderComponent3GitComponent11319ECE", - "AMILinuxBuilderComponent4GithubCliComponent21834DCF", - "AMILinuxBuilderComponent5AwsCliComponent3AA64EA2", - "AMILinuxBuilderComponent6DockerComponentD5E4165F", - "AMILinuxBuilderComponent7GithubRunnerComponent898B6A50", - "AMILinuxBuilderComponent8CustomUndefinedComponentCF5507D3", - "AMILinuxBuilderComponent9EnvironmentVariablesComponent59394D7E", + "AMILinuxBuilderAmiRecipeB7CF9599", + "AMILinuxBuilderComponent0RequiredPackagesComponent74077CC6", + "AMILinuxBuilderComponent1CloudWatchAgentComponentE997701A", + "AMILinuxBuilderComponent2RunnerUserComponentCDE71073", + "AMILinuxBuilderComponent3GitComponent9011E3AB", + "AMILinuxBuilderComponent4GithubCliComponent602EE471", + "AMILinuxBuilderComponent5AwsCliComponent72637C19", + "AMILinuxBuilderComponent6DockerComponent9E523A42", + "AMILinuxBuilderComponent7GithubRunnerComponentD0CD7066", + "AMILinuxBuilderComponent8CustomUndefinedComponent746EA99F", + "AMILinuxBuilderComponent9EnvironmentVariablesComponent31538DDD", "AMILinuxBuilderImageCleanerF1745EF6", - "AMILinuxBuilderInfrastructure6FCD154A", - "AMILinuxBuilderInstanceProfile3CA638BE", + "AMILinuxBuilderInfrastructureInstanceProfileB423D304", + "AMILinuxBuilderInfrastructure069F0561", "AMILinuxBuilderLaunchtemplateA29452C4", - "AMILinuxBuilderLifecyclePolicyAMIFB556CB2", "AMILinuxBuilderLifecyclePolicyAMIRole7BBFF711", + "AMILinuxBuilderLifecyclePolicyAMI9EC6A562", "AMILinuxBuilderRoleDefaultPolicy69ED051F", "AMILinuxBuilderRole0C42378A", "AMILinuxBuilderSGEDC86329" @@ -13367,28 +13464,28 @@ } }, "DependsOn": [ - "AMILinuxBuilderAMIDistribution46435AF5", - "AMILinuxBuilderAMIImage93D83DE5", + "AMILinuxBuilderAMIDistribution215F3A5C", + "AMILinuxBuilderAMIImage8609B129", "AMILinuxBuilderAmiLog0DB16E38", - "AMILinuxBuilderAMIPipelineEC5051DF", + "AMILinuxBuilderAMIPipeline77F9C0F7", "AMILinuxBuilderAmiRecipeAMIRootDevice7FF39374", - "AMILinuxBuilderAmiRecipe7C7ED6C7", - "AMILinuxBuilderComponent0RequiredPackagesComponent6D0029EE", - "AMILinuxBuilderComponent1CloudWatchAgentComponentEF606A78", - "AMILinuxBuilderComponent2RunnerUserComponentEE2EFAA9", - "AMILinuxBuilderComponent3GitComponent11319ECE", - "AMILinuxBuilderComponent4GithubCliComponent21834DCF", - "AMILinuxBuilderComponent5AwsCliComponent3AA64EA2", - "AMILinuxBuilderComponent6DockerComponentD5E4165F", - "AMILinuxBuilderComponent7GithubRunnerComponent898B6A50", - "AMILinuxBuilderComponent8CustomUndefinedComponentCF5507D3", - "AMILinuxBuilderComponent9EnvironmentVariablesComponent59394D7E", + "AMILinuxBuilderAmiRecipeB7CF9599", + "AMILinuxBuilderComponent0RequiredPackagesComponent74077CC6", + "AMILinuxBuilderComponent1CloudWatchAgentComponentE997701A", + "AMILinuxBuilderComponent2RunnerUserComponentCDE71073", + "AMILinuxBuilderComponent3GitComponent9011E3AB", + "AMILinuxBuilderComponent4GithubCliComponent602EE471", + "AMILinuxBuilderComponent5AwsCliComponent72637C19", + "AMILinuxBuilderComponent6DockerComponent9E523A42", + "AMILinuxBuilderComponent7GithubRunnerComponentD0CD7066", + "AMILinuxBuilderComponent8CustomUndefinedComponent746EA99F", + "AMILinuxBuilderComponent9EnvironmentVariablesComponent31538DDD", "AMILinuxBuilderImageCleanerF1745EF6", - "AMILinuxBuilderInfrastructure6FCD154A", - "AMILinuxBuilderInstanceProfile3CA638BE", + "AMILinuxBuilderInfrastructureInstanceProfileB423D304", + "AMILinuxBuilderInfrastructure069F0561", "AMILinuxBuilderLaunchtemplateA29452C4", - "AMILinuxBuilderLifecyclePolicyAMIFB556CB2", "AMILinuxBuilderLifecyclePolicyAMIRole7BBFF711", + "AMILinuxBuilderLifecyclePolicyAMI9EC6A562", "AMILinuxBuilderRoleDefaultPolicy69ED051F", "AMILinuxBuilderRole0C42378A", "AMILinuxBuilderSGEDC86329" @@ -13563,27 +13660,27 @@ } }, "DependsOn": [ - "AMILinuxarm64BuilderAMIDistribution2BDAF717", - "AMILinuxarm64BuilderAMIImage40078F9E", + "AMILinuxarm64BuilderAMIDistributionE6989D01", + "AMILinuxarm64BuilderAMIImageC529A482", "AMILinuxarm64BuilderAmiLog84A9D94A", - "AMILinuxarm64BuilderAMIPipeline9CC1354C", - "AMILinuxarm64BuilderAmiRecipe6A6ED38F", - "AMILinuxarm64BuilderComponent0RequiredPackagesComponent2ABFFC8F", - "AMILinuxarm64BuilderComponent1CloudWatchAgentComponentE8D7E944", - "AMILinuxarm64BuilderComponent2RunnerUserComponent81DDD70D", - "AMILinuxarm64BuilderComponent3GitComponent341EEEFC", - "AMILinuxarm64BuilderComponent4GithubCliComponentBB29E40E", - "AMILinuxarm64BuilderComponent5AwsCliComponentDFF10DCB", - "AMILinuxarm64BuilderComponent6DockerComponent1A04C1F4", - "AMILinuxarm64BuilderComponent7GithubRunnerComponentE1EF4281", - "AMILinuxarm64BuilderComponent8CustomUndefinedComponent8BF2DD41", - "AMILinuxarm64BuilderComponent9EnvironmentVariablesComponent99728C6D", + "AMILinuxarm64BuilderAMIPipeline462B4E1B", + "AMILinuxarm64BuilderAmiRecipe4287E320", + "AMILinuxarm64BuilderComponent0RequiredPackagesComponentBADF7D60", + "AMILinuxarm64BuilderComponent1CloudWatchAgentComponentC4EC4BFB", + "AMILinuxarm64BuilderComponent2RunnerUserComponent50218DEA", + "AMILinuxarm64BuilderComponent3GitComponent4F72CDB4", + "AMILinuxarm64BuilderComponent4GithubCliComponent8F555A41", + "AMILinuxarm64BuilderComponent5AwsCliComponentA8EC9E97", + "AMILinuxarm64BuilderComponent6DockerComponentE31D0222", + "AMILinuxarm64BuilderComponent7GithubRunnerComponentAFBEE3CB", + "AMILinuxarm64BuilderComponent8CustomUndefinedComponent08FD8437", + "AMILinuxarm64BuilderComponent9EnvironmentVariablesComponent589AD395", "AMILinuxarm64BuilderImageCleanerA5DDFE7A", - "AMILinuxarm64BuilderInfrastructure80FA16D6", - "AMILinuxarm64BuilderInstanceProfileCE3B6B09", + "AMILinuxarm64BuilderInfrastructureInstanceProfile7C4D69A7", + "AMILinuxarm64BuilderInfrastructureA97EB3DD", "AMILinuxarm64BuilderLaunchtemplate8F5EFF44", - "AMILinuxarm64BuilderLifecyclePolicyAMI44B6EABD", "AMILinuxarm64BuilderLifecyclePolicyAMIRole1D81BF43", + "AMILinuxarm64BuilderLifecyclePolicyAMI1941512F", "AMILinuxarm64BuilderRoleDefaultPolicy113305EE", "AMILinuxarm64BuilderRole40D54E29", "AMILinuxarm64BuilderSG94315968" @@ -13758,27 +13855,27 @@ } }, "DependsOn": [ - "WindowsEC2BuilderAMIDistributionC7E428C1", - "WindowsEC2BuilderAMIImage9D812188", + "WindowsEC2BuilderAMIDistribution6B33DD89", + "WindowsEC2BuilderAMIImageD1C73439", "WindowsEC2BuilderAmiLog126E54B2", - "WindowsEC2BuilderAMIPipelineE3836949", - "WindowsEC2BuilderAmiRecipe41A137FF", - "WindowsEC2BuilderComponent0RequiredPackagesComponent42A20182", - "WindowsEC2BuilderComponent1CloudWatchAgentComponent0259F61E", - "WindowsEC2BuilderComponent2RunnerUserComponentB482ECD9", - "WindowsEC2BuilderComponent3GitComponent71764393", - "WindowsEC2BuilderComponent4GithubCliComponent4C5B4A15", - "WindowsEC2BuilderComponent5AwsCliComponentA5AD7E67", - "WindowsEC2BuilderComponent6DockerComponent0A5C21D2", - "WindowsEC2BuilderComponent7GithubRunnerComponentB05EF94B", - "WindowsEC2BuilderComponent8CustomUndefinedComponent1B25F637", - "WindowsEC2BuilderComponent9EnvironmentVariablesComponentF10003FD", + "WindowsEC2BuilderAMIPipeline445918BA", + "WindowsEC2BuilderAmiRecipe9D687A09", + "WindowsEC2BuilderComponent0RequiredPackagesComponentC058987B", + "WindowsEC2BuilderComponent1CloudWatchAgentComponent7BB918AA", + "WindowsEC2BuilderComponent2RunnerUserComponentDF4429CD", + "WindowsEC2BuilderComponent3GitComponent4F86AE54", + "WindowsEC2BuilderComponent4GithubCliComponent0B2AA45F", + "WindowsEC2BuilderComponent5AwsCliComponent4CFA39A7", + "WindowsEC2BuilderComponent6DockerComponent3B0B9BA0", + "WindowsEC2BuilderComponent7GithubRunnerComponentB34D30BC", + "WindowsEC2BuilderComponent8CustomUndefinedComponent4833E552", + "WindowsEC2BuilderComponent9EnvironmentVariablesComponentB3C3A7C0", "WindowsEC2BuilderImageCleanerEF537850", - "WindowsEC2BuilderInfrastructure757D4FD7", - "WindowsEC2BuilderInstanceProfileA8DBA763", + "WindowsEC2BuilderInfrastructureInstanceProfile8A9DECBA", + "WindowsEC2BuilderInfrastructure4289B6D2", "WindowsEC2BuilderLaunchtemplate0A66E9C2", - "WindowsEC2BuilderLifecyclePolicyAMIF732B3A7", "WindowsEC2BuilderLifecyclePolicyAMIRoleE85A7F2C", + "WindowsEC2BuilderLifecyclePolicyAMI73E24E7A", "WindowsEC2BuilderRoleDefaultPolicy8A5B4E85", "WindowsEC2BuilderRole1BA7D3E7", "WindowsEC2BuilderSGE3F67842" @@ -16651,6 +16748,20 @@ "Principal": "*" } }, + "runnersWebhookHandlerwebhookhandlerinvokefunction76559985": { + "Type": "AWS::Lambda::Permission", + "Properties": { + "Action": "lambda:InvokeFunction", + "FunctionName": { + "Fn::GetAtt": [ + "runnersWebhookHandlerwebhookhandler22779A81", + "Arn" + ] + }, + "InvokedViaFunctionUrl": true, + "Principal": "*" + } + }, "runnersWebhookRedeliveryLambdaServiceRole464CDD30": { "Type": "AWS::IAM::Role", "Properties": { @@ -16841,7 +16952,8 @@ { "Action": [ "secretsmanager:PutSecretValue", - "secretsmanager:UpdateSecret" + "secretsmanager:UpdateSecret", + "secretsmanager:UpdateSecretVersionStage" ], "Effect": "Allow", "Resource": { @@ -16861,7 +16973,8 @@ { "Action": [ "secretsmanager:PutSecretValue", - "secretsmanager:UpdateSecret" + "secretsmanager:UpdateSecret", + "secretsmanager:UpdateSecretVersionStage" ], "Effect": "Allow", "Resource": { @@ -16871,7 +16984,8 @@ { "Action": [ "secretsmanager:PutSecretValue", - "secretsmanager:UpdateSecret" + "secretsmanager:UpdateSecret", + "secretsmanager:UpdateSecretVersionStage" ], "Effect": "Allow", "Resource": { @@ -16891,7 +17005,8 @@ { "Action": [ "secretsmanager:PutSecretValue", - "secretsmanager:UpdateSecret" + "secretsmanager:UpdateSecret", + "secretsmanager:UpdateSecretVersionStage" ], "Effect": "Allow", "Resource": { @@ -16989,6 +17104,20 @@ "Principal": "*" } }, + "runnerssetupinvokefunctionC1E3C6E6": { + "Type": "AWS::Lambda::Permission", + "Properties": { + "Action": "lambda:InvokeFunction", + "FunctionName": { + "Fn::GetAtt": [ + "runnerssetup9896CB59", + "Arn" + ] + }, + "InvokedViaFunctionUrl": true, + "Principal": "*" + } + }, "runnersstatusServiceRole71A1ADB6": { "Type": "AWS::IAM::Role", "Properties": { @@ -19101,130 +19230,6 @@ "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]" } }, - "Mappings": { - "LatestNodeRuntimeMap": { - "af-south-1": { - "value": "nodejs20.x" - }, - "ap-east-1": { - "value": "nodejs20.x" - }, - "ap-northeast-1": { - "value": "nodejs20.x" - }, - "ap-northeast-2": { - "value": "nodejs20.x" - }, - "ap-northeast-3": { - "value": "nodejs20.x" - }, - "ap-south-1": { - "value": "nodejs20.x" - }, - "ap-south-2": { - "value": "nodejs20.x" - }, - "ap-southeast-1": { - "value": "nodejs20.x" - }, - "ap-southeast-2": { - "value": "nodejs20.x" - }, - "ap-southeast-3": { - "value": "nodejs20.x" - }, - "ap-southeast-4": { - "value": "nodejs20.x" - }, - "ap-southeast-5": { - "value": "nodejs20.x" - }, - "ap-southeast-7": { - "value": "nodejs20.x" - }, - "ca-central-1": { - "value": "nodejs20.x" - }, - "ca-west-1": { - "value": "nodejs20.x" - }, - "cn-north-1": { - "value": "nodejs18.x" - }, - "cn-northwest-1": { - "value": "nodejs18.x" - }, - "eu-central-1": { - "value": "nodejs20.x" - }, - "eu-central-2": { - "value": "nodejs20.x" - }, - "eu-isoe-west-1": { - "value": "nodejs18.x" - }, - "eu-north-1": { - "value": "nodejs20.x" - }, - "eu-south-1": { - "value": "nodejs20.x" - }, - "eu-south-2": { - "value": "nodejs20.x" - }, - "eu-west-1": { - "value": "nodejs20.x" - }, - "eu-west-2": { - "value": "nodejs20.x" - }, - "eu-west-3": { - "value": "nodejs20.x" - }, - "il-central-1": { - "value": "nodejs20.x" - }, - "me-central-1": { - "value": "nodejs20.x" - }, - "me-south-1": { - "value": "nodejs20.x" - }, - "mx-central-1": { - "value": "nodejs20.x" - }, - "sa-east-1": { - "value": "nodejs20.x" - }, - "us-east-1": { - "value": "nodejs20.x" - }, - "us-east-2": { - "value": "nodejs20.x" - }, - "us-gov-east-1": { - "value": "nodejs18.x" - }, - "us-gov-west-1": { - "value": "nodejs18.x" - }, - "us-iso-east-1": { - "value": "nodejs18.x" - }, - "us-iso-west-1": { - "value": "nodejs18.x" - }, - "us-isob-east-1": { - "value": "nodejs18.x" - }, - "us-west-1": { - "value": "nodejs20.x" - }, - "us-west-2": { - "value": "nodejs20.x" - } - } - }, "Outputs": { "runnersstatuscommand4A30F0F5": { "Value": { diff --git a/yarn.lock b/yarn.lock index 38b41fc4..1448e197 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,28 +2,30 @@ # yarn lockfile v1 -"@aws-cdk/asset-awscli-v1@^2.2.202": - version "2.2.258" - resolved "https://registry.yarnpkg.com/@aws-cdk/asset-awscli-v1/-/asset-awscli-v1-2.2.258.tgz#638854db7ffe218076091360feb9dcc69e8bedba" - integrity sha512-TL3I9cIue0bAsuwrmjgjAQaEH6JL09y49FVQMDhrz4jJ2iPKuHtdrYd7ydm02t1YZdPZE2M0VNj6VD4fGIFpvw== +"@aws-cdk/asset-awscli-v1@2.2.242": + version "2.2.242" + resolved "https://registry.yarnpkg.com/@aws-cdk/asset-awscli-v1/-/asset-awscli-v1-2.2.242.tgz#235cb25b6d1ad26975b0095c0d6ee84309adae5c" + integrity sha512-4c1bAy2ISzcdKXYS1k4HYZsNrgiwbiDzj36ybwFVxEWZXVAP0dimQTCaB9fxu7sWzEjw3d+eaw6Fon+QTfTIpQ== -"@aws-cdk/asset-kubectl-v20@^2.1.2": - version "2.1.4" - resolved "https://registry.yarnpkg.com/@aws-cdk/asset-kubectl-v20/-/asset-kubectl-v20-2.1.4.tgz#5b76656f651a192e8d28766a5bdf04c444905363" - integrity sha512-Ps2MkmjYgMyflagqQ4dgTElc7Vwpqj8spw8dQVFiSeaaMPsuDSNsPax3/HjuDuwqsmLdaCZc6umlxYLpL0kYDA== - -"@aws-cdk/asset-node-proxy-agent-v6@^2.0.3": +"@aws-cdk/asset-node-proxy-agent-v6@^2.1.0": version "2.1.0" resolved "https://registry.yarnpkg.com/@aws-cdk/asset-node-proxy-agent-v6/-/asset-node-proxy-agent-v6-2.1.0.tgz#6d3c7860354d4856a7e75375f2f0ecab313b4989" integrity sha512-7bY3J8GCVxLupn/kNmpPc5VJz8grx+4RKfnnJiO1LG+uxkZfANZG3RMHhE+qQxxwkyQ9/MfPtTpf748UhR425A== -"@aws-cdk/cloud-assembly-schema@^36.0.5": - version "36.3.0" - resolved "https://registry.yarnpkg.com/@aws-cdk/cloud-assembly-schema/-/cloud-assembly-schema-36.3.0.tgz#17aeb389cbbff72f2b8d5b3b25d8d21d6ec3f0ef" - integrity sha512-mLSYgcMFTNCXrGAD7xob95p9s47/7WwEWUJiexxM46H2GxiijhlhLQJs31AS5uRRP6Cx1DLEu4qayKAUOOVGrw== +"@aws-cdk/aws-imagebuilder-alpha@2.231.0-alpha.0": + version "2.231.0-alpha.0" + resolved "https://registry.yarnpkg.com/@aws-cdk/aws-imagebuilder-alpha/-/aws-imagebuilder-alpha-2.231.0-alpha.0.tgz#de3e575d2e26e82604e9422050728fcf4209b931" + integrity sha512-cfZ48Udz8wweTH6EaN8C6V+f5Odn2nu5m2tnRKs+fjYSBE/x6TG548Hks/Wo2iXIsyDONiB2MISXw1o7I3WdNg== + dependencies: + yaml "1.10.2" + +"@aws-cdk/cloud-assembly-schema@^48.6.0": + version "48.20.0" + resolved "https://registry.yarnpkg.com/@aws-cdk/cloud-assembly-schema/-/cloud-assembly-schema-48.20.0.tgz#a2b60373cfbe228f901f62f0d7e2c5e2fe40702d" + integrity sha512-+eeiav9LY4wbF/EFuCt/vfvi/Zoxo8bf94PW5clbMraChEliq83w4TbRVy0jB9jE0v1ooFTtIjSQkowSPkfISg== dependencies: - jsonschema "^1.4.1" - semver "^7.6.3" + jsonschema "~1.4.1" + semver "^7.7.2" "@aws-crypto/crc32@5.2.0": version "5.2.0" @@ -72,773 +74,781 @@ "@smithy/util-utf8" "^2.0.0" tslib "^2.6.2" -"@aws-sdk/client-cloudformation@^3.948.0": - version "3.948.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-cloudformation/-/client-cloudformation-3.948.0.tgz#d5b5564532ae91ff9ce09a2355ce0a7aa0ba6d1a" - integrity sha512-DIUH70KaFjOPezX2oHAC1Ky8hlUBnf0C7lB+1SBdLcjS1b/rbBTlWHmCOc0wC8cOG507gbxhwqmOX9RU/GX3+w== +"@aws-sdk/client-cloudformation@^3.940.0": + version "3.953.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-cloudformation/-/client-cloudformation-3.953.0.tgz#0331fbb45bf5094276349b4500adc2aff3a59145" + integrity sha512-CZOlj+qKmKcMVODs8oaG3dUvtSEeTpqeTNcDidb2vjf45GJioXBR0MA5BAhFws6/YRP3SlqOQ9orTLmfRtdC4w== dependencies: "@aws-crypto/sha256-browser" "5.2.0" "@aws-crypto/sha256-js" "5.2.0" - "@aws-sdk/core" "3.947.0" - "@aws-sdk/credential-provider-node" "3.948.0" - "@aws-sdk/middleware-host-header" "3.936.0" - "@aws-sdk/middleware-logger" "3.936.0" - "@aws-sdk/middleware-recursion-detection" "3.948.0" - "@aws-sdk/middleware-user-agent" "3.947.0" - "@aws-sdk/region-config-resolver" "3.936.0" - "@aws-sdk/types" "3.936.0" - "@aws-sdk/util-endpoints" "3.936.0" - "@aws-sdk/util-user-agent-browser" "3.936.0" - "@aws-sdk/util-user-agent-node" "3.947.0" - "@smithy/config-resolver" "^4.4.3" - "@smithy/core" "^3.18.7" - "@smithy/fetch-http-handler" "^5.3.6" - "@smithy/hash-node" "^4.2.5" - "@smithy/invalid-dependency" "^4.2.5" - "@smithy/middleware-content-length" "^4.2.5" - "@smithy/middleware-endpoint" "^4.3.14" - "@smithy/middleware-retry" "^4.4.14" - "@smithy/middleware-serde" "^4.2.6" - "@smithy/middleware-stack" "^4.2.5" - "@smithy/node-config-provider" "^4.3.5" - "@smithy/node-http-handler" "^4.4.5" - "@smithy/protocol-http" "^5.3.5" - "@smithy/smithy-client" "^4.9.10" - "@smithy/types" "^4.9.0" - "@smithy/url-parser" "^4.2.5" + "@aws-sdk/core" "3.953.0" + "@aws-sdk/credential-provider-node" "3.953.0" + "@aws-sdk/middleware-host-header" "3.953.0" + "@aws-sdk/middleware-logger" "3.953.0" + "@aws-sdk/middleware-recursion-detection" "3.953.0" + "@aws-sdk/middleware-user-agent" "3.953.0" + "@aws-sdk/region-config-resolver" "3.953.0" + "@aws-sdk/types" "3.953.0" + "@aws-sdk/util-endpoints" "3.953.0" + "@aws-sdk/util-user-agent-browser" "3.953.0" + "@aws-sdk/util-user-agent-node" "3.953.0" + "@smithy/config-resolver" "^4.4.4" + "@smithy/core" "^3.19.0" + "@smithy/fetch-http-handler" "^5.3.7" + "@smithy/hash-node" "^4.2.6" + "@smithy/invalid-dependency" "^4.2.6" + "@smithy/middleware-content-length" "^4.2.6" + "@smithy/middleware-endpoint" "^4.3.15" + "@smithy/middleware-retry" "^4.4.15" + "@smithy/middleware-serde" "^4.2.7" + "@smithy/middleware-stack" "^4.2.6" + "@smithy/node-config-provider" "^4.3.6" + "@smithy/node-http-handler" "^4.4.6" + "@smithy/protocol-http" "^5.3.6" + "@smithy/smithy-client" "^4.10.0" + "@smithy/types" "^4.10.0" + "@smithy/url-parser" "^4.2.6" "@smithy/util-base64" "^4.3.0" "@smithy/util-body-length-browser" "^4.2.0" "@smithy/util-body-length-node" "^4.2.1" - "@smithy/util-defaults-mode-browser" "^4.3.13" - "@smithy/util-defaults-mode-node" "^4.2.16" - "@smithy/util-endpoints" "^3.2.5" - "@smithy/util-middleware" "^4.2.5" - "@smithy/util-retry" "^4.2.5" + "@smithy/util-defaults-mode-browser" "^4.3.14" + "@smithy/util-defaults-mode-node" "^4.2.17" + "@smithy/util-endpoints" "^3.2.6" + "@smithy/util-middleware" "^4.2.6" + "@smithy/util-retry" "^4.2.6" "@smithy/util-utf8" "^4.2.0" - "@smithy/util-waiter" "^4.2.5" + "@smithy/util-waiter" "^4.2.6" tslib "^2.6.2" -"@aws-sdk/client-codebuild@^3.948.0": - version "3.948.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-codebuild/-/client-codebuild-3.948.0.tgz#c09d277e4ab7542149bb88f40cef6b177a7c0a34" - integrity sha512-UYuKCey44Fxwad7xDfEHAxyBHmgtty549ya+JHf0Jl/cZ2Heyn0n89vA35IZUHGIqnJAarq4dDjiEV5IuGfcUw== +"@aws-sdk/client-codebuild@^3.940.0": + version "3.953.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-codebuild/-/client-codebuild-3.953.0.tgz#8131d0ef07cf9791f556bac88c751fd720d6d8c4" + integrity sha512-sUse0DTznvcMVKyhSMCDx8hbXUrI1eaWEEWGnbPd0Uqxm5AqMTXD8tNcVfHQwRY3jU1FAJaNlnHZ4G4yeKMiQw== dependencies: "@aws-crypto/sha256-browser" "5.2.0" "@aws-crypto/sha256-js" "5.2.0" - "@aws-sdk/core" "3.947.0" - "@aws-sdk/credential-provider-node" "3.948.0" - "@aws-sdk/middleware-host-header" "3.936.0" - "@aws-sdk/middleware-logger" "3.936.0" - "@aws-sdk/middleware-recursion-detection" "3.948.0" - "@aws-sdk/middleware-user-agent" "3.947.0" - "@aws-sdk/region-config-resolver" "3.936.0" - "@aws-sdk/types" "3.936.0" - "@aws-sdk/util-endpoints" "3.936.0" - "@aws-sdk/util-user-agent-browser" "3.936.0" - "@aws-sdk/util-user-agent-node" "3.947.0" - "@smithy/config-resolver" "^4.4.3" - "@smithy/core" "^3.18.7" - "@smithy/fetch-http-handler" "^5.3.6" - "@smithy/hash-node" "^4.2.5" - "@smithy/invalid-dependency" "^4.2.5" - "@smithy/middleware-content-length" "^4.2.5" - "@smithy/middleware-endpoint" "^4.3.14" - "@smithy/middleware-retry" "^4.4.14" - "@smithy/middleware-serde" "^4.2.6" - "@smithy/middleware-stack" "^4.2.5" - "@smithy/node-config-provider" "^4.3.5" - "@smithy/node-http-handler" "^4.4.5" - "@smithy/protocol-http" "^5.3.5" - "@smithy/smithy-client" "^4.9.10" - "@smithy/types" "^4.9.0" - "@smithy/url-parser" "^4.2.5" + "@aws-sdk/core" "3.953.0" + "@aws-sdk/credential-provider-node" "3.953.0" + "@aws-sdk/middleware-host-header" "3.953.0" + "@aws-sdk/middleware-logger" "3.953.0" + "@aws-sdk/middleware-recursion-detection" "3.953.0" + "@aws-sdk/middleware-user-agent" "3.953.0" + "@aws-sdk/region-config-resolver" "3.953.0" + "@aws-sdk/types" "3.953.0" + "@aws-sdk/util-endpoints" "3.953.0" + "@aws-sdk/util-user-agent-browser" "3.953.0" + "@aws-sdk/util-user-agent-node" "3.953.0" + "@smithy/config-resolver" "^4.4.4" + "@smithy/core" "^3.19.0" + "@smithy/fetch-http-handler" "^5.3.7" + "@smithy/hash-node" "^4.2.6" + "@smithy/invalid-dependency" "^4.2.6" + "@smithy/middleware-content-length" "^4.2.6" + "@smithy/middleware-endpoint" "^4.3.15" + "@smithy/middleware-retry" "^4.4.15" + "@smithy/middleware-serde" "^4.2.7" + "@smithy/middleware-stack" "^4.2.6" + "@smithy/node-config-provider" "^4.3.6" + "@smithy/node-http-handler" "^4.4.6" + "@smithy/protocol-http" "^5.3.6" + "@smithy/smithy-client" "^4.10.0" + "@smithy/types" "^4.10.0" + "@smithy/url-parser" "^4.2.6" "@smithy/util-base64" "^4.3.0" "@smithy/util-body-length-browser" "^4.2.0" "@smithy/util-body-length-node" "^4.2.1" - "@smithy/util-defaults-mode-browser" "^4.3.13" - "@smithy/util-defaults-mode-node" "^4.2.16" - "@smithy/util-endpoints" "^3.2.5" - "@smithy/util-middleware" "^4.2.5" - "@smithy/util-retry" "^4.2.5" + "@smithy/util-defaults-mode-browser" "^4.3.14" + "@smithy/util-defaults-mode-node" "^4.2.17" + "@smithy/util-endpoints" "^3.2.6" + "@smithy/util-middleware" "^4.2.6" + "@smithy/util-retry" "^4.2.6" "@smithy/util-utf8" "^4.2.0" tslib "^2.6.2" -"@aws-sdk/client-ec2@^3.948.0": - version "3.948.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-ec2/-/client-ec2-3.948.0.tgz#0d2522bbb3d7d101f07c1cc82d2d06929c4ad6a8" - integrity sha512-3fGCPpXzWdnfb3fbKHn8GFs3L+BtDyk8ctsoLF/osrx965SNPjfjHg0084hq7lIov2RvJr+ao6okqVuVOeqnpQ== +"@aws-sdk/client-ec2@^3.940.0": + version "3.953.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-ec2/-/client-ec2-3.953.0.tgz#94e7a7c3c3961a2835afc30e2b3805102082e7cf" + integrity sha512-eyupol+SP5xyCxF7gzo/ArAxgpoAkm7mgI3XUCBR+XxgsaCRxk0YdW27KVWJXKAkR7JINqIN2rX4uyI06EkFAg== dependencies: "@aws-crypto/sha256-browser" "5.2.0" "@aws-crypto/sha256-js" "5.2.0" - "@aws-sdk/core" "3.947.0" - "@aws-sdk/credential-provider-node" "3.948.0" - "@aws-sdk/middleware-host-header" "3.936.0" - "@aws-sdk/middleware-logger" "3.936.0" - "@aws-sdk/middleware-recursion-detection" "3.948.0" - "@aws-sdk/middleware-sdk-ec2" "3.946.0" - "@aws-sdk/middleware-user-agent" "3.947.0" - "@aws-sdk/region-config-resolver" "3.936.0" - "@aws-sdk/types" "3.936.0" - "@aws-sdk/util-endpoints" "3.936.0" - "@aws-sdk/util-user-agent-browser" "3.936.0" - "@aws-sdk/util-user-agent-node" "3.947.0" - "@smithy/config-resolver" "^4.4.3" - "@smithy/core" "^3.18.7" - "@smithy/fetch-http-handler" "^5.3.6" - "@smithy/hash-node" "^4.2.5" - "@smithy/invalid-dependency" "^4.2.5" - "@smithy/middleware-content-length" "^4.2.5" - "@smithy/middleware-endpoint" "^4.3.14" - "@smithy/middleware-retry" "^4.4.14" - "@smithy/middleware-serde" "^4.2.6" - "@smithy/middleware-stack" "^4.2.5" - "@smithy/node-config-provider" "^4.3.5" - "@smithy/node-http-handler" "^4.4.5" - "@smithy/protocol-http" "^5.3.5" - "@smithy/smithy-client" "^4.9.10" - "@smithy/types" "^4.9.0" - "@smithy/url-parser" "^4.2.5" + "@aws-sdk/core" "3.953.0" + "@aws-sdk/credential-provider-node" "3.953.0" + "@aws-sdk/middleware-host-header" "3.953.0" + "@aws-sdk/middleware-logger" "3.953.0" + "@aws-sdk/middleware-recursion-detection" "3.953.0" + "@aws-sdk/middleware-sdk-ec2" "3.953.0" + "@aws-sdk/middleware-user-agent" "3.953.0" + "@aws-sdk/region-config-resolver" "3.953.0" + "@aws-sdk/types" "3.953.0" + "@aws-sdk/util-endpoints" "3.953.0" + "@aws-sdk/util-user-agent-browser" "3.953.0" + "@aws-sdk/util-user-agent-node" "3.953.0" + "@smithy/config-resolver" "^4.4.4" + "@smithy/core" "^3.19.0" + "@smithy/fetch-http-handler" "^5.3.7" + "@smithy/hash-node" "^4.2.6" + "@smithy/invalid-dependency" "^4.2.6" + "@smithy/middleware-content-length" "^4.2.6" + "@smithy/middleware-endpoint" "^4.3.15" + "@smithy/middleware-retry" "^4.4.15" + "@smithy/middleware-serde" "^4.2.7" + "@smithy/middleware-stack" "^4.2.6" + "@smithy/node-config-provider" "^4.3.6" + "@smithy/node-http-handler" "^4.4.6" + "@smithy/protocol-http" "^5.3.6" + "@smithy/smithy-client" "^4.10.0" + "@smithy/types" "^4.10.0" + "@smithy/url-parser" "^4.2.6" "@smithy/util-base64" "^4.3.0" "@smithy/util-body-length-browser" "^4.2.0" "@smithy/util-body-length-node" "^4.2.1" - "@smithy/util-defaults-mode-browser" "^4.3.13" - "@smithy/util-defaults-mode-node" "^4.2.16" - "@smithy/util-endpoints" "^3.2.5" - "@smithy/util-middleware" "^4.2.5" - "@smithy/util-retry" "^4.2.5" + "@smithy/util-defaults-mode-browser" "^4.3.14" + "@smithy/util-defaults-mode-node" "^4.2.17" + "@smithy/util-endpoints" "^3.2.6" + "@smithy/util-middleware" "^4.2.6" + "@smithy/util-retry" "^4.2.6" "@smithy/util-utf8" "^4.2.0" - "@smithy/util-waiter" "^4.2.5" + "@smithy/util-waiter" "^4.2.6" tslib "^2.6.2" -"@aws-sdk/client-ecr@^3.948.0": - version "3.948.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-ecr/-/client-ecr-3.948.0.tgz#c4da376605b54806b5f66c0b92a68d09f62bfd6a" - integrity sha512-CqJ0pAKirLUEufGXlJ5P3imfZ94K/o5574LO3rKghEC767dRfhNRHv8wT2GB9fy3LSwnJ6q/JXg3IgDL2eLSjQ== +"@aws-sdk/client-ecr@^3.940.0": + version "3.953.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-ecr/-/client-ecr-3.953.0.tgz#e119fd1087d16c76f85989ed68ba82fb33baca8b" + integrity sha512-V/N/7P1r5m3MzO0/xP32DzIJKAO7fo3GbMcJhl2eQyc51IEz1ovh/IbP+rePY3yK41R0fE6Yo4mKmkCI0mUmxg== dependencies: "@aws-crypto/sha256-browser" "5.2.0" "@aws-crypto/sha256-js" "5.2.0" - "@aws-sdk/core" "3.947.0" - "@aws-sdk/credential-provider-node" "3.948.0" - "@aws-sdk/middleware-host-header" "3.936.0" - "@aws-sdk/middleware-logger" "3.936.0" - "@aws-sdk/middleware-recursion-detection" "3.948.0" - "@aws-sdk/middleware-user-agent" "3.947.0" - "@aws-sdk/region-config-resolver" "3.936.0" - "@aws-sdk/types" "3.936.0" - "@aws-sdk/util-endpoints" "3.936.0" - "@aws-sdk/util-user-agent-browser" "3.936.0" - "@aws-sdk/util-user-agent-node" "3.947.0" - "@smithy/config-resolver" "^4.4.3" - "@smithy/core" "^3.18.7" - "@smithy/fetch-http-handler" "^5.3.6" - "@smithy/hash-node" "^4.2.5" - "@smithy/invalid-dependency" "^4.2.5" - "@smithy/middleware-content-length" "^4.2.5" - "@smithy/middleware-endpoint" "^4.3.14" - "@smithy/middleware-retry" "^4.4.14" - "@smithy/middleware-serde" "^4.2.6" - "@smithy/middleware-stack" "^4.2.5" - "@smithy/node-config-provider" "^4.3.5" - "@smithy/node-http-handler" "^4.4.5" - "@smithy/protocol-http" "^5.3.5" - "@smithy/smithy-client" "^4.9.10" - "@smithy/types" "^4.9.0" - "@smithy/url-parser" "^4.2.5" + "@aws-sdk/core" "3.953.0" + "@aws-sdk/credential-provider-node" "3.953.0" + "@aws-sdk/middleware-host-header" "3.953.0" + "@aws-sdk/middleware-logger" "3.953.0" + "@aws-sdk/middleware-recursion-detection" "3.953.0" + "@aws-sdk/middleware-user-agent" "3.953.0" + "@aws-sdk/region-config-resolver" "3.953.0" + "@aws-sdk/types" "3.953.0" + "@aws-sdk/util-endpoints" "3.953.0" + "@aws-sdk/util-user-agent-browser" "3.953.0" + "@aws-sdk/util-user-agent-node" "3.953.0" + "@smithy/config-resolver" "^4.4.4" + "@smithy/core" "^3.19.0" + "@smithy/fetch-http-handler" "^5.3.7" + "@smithy/hash-node" "^4.2.6" + "@smithy/invalid-dependency" "^4.2.6" + "@smithy/middleware-content-length" "^4.2.6" + "@smithy/middleware-endpoint" "^4.3.15" + "@smithy/middleware-retry" "^4.4.15" + "@smithy/middleware-serde" "^4.2.7" + "@smithy/middleware-stack" "^4.2.6" + "@smithy/node-config-provider" "^4.3.6" + "@smithy/node-http-handler" "^4.4.6" + "@smithy/protocol-http" "^5.3.6" + "@smithy/smithy-client" "^4.10.0" + "@smithy/types" "^4.10.0" + "@smithy/url-parser" "^4.2.6" "@smithy/util-base64" "^4.3.0" "@smithy/util-body-length-browser" "^4.2.0" "@smithy/util-body-length-node" "^4.2.1" - "@smithy/util-defaults-mode-browser" "^4.3.13" - "@smithy/util-defaults-mode-node" "^4.2.16" - "@smithy/util-endpoints" "^3.2.5" - "@smithy/util-middleware" "^4.2.5" - "@smithy/util-retry" "^4.2.5" + "@smithy/util-defaults-mode-browser" "^4.3.14" + "@smithy/util-defaults-mode-node" "^4.2.17" + "@smithy/util-endpoints" "^3.2.6" + "@smithy/util-middleware" "^4.2.6" + "@smithy/util-retry" "^4.2.6" "@smithy/util-utf8" "^4.2.0" - "@smithy/util-waiter" "^4.2.5" + "@smithy/util-waiter" "^4.2.6" tslib "^2.6.2" -"@aws-sdk/client-imagebuilder@^3.948.0": - version "3.948.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-imagebuilder/-/client-imagebuilder-3.948.0.tgz#49320545c3adb9e678145ce38013b097f82e3f49" - integrity sha512-ed7jAU3OTdGKWPALM43SKNHxPWHYsX7HrNxXk4K1BFfT/+87B95iNgemSZBK39c8Vs19Ug0GP5udjz+/bhaBAA== +"@aws-sdk/client-imagebuilder@^3.940.0": + version "3.953.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-imagebuilder/-/client-imagebuilder-3.953.0.tgz#ede4141edecfb84a41c3e8c172b87e6299080b94" + integrity sha512-ChhmWFkpbyk5EU5iIncb6XuYRid4THsTAZcOrsX/jPOAMes3VSbVlg2B6UOnPWHMNr9TEjWnbVfikO067JCfpg== dependencies: "@aws-crypto/sha256-browser" "5.2.0" "@aws-crypto/sha256-js" "5.2.0" - "@aws-sdk/core" "3.947.0" - "@aws-sdk/credential-provider-node" "3.948.0" - "@aws-sdk/middleware-host-header" "3.936.0" - "@aws-sdk/middleware-logger" "3.936.0" - "@aws-sdk/middleware-recursion-detection" "3.948.0" - "@aws-sdk/middleware-user-agent" "3.947.0" - "@aws-sdk/region-config-resolver" "3.936.0" - "@aws-sdk/types" "3.936.0" - "@aws-sdk/util-endpoints" "3.936.0" - "@aws-sdk/util-user-agent-browser" "3.936.0" - "@aws-sdk/util-user-agent-node" "3.947.0" - "@smithy/config-resolver" "^4.4.3" - "@smithy/core" "^3.18.7" - "@smithy/fetch-http-handler" "^5.3.6" - "@smithy/hash-node" "^4.2.5" - "@smithy/invalid-dependency" "^4.2.5" - "@smithy/middleware-content-length" "^4.2.5" - "@smithy/middleware-endpoint" "^4.3.14" - "@smithy/middleware-retry" "^4.4.14" - "@smithy/middleware-serde" "^4.2.6" - "@smithy/middleware-stack" "^4.2.5" - "@smithy/node-config-provider" "^4.3.5" - "@smithy/node-http-handler" "^4.4.5" - "@smithy/protocol-http" "^5.3.5" - "@smithy/smithy-client" "^4.9.10" - "@smithy/types" "^4.9.0" - "@smithy/url-parser" "^4.2.5" + "@aws-sdk/core" "3.953.0" + "@aws-sdk/credential-provider-node" "3.953.0" + "@aws-sdk/middleware-host-header" "3.953.0" + "@aws-sdk/middleware-logger" "3.953.0" + "@aws-sdk/middleware-recursion-detection" "3.953.0" + "@aws-sdk/middleware-user-agent" "3.953.0" + "@aws-sdk/region-config-resolver" "3.953.0" + "@aws-sdk/types" "3.953.0" + "@aws-sdk/util-endpoints" "3.953.0" + "@aws-sdk/util-user-agent-browser" "3.953.0" + "@aws-sdk/util-user-agent-node" "3.953.0" + "@smithy/config-resolver" "^4.4.4" + "@smithy/core" "^3.19.0" + "@smithy/fetch-http-handler" "^5.3.7" + "@smithy/hash-node" "^4.2.6" + "@smithy/invalid-dependency" "^4.2.6" + "@smithy/middleware-content-length" "^4.2.6" + "@smithy/middleware-endpoint" "^4.3.15" + "@smithy/middleware-retry" "^4.4.15" + "@smithy/middleware-serde" "^4.2.7" + "@smithy/middleware-stack" "^4.2.6" + "@smithy/node-config-provider" "^4.3.6" + "@smithy/node-http-handler" "^4.4.6" + "@smithy/protocol-http" "^5.3.6" + "@smithy/smithy-client" "^4.10.0" + "@smithy/types" "^4.10.0" + "@smithy/url-parser" "^4.2.6" "@smithy/util-base64" "^4.3.0" "@smithy/util-body-length-browser" "^4.2.0" "@smithy/util-body-length-node" "^4.2.1" - "@smithy/util-defaults-mode-browser" "^4.3.13" - "@smithy/util-defaults-mode-node" "^4.2.16" - "@smithy/util-endpoints" "^3.2.5" - "@smithy/util-middleware" "^4.2.5" - "@smithy/util-retry" "^4.2.5" + "@smithy/util-defaults-mode-browser" "^4.3.14" + "@smithy/util-defaults-mode-node" "^4.2.17" + "@smithy/util-endpoints" "^3.2.6" + "@smithy/util-middleware" "^4.2.6" + "@smithy/util-retry" "^4.2.6" "@smithy/util-utf8" "^4.2.0" tslib "^2.6.2" -"@aws-sdk/client-lambda@^3.950.0": - version "3.950.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-lambda/-/client-lambda-3.950.0.tgz#665116803c7ab2639356aca96691765de550b5b3" - integrity sha512-4Sqxci8y2ltSfPz/hClpKaUeY8uSM+WrZvzH2EPBDX0b3TecozoPu5zXJ/Jb0TEbm5lRWmtYoIB+QG2Wvkti9g== +"@aws-sdk/client-lambda@^3.940.0": + version "3.953.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-lambda/-/client-lambda-3.953.0.tgz#4b02963f3e0b0ec84245e7200fe5f2469b4b03da" + integrity sha512-Bsm5arLOjkrhGQzycmswnVWwJANd447h5e/TRqyYd07Zr6LIhylcACOeyJIoz7z1ffXTCTj8iLGE7Zac4g0mSQ== dependencies: "@aws-crypto/sha256-browser" "5.2.0" "@aws-crypto/sha256-js" "5.2.0" - "@aws-sdk/core" "3.947.0" - "@aws-sdk/credential-provider-node" "3.948.0" - "@aws-sdk/middleware-host-header" "3.936.0" - "@aws-sdk/middleware-logger" "3.936.0" - "@aws-sdk/middleware-recursion-detection" "3.948.0" - "@aws-sdk/middleware-user-agent" "3.947.0" - "@aws-sdk/region-config-resolver" "3.936.0" - "@aws-sdk/types" "3.936.0" - "@aws-sdk/util-endpoints" "3.936.0" - "@aws-sdk/util-user-agent-browser" "3.936.0" - "@aws-sdk/util-user-agent-node" "3.947.0" - "@smithy/config-resolver" "^4.4.3" - "@smithy/core" "^3.18.7" - "@smithy/eventstream-serde-browser" "^4.2.5" - "@smithy/eventstream-serde-config-resolver" "^4.3.5" - "@smithy/eventstream-serde-node" "^4.2.5" - "@smithy/fetch-http-handler" "^5.3.6" - "@smithy/hash-node" "^4.2.5" - "@smithy/invalid-dependency" "^4.2.5" - "@smithy/middleware-content-length" "^4.2.5" - "@smithy/middleware-endpoint" "^4.3.14" - "@smithy/middleware-retry" "^4.4.14" - "@smithy/middleware-serde" "^4.2.6" - "@smithy/middleware-stack" "^4.2.5" - "@smithy/node-config-provider" "^4.3.5" - "@smithy/node-http-handler" "^4.4.5" - "@smithy/protocol-http" "^5.3.5" - "@smithy/smithy-client" "^4.9.10" - "@smithy/types" "^4.9.0" - "@smithy/url-parser" "^4.2.5" + "@aws-sdk/core" "3.953.0" + "@aws-sdk/credential-provider-node" "3.953.0" + "@aws-sdk/middleware-host-header" "3.953.0" + "@aws-sdk/middleware-logger" "3.953.0" + "@aws-sdk/middleware-recursion-detection" "3.953.0" + "@aws-sdk/middleware-user-agent" "3.953.0" + "@aws-sdk/region-config-resolver" "3.953.0" + "@aws-sdk/types" "3.953.0" + "@aws-sdk/util-endpoints" "3.953.0" + "@aws-sdk/util-user-agent-browser" "3.953.0" + "@aws-sdk/util-user-agent-node" "3.953.0" + "@smithy/config-resolver" "^4.4.4" + "@smithy/core" "^3.19.0" + "@smithy/eventstream-serde-browser" "^4.2.6" + "@smithy/eventstream-serde-config-resolver" "^4.3.6" + "@smithy/eventstream-serde-node" "^4.2.6" + "@smithy/fetch-http-handler" "^5.3.7" + "@smithy/hash-node" "^4.2.6" + "@smithy/invalid-dependency" "^4.2.6" + "@smithy/middleware-content-length" "^4.2.6" + "@smithy/middleware-endpoint" "^4.3.15" + "@smithy/middleware-retry" "^4.4.15" + "@smithy/middleware-serde" "^4.2.7" + "@smithy/middleware-stack" "^4.2.6" + "@smithy/node-config-provider" "^4.3.6" + "@smithy/node-http-handler" "^4.4.6" + "@smithy/protocol-http" "^5.3.6" + "@smithy/smithy-client" "^4.10.0" + "@smithy/types" "^4.10.0" + "@smithy/url-parser" "^4.2.6" "@smithy/util-base64" "^4.3.0" "@smithy/util-body-length-browser" "^4.2.0" "@smithy/util-body-length-node" "^4.2.1" - "@smithy/util-defaults-mode-browser" "^4.3.13" - "@smithy/util-defaults-mode-node" "^4.2.16" - "@smithy/util-endpoints" "^3.2.5" - "@smithy/util-middleware" "^4.2.5" - "@smithy/util-retry" "^4.2.5" - "@smithy/util-stream" "^4.5.6" + "@smithy/util-defaults-mode-browser" "^4.3.14" + "@smithy/util-defaults-mode-node" "^4.2.17" + "@smithy/util-endpoints" "^3.2.6" + "@smithy/util-middleware" "^4.2.6" + "@smithy/util-retry" "^4.2.6" + "@smithy/util-stream" "^4.5.7" "@smithy/util-utf8" "^4.2.0" - "@smithy/util-waiter" "^4.2.5" + "@smithy/util-waiter" "^4.2.6" tslib "^2.6.2" -"@aws-sdk/client-secrets-manager@^3.950.0": - version "3.950.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-secrets-manager/-/client-secrets-manager-3.950.0.tgz#482b882c00ac6308876e2ca8724b8ea5918960cf" - integrity sha512-aOI7W+axLah68a0fOLafu8aIrLuGqyuDp6AsgaKlOVNwr2R3a7WaPquNgL9FPzYydiKKVbUkHHFvraicQIQdOw== +"@aws-sdk/client-secrets-manager@^3.940.0": + version "3.953.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-secrets-manager/-/client-secrets-manager-3.953.0.tgz#36be723b33a25f4495a0e829dc74914f81edb3f1" + integrity sha512-5IFrqk38VKwTUA0ZRO5IoMqSMK/1860bMTe6kgv+6c2h2bU5zYMDlt8cnkdEADHug/BMzZUwPTAziPlyjGhRoA== dependencies: "@aws-crypto/sha256-browser" "5.2.0" "@aws-crypto/sha256-js" "5.2.0" - "@aws-sdk/core" "3.947.0" - "@aws-sdk/credential-provider-node" "3.948.0" - "@aws-sdk/middleware-host-header" "3.936.0" - "@aws-sdk/middleware-logger" "3.936.0" - "@aws-sdk/middleware-recursion-detection" "3.948.0" - "@aws-sdk/middleware-user-agent" "3.947.0" - "@aws-sdk/region-config-resolver" "3.936.0" - "@aws-sdk/types" "3.936.0" - "@aws-sdk/util-endpoints" "3.936.0" - "@aws-sdk/util-user-agent-browser" "3.936.0" - "@aws-sdk/util-user-agent-node" "3.947.0" - "@smithy/config-resolver" "^4.4.3" - "@smithy/core" "^3.18.7" - "@smithy/fetch-http-handler" "^5.3.6" - "@smithy/hash-node" "^4.2.5" - "@smithy/invalid-dependency" "^4.2.5" - "@smithy/middleware-content-length" "^4.2.5" - "@smithy/middleware-endpoint" "^4.3.14" - "@smithy/middleware-retry" "^4.4.14" - "@smithy/middleware-serde" "^4.2.6" - "@smithy/middleware-stack" "^4.2.5" - "@smithy/node-config-provider" "^4.3.5" - "@smithy/node-http-handler" "^4.4.5" - "@smithy/protocol-http" "^5.3.5" - "@smithy/smithy-client" "^4.9.10" - "@smithy/types" "^4.9.0" - "@smithy/url-parser" "^4.2.5" + "@aws-sdk/core" "3.953.0" + "@aws-sdk/credential-provider-node" "3.953.0" + "@aws-sdk/middleware-host-header" "3.953.0" + "@aws-sdk/middleware-logger" "3.953.0" + "@aws-sdk/middleware-recursion-detection" "3.953.0" + "@aws-sdk/middleware-user-agent" "3.953.0" + "@aws-sdk/region-config-resolver" "3.953.0" + "@aws-sdk/types" "3.953.0" + "@aws-sdk/util-endpoints" "3.953.0" + "@aws-sdk/util-user-agent-browser" "3.953.0" + "@aws-sdk/util-user-agent-node" "3.953.0" + "@smithy/config-resolver" "^4.4.4" + "@smithy/core" "^3.19.0" + "@smithy/fetch-http-handler" "^5.3.7" + "@smithy/hash-node" "^4.2.6" + "@smithy/invalid-dependency" "^4.2.6" + "@smithy/middleware-content-length" "^4.2.6" + "@smithy/middleware-endpoint" "^4.3.15" + "@smithy/middleware-retry" "^4.4.15" + "@smithy/middleware-serde" "^4.2.7" + "@smithy/middleware-stack" "^4.2.6" + "@smithy/node-config-provider" "^4.3.6" + "@smithy/node-http-handler" "^4.4.6" + "@smithy/protocol-http" "^5.3.6" + "@smithy/smithy-client" "^4.10.0" + "@smithy/types" "^4.10.0" + "@smithy/url-parser" "^4.2.6" "@smithy/util-base64" "^4.3.0" "@smithy/util-body-length-browser" "^4.2.0" "@smithy/util-body-length-node" "^4.2.1" - "@smithy/util-defaults-mode-browser" "^4.3.13" - "@smithy/util-defaults-mode-node" "^4.2.16" - "@smithy/util-endpoints" "^3.2.5" - "@smithy/util-middleware" "^4.2.5" - "@smithy/util-retry" "^4.2.5" + "@smithy/util-defaults-mode-browser" "^4.3.14" + "@smithy/util-defaults-mode-node" "^4.2.17" + "@smithy/util-endpoints" "^3.2.6" + "@smithy/util-middleware" "^4.2.6" + "@smithy/util-retry" "^4.2.6" "@smithy/util-utf8" "^4.2.0" tslib "^2.6.2" -"@aws-sdk/client-sfn@^3.948.0": - version "3.948.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sfn/-/client-sfn-3.948.0.tgz#a87b1797de92a9d9d00af93fdb980636f76ec5d3" - integrity sha512-5mwdVD5G+xt75PLKTFz2aBq47wK5te1LpqFioUrLXRN3qdPyGU0e/L8Xo6jHA3jpii0QMESaaWubdIOei5NSsA== +"@aws-sdk/client-sfn@^3.940.0": + version "3.953.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sfn/-/client-sfn-3.953.0.tgz#d3d73b178e9b33f5a364e05b365b2ea3b9834157" + integrity sha512-dzJDuaR8bGpDMoXgOVcoMJn6YpfzioXDNT0EXzkPnu3fruq0WSWacrduHu/TA8DuaH4ksNLhBFpdl0MmV7fUBQ== dependencies: "@aws-crypto/sha256-browser" "5.2.0" "@aws-crypto/sha256-js" "5.2.0" - "@aws-sdk/core" "3.947.0" - "@aws-sdk/credential-provider-node" "3.948.0" - "@aws-sdk/middleware-host-header" "3.936.0" - "@aws-sdk/middleware-logger" "3.936.0" - "@aws-sdk/middleware-recursion-detection" "3.948.0" - "@aws-sdk/middleware-user-agent" "3.947.0" - "@aws-sdk/region-config-resolver" "3.936.0" - "@aws-sdk/types" "3.936.0" - "@aws-sdk/util-endpoints" "3.936.0" - "@aws-sdk/util-user-agent-browser" "3.936.0" - "@aws-sdk/util-user-agent-node" "3.947.0" - "@smithy/config-resolver" "^4.4.3" - "@smithy/core" "^3.18.7" - "@smithy/fetch-http-handler" "^5.3.6" - "@smithy/hash-node" "^4.2.5" - "@smithy/invalid-dependency" "^4.2.5" - "@smithy/middleware-content-length" "^4.2.5" - "@smithy/middleware-endpoint" "^4.3.14" - "@smithy/middleware-retry" "^4.4.14" - "@smithy/middleware-serde" "^4.2.6" - "@smithy/middleware-stack" "^4.2.5" - "@smithy/node-config-provider" "^4.3.5" - "@smithy/node-http-handler" "^4.4.5" - "@smithy/protocol-http" "^5.3.5" - "@smithy/smithy-client" "^4.9.10" - "@smithy/types" "^4.9.0" - "@smithy/url-parser" "^4.2.5" + "@aws-sdk/core" "3.953.0" + "@aws-sdk/credential-provider-node" "3.953.0" + "@aws-sdk/middleware-host-header" "3.953.0" + "@aws-sdk/middleware-logger" "3.953.0" + "@aws-sdk/middleware-recursion-detection" "3.953.0" + "@aws-sdk/middleware-user-agent" "3.953.0" + "@aws-sdk/region-config-resolver" "3.953.0" + "@aws-sdk/types" "3.953.0" + "@aws-sdk/util-endpoints" "3.953.0" + "@aws-sdk/util-user-agent-browser" "3.953.0" + "@aws-sdk/util-user-agent-node" "3.953.0" + "@smithy/config-resolver" "^4.4.4" + "@smithy/core" "^3.19.0" + "@smithy/fetch-http-handler" "^5.3.7" + "@smithy/hash-node" "^4.2.6" + "@smithy/invalid-dependency" "^4.2.6" + "@smithy/middleware-content-length" "^4.2.6" + "@smithy/middleware-endpoint" "^4.3.15" + "@smithy/middleware-retry" "^4.4.15" + "@smithy/middleware-serde" "^4.2.7" + "@smithy/middleware-stack" "^4.2.6" + "@smithy/node-config-provider" "^4.3.6" + "@smithy/node-http-handler" "^4.4.6" + "@smithy/protocol-http" "^5.3.6" + "@smithy/smithy-client" "^4.10.0" + "@smithy/types" "^4.10.0" + "@smithy/url-parser" "^4.2.6" "@smithy/util-base64" "^4.3.0" "@smithy/util-body-length-browser" "^4.2.0" "@smithy/util-body-length-node" "^4.2.1" - "@smithy/util-defaults-mode-browser" "^4.3.13" - "@smithy/util-defaults-mode-node" "^4.2.16" - "@smithy/util-endpoints" "^3.2.5" - "@smithy/util-middleware" "^4.2.5" - "@smithy/util-retry" "^4.2.5" + "@smithy/util-defaults-mode-browser" "^4.3.14" + "@smithy/util-defaults-mode-node" "^4.2.17" + "@smithy/util-endpoints" "^3.2.6" + "@smithy/util-middleware" "^4.2.6" + "@smithy/util-retry" "^4.2.6" "@smithy/util-utf8" "^4.2.0" tslib "^2.6.2" -"@aws-sdk/client-sns@^3.948.0": - version "3.948.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sns/-/client-sns-3.948.0.tgz#8df80dd3e24b9a5d1090f4ace0b17fc4eff23188" - integrity sha512-e/0nzLAh+ApBPhhtchlCRu/touZK6XDTF1gFtKj6vvHmr1DNf34yBCrbe7aAoPh1Ce++bWShTLHZoGOTi02WWQ== +"@aws-sdk/client-sns@^3.940.0": + version "3.953.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sns/-/client-sns-3.953.0.tgz#1bf6d1ebcc1a33907bafffa3ec4c28f5617544ea" + integrity sha512-tlmq3g9WxxMBZsOTak22gs8gXCXUCtKMZvl2CJrB6/kPm0CTqquKli/S7XmpWFj8BudUmf48R+Cc23AkRCvtPA== dependencies: "@aws-crypto/sha256-browser" "5.2.0" "@aws-crypto/sha256-js" "5.2.0" - "@aws-sdk/core" "3.947.0" - "@aws-sdk/credential-provider-node" "3.948.0" - "@aws-sdk/middleware-host-header" "3.936.0" - "@aws-sdk/middleware-logger" "3.936.0" - "@aws-sdk/middleware-recursion-detection" "3.948.0" - "@aws-sdk/middleware-user-agent" "3.947.0" - "@aws-sdk/region-config-resolver" "3.936.0" - "@aws-sdk/types" "3.936.0" - "@aws-sdk/util-endpoints" "3.936.0" - "@aws-sdk/util-user-agent-browser" "3.936.0" - "@aws-sdk/util-user-agent-node" "3.947.0" - "@smithy/config-resolver" "^4.4.3" - "@smithy/core" "^3.18.7" - "@smithy/fetch-http-handler" "^5.3.6" - "@smithy/hash-node" "^4.2.5" - "@smithy/invalid-dependency" "^4.2.5" - "@smithy/middleware-content-length" "^4.2.5" - "@smithy/middleware-endpoint" "^4.3.14" - "@smithy/middleware-retry" "^4.4.14" - "@smithy/middleware-serde" "^4.2.6" - "@smithy/middleware-stack" "^4.2.5" - "@smithy/node-config-provider" "^4.3.5" - "@smithy/node-http-handler" "^4.4.5" - "@smithy/protocol-http" "^5.3.5" - "@smithy/smithy-client" "^4.9.10" - "@smithy/types" "^4.9.0" - "@smithy/url-parser" "^4.2.5" + "@aws-sdk/core" "3.953.0" + "@aws-sdk/credential-provider-node" "3.953.0" + "@aws-sdk/middleware-host-header" "3.953.0" + "@aws-sdk/middleware-logger" "3.953.0" + "@aws-sdk/middleware-recursion-detection" "3.953.0" + "@aws-sdk/middleware-user-agent" "3.953.0" + "@aws-sdk/region-config-resolver" "3.953.0" + "@aws-sdk/types" "3.953.0" + "@aws-sdk/util-endpoints" "3.953.0" + "@aws-sdk/util-user-agent-browser" "3.953.0" + "@aws-sdk/util-user-agent-node" "3.953.0" + "@smithy/config-resolver" "^4.4.4" + "@smithy/core" "^3.19.0" + "@smithy/fetch-http-handler" "^5.3.7" + "@smithy/hash-node" "^4.2.6" + "@smithy/invalid-dependency" "^4.2.6" + "@smithy/middleware-content-length" "^4.2.6" + "@smithy/middleware-endpoint" "^4.3.15" + "@smithy/middleware-retry" "^4.4.15" + "@smithy/middleware-serde" "^4.2.7" + "@smithy/middleware-stack" "^4.2.6" + "@smithy/node-config-provider" "^4.3.6" + "@smithy/node-http-handler" "^4.4.6" + "@smithy/protocol-http" "^5.3.6" + "@smithy/smithy-client" "^4.10.0" + "@smithy/types" "^4.10.0" + "@smithy/url-parser" "^4.2.6" "@smithy/util-base64" "^4.3.0" "@smithy/util-body-length-browser" "^4.2.0" "@smithy/util-body-length-node" "^4.2.1" - "@smithy/util-defaults-mode-browser" "^4.3.13" - "@smithy/util-defaults-mode-node" "^4.2.16" - "@smithy/util-endpoints" "^3.2.5" - "@smithy/util-middleware" "^4.2.5" - "@smithy/util-retry" "^4.2.5" + "@smithy/util-defaults-mode-browser" "^4.3.14" + "@smithy/util-defaults-mode-node" "^4.2.17" + "@smithy/util-endpoints" "^3.2.6" + "@smithy/util-middleware" "^4.2.6" + "@smithy/util-retry" "^4.2.6" "@smithy/util-utf8" "^4.2.0" tslib "^2.6.2" -"@aws-sdk/client-ssm@^3.948.0": - version "3.948.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-ssm/-/client-ssm-3.948.0.tgz#a0fbd4862abf1b0a397f3f884ab09ce695202d1d" - integrity sha512-G3mLrNBCo2ZzBS/nM5YRgONBxXBqeU7sXREgM3GLRiozmZB5eNdill/AsvHwYTVp3hk+vAcU/fvKROrvqIna4A== +"@aws-sdk/client-ssm@^3.940.0": + version "3.953.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-ssm/-/client-ssm-3.953.0.tgz#a85b207037708170fed02ec24d57ae7594cb6ece" + integrity sha512-VlYraQRDkW/9shxUTkwEzPolKHBqucao0lpZkg/WFOyVu2R4pA9ly0HvpAu3VAp8Gwf4HliJ0KyNXOJqgAPocw== dependencies: "@aws-crypto/sha256-browser" "5.2.0" "@aws-crypto/sha256-js" "5.2.0" - "@aws-sdk/core" "3.947.0" - "@aws-sdk/credential-provider-node" "3.948.0" - "@aws-sdk/middleware-host-header" "3.936.0" - "@aws-sdk/middleware-logger" "3.936.0" - "@aws-sdk/middleware-recursion-detection" "3.948.0" - "@aws-sdk/middleware-user-agent" "3.947.0" - "@aws-sdk/region-config-resolver" "3.936.0" - "@aws-sdk/types" "3.936.0" - "@aws-sdk/util-endpoints" "3.936.0" - "@aws-sdk/util-user-agent-browser" "3.936.0" - "@aws-sdk/util-user-agent-node" "3.947.0" - "@smithy/config-resolver" "^4.4.3" - "@smithy/core" "^3.18.7" - "@smithy/fetch-http-handler" "^5.3.6" - "@smithy/hash-node" "^4.2.5" - "@smithy/invalid-dependency" "^4.2.5" - "@smithy/middleware-content-length" "^4.2.5" - "@smithy/middleware-endpoint" "^4.3.14" - "@smithy/middleware-retry" "^4.4.14" - "@smithy/middleware-serde" "^4.2.6" - "@smithy/middleware-stack" "^4.2.5" - "@smithy/node-config-provider" "^4.3.5" - "@smithy/node-http-handler" "^4.4.5" - "@smithy/protocol-http" "^5.3.5" - "@smithy/smithy-client" "^4.9.10" - "@smithy/types" "^4.9.0" - "@smithy/url-parser" "^4.2.5" + "@aws-sdk/core" "3.953.0" + "@aws-sdk/credential-provider-node" "3.953.0" + "@aws-sdk/middleware-host-header" "3.953.0" + "@aws-sdk/middleware-logger" "3.953.0" + "@aws-sdk/middleware-recursion-detection" "3.953.0" + "@aws-sdk/middleware-user-agent" "3.953.0" + "@aws-sdk/region-config-resolver" "3.953.0" + "@aws-sdk/types" "3.953.0" + "@aws-sdk/util-endpoints" "3.953.0" + "@aws-sdk/util-user-agent-browser" "3.953.0" + "@aws-sdk/util-user-agent-node" "3.953.0" + "@smithy/config-resolver" "^4.4.4" + "@smithy/core" "^3.19.0" + "@smithy/fetch-http-handler" "^5.3.7" + "@smithy/hash-node" "^4.2.6" + "@smithy/invalid-dependency" "^4.2.6" + "@smithy/middleware-content-length" "^4.2.6" + "@smithy/middleware-endpoint" "^4.3.15" + "@smithy/middleware-retry" "^4.4.15" + "@smithy/middleware-serde" "^4.2.7" + "@smithy/middleware-stack" "^4.2.6" + "@smithy/node-config-provider" "^4.3.6" + "@smithy/node-http-handler" "^4.4.6" + "@smithy/protocol-http" "^5.3.6" + "@smithy/smithy-client" "^4.10.0" + "@smithy/types" "^4.10.0" + "@smithy/url-parser" "^4.2.6" "@smithy/util-base64" "^4.3.0" "@smithy/util-body-length-browser" "^4.2.0" "@smithy/util-body-length-node" "^4.2.1" - "@smithy/util-defaults-mode-browser" "^4.3.13" - "@smithy/util-defaults-mode-node" "^4.2.16" - "@smithy/util-endpoints" "^3.2.5" - "@smithy/util-middleware" "^4.2.5" - "@smithy/util-retry" "^4.2.5" + "@smithy/util-defaults-mode-browser" "^4.3.14" + "@smithy/util-defaults-mode-node" "^4.2.17" + "@smithy/util-endpoints" "^3.2.6" + "@smithy/util-middleware" "^4.2.6" + "@smithy/util-retry" "^4.2.6" "@smithy/util-utf8" "^4.2.0" - "@smithy/util-waiter" "^4.2.5" + "@smithy/util-waiter" "^4.2.6" tslib "^2.6.2" -"@aws-sdk/client-sso@3.948.0": - version "3.948.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.948.0.tgz#f5ce315d74a05d09e039b7acbf9617b2d39899bc" - integrity sha512-iWjchXy8bIAVBUsKnbfKYXRwhLgRg3EqCQ5FTr3JbR+QR75rZm4ZOYXlvHGztVTmtAZ+PQVA1Y4zO7v7N87C0A== +"@aws-sdk/client-sso@3.953.0": + version "3.953.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.953.0.tgz#a32cb99768cc235e61546fe6c12fff7d6306ec3b" + integrity sha512-WU8XtORGnhy1JjTLflcGcNGU329pmwl/2claTVGp7vrgUKyreQV9Ke3BkMuUPYLOGO/Znstzc1VbUT9ORH3+WQ== dependencies: "@aws-crypto/sha256-browser" "5.2.0" "@aws-crypto/sha256-js" "5.2.0" - "@aws-sdk/core" "3.947.0" - "@aws-sdk/middleware-host-header" "3.936.0" - "@aws-sdk/middleware-logger" "3.936.0" - "@aws-sdk/middleware-recursion-detection" "3.948.0" - "@aws-sdk/middleware-user-agent" "3.947.0" - "@aws-sdk/region-config-resolver" "3.936.0" - "@aws-sdk/types" "3.936.0" - "@aws-sdk/util-endpoints" "3.936.0" - "@aws-sdk/util-user-agent-browser" "3.936.0" - "@aws-sdk/util-user-agent-node" "3.947.0" - "@smithy/config-resolver" "^4.4.3" - "@smithy/core" "^3.18.7" - "@smithy/fetch-http-handler" "^5.3.6" - "@smithy/hash-node" "^4.2.5" - "@smithy/invalid-dependency" "^4.2.5" - "@smithy/middleware-content-length" "^4.2.5" - "@smithy/middleware-endpoint" "^4.3.14" - "@smithy/middleware-retry" "^4.4.14" - "@smithy/middleware-serde" "^4.2.6" - "@smithy/middleware-stack" "^4.2.5" - "@smithy/node-config-provider" "^4.3.5" - "@smithy/node-http-handler" "^4.4.5" - "@smithy/protocol-http" "^5.3.5" - "@smithy/smithy-client" "^4.9.10" - "@smithy/types" "^4.9.0" - "@smithy/url-parser" "^4.2.5" + "@aws-sdk/core" "3.953.0" + "@aws-sdk/middleware-host-header" "3.953.0" + "@aws-sdk/middleware-logger" "3.953.0" + "@aws-sdk/middleware-recursion-detection" "3.953.0" + "@aws-sdk/middleware-user-agent" "3.953.0" + "@aws-sdk/region-config-resolver" "3.953.0" + "@aws-sdk/types" "3.953.0" + "@aws-sdk/util-endpoints" "3.953.0" + "@aws-sdk/util-user-agent-browser" "3.953.0" + "@aws-sdk/util-user-agent-node" "3.953.0" + "@smithy/config-resolver" "^4.4.4" + "@smithy/core" "^3.19.0" + "@smithy/fetch-http-handler" "^5.3.7" + "@smithy/hash-node" "^4.2.6" + "@smithy/invalid-dependency" "^4.2.6" + "@smithy/middleware-content-length" "^4.2.6" + "@smithy/middleware-endpoint" "^4.3.15" + "@smithy/middleware-retry" "^4.4.15" + "@smithy/middleware-serde" "^4.2.7" + "@smithy/middleware-stack" "^4.2.6" + "@smithy/node-config-provider" "^4.3.6" + "@smithy/node-http-handler" "^4.4.6" + "@smithy/protocol-http" "^5.3.6" + "@smithy/smithy-client" "^4.10.0" + "@smithy/types" "^4.10.0" + "@smithy/url-parser" "^4.2.6" "@smithy/util-base64" "^4.3.0" "@smithy/util-body-length-browser" "^4.2.0" "@smithy/util-body-length-node" "^4.2.1" - "@smithy/util-defaults-mode-browser" "^4.3.13" - "@smithy/util-defaults-mode-node" "^4.2.16" - "@smithy/util-endpoints" "^3.2.5" - "@smithy/util-middleware" "^4.2.5" - "@smithy/util-retry" "^4.2.5" + "@smithy/util-defaults-mode-browser" "^4.3.14" + "@smithy/util-defaults-mode-node" "^4.2.17" + "@smithy/util-endpoints" "^3.2.6" + "@smithy/util-middleware" "^4.2.6" + "@smithy/util-retry" "^4.2.6" "@smithy/util-utf8" "^4.2.0" tslib "^2.6.2" -"@aws-sdk/core@3.947.0": - version "3.947.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.947.0.tgz#2131aa3ddea99b8986145d7810b285daa4a76c3a" - integrity sha512-Khq4zHhuAkvCFuFbgcy3GrZTzfSX7ZIjIcW1zRDxXRLZKRtuhnZdonqTUfaWi5K42/4OmxkYNpsO7X7trQOeHw== - dependencies: - "@aws-sdk/types" "3.936.0" - "@aws-sdk/xml-builder" "3.930.0" - "@smithy/core" "^3.18.7" - "@smithy/node-config-provider" "^4.3.5" - "@smithy/property-provider" "^4.2.5" - "@smithy/protocol-http" "^5.3.5" - "@smithy/signature-v4" "^5.3.5" - "@smithy/smithy-client" "^4.9.10" - "@smithy/types" "^4.9.0" +"@aws-sdk/core@3.953.0": + version "3.953.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.953.0.tgz#fd675002ba34a21abfae104ea5aca980cb933c8f" + integrity sha512-hnz4ukn+XupuotZcFAyCIX41QqEWSHc8zf4gN4l5qVP2M8YCyZkLLZ5t5LaWLJkUFbOUU2w4SuGpUp+5ddtSkw== + dependencies: + "@aws-sdk/types" "3.953.0" + "@aws-sdk/xml-builder" "3.953.0" + "@smithy/core" "^3.19.0" + "@smithy/node-config-provider" "^4.3.6" + "@smithy/property-provider" "^4.2.6" + "@smithy/protocol-http" "^5.3.6" + "@smithy/signature-v4" "^5.3.6" + "@smithy/smithy-client" "^4.10.0" + "@smithy/types" "^4.10.0" "@smithy/util-base64" "^4.3.0" - "@smithy/util-middleware" "^4.2.5" + "@smithy/util-middleware" "^4.2.6" "@smithy/util-utf8" "^4.2.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-env@3.947.0": - version "3.947.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.947.0.tgz#8110b5cc5bd6d664b932d352ca590ab62c8d3a70" - integrity sha512-VR2V6dRELmzwAsCpK4GqxUi6UW5WNhAXS9F9AzWi5jvijwJo3nH92YNJUP4quMpgFZxJHEWyXLWgPjh9u0zYOA== +"@aws-sdk/credential-provider-env@3.953.0": + version "3.953.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.953.0.tgz#bea13a3d2052c1517e842b08f14da035fab6984b" + integrity sha512-ahOxDxvaKUf99LU9iRmRtPW2HLmsR+ix2WyzRGl1PpLltiRLMbKJHj5Tu2xyOsgLxs8tefK9D1j0SUgPk8GJ6g== dependencies: - "@aws-sdk/core" "3.947.0" - "@aws-sdk/types" "3.936.0" - "@smithy/property-provider" "^4.2.5" - "@smithy/types" "^4.9.0" + "@aws-sdk/core" "3.953.0" + "@aws-sdk/types" "3.953.0" + "@smithy/property-provider" "^4.2.6" + "@smithy/types" "^4.10.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-http@3.947.0": - version "3.947.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.947.0.tgz#dc9ddaf5154d3ac2d669c9c6cffb817c1253e536" - integrity sha512-inF09lh9SlHj63Vmr5d+LmwPXZc2IbK8lAruhOr3KLsZAIHEgHgGPXWDC2ukTEMzg0pkexQ6FOhXXad6klK4RA== - dependencies: - "@aws-sdk/core" "3.947.0" - "@aws-sdk/types" "3.936.0" - "@smithy/fetch-http-handler" "^5.3.6" - "@smithy/node-http-handler" "^4.4.5" - "@smithy/property-provider" "^4.2.5" - "@smithy/protocol-http" "^5.3.5" - "@smithy/smithy-client" "^4.9.10" - "@smithy/types" "^4.9.0" - "@smithy/util-stream" "^4.5.6" +"@aws-sdk/credential-provider-http@3.953.0": + version "3.953.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.953.0.tgz#762e106635905b08ac37ed623c2ac0e0509b85d7" + integrity sha512-kYQEcJpJLiT+1ZdsQDMrIs2o3YydxdAIDdLUxbIwks1+WQz2sCr9b94ld19aMZ0rejosASO0J3dfY0lt3Tfl+Q== + dependencies: + "@aws-sdk/core" "3.953.0" + "@aws-sdk/types" "3.953.0" + "@smithy/fetch-http-handler" "^5.3.7" + "@smithy/node-http-handler" "^4.4.6" + "@smithy/property-provider" "^4.2.6" + "@smithy/protocol-http" "^5.3.6" + "@smithy/smithy-client" "^4.10.0" + "@smithy/types" "^4.10.0" + "@smithy/util-stream" "^4.5.7" tslib "^2.6.2" -"@aws-sdk/credential-provider-ini@3.948.0": - version "3.948.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.948.0.tgz#f6e6c54e8248a33e974c4896d49959dc1430efe4" - integrity sha512-Cl//Qh88e8HBL7yYkJNpF5eq76IO6rq8GsatKcfVBm7RFVxCqYEPSSBtkHdbtNwQdRQqAMXc6E/lEB/CZUDxnA== - dependencies: - "@aws-sdk/core" "3.947.0" - "@aws-sdk/credential-provider-env" "3.947.0" - "@aws-sdk/credential-provider-http" "3.947.0" - "@aws-sdk/credential-provider-login" "3.948.0" - "@aws-sdk/credential-provider-process" "3.947.0" - "@aws-sdk/credential-provider-sso" "3.948.0" - "@aws-sdk/credential-provider-web-identity" "3.948.0" - "@aws-sdk/nested-clients" "3.948.0" - "@aws-sdk/types" "3.936.0" - "@smithy/credential-provider-imds" "^4.2.5" - "@smithy/property-provider" "^4.2.5" - "@smithy/shared-ini-file-loader" "^4.4.0" - "@smithy/types" "^4.9.0" +"@aws-sdk/credential-provider-ini@3.953.0": + version "3.953.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.953.0.tgz#22f5211840a21fb3b70b259a1719e6824aa5b8ed" + integrity sha512-5cy6b3VntBvhRCanwohRtR0wbKKUd6JfIsnuXImB4JcZa2iMW5tDW0LhNangYZ9wrrM7sJol6cKHtUW9LNemFQ== + dependencies: + "@aws-sdk/core" "3.953.0" + "@aws-sdk/credential-provider-env" "3.953.0" + "@aws-sdk/credential-provider-http" "3.953.0" + "@aws-sdk/credential-provider-login" "3.953.0" + "@aws-sdk/credential-provider-process" "3.953.0" + "@aws-sdk/credential-provider-sso" "3.953.0" + "@aws-sdk/credential-provider-web-identity" "3.953.0" + "@aws-sdk/nested-clients" "3.953.0" + "@aws-sdk/types" "3.953.0" + "@smithy/credential-provider-imds" "^4.2.6" + "@smithy/property-provider" "^4.2.6" + "@smithy/shared-ini-file-loader" "^4.4.1" + "@smithy/types" "^4.10.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-login@3.948.0": - version "3.948.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-login/-/credential-provider-login-3.948.0.tgz#b3996d2a8090ae82bf37ea4c52c983c553b3c307" - integrity sha512-gcKO2b6eeTuZGp3Vvgr/9OxajMrD3W+FZ2FCyJox363ZgMoYJsyNid1vuZrEuAGkx0jvveLXfwiVS0UXyPkgtw== - dependencies: - "@aws-sdk/core" "3.947.0" - "@aws-sdk/nested-clients" "3.948.0" - "@aws-sdk/types" "3.936.0" - "@smithy/property-provider" "^4.2.5" - "@smithy/protocol-http" "^5.3.5" - "@smithy/shared-ini-file-loader" "^4.4.0" - "@smithy/types" "^4.9.0" +"@aws-sdk/credential-provider-login@3.953.0": + version "3.953.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-login/-/credential-provider-login-3.953.0.tgz#f09738c83a8839fc23ac7f75c309c668d71aed0d" + integrity sha512-Drf4v7uBKnU/nY/qgQD9ZA2zD5gjQEatxQajQHUN54erDSQ2rB5ApNuTnc2cyNwaxURnQvO1J72mwO6P5lIpsg== + dependencies: + "@aws-sdk/core" "3.953.0" + "@aws-sdk/nested-clients" "3.953.0" + "@aws-sdk/types" "3.953.0" + "@smithy/property-provider" "^4.2.6" + "@smithy/protocol-http" "^5.3.6" + "@smithy/shared-ini-file-loader" "^4.4.1" + "@smithy/types" "^4.10.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-node@3.948.0": - version "3.948.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.948.0.tgz#c703485e5de216b19782d4603591e6bf252641d2" - integrity sha512-ep5vRLnrRdcsP17Ef31sNN4g8Nqk/4JBydcUJuFRbGuyQtrZZrVT81UeH2xhz6d0BK6ejafDB9+ZpBjXuWT5/Q== - dependencies: - "@aws-sdk/credential-provider-env" "3.947.0" - "@aws-sdk/credential-provider-http" "3.947.0" - "@aws-sdk/credential-provider-ini" "3.948.0" - "@aws-sdk/credential-provider-process" "3.947.0" - "@aws-sdk/credential-provider-sso" "3.948.0" - "@aws-sdk/credential-provider-web-identity" "3.948.0" - "@aws-sdk/types" "3.936.0" - "@smithy/credential-provider-imds" "^4.2.5" - "@smithy/property-provider" "^4.2.5" - "@smithy/shared-ini-file-loader" "^4.4.0" - "@smithy/types" "^4.9.0" +"@aws-sdk/credential-provider-node@3.953.0": + version "3.953.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.953.0.tgz#7446d049ba2f14b4585d0187ce8354a644536b99" + integrity sha512-/3gUap/QwAV/U3RPStcSjdiksDboTdcz82qajfhURhtAe9iEdoKJy7vTYqg75eX7IjpgBwLGajt0URasUofrPg== + dependencies: + "@aws-sdk/credential-provider-env" "3.953.0" + "@aws-sdk/credential-provider-http" "3.953.0" + "@aws-sdk/credential-provider-ini" "3.953.0" + "@aws-sdk/credential-provider-process" "3.953.0" + "@aws-sdk/credential-provider-sso" "3.953.0" + "@aws-sdk/credential-provider-web-identity" "3.953.0" + "@aws-sdk/types" "3.953.0" + "@smithy/credential-provider-imds" "^4.2.6" + "@smithy/property-provider" "^4.2.6" + "@smithy/shared-ini-file-loader" "^4.4.1" + "@smithy/types" "^4.10.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-process@3.947.0": - version "3.947.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.947.0.tgz#7476d97d16472e868ea670799f65e92fdec1addc" - integrity sha512-WpanFbHe08SP1hAJNeDdBDVz9SGgMu/gc0XJ9u3uNpW99nKZjDpvPRAdW7WLA4K6essMjxWkguIGNOpij6Do2Q== +"@aws-sdk/credential-provider-process@3.953.0": + version "3.953.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.953.0.tgz#d71179b9b5cd148f884ab745dc92e13010228c74" + integrity sha512-YeqzqxzBzXnqdzn4pBuoXeCmWrXOLIu5owAowUc4dOvHmtlpXxB3beJdQ9g/Ky6fG6iaAPKO1vrCEoHNjM85Dw== dependencies: - "@aws-sdk/core" "3.947.0" - "@aws-sdk/types" "3.936.0" - "@smithy/property-provider" "^4.2.5" - "@smithy/shared-ini-file-loader" "^4.4.0" - "@smithy/types" "^4.9.0" + "@aws-sdk/core" "3.953.0" + "@aws-sdk/types" "3.953.0" + "@smithy/property-provider" "^4.2.6" + "@smithy/shared-ini-file-loader" "^4.4.1" + "@smithy/types" "^4.10.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-sso@3.948.0": - version "3.948.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.948.0.tgz#0452bc62388d98cc5b3c3e79b56c0853c4d6bd2b" - integrity sha512-gqLhX1L+zb/ZDnnYbILQqJ46j735StfWV5PbDjxRzBKS7GzsiYoaf6MyHseEopmWrez5zl5l6aWzig7UpzSeQQ== - dependencies: - "@aws-sdk/client-sso" "3.948.0" - "@aws-sdk/core" "3.947.0" - "@aws-sdk/token-providers" "3.948.0" - "@aws-sdk/types" "3.936.0" - "@smithy/property-provider" "^4.2.5" - "@smithy/shared-ini-file-loader" "^4.4.0" - "@smithy/types" "^4.9.0" +"@aws-sdk/credential-provider-sso@3.953.0": + version "3.953.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.953.0.tgz#9067eb54f055fb3f6eb6625cc9a926e959b41d51" + integrity sha512-Kp/49vAJweixMo3q85eVpq1JO9KgKc6A+f8/8WDkN5CkMsfKQcGJZbO5JtuJfzar4pPmRKbgOeOP1qQsOmfyfw== + dependencies: + "@aws-sdk/client-sso" "3.953.0" + "@aws-sdk/core" "3.953.0" + "@aws-sdk/token-providers" "3.953.0" + "@aws-sdk/types" "3.953.0" + "@smithy/property-provider" "^4.2.6" + "@smithy/shared-ini-file-loader" "^4.4.1" + "@smithy/types" "^4.10.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-web-identity@3.948.0": - version "3.948.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.948.0.tgz#30469dec60df32669277679a141bfa99880bf187" - integrity sha512-MvYQlXVoJyfF3/SmnNzOVEtANRAiJIObEUYYyjTqKZTmcRIVVky0tPuG26XnB8LmTYgtESwJIZJj/Eyyc9WURQ== - dependencies: - "@aws-sdk/core" "3.947.0" - "@aws-sdk/nested-clients" "3.948.0" - "@aws-sdk/types" "3.936.0" - "@smithy/property-provider" "^4.2.5" - "@smithy/shared-ini-file-loader" "^4.4.0" - "@smithy/types" "^4.9.0" +"@aws-sdk/credential-provider-web-identity@3.953.0": + version "3.953.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.953.0.tgz#148b4e182e2c25188ea3a3c775957011ea7d2121" + integrity sha512-V8SpGVtNjQZboHjb/GLM4L3/6O/AZJFtwJ8fiBaemKMTntl8haioZlQHDklWixR9s9zthOdFsCDs1+92ndUBRw== + dependencies: + "@aws-sdk/core" "3.953.0" + "@aws-sdk/nested-clients" "3.953.0" + "@aws-sdk/types" "3.953.0" + "@smithy/property-provider" "^4.2.6" + "@smithy/shared-ini-file-loader" "^4.4.1" + "@smithy/types" "^4.10.0" tslib "^2.6.2" -"@aws-sdk/middleware-host-header@3.936.0": - version "3.936.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.936.0.tgz#ef1144d175f1f499afbbd92ad07e24f8ccc9e9ce" - integrity sha512-tAaObaAnsP1XnLGndfkGWFuzrJYuk9W0b/nLvol66t8FZExIAf/WdkT2NNAWOYxljVs++oHnyHBCxIlaHrzSiw== +"@aws-sdk/middleware-host-header@3.953.0": + version "3.953.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.953.0.tgz#e13a8fbc2e017d9bfc6b77f7c1be16edd9841c49" + integrity sha512-jTGhfkONav+r4E6HLOrl5SzBqDmPByUYCkyB/c/3TVb8jX3wAZx8/q9bphKpCh+G5ARi3IdbSisgkZrJYqQ19Q== dependencies: - "@aws-sdk/types" "3.936.0" - "@smithy/protocol-http" "^5.3.5" - "@smithy/types" "^4.9.0" + "@aws-sdk/types" "3.953.0" + "@smithy/protocol-http" "^5.3.6" + "@smithy/types" "^4.10.0" tslib "^2.6.2" -"@aws-sdk/middleware-logger@3.936.0": - version "3.936.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.936.0.tgz#691093bebb708b994be10f19358e8699af38a209" - integrity sha512-aPSJ12d3a3Ea5nyEnLbijCaaYJT2QjQ9iW+zGh5QcZYXmOGWbKVyPSxmVOboZQG+c1M8t6d2O7tqrwzIq8L8qw== +"@aws-sdk/middleware-logger@3.953.0": + version "3.953.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.953.0.tgz#c18e1935a092038e7a538da15abbd00bba4bcb57" + integrity sha512-PlWdVYgcuptkIC0ZKqVUhWNtSHXJSx7U9V8J7dJjRmsXC40X7zpEycvrkzDMJjeTDGcCceYbyYAg/4X1lkcIMw== dependencies: - "@aws-sdk/types" "3.936.0" - "@smithy/types" "^4.9.0" + "@aws-sdk/types" "3.953.0" + "@smithy/types" "^4.10.0" tslib "^2.6.2" -"@aws-sdk/middleware-recursion-detection@3.948.0": - version "3.948.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.948.0.tgz#869dce8a9ad2934deb885602e6f9c905017afd6b" - integrity sha512-Qa8Zj+EAqA0VlAVvxpRnpBpIWJI9KUwaioY1vkeNVwXPlNaz9y9zCKVM9iU9OZ5HXpoUg6TnhATAHXHAE8+QsQ== +"@aws-sdk/middleware-recursion-detection@3.953.0": + version "3.953.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.953.0.tgz#986c4ee192023549135d9a1ebe21f454ae1b7439" + integrity sha512-cmIJx0gWeesUKK4YwgE+VQL3mpACr3/J24fbwnc1Z5tntC86b+HQFzU5vsBDw6lLwyD46dBgWdsXFh1jL+ZaFw== dependencies: - "@aws-sdk/types" "3.936.0" + "@aws-sdk/types" "3.953.0" "@aws/lambda-invoke-store" "^0.2.2" - "@smithy/protocol-http" "^5.3.5" - "@smithy/types" "^4.9.0" + "@smithy/protocol-http" "^5.3.6" + "@smithy/types" "^4.10.0" tslib "^2.6.2" -"@aws-sdk/middleware-sdk-ec2@3.946.0": - version "3.946.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-sdk-ec2/-/middleware-sdk-ec2-3.946.0.tgz#adae36995f8de84f9e0ad2fbc8bb666d42448250" - integrity sha512-dFJMEnXcb0amuSK6YsTR3Vx6YUkwOOdzSYH12OARwvpPjlovJC+s0eB5TRgwP/easWE+ceAoR2BvbH/aedWMVw== - dependencies: - "@aws-sdk/types" "3.936.0" - "@aws-sdk/util-format-url" "3.936.0" - "@smithy/middleware-endpoint" "^4.3.14" - "@smithy/protocol-http" "^5.3.5" - "@smithy/signature-v4" "^5.3.5" - "@smithy/smithy-client" "^4.9.10" - "@smithy/types" "^4.9.0" +"@aws-sdk/middleware-sdk-ec2@3.953.0": + version "3.953.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-sdk-ec2/-/middleware-sdk-ec2-3.953.0.tgz#7bd46acdf21bfe69793d3aed07c2e8a34dafca9f" + integrity sha512-r5F6zevhNnTICqu6YM1SWzFcz0T5D9rYDjwJjDOZ8KFa6cb+FqV2MOcvAePz7yuaWj05+SGw1A8BC7M4IpVLfA== + dependencies: + "@aws-sdk/types" "3.953.0" + "@aws-sdk/util-format-url" "3.953.0" + "@smithy/middleware-endpoint" "^4.3.15" + "@smithy/protocol-http" "^5.3.6" + "@smithy/signature-v4" "^5.3.6" + "@smithy/smithy-client" "^4.10.0" + "@smithy/types" "^4.10.0" tslib "^2.6.2" -"@aws-sdk/middleware-user-agent@3.947.0": - version "3.947.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.947.0.tgz#2cb484c9af8334504a9ebf7e24a4ca0175aaf3f5" - integrity sha512-7rpKV8YNgCP2R4F9RjWZFcD2R+SO/0R4VHIbY9iZJdH2MzzJ8ZG7h8dZ2m8QkQd1fjx4wrFJGGPJUTYXPV3baA== - dependencies: - "@aws-sdk/core" "3.947.0" - "@aws-sdk/types" "3.936.0" - "@aws-sdk/util-endpoints" "3.936.0" - "@smithy/core" "^3.18.7" - "@smithy/protocol-http" "^5.3.5" - "@smithy/types" "^4.9.0" +"@aws-sdk/middleware-user-agent@3.953.0": + version "3.953.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.953.0.tgz#0327bb8449f0464162df46e2055f1b5fcf6aef70" + integrity sha512-xZSU54cEHlIvRTUewyTAajb4WJPdbBd1mIaDYOzac07+vsfMuCREQ5CheQ3inoBfqske7QOX+mIjLpVV4azAnw== + dependencies: + "@aws-sdk/core" "3.953.0" + "@aws-sdk/types" "3.953.0" + "@aws-sdk/util-endpoints" "3.953.0" + "@smithy/core" "^3.19.0" + "@smithy/protocol-http" "^5.3.6" + "@smithy/types" "^4.10.0" tslib "^2.6.2" -"@aws-sdk/nested-clients@3.948.0": - version "3.948.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/nested-clients/-/nested-clients-3.948.0.tgz#86a369179dd3f336535904f4d4c63aebbfe36d78" - integrity sha512-zcbJfBsB6h254o3NuoEkf0+UY1GpE9ioiQdENWv7odo69s8iaGBEQ4BDpsIMqcuiiUXw1uKIVNxCB1gUGYz8lw== +"@aws-sdk/nested-clients@3.953.0": + version "3.953.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/nested-clients/-/nested-clients-3.953.0.tgz#032a267cba37ecfa7a425a8205107bba23a73131" + integrity sha512-YEBI0b/4ezNkw5W4+RBRUoueFzqEPPrnkh/3LBqeJ7RWZTymBhxlpoLo6Gfxw9LxtDgv2vZ5K5rgC4/6Ly8ADg== dependencies: "@aws-crypto/sha256-browser" "5.2.0" "@aws-crypto/sha256-js" "5.2.0" - "@aws-sdk/core" "3.947.0" - "@aws-sdk/middleware-host-header" "3.936.0" - "@aws-sdk/middleware-logger" "3.936.0" - "@aws-sdk/middleware-recursion-detection" "3.948.0" - "@aws-sdk/middleware-user-agent" "3.947.0" - "@aws-sdk/region-config-resolver" "3.936.0" - "@aws-sdk/types" "3.936.0" - "@aws-sdk/util-endpoints" "3.936.0" - "@aws-sdk/util-user-agent-browser" "3.936.0" - "@aws-sdk/util-user-agent-node" "3.947.0" - "@smithy/config-resolver" "^4.4.3" - "@smithy/core" "^3.18.7" - "@smithy/fetch-http-handler" "^5.3.6" - "@smithy/hash-node" "^4.2.5" - "@smithy/invalid-dependency" "^4.2.5" - "@smithy/middleware-content-length" "^4.2.5" - "@smithy/middleware-endpoint" "^4.3.14" - "@smithy/middleware-retry" "^4.4.14" - "@smithy/middleware-serde" "^4.2.6" - "@smithy/middleware-stack" "^4.2.5" - "@smithy/node-config-provider" "^4.3.5" - "@smithy/node-http-handler" "^4.4.5" - "@smithy/protocol-http" "^5.3.5" - "@smithy/smithy-client" "^4.9.10" - "@smithy/types" "^4.9.0" - "@smithy/url-parser" "^4.2.5" + "@aws-sdk/core" "3.953.0" + "@aws-sdk/middleware-host-header" "3.953.0" + "@aws-sdk/middleware-logger" "3.953.0" + "@aws-sdk/middleware-recursion-detection" "3.953.0" + "@aws-sdk/middleware-user-agent" "3.953.0" + "@aws-sdk/region-config-resolver" "3.953.0" + "@aws-sdk/types" "3.953.0" + "@aws-sdk/util-endpoints" "3.953.0" + "@aws-sdk/util-user-agent-browser" "3.953.0" + "@aws-sdk/util-user-agent-node" "3.953.0" + "@smithy/config-resolver" "^4.4.4" + "@smithy/core" "^3.19.0" + "@smithy/fetch-http-handler" "^5.3.7" + "@smithy/hash-node" "^4.2.6" + "@smithy/invalid-dependency" "^4.2.6" + "@smithy/middleware-content-length" "^4.2.6" + "@smithy/middleware-endpoint" "^4.3.15" + "@smithy/middleware-retry" "^4.4.15" + "@smithy/middleware-serde" "^4.2.7" + "@smithy/middleware-stack" "^4.2.6" + "@smithy/node-config-provider" "^4.3.6" + "@smithy/node-http-handler" "^4.4.6" + "@smithy/protocol-http" "^5.3.6" + "@smithy/smithy-client" "^4.10.0" + "@smithy/types" "^4.10.0" + "@smithy/url-parser" "^4.2.6" "@smithy/util-base64" "^4.3.0" "@smithy/util-body-length-browser" "^4.2.0" "@smithy/util-body-length-node" "^4.2.1" - "@smithy/util-defaults-mode-browser" "^4.3.13" - "@smithy/util-defaults-mode-node" "^4.2.16" - "@smithy/util-endpoints" "^3.2.5" - "@smithy/util-middleware" "^4.2.5" - "@smithy/util-retry" "^4.2.5" + "@smithy/util-defaults-mode-browser" "^4.3.14" + "@smithy/util-defaults-mode-node" "^4.2.17" + "@smithy/util-endpoints" "^3.2.6" + "@smithy/util-middleware" "^4.2.6" + "@smithy/util-retry" "^4.2.6" "@smithy/util-utf8" "^4.2.0" tslib "^2.6.2" -"@aws-sdk/region-config-resolver@3.936.0": - version "3.936.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/region-config-resolver/-/region-config-resolver-3.936.0.tgz#b02f20c4d62973731d42da1f1239a27fbbe53c0a" - integrity sha512-wOKhzzWsshXGduxO4pqSiNyL9oUtk4BEvjWm9aaq6Hmfdoydq6v6t0rAGHWPjFwy9z2haovGRi3C8IxdMB4muw== +"@aws-sdk/region-config-resolver@3.953.0": + version "3.953.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/region-config-resolver/-/region-config-resolver-3.953.0.tgz#74686a62d38514578c5000878a175a80de6419ab" + integrity sha512-5MJgnsc+HLO+le0EK1cy92yrC7kyhGZSpaq8PcQvKs9qtXCXT5Tb6tMdkr5Y07JxYsYOV1omWBynvL6PWh08tQ== dependencies: - "@aws-sdk/types" "3.936.0" - "@smithy/config-resolver" "^4.4.3" - "@smithy/node-config-provider" "^4.3.5" - "@smithy/types" "^4.9.0" + "@aws-sdk/types" "3.953.0" + "@smithy/config-resolver" "^4.4.4" + "@smithy/node-config-provider" "^4.3.6" + "@smithy/types" "^4.10.0" tslib "^2.6.2" -"@aws-sdk/token-providers@3.948.0": - version "3.948.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.948.0.tgz#c813b1774fd30dc5fe0379527fb57d245b37f50a" - integrity sha512-V487/kM4Teq5dcr1t5K6eoUKuqlGr9FRWL3MIMukMERJXHZvio6kox60FZ/YtciRHRI75u14YUqm2Dzddcu3+A== +"@aws-sdk/token-providers@3.953.0": + version "3.953.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.953.0.tgz#901e69f0b98da744f7a4028956652f278d972646" + integrity sha512-4FWWR3lDDuIftmCEWpGejfkJu2J1VG2MUktChQshADXABfVfM0fsT7OYlO7Sy106nOe9upE4uQTWXg9YT/6ssw== + dependencies: + "@aws-sdk/core" "3.953.0" + "@aws-sdk/nested-clients" "3.953.0" + "@aws-sdk/types" "3.953.0" + "@smithy/property-provider" "^4.2.6" + "@smithy/shared-ini-file-loader" "^4.4.1" + "@smithy/types" "^4.10.0" + tslib "^2.6.2" + +"@aws-sdk/types@3.953.0": + version "3.953.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.953.0.tgz#d9a67388fa04e1f3af69592e78ec263769579273" + integrity sha512-M9Iwg9kTyqTErI0vOTVVpcnTHWzS3VplQppy8MuL02EE+mJ0BIwpWfsaAPQW+/XnVpdNpWZTsHcNE29f1+hR8g== dependencies: - "@aws-sdk/core" "3.947.0" - "@aws-sdk/nested-clients" "3.948.0" - "@aws-sdk/types" "3.936.0" - "@smithy/property-provider" "^4.2.5" - "@smithy/shared-ini-file-loader" "^4.4.0" - "@smithy/types" "^4.9.0" + "@smithy/types" "^4.10.0" tslib "^2.6.2" -"@aws-sdk/types@3.936.0", "@aws-sdk/types@^3.222.0": +"@aws-sdk/types@^3.222.0": version "3.936.0" resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.936.0.tgz#ecd3a4bec1a1bd4df834ab21fe52a76e332dc27a" integrity sha512-uz0/VlMd2pP5MepdrHizd+T+OKfyK4r3OA9JI+L/lPKg0YFQosdJNCKisr6o70E3dh8iMpFYxF1UN/4uZsyARg== @@ -846,25 +856,25 @@ "@smithy/types" "^4.9.0" tslib "^2.6.2" -"@aws-sdk/util-endpoints@3.936.0": - version "3.936.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.936.0.tgz#81c00be8cfd4f966e05defd739a720ce2c888ddf" - integrity sha512-0Zx3Ntdpu+z9Wlm7JKUBOzS9EunwKAb4KdGUQQxDqh5Lc3ta5uBoub+FgmVuzwnmBu9U1Os8UuwVTH0Lgu+P5w== +"@aws-sdk/util-endpoints@3.953.0": + version "3.953.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.953.0.tgz#f45c73fa69af7068ba48206bf427c1996d1f6b88" + integrity sha512-rjaS6jrFksopXvNg6YeN+D1lYwhcByORNlFuYesFvaQNtPOufbE5tJL4GJ3TMXyaY0uFR28N5BHHITPyWWfH/g== dependencies: - "@aws-sdk/types" "3.936.0" - "@smithy/types" "^4.9.0" - "@smithy/url-parser" "^4.2.5" - "@smithy/util-endpoints" "^3.2.5" + "@aws-sdk/types" "3.953.0" + "@smithy/types" "^4.10.0" + "@smithy/url-parser" "^4.2.6" + "@smithy/util-endpoints" "^3.2.6" tslib "^2.6.2" -"@aws-sdk/util-format-url@3.936.0": - version "3.936.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-format-url/-/util-format-url-3.936.0.tgz#66070d028d2db66729face62d75468bea4c25eee" - integrity sha512-MS5eSEtDUFIAMHrJaMERiHAvDPdfxc/T869ZjDNFAIiZhyc037REw0aoTNeimNXDNy2txRNZJaAUn/kE4RwN+g== +"@aws-sdk/util-format-url@3.953.0": + version "3.953.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-format-url/-/util-format-url-3.953.0.tgz#5e2d5053f6f771e9572792369e1187298da9cfa0" + integrity sha512-fs70vtTiBhp/T9ss52OuW2LGJqPoNBbd1+wxqh82CMdzkOvCzI3qa/cK8tR0jCFeIjGeiV74lAskImRxu/V4lg== dependencies: - "@aws-sdk/types" "3.936.0" - "@smithy/querystring-builder" "^4.2.5" - "@smithy/types" "^4.9.0" + "@aws-sdk/types" "3.953.0" + "@smithy/querystring-builder" "^4.2.6" + "@smithy/types" "^4.10.0" tslib "^2.6.2" "@aws-sdk/util-locate-window@^3.0.0": @@ -874,33 +884,33 @@ dependencies: tslib "^2.6.2" -"@aws-sdk/util-user-agent-browser@3.936.0": - version "3.936.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.936.0.tgz#cbfcaeaba6d843b060183638699c0f20dcaed774" - integrity sha512-eZ/XF6NxMtu+iCma58GRNRxSq4lHo6zHQLOZRIeL/ghqYJirqHdenMOwrzPettj60KWlv827RVebP9oNVrwZbw== +"@aws-sdk/util-user-agent-browser@3.953.0": + version "3.953.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.953.0.tgz#f061e6942c988d8bcc781af4253e52b5a84137f3" + integrity sha512-UF5NeqYesWuFao+u7LJvpV1SJCaLml5BtFZKUdTnNNMeN6jvV+dW/eQoFGpXF94RCqguX0XESmRuRRPQp+/rzQ== dependencies: - "@aws-sdk/types" "3.936.0" - "@smithy/types" "^4.9.0" + "@aws-sdk/types" "3.953.0" + "@smithy/types" "^4.10.0" bowser "^2.11.0" tslib "^2.6.2" -"@aws-sdk/util-user-agent-node@3.947.0": - version "3.947.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.947.0.tgz#1f1f6792262d9bf7dcd7eeef807b3028c7bb486b" - integrity sha512-+vhHoDrdbb+zerV4noQk1DHaUMNzWFWPpPYjVTwW2186k5BEJIecAMChYkghRrBVJ3KPWP1+JnZwOd72F3d4rQ== +"@aws-sdk/util-user-agent-node@3.953.0": + version "3.953.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.953.0.tgz#d2acaa852a17e649f7943504a7d034b9ee085de1" + integrity sha512-HjJ0Nq/57kg0QCjt8mwBAK6C34njKezy9ItUNcrWITzrBZv7ikQtyqM1pindAIzgLaBb7ly/0kbJqMY+NPbcJA== dependencies: - "@aws-sdk/middleware-user-agent" "3.947.0" - "@aws-sdk/types" "3.936.0" - "@smithy/node-config-provider" "^4.3.5" - "@smithy/types" "^4.9.0" + "@aws-sdk/middleware-user-agent" "3.953.0" + "@aws-sdk/types" "3.953.0" + "@smithy/node-config-provider" "^4.3.6" + "@smithy/types" "^4.10.0" tslib "^2.6.2" -"@aws-sdk/xml-builder@3.930.0": - version "3.930.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/xml-builder/-/xml-builder-3.930.0.tgz#949a35219ca52cc769ffbfbf38f3324178ba74f9" - integrity sha512-YIfkD17GocxdmlUVc3ia52QhcWuRIUJonbF8A2CYfcWNV3HzvAqpcPeC0bYUhkK+8e8YO1ARnLKZQE0TlwzorA== +"@aws-sdk/xml-builder@3.953.0": + version "3.953.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/xml-builder/-/xml-builder-3.953.0.tgz#c0b600a168a934323509c82a78a9424f366c75c7" + integrity sha512-Zmrj21jQ2OeOJGr9spPiN00aQvXa/WUqRXcTVENhrMt+OFoSOfDFpYhUj9NQ09QmQ8KMWFoWuWW6iKurNqLvAA== dependencies: - "@smithy/types" "^4.9.0" + "@smithy/types" "^4.10.0" fast-xml-parser "5.2.5" tslib "^2.6.2" @@ -2258,125 +2268,125 @@ dependencies: "@sinonjs/commons" "^3.0.0" -"@smithy/abort-controller@^4.2.5": - version "4.2.5" - resolved "https://registry.yarnpkg.com/@smithy/abort-controller/-/abort-controller-4.2.5.tgz#3386e8fff5a8d05930996d891d06803f2b7e5e2c" - integrity sha512-j7HwVkBw68YW8UmFRcjZOmssE77Rvk0GWAIN1oFBhsaovQmZWYCIcGa9/pwRB0ExI8Sk9MWNALTjftjHZea7VA== +"@smithy/abort-controller@^4.2.6": + version "4.2.6" + resolved "https://registry.yarnpkg.com/@smithy/abort-controller/-/abort-controller-4.2.6.tgz#fce3382b9637e7df50be3d164f6125433a613ed9" + integrity sha512-P7JD4J+wxHMpGxqIg6SHno2tPkZbBUBLbPpR5/T1DEUvw/mEaINBMaPFZNM7lA+ToSCZ36j6nMHa+5kej+fhGg== dependencies: - "@smithy/types" "^4.9.0" + "@smithy/types" "^4.10.0" tslib "^2.6.2" -"@smithy/config-resolver@^4.4.3": - version "4.4.3" - resolved "https://registry.yarnpkg.com/@smithy/config-resolver/-/config-resolver-4.4.3.tgz#37b0e3cba827272e92612e998a2b17e841e20bab" - integrity sha512-ezHLe1tKLUxDJo2LHtDuEDyWXolw8WGOR92qb4bQdWq/zKenO5BvctZGrVJBK08zjezSk7bmbKFOXIVyChvDLw== +"@smithy/config-resolver@^4.4.4": + version "4.4.4" + resolved "https://registry.yarnpkg.com/@smithy/config-resolver/-/config-resolver-4.4.4.tgz#58a435b8b77c8588b22910ed2484b80e605e48c9" + integrity sha512-s3U5ChS21DwU54kMmZ0UJumoS5cg0+rGVZvN6f5Lp6EbAVi0ZyP+qDSHdewfmXKUgNK1j3z45JyzulkDukrjAA== dependencies: - "@smithy/node-config-provider" "^4.3.5" - "@smithy/types" "^4.9.0" + "@smithy/node-config-provider" "^4.3.6" + "@smithy/types" "^4.10.0" "@smithy/util-config-provider" "^4.2.0" - "@smithy/util-endpoints" "^3.2.5" - "@smithy/util-middleware" "^4.2.5" + "@smithy/util-endpoints" "^3.2.6" + "@smithy/util-middleware" "^4.2.6" tslib "^2.6.2" -"@smithy/core@^3.18.7": - version "3.18.7" - resolved "https://registry.yarnpkg.com/@smithy/core/-/core-3.18.7.tgz#88c67b9474eadf51a632e2956c8756d36c7072c8" - integrity sha512-axG9MvKhMWOhFbvf5y2DuyTxQueO0dkedY9QC3mAfndLosRI/9LJv8WaL0mw7ubNhsO4IuXX9/9dYGPFvHrqlw== +"@smithy/core@^3.19.0": + version "3.19.0" + resolved "https://registry.yarnpkg.com/@smithy/core/-/core-3.19.0.tgz#57d908bf4e6da83980c6789d1896aca10ef9db31" + integrity sha512-Y9oHXpBcXQgYHOcAEmxjkDilUbSTkgKjoHYed3WaYUH8jngq8lPWDBSpjHblJ9uOgBdy5mh3pzebrScDdYr29w== dependencies: - "@smithy/middleware-serde" "^4.2.6" - "@smithy/protocol-http" "^5.3.5" - "@smithy/types" "^4.9.0" + "@smithy/middleware-serde" "^4.2.7" + "@smithy/protocol-http" "^5.3.6" + "@smithy/types" "^4.10.0" "@smithy/util-base64" "^4.3.0" "@smithy/util-body-length-browser" "^4.2.0" - "@smithy/util-middleware" "^4.2.5" - "@smithy/util-stream" "^4.5.6" + "@smithy/util-middleware" "^4.2.6" + "@smithy/util-stream" "^4.5.7" "@smithy/util-utf8" "^4.2.0" "@smithy/uuid" "^1.1.0" tslib "^2.6.2" -"@smithy/credential-provider-imds@^4.2.5": - version "4.2.5" - resolved "https://registry.yarnpkg.com/@smithy/credential-provider-imds/-/credential-provider-imds-4.2.5.tgz#5acbcd1d02ae31700c2f027090c202d7315d70d3" - integrity sha512-BZwotjoZWn9+36nimwm/OLIcVe+KYRwzMjfhd4QT7QxPm9WY0HiOV8t/Wlh+HVUif0SBVV7ksq8//hPaBC/okQ== +"@smithy/credential-provider-imds@^4.2.6": + version "4.2.6" + resolved "https://registry.yarnpkg.com/@smithy/credential-provider-imds/-/credential-provider-imds-4.2.6.tgz#78e7378b26dd6e395059bab87472209271d2e45e" + integrity sha512-xBmawExyTzOjbhzkZwg+vVm/khg28kG+rj2sbGlULjFd1jI70sv/cbpaR0Ev4Yfd6CpDUDRMe64cTqR//wAOyA== dependencies: - "@smithy/node-config-provider" "^4.3.5" - "@smithy/property-provider" "^4.2.5" - "@smithy/types" "^4.9.0" - "@smithy/url-parser" "^4.2.5" + "@smithy/node-config-provider" "^4.3.6" + "@smithy/property-provider" "^4.2.6" + "@smithy/types" "^4.10.0" + "@smithy/url-parser" "^4.2.6" tslib "^2.6.2" -"@smithy/eventstream-codec@^4.2.5": - version "4.2.5" - resolved "https://registry.yarnpkg.com/@smithy/eventstream-codec/-/eventstream-codec-4.2.5.tgz#331b3f23528137cb5f4ad861de7f34ddff68c62b" - integrity sha512-Ogt4Zi9hEbIP17oQMd68qYOHUzmH47UkK7q7Gl55iIm9oKt27MUGrC5JfpMroeHjdkOliOA4Qt3NQ1xMq/nrlA== +"@smithy/eventstream-codec@^4.2.6": + version "4.2.6" + resolved "https://registry.yarnpkg.com/@smithy/eventstream-codec/-/eventstream-codec-4.2.6.tgz#06985fd79e60735d8b0998ce552cf6060379acb3" + integrity sha512-OZfsI+YRG26XZik/jKMMg37acnBSbUiK/8nETW3uM3mLj+0tMmFXdHQw1e5WEd/IHN8BGOh3te91SNDe2o4RHg== dependencies: "@aws-crypto/crc32" "5.2.0" - "@smithy/types" "^4.9.0" + "@smithy/types" "^4.10.0" "@smithy/util-hex-encoding" "^4.2.0" tslib "^2.6.2" -"@smithy/eventstream-serde-browser@^4.2.5": - version "4.2.5" - resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-4.2.5.tgz#54a680006539601ce71306d8bf2946e3462a47b3" - integrity sha512-HohfmCQZjppVnKX2PnXlf47CW3j92Ki6T/vkAT2DhBR47e89pen3s4fIa7otGTtrVxmj7q+IhH0RnC5kpR8wtw== +"@smithy/eventstream-serde-browser@^4.2.6": + version "4.2.6" + resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-4.2.6.tgz#952c8a731fa067bfbe2b9af59ac88991dd6c1934" + integrity sha512-6OiaAaEbLB6dEkRbQyNzFSJv5HDvly3Mc6q/qcPd2uS/g3szR8wAIkh7UndAFKfMypNSTuZ6eCBmgCLR5LacTg== dependencies: - "@smithy/eventstream-serde-universal" "^4.2.5" - "@smithy/types" "^4.9.0" + "@smithy/eventstream-serde-universal" "^4.2.6" + "@smithy/types" "^4.10.0" tslib "^2.6.2" -"@smithy/eventstream-serde-config-resolver@^4.3.5": - version "4.3.5" - resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-4.3.5.tgz#d1490aa127f43ac242495fa6e2e5833e1949a481" - integrity sha512-ibjQjM7wEXtECiT6my1xfiMH9IcEczMOS6xiCQXoUIYSj5b1CpBbJ3VYbdwDy8Vcg5JHN7eFpOCGk8nyZAltNQ== +"@smithy/eventstream-serde-config-resolver@^4.3.6": + version "4.3.6" + resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-4.3.6.tgz#99c733b1944dc069e1be066ce3aad5cef4a7671b" + integrity sha512-xP5YXbOVRVN8A4pDnSUkEUsL9fYFU6VNhxo8tgr13YnMbf3Pn4xVr+hSyLVjS1Frfi1Uk03ET5Bwml4+0CeYEw== dependencies: - "@smithy/types" "^4.9.0" + "@smithy/types" "^4.10.0" tslib "^2.6.2" -"@smithy/eventstream-serde-node@^4.2.5": - version "4.2.5" - resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-node/-/eventstream-serde-node-4.2.5.tgz#7dd64e0ba64fa930959f3d5b7995c310573ecaf3" - integrity sha512-+elOuaYx6F2H6x1/5BQP5ugv12nfJl66GhxON8+dWVUEDJ9jah/A0tayVdkLRP0AeSac0inYkDz5qBFKfVp2Gg== +"@smithy/eventstream-serde-node@^4.2.6": + version "4.2.6" + resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-node/-/eventstream-serde-node-4.2.6.tgz#309c9eb7358fe8649c1ffd5c50c51135221ed05a" + integrity sha512-jhH7nJuaOpnTFcuZpWK9dqb6Ge2yGi1okTo0W6wkJrfwAm2vwmO74tF1v07JmrSyHBcKLQATEexclJw9K1Vj7w== dependencies: - "@smithy/eventstream-serde-universal" "^4.2.5" - "@smithy/types" "^4.9.0" + "@smithy/eventstream-serde-universal" "^4.2.6" + "@smithy/types" "^4.10.0" tslib "^2.6.2" -"@smithy/eventstream-serde-universal@^4.2.5": - version "4.2.5" - resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-4.2.5.tgz#34189de45cf5e1d9cb59978e94b76cc210fa984f" - integrity sha512-G9WSqbST45bmIFaeNuP/EnC19Rhp54CcVdX9PDL1zyEB514WsDVXhlyihKlGXnRycmHNmVv88Bvvt4EYxWef/Q== +"@smithy/eventstream-serde-universal@^4.2.6": + version "4.2.6" + resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-4.2.6.tgz#31b6ded5652edff42bb9c8f5933c2b528e7c1aaf" + integrity sha512-olIfZ230B64TvPD6b0tPvrEp2eB0FkyL3KvDlqF4RVmIc/kn3orzXnV6DTQdOOW5UU+M5zKY3/BU47X420/oPw== dependencies: - "@smithy/eventstream-codec" "^4.2.5" - "@smithy/types" "^4.9.0" + "@smithy/eventstream-codec" "^4.2.6" + "@smithy/types" "^4.10.0" tslib "^2.6.2" -"@smithy/fetch-http-handler@^5.3.6": - version "5.3.6" - resolved "https://registry.yarnpkg.com/@smithy/fetch-http-handler/-/fetch-http-handler-5.3.6.tgz#d9dcb8d8ca152918224492f4d1cc1b50df93ae13" - integrity sha512-3+RG3EA6BBJ/ofZUeTFJA7mHfSYrZtQIrDP9dI8Lf7X6Jbos2jptuLrAAteDiFVrmbEmLSuRG/bUKzfAXk7dhg== +"@smithy/fetch-http-handler@^5.3.7": + version "5.3.7" + resolved "https://registry.yarnpkg.com/@smithy/fetch-http-handler/-/fetch-http-handler-5.3.7.tgz#77e603a68ad644514bc0ddb81bbbddee41105387" + integrity sha512-fcVap4QwqmzQwQK9QU3keeEpCzTjnP9NJ171vI7GnD7nbkAIcP9biZhDUx88uRH9BabSsQDS0unUps88uZvFIQ== dependencies: - "@smithy/protocol-http" "^5.3.5" - "@smithy/querystring-builder" "^4.2.5" - "@smithy/types" "^4.9.0" + "@smithy/protocol-http" "^5.3.6" + "@smithy/querystring-builder" "^4.2.6" + "@smithy/types" "^4.10.0" "@smithy/util-base64" "^4.3.0" tslib "^2.6.2" -"@smithy/hash-node@^4.2.5": - version "4.2.5" - resolved "https://registry.yarnpkg.com/@smithy/hash-node/-/hash-node-4.2.5.tgz#fb751ec4a4c6347612458430f201f878adc787f6" - integrity sha512-DpYX914YOfA3UDT9CN1BM787PcHfWRBB43fFGCYrZFUH0Jv+5t8yYl+Pd5PW4+QzoGEDvn5d5QIO4j2HyYZQSA== +"@smithy/hash-node@^4.2.6": + version "4.2.6" + resolved "https://registry.yarnpkg.com/@smithy/hash-node/-/hash-node-4.2.6.tgz#22594fcdfddda057da8076eb2c6897afeb8bcd29" + integrity sha512-k3Dy9VNR37wfMh2/1RHkFf/e0rMyN0pjY0FdyY6ItJRjENYyVPRMwad6ZR1S9HFm6tTuIOd9pqKBmtJ4VHxvxg== dependencies: - "@smithy/types" "^4.9.0" + "@smithy/types" "^4.10.0" "@smithy/util-buffer-from" "^4.2.0" "@smithy/util-utf8" "^4.2.0" tslib "^2.6.2" -"@smithy/invalid-dependency@^4.2.5": - version "4.2.5" - resolved "https://registry.yarnpkg.com/@smithy/invalid-dependency/-/invalid-dependency-4.2.5.tgz#58d997e91e7683ffc59882d8fcb180ed9aa9c7dd" - integrity sha512-2L2erASEro1WC5nV+plwIMxrTXpvpfzl4e+Nre6vBVRR2HKeGGcvpJyyL3/PpiSg+cJG2KpTmZmq934Olb6e5A== +"@smithy/invalid-dependency@^4.2.6": + version "4.2.6" + resolved "https://registry.yarnpkg.com/@smithy/invalid-dependency/-/invalid-dependency-4.2.6.tgz#22d40f5ba701be743a27f160aafe8fcdb3cb53f1" + integrity sha512-E4t/V/q2T46RY21fpfznd1iSLTvCXKNKo4zJ1QuEFN4SE9gKfu2vb6bgq35LpufkQ+SETWIC7ZAf2GGvTlBaMQ== dependencies: - "@smithy/types" "^4.9.0" + "@smithy/types" "^4.10.0" tslib "^2.6.2" "@smithy/is-array-buffer@^2.2.0": @@ -2393,155 +2403,162 @@ dependencies: tslib "^2.6.2" -"@smithy/middleware-content-length@^4.2.5": - version "4.2.5" - resolved "https://registry.yarnpkg.com/@smithy/middleware-content-length/-/middleware-content-length-4.2.5.tgz#a6942ce2d7513b46f863348c6c6a8177e9ace752" - integrity sha512-Y/RabVa5vbl5FuHYV2vUCwvh/dqzrEY/K2yWPSqvhFUwIY0atLqO4TienjBXakoy4zrKAMCZwg+YEqmH7jaN7A== +"@smithy/middleware-content-length@^4.2.6": + version "4.2.6" + resolved "https://registry.yarnpkg.com/@smithy/middleware-content-length/-/middleware-content-length-4.2.6.tgz#7b2a72bd581191b4e152397bb225354f27b80d79" + integrity sha512-0cjqjyfj+Gls30ntq45SsBtqF3dfJQCeqQPyGz58Pk8OgrAr5YiB7ZvDzjCA94p4r6DCI4qLm7FKobqBjf515w== dependencies: - "@smithy/protocol-http" "^5.3.5" - "@smithy/types" "^4.9.0" + "@smithy/protocol-http" "^5.3.6" + "@smithy/types" "^4.10.0" tslib "^2.6.2" -"@smithy/middleware-endpoint@^4.3.14": - version "4.3.14" - resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-4.3.14.tgz#da145b02f6a5d073595111bf73fa31da16e73773" - integrity sha512-v0q4uTKgBM8dsqGjqsabZQyH85nFaTnFcgpWU1uydKFsdyyMzfvOkNum9G7VK+dOP01vUnoZxIeRiJ6uD0kjIg== - dependencies: - "@smithy/core" "^3.18.7" - "@smithy/middleware-serde" "^4.2.6" - "@smithy/node-config-provider" "^4.3.5" - "@smithy/shared-ini-file-loader" "^4.4.0" - "@smithy/types" "^4.9.0" - "@smithy/url-parser" "^4.2.5" - "@smithy/util-middleware" "^4.2.5" +"@smithy/middleware-endpoint@^4.3.15", "@smithy/middleware-endpoint@^4.4.0": + version "4.4.0" + resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-4.4.0.tgz#ed5b21844d6f978a532ca8cf2fd0a351db927438" + integrity sha512-M6qWfUNny6NFNy8amrCGIb9TfOMUkHVtg9bHtEFGRgfH7A7AtPpn/fcrToGPjVDK1ECuMVvqGQOXcZxmu9K+7A== + dependencies: + "@smithy/core" "^3.19.0" + "@smithy/middleware-serde" "^4.2.7" + "@smithy/node-config-provider" "^4.3.6" + "@smithy/shared-ini-file-loader" "^4.4.1" + "@smithy/types" "^4.10.0" + "@smithy/url-parser" "^4.2.6" + "@smithy/util-middleware" "^4.2.6" tslib "^2.6.2" -"@smithy/middleware-retry@^4.4.14": - version "4.4.14" - resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-4.4.14.tgz#92e503946314278614f608537d77a04db6d7b810" - integrity sha512-Z2DG8Ej7FyWG1UA+7HceINtSLzswUgs2np3sZX0YBBxCt+CXG4QUxv88ZDS3+2/1ldW7LqtSY1UO/6VQ1pND8Q== - dependencies: - "@smithy/node-config-provider" "^4.3.5" - "@smithy/protocol-http" "^5.3.5" - "@smithy/service-error-classification" "^4.2.5" - "@smithy/smithy-client" "^4.9.10" - "@smithy/types" "^4.9.0" - "@smithy/util-middleware" "^4.2.5" - "@smithy/util-retry" "^4.2.5" +"@smithy/middleware-retry@^4.4.15": + version "4.4.16" + resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-4.4.16.tgz#f790544d6204e8ded8edec43952aff1481de880d" + integrity sha512-XPpNhNRzm3vhYm7YCsyw3AtmWggJbg1wNGAoqb7NBYr5XA5isMRv14jgbYyUV6IvbTBFZQdf2QpeW43LrRdStQ== + dependencies: + "@smithy/node-config-provider" "^4.3.6" + "@smithy/protocol-http" "^5.3.6" + "@smithy/service-error-classification" "^4.2.6" + "@smithy/smithy-client" "^4.10.1" + "@smithy/types" "^4.10.0" + "@smithy/util-middleware" "^4.2.6" + "@smithy/util-retry" "^4.2.6" "@smithy/uuid" "^1.1.0" tslib "^2.6.2" -"@smithy/middleware-serde@^4.2.6": - version "4.2.6" - resolved "https://registry.yarnpkg.com/@smithy/middleware-serde/-/middleware-serde-4.2.6.tgz#7e710f43206e13a8c081a372b276e7b2c51bff5b" - integrity sha512-VkLoE/z7e2g8pirwisLz8XJWedUSY8my/qrp81VmAdyrhi94T+riBfwP+AOEEFR9rFTSonC/5D2eWNmFabHyGQ== +"@smithy/middleware-serde@^4.2.7": + version "4.2.7" + resolved "https://registry.yarnpkg.com/@smithy/middleware-serde/-/middleware-serde-4.2.7.tgz#5fccd5691f80e1d88a4d4c10bc36e570e0a14215" + integrity sha512-PFMVHVPgtFECeu4iZ+4SX6VOQT0+dIpm4jSPLLL6JLSkp9RohGqKBKD0cbiXdeIFS08Forp0UHI6kc0gIHenSA== dependencies: - "@smithy/protocol-http" "^5.3.5" - "@smithy/types" "^4.9.0" + "@smithy/protocol-http" "^5.3.6" + "@smithy/types" "^4.10.0" tslib "^2.6.2" -"@smithy/middleware-stack@^4.2.5": - version "4.2.5" - resolved "https://registry.yarnpkg.com/@smithy/middleware-stack/-/middleware-stack-4.2.5.tgz#2d13415ed3561c882594c8e6340b801d9a2eb222" - integrity sha512-bYrutc+neOyWxtZdbB2USbQttZN0mXaOyYLIsaTbJhFsfpXyGWUxJpEuO1rJ8IIJm2qH4+xJT0mxUSsEDTYwdQ== +"@smithy/middleware-stack@^4.2.6": + version "4.2.6" + resolved "https://registry.yarnpkg.com/@smithy/middleware-stack/-/middleware-stack-4.2.6.tgz#63efd200594f7c54f0f497497e62c60cbc8d72c4" + integrity sha512-JSbALU3G+JS4kyBZPqnJ3hxIYwOVRV7r9GNQMS6j5VsQDo5+Es5nddLfr9TQlxZLNHPvKSh+XSB0OuWGfSWFcA== dependencies: - "@smithy/types" "^4.9.0" + "@smithy/types" "^4.10.0" tslib "^2.6.2" -"@smithy/node-config-provider@^4.3.5": - version "4.3.5" - resolved "https://registry.yarnpkg.com/@smithy/node-config-provider/-/node-config-provider-4.3.5.tgz#c09137a79c2930dcc30e6c8bb4f2608d72c1e2c9" - integrity sha512-UTurh1C4qkVCtqggI36DGbLB2Kv8UlcFdMXDcWMbqVY2uRg0XmT9Pb4Vj6oSQ34eizO1fvR0RnFV4Axw4IrrAg== +"@smithy/node-config-provider@^4.3.6": + version "4.3.6" + resolved "https://registry.yarnpkg.com/@smithy/node-config-provider/-/node-config-provider-4.3.6.tgz#f3824228ea266ab09370ecfdea54b5069cbddca2" + integrity sha512-fYEyL59Qe82Ha1p97YQTMEQPJYmBS+ux76foqluaTVWoG9Px5J53w6NvXZNE3wP7lIicLDF7Vj1Em18XTX7fsA== dependencies: - "@smithy/property-provider" "^4.2.5" - "@smithy/shared-ini-file-loader" "^4.4.0" - "@smithy/types" "^4.9.0" + "@smithy/property-provider" "^4.2.6" + "@smithy/shared-ini-file-loader" "^4.4.1" + "@smithy/types" "^4.10.0" tslib "^2.6.2" -"@smithy/node-http-handler@^4.4.5": - version "4.4.5" - resolved "https://registry.yarnpkg.com/@smithy/node-http-handler/-/node-http-handler-4.4.5.tgz#2aea598fdf3dc4e32667d673d48abd4a073665f4" - integrity sha512-CMnzM9R2WqlqXQGtIlsHMEZfXKJVTIrqCNoSd/QpAyp+Dw0a1Vps13l6ma1fH8g7zSPNsA59B/kWgeylFuA/lw== +"@smithy/node-http-handler@^4.4.6": + version "4.4.6" + resolved "https://registry.yarnpkg.com/@smithy/node-http-handler/-/node-http-handler-4.4.6.tgz#311529c5a8048a2f629c7f4e69859033c630f64e" + integrity sha512-Gsb9jf4ido5BhPfani4ggyrKDd3ZK+vTFWmUaZeFg5G3E5nhFmqiTzAIbHqmPs1sARuJawDiGMGR/nY+Gw6+aQ== dependencies: - "@smithy/abort-controller" "^4.2.5" - "@smithy/protocol-http" "^5.3.5" - "@smithy/querystring-builder" "^4.2.5" - "@smithy/types" "^4.9.0" + "@smithy/abort-controller" "^4.2.6" + "@smithy/protocol-http" "^5.3.6" + "@smithy/querystring-builder" "^4.2.6" + "@smithy/types" "^4.10.0" tslib "^2.6.2" -"@smithy/property-provider@^4.2.5": - version "4.2.5" - resolved "https://registry.yarnpkg.com/@smithy/property-provider/-/property-provider-4.2.5.tgz#f75dc5735d29ca684abbc77504be9246340a43f0" - integrity sha512-8iLN1XSE1rl4MuxvQ+5OSk/Zb5El7NJZ1td6Tn+8dQQHIjp59Lwl6bd0+nzw6SKm2wSSriH2v/I9LPzUic7EOg== +"@smithy/property-provider@^4.2.6": + version "4.2.6" + resolved "https://registry.yarnpkg.com/@smithy/property-provider/-/property-provider-4.2.6.tgz#c0327aa7695dc4bdc7a0004c5ad0a51d08f2acd3" + integrity sha512-a/tGSLPtaia2krbRdwR4xbZKO8lU67DjMk/jfY4QKt4PRlKML+2tL/gmAuhNdFDioO6wOq0sXkfnddNFH9mNUA== dependencies: - "@smithy/types" "^4.9.0" + "@smithy/types" "^4.10.0" tslib "^2.6.2" -"@smithy/protocol-http@^5.3.5": - version "5.3.5" - resolved "https://registry.yarnpkg.com/@smithy/protocol-http/-/protocol-http-5.3.5.tgz#a8f4296dd6d190752589e39ee95298d5c65a60db" - integrity sha512-RlaL+sA0LNMp03bf7XPbFmT5gN+w3besXSWMkA8rcmxLSVfiEXElQi4O2IWwPfxzcHkxqrwBFMbngB8yx/RvaQ== +"@smithy/protocol-http@^5.3.6": + version "5.3.6" + resolved "https://registry.yarnpkg.com/@smithy/protocol-http/-/protocol-http-5.3.6.tgz#96ed5385b632005be2e12c31807c0d198514035c" + integrity sha512-qLRZzP2+PqhE3OSwvY2jpBbP0WKTZ9opTsn+6IWYI0SKVpbG+imcfNxXPq9fj5XeaUTr7odpsNpK6dmoiM1gJQ== dependencies: - "@smithy/types" "^4.9.0" + "@smithy/types" "^4.10.0" tslib "^2.6.2" -"@smithy/querystring-builder@^4.2.5": - version "4.2.5" - resolved "https://registry.yarnpkg.com/@smithy/querystring-builder/-/querystring-builder-4.2.5.tgz#00cafa5a4055600ab8058e26db42f580146b91f3" - integrity sha512-y98otMI1saoajeik2kLfGyRp11e5U/iJYH/wLCh3aTV/XutbGT9nziKGkgCaMD1ghK7p6htHMm6b6scl9JRUWg== +"@smithy/querystring-builder@^4.2.6": + version "4.2.6" + resolved "https://registry.yarnpkg.com/@smithy/querystring-builder/-/querystring-builder-4.2.6.tgz#3a1d03179572b138160312c66eb05a8cd8cb2725" + integrity sha512-MeM9fTAiD3HvoInK/aA8mgJaKQDvm8N0dKy6EiFaCfgpovQr4CaOkJC28XqlSRABM+sHdSQXbC8NZ0DShBMHqg== dependencies: - "@smithy/types" "^4.9.0" + "@smithy/types" "^4.10.0" "@smithy/util-uri-escape" "^4.2.0" tslib "^2.6.2" -"@smithy/querystring-parser@^4.2.5": - version "4.2.5" - resolved "https://registry.yarnpkg.com/@smithy/querystring-parser/-/querystring-parser-4.2.5.tgz#61d2e77c62f44196590fa0927dbacfbeaffe8c53" - integrity sha512-031WCTdPYgiQRYNPXznHXof2YM0GwL6SeaSyTH/P72M1Vz73TvCNH2Nq8Iu2IEPq9QP2yx0/nrw5YmSeAi/AjQ== +"@smithy/querystring-parser@^4.2.6": + version "4.2.6" + resolved "https://registry.yarnpkg.com/@smithy/querystring-parser/-/querystring-parser-4.2.6.tgz#c4e64026debeb0053f845168aeb1b24d7f399831" + integrity sha512-YmWxl32SQRw/kIRccSOxzS/Ib8/b5/f9ex0r5PR40jRJg8X1wgM3KrR2In+8zvOGVhRSXgvyQpw9yOSlmfmSnA== dependencies: - "@smithy/types" "^4.9.0" + "@smithy/types" "^4.10.0" tslib "^2.6.2" -"@smithy/service-error-classification@^4.2.5": - version "4.2.5" - resolved "https://registry.yarnpkg.com/@smithy/service-error-classification/-/service-error-classification-4.2.5.tgz#a64eb78e096e59cc71141e3fea2b4194ce59b4fd" - integrity sha512-8fEvK+WPE3wUAcDvqDQG1Vk3ANLR8Px979te96m84CbKAjBVf25rPYSzb4xU4hlTyho7VhOGnh5i62D/JVF0JQ== +"@smithy/service-error-classification@^4.2.6": + version "4.2.6" + resolved "https://registry.yarnpkg.com/@smithy/service-error-classification/-/service-error-classification-4.2.6.tgz#12752e4410d915b069a9081755acae1a3c6a65f1" + integrity sha512-Q73XBrzJlGTut2nf5RglSntHKgAG0+KiTJdO5QQblLfr4TdliGwIAha1iZIjwisc3rA5ulzqwwsYC6xrclxVQg== dependencies: - "@smithy/types" "^4.9.0" + "@smithy/types" "^4.10.0" -"@smithy/shared-ini-file-loader@^4.4.0": - version "4.4.0" - resolved "https://registry.yarnpkg.com/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-4.4.0.tgz#a2f8282f49982f00bafb1fa8cb7fc188a202a594" - integrity sha512-5WmZ5+kJgJDjwXXIzr1vDTG+RhF9wzSODQBfkrQ2VVkYALKGvZX1lgVSxEkgicSAFnFhPj5rudJV0zoinqS0bA== +"@smithy/shared-ini-file-loader@^4.4.1": + version "4.4.1" + resolved "https://registry.yarnpkg.com/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-4.4.1.tgz#746f33166bc06b356b02a05d3d733ca6e85f46c3" + integrity sha512-tph+oQYPbpN6NamF030hx1gb5YN2Plog+GLaRHpoEDwp8+ZPG26rIJvStG9hkWzN2HBn3HcWg0sHeB0tmkYzqA== dependencies: - "@smithy/types" "^4.9.0" + "@smithy/types" "^4.10.0" tslib "^2.6.2" -"@smithy/signature-v4@^5.3.5": - version "5.3.5" - resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-5.3.5.tgz#13ab710653f9f16c325ee7e0a102a44f73f2643f" - integrity sha512-xSUfMu1FT7ccfSXkoLl/QRQBi2rOvi3tiBZU2Tdy3I6cgvZ6SEi9QNey+lqps/sJRnogIS+lq+B1gxxbra2a/w== +"@smithy/signature-v4@^5.3.6": + version "5.3.6" + resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-5.3.6.tgz#b6335ad9afc3408642a27851c1457e0eabd5cbc7" + integrity sha512-P1TXDHuQMadTMTOBv4oElZMURU4uyEhxhHfn+qOc2iofW9Rd4sZtBGx58Lzk112rIGVEYZT8eUMK4NftpewpRA== dependencies: "@smithy/is-array-buffer" "^4.2.0" - "@smithy/protocol-http" "^5.3.5" - "@smithy/types" "^4.9.0" + "@smithy/protocol-http" "^5.3.6" + "@smithy/types" "^4.10.0" "@smithy/util-hex-encoding" "^4.2.0" - "@smithy/util-middleware" "^4.2.5" + "@smithy/util-middleware" "^4.2.6" "@smithy/util-uri-escape" "^4.2.0" "@smithy/util-utf8" "^4.2.0" tslib "^2.6.2" -"@smithy/smithy-client@^4.9.10": - version "4.9.10" - resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-4.9.10.tgz#a395bbc6ccf35cdbae44ce024909b6c5aec06283" - integrity sha512-Jaoz4Jw1QYHc1EFww/E6gVtNjhoDU+gwRKqXP6C3LKYqqH2UQhP8tMP3+t/ePrhaze7fhLE8vS2q6vVxBANFTQ== +"@smithy/smithy-client@^4.10.0", "@smithy/smithy-client@^4.10.1": + version "4.10.1" + resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-4.10.1.tgz#bcdfc6d0dde8eda78758390997de54976925cfa1" + integrity sha512-1ovWdxzYprhq+mWqiGZlt3kF69LJthuQcfY9BIyHx9MywTFKzFapluku1QXoaBB43GCsLDxNqS+1v30ure69AA== + dependencies: + "@smithy/core" "^3.19.0" + "@smithy/middleware-endpoint" "^4.4.0" + "@smithy/middleware-stack" "^4.2.6" + "@smithy/protocol-http" "^5.3.6" + "@smithy/types" "^4.10.0" + "@smithy/util-stream" "^4.5.7" + tslib "^2.6.2" + +"@smithy/types@^4.10.0": + version "4.10.0" + resolved "https://registry.yarnpkg.com/@smithy/types/-/types-4.10.0.tgz#cb0b5d117a900aa09f0f8bc960513466ca589cb3" + integrity sha512-K9mY7V/f3Ul+/Gz4LJANZ3vJ/yiBIwCyxe0sPT4vNJK63Srvd+Yk1IzP0t+nE7XFSpIGtzR71yljtnqpUTYFlQ== dependencies: - "@smithy/core" "^3.18.7" - "@smithy/middleware-endpoint" "^4.3.14" - "@smithy/middleware-stack" "^4.2.5" - "@smithy/protocol-http" "^5.3.5" - "@smithy/types" "^4.9.0" - "@smithy/util-stream" "^4.5.6" tslib "^2.6.2" "@smithy/types@^4.9.0": @@ -2551,13 +2568,13 @@ dependencies: tslib "^2.6.2" -"@smithy/url-parser@^4.2.5": - version "4.2.5" - resolved "https://registry.yarnpkg.com/@smithy/url-parser/-/url-parser-4.2.5.tgz#2fea006108f17f7761432c7ef98d6aa003421487" - integrity sha512-VaxMGsilqFnK1CeBX+LXnSuaMx4sTL/6znSZh2829txWieazdVxr54HmiyTsIbpOTLcf5nYpq9lpzmwRdxj6rQ== +"@smithy/url-parser@^4.2.6": + version "4.2.6" + resolved "https://registry.yarnpkg.com/@smithy/url-parser/-/url-parser-4.2.6.tgz#0a8da2d3e8b9a27ad38c0db4d2fca09a991da8ad" + integrity sha512-tVoyzJ2vXp4R3/aeV4EQjBDmCuWxRa8eo3KybL7Xv4wEM16nObYh7H1sNfcuLWHAAAzb0RVyxUz1S3sGj4X+Tg== dependencies: - "@smithy/querystring-parser" "^4.2.5" - "@smithy/types" "^4.9.0" + "@smithy/querystring-parser" "^4.2.6" + "@smithy/types" "^4.10.0" tslib "^2.6.2" "@smithy/util-base64@^4.3.0": @@ -2606,36 +2623,36 @@ dependencies: tslib "^2.6.2" -"@smithy/util-defaults-mode-browser@^4.3.13": - version "4.3.13" - resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.3.13.tgz#51e3cadfe772882f941f1dff07d2f8b7acb9c21e" - integrity sha512-hlVLdAGrVfyNei+pKIgqDTxfu/ZI2NSyqj4IDxKd5bIsIqwR/dSlkxlPaYxFiIaDVrBy0he8orsFy+Cz119XvA== +"@smithy/util-defaults-mode-browser@^4.3.14": + version "4.3.15" + resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.3.15.tgz#e84f8d04f4ae824e907de4b50a00dadcaa3cfce1" + integrity sha512-LiZQVAg/oO8kueX4c+oMls5njaD2cRLXRfcjlTYjhIqmwHnCwkQO5B3dMQH0c5PACILxGAQf6Mxsq7CjlDc76A== dependencies: - "@smithy/property-provider" "^4.2.5" - "@smithy/smithy-client" "^4.9.10" - "@smithy/types" "^4.9.0" + "@smithy/property-provider" "^4.2.6" + "@smithy/smithy-client" "^4.10.1" + "@smithy/types" "^4.10.0" tslib "^2.6.2" -"@smithy/util-defaults-mode-node@^4.2.16": - version "4.2.16" - resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.2.16.tgz#ab4abdebae65e8628473d1493b1de5f82aa0eec9" - integrity sha512-F1t22IUiJLHrxW9W1CQ6B9PN+skZ9cqSuzB18Eh06HrJPbjsyZ7ZHecAKw80DQtyGTRcVfeukKaCRYebFwclbg== - dependencies: - "@smithy/config-resolver" "^4.4.3" - "@smithy/credential-provider-imds" "^4.2.5" - "@smithy/node-config-provider" "^4.3.5" - "@smithy/property-provider" "^4.2.5" - "@smithy/smithy-client" "^4.9.10" - "@smithy/types" "^4.9.0" +"@smithy/util-defaults-mode-node@^4.2.17": + version "4.2.18" + resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.2.18.tgz#0cf885a8cebe750c9e9de3f7228e7ba2084ac9ed" + integrity sha512-Kw2J+KzYm9C9Z9nY6+W0tEnoZOofstVCMTshli9jhQbQCy64rueGfKzPfuFBnVUqZD9JobxTh2DzHmPkp/Va/Q== + dependencies: + "@smithy/config-resolver" "^4.4.4" + "@smithy/credential-provider-imds" "^4.2.6" + "@smithy/node-config-provider" "^4.3.6" + "@smithy/property-provider" "^4.2.6" + "@smithy/smithy-client" "^4.10.1" + "@smithy/types" "^4.10.0" tslib "^2.6.2" -"@smithy/util-endpoints@^3.2.5": - version "3.2.5" - resolved "https://registry.yarnpkg.com/@smithy/util-endpoints/-/util-endpoints-3.2.5.tgz#9e0fc34e38ddfbbc434d23a38367638dc100cb14" - integrity sha512-3O63AAWu2cSNQZp+ayl9I3NapW1p1rR5mlVHcF6hAB1dPZUQFfRPYtplWX/3xrzWthPGj5FqB12taJJCfH6s8A== +"@smithy/util-endpoints@^3.2.6": + version "3.2.6" + resolved "https://registry.yarnpkg.com/@smithy/util-endpoints/-/util-endpoints-3.2.6.tgz#7924e6725d42b436e7177c1c9a4c9b3e7999f67c" + integrity sha512-v60VNM2+mPvgHCBXEfMCYrQ0RepP6u6xvbAkMenfe4Mi872CqNkJzgcnQL837e8NdeDxBgrWQRTluKq5Lqdhfg== dependencies: - "@smithy/node-config-provider" "^4.3.5" - "@smithy/types" "^4.9.0" + "@smithy/node-config-provider" "^4.3.6" + "@smithy/types" "^4.10.0" tslib "^2.6.2" "@smithy/util-hex-encoding@^4.2.0": @@ -2645,31 +2662,31 @@ dependencies: tslib "^2.6.2" -"@smithy/util-middleware@^4.2.5": - version "4.2.5" - resolved "https://registry.yarnpkg.com/@smithy/util-middleware/-/util-middleware-4.2.5.tgz#1ace865afe678fd4b0f9217197e2fe30178d4835" - integrity sha512-6Y3+rvBF7+PZOc40ybeZMcGln6xJGVeY60E7jy9Mv5iKpMJpHgRE6dKy9ScsVxvfAYuEX4Q9a65DQX90KaQ3bA== +"@smithy/util-middleware@^4.2.6": + version "4.2.6" + resolved "https://registry.yarnpkg.com/@smithy/util-middleware/-/util-middleware-4.2.6.tgz#05e2bc1f997d30b48e4f2c14bd94146df40701ca" + integrity sha512-qrvXUkxBSAFomM3/OEMuDVwjh4wtqK8D2uDZPShzIqOylPst6gor2Cdp6+XrH4dyksAWq/bE2aSDYBTTnj0Rxg== dependencies: - "@smithy/types" "^4.9.0" + "@smithy/types" "^4.10.0" tslib "^2.6.2" -"@smithy/util-retry@^4.2.5": - version "4.2.5" - resolved "https://registry.yarnpkg.com/@smithy/util-retry/-/util-retry-4.2.5.tgz#70fe4fbbfb9ad43a9ce2ba4ed111ff7b30d7b333" - integrity sha512-GBj3+EZBbN4NAqJ/7pAhsXdfzdlznOh8PydUijy6FpNIMnHPSMO2/rP4HKu+UFeikJxShERk528oy7GT79YiJg== +"@smithy/util-retry@^4.2.6": + version "4.2.6" + resolved "https://registry.yarnpkg.com/@smithy/util-retry/-/util-retry-4.2.6.tgz#9b4785b0eba43cbe270fd12cdd77f47a934e92ba" + integrity sha512-x7CeDQLPQ9cb6xN7fRJEjlP9NyGW/YeXWc4j/RUhg4I+H60F0PEeRc2c/z3rm9zmsdiMFzpV/rT+4UHW6KM1SA== dependencies: - "@smithy/service-error-classification" "^4.2.5" - "@smithy/types" "^4.9.0" + "@smithy/service-error-classification" "^4.2.6" + "@smithy/types" "^4.10.0" tslib "^2.6.2" -"@smithy/util-stream@^4.5.6": - version "4.5.6" - resolved "https://registry.yarnpkg.com/@smithy/util-stream/-/util-stream-4.5.6.tgz#ebee9e52adeb6f88337778b2f3356a2cc615298c" - integrity sha512-qWw/UM59TiaFrPevefOZ8CNBKbYEP6wBAIlLqxn3VAIo9rgnTNc4ASbVrqDmhuwI87usnjhdQrxodzAGFFzbRQ== +"@smithy/util-stream@^4.5.7": + version "4.5.7" + resolved "https://registry.yarnpkg.com/@smithy/util-stream/-/util-stream-4.5.7.tgz#0bc4362d450308ddc7c9dc7efa13166c117e3dc5" + integrity sha512-Uuy4S5Aj4oF6k1z+i2OtIBJUns4mlg29Ph4S+CqjR+f4XXpSFVgTCYLzMszHJTicYDBxKFtwq2/QSEDSS5l02A== dependencies: - "@smithy/fetch-http-handler" "^5.3.6" - "@smithy/node-http-handler" "^4.4.5" - "@smithy/types" "^4.9.0" + "@smithy/fetch-http-handler" "^5.3.7" + "@smithy/node-http-handler" "^4.4.6" + "@smithy/types" "^4.10.0" "@smithy/util-base64" "^4.3.0" "@smithy/util-buffer-from" "^4.2.0" "@smithy/util-hex-encoding" "^4.2.0" @@ -2699,13 +2716,13 @@ "@smithy/util-buffer-from" "^4.2.0" tslib "^2.6.2" -"@smithy/util-waiter@^4.2.5": - version "4.2.5" - resolved "https://registry.yarnpkg.com/@smithy/util-waiter/-/util-waiter-4.2.5.tgz#e527816edae20ec5f68b25685f4b21d93424ea86" - integrity sha512-Dbun99A3InifQdIrsXZ+QLcC0PGBPAdrl4cj1mTgJvyc9N2zf7QSxg8TBkzsCmGJdE3TLbO9ycwpY0EkWahQ/g== +"@smithy/util-waiter@^4.2.6": + version "4.2.6" + resolved "https://registry.yarnpkg.com/@smithy/util-waiter/-/util-waiter-4.2.6.tgz#d6f838950f1c000e0fd72029cecc838ce2c240e8" + integrity sha512-xU9HwUSik9UUCJmm530yvBy0AwlQFICveKmqvaaTukKkXEAhyiBdHtSrhPrH3rH+uz0ykyaE3LdgsX86C6mDCQ== dependencies: - "@smithy/abort-controller" "^4.2.5" - "@smithy/types" "^4.9.0" + "@smithy/abort-controller" "^4.2.6" + "@smithy/types" "^4.10.0" tslib "^2.6.2" "@smithy/uuid@^1.1.0": @@ -3226,25 +3243,24 @@ available-typed-arrays@^1.0.7: dependencies: possible-typed-array-names "^1.0.0" -aws-cdk-lib@2.155.0: - version "2.155.0" - resolved "https://registry.yarnpkg.com/aws-cdk-lib/-/aws-cdk-lib-2.155.0.tgz#73abc753bf5dc9b5abe7e71aff254b386786a455" - integrity sha512-QGzDhLldBXsyOUmhgtZ98PiOUS2g1Mb5MO08FiOvQn3+KSyJjQdq0GoyxtDpCNGLaWmIfcyrtB9aDhod38fl9g== +aws-cdk-lib@2.231.0: + version "2.231.0" + resolved "https://registry.yarnpkg.com/aws-cdk-lib/-/aws-cdk-lib-2.231.0.tgz#bed5a9664fd4b63bfdb2af11b6dbfa741eb865b2" + integrity sha512-RMt88F1vhsM28j81EjvIXRoPeYQdtk72EGh9xAP6LjuyF8df1hDBIy5cawUvagdp5eCBPVHrPJ2U0eaUUKtjFg== dependencies: - "@aws-cdk/asset-awscli-v1" "^2.2.202" - "@aws-cdk/asset-kubectl-v20" "^2.1.2" - "@aws-cdk/asset-node-proxy-agent-v6" "^2.0.3" - "@aws-cdk/cloud-assembly-schema" "^36.0.5" + "@aws-cdk/asset-awscli-v1" "2.2.242" + "@aws-cdk/asset-node-proxy-agent-v6" "^2.1.0" + "@aws-cdk/cloud-assembly-schema" "^48.6.0" "@balena/dockerignore" "^1.0.2" case "1.6.3" - fs-extra "^11.2.0" - ignore "^5.3.1" - jsonschema "^1.4.1" + fs-extra "^11.3.1" + ignore "^5.3.2" + jsonschema "^1.5.0" mime-types "^2.1.35" minimatch "^3.1.2" punycode "^2.3.1" - semver "^7.6.2" - table "^6.8.2" + semver "^7.7.2" + table "^6.9.0" yaml "1.10.2" aws-cdk@^2: @@ -4647,7 +4663,7 @@ fs-extra@^10.1.0: jsonfile "^6.0.1" universalify "^2.0.0" -fs-extra@^11.2.0: +fs-extra@^11.3.1: version "11.3.2" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.3.2.tgz#c838aeddc6f4a8c74dd15f85e11fe5511bfe02a4" integrity sha512-Xr9F6z6up6Ws+NjzMCZc6WXg2YFRlrLP9NQDO3VQrWrfiojdhS56TzueT88ze0uBdCTwEIhQ3ptnmKeWGFAe0A== @@ -4950,7 +4966,7 @@ human-signals@^2.1.0: resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== -ignore@^5.2.0, ignore@^5.3.1: +ignore@^5.2.0, ignore@^5.3.2: version "5.3.2" resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.2.tgz#3cd40e729f3643fd87cb04e50bf0eb722bc596f5" integrity sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g== @@ -5905,11 +5921,16 @@ jsonparse@^1.2.0: resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280" integrity sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg== -jsonschema@^1.4.1: +jsonschema@^1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/jsonschema/-/jsonschema-1.5.0.tgz#f6aceb1ab9123563dd901d05f81f9d4883d3b7d8" integrity sha512-K+A9hhqbn0f3pJX17Q/7H6yQfD/5OXgdrR5UE12gMXCiN9D5Xq2o5mddV2QEcX/bjla99ASsAAQUyMCCRWAEhw== +jsonschema@~1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/jsonschema/-/jsonschema-1.4.1.tgz#cc4c3f0077fb4542982973d8a083b6b34f482dab" + integrity sha512-S6cATIPVv1z0IlxdN+zUk5EPjkGCdnhN4wVSBlvoUO1tOLJootbo9CquNJmbIh4yikWHiUedhRYrNPn1arpEmQ== + jsonwebtoken@^9.0.2: version "9.0.3" resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-9.0.3.tgz#6cd57ab01e9b0ac07cb847d53d3c9b6ee31f7ae2" @@ -7020,7 +7041,7 @@ semver@^6.3.0, semver@^6.3.1: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== -semver@^7.0.0, semver@^7.3.4, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0, semver@^7.6.2, semver@^7.6.3, semver@^7.7.2, semver@^7.7.3: +semver@^7.0.0, semver@^7.3.4, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0, semver@^7.6.2, semver@^7.7.2, semver@^7.7.3: version "7.7.3" resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.3.tgz#4b5f4143d007633a8dc671cd0a6ef9147b8bb946" integrity sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q== @@ -7456,7 +7477,7 @@ svelte@^5: magic-string "^0.30.11" zimmerframe "^1.1.2" -table@^6.8.2: +table@^6.9.0: version "6.9.0" resolved "https://registry.yarnpkg.com/table/-/table-6.9.0.tgz#50040afa6264141c7566b3b81d4d82c47a8668f5" integrity sha512-9kY+CygyYM6j02t5YFHbNz2FN5QmYGv9zAjVp4lCDjlCw7amdckXlEt/bjMhUIfj4ThGRE4gCUH5+yGnNuPo5A==