Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(github-codebuild-logs): update serverless app to most current version #1721

Closed
wants to merge 2 commits into from
Closed

fix(github-codebuild-logs): update serverless app to most current version #1721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b22c27
Update github-logs version and default jsii image
biffgaut Aug 14, 2024
5b5c507
Merge branch 'main' into main
mrgrain Aug 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/__tests__/expected.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1043,7 +1043,7 @@ Resources:
- Name: DELIVLIB_ENV_TEST
Type: PLAINTEXT
Value: MAGIC_1924
Image: public.ecr.aws/jsii/superchain:1-bullseye-slim-node18
Image: public.ecr.aws/jsii/superchain:1-bookworm-slim
ImagePullCredentialsType: SERVICE_ROLE
PrivilegedMode: false
Type: LINUX_CONTAINER
Expand Down Expand Up @@ -4107,7 +4107,7 @@ Resources:
Type: NO_ARTIFACTS
Environment:
ComputeType: BUILD_GENERAL1_SMALL
Image: public.ecr.aws/jsii/superchain:1-bullseye-slim-node18
Image: public.ecr.aws/jsii/superchain:1-bookworm-slim
ImagePullCredentialsType: SERVICE_ROLE
PrivilegedMode: false
Type: LINUX_CONTAINER
Expand Down Expand Up @@ -4136,7 +4136,7 @@ Resources:
Properties:
Location:
ApplicationId: arn:aws:serverlessrepo:us-east-1:277187709615:applications/github-codebuild-logs
SemanticVersion: 1.4.0
SemanticVersion: 1.6.0
Parameters:
CodeBuildProjectName:
Ref: CodeCommitPipelineAutoBuildProject5D212EE9
Expand Down
2 changes: 1 addition & 1 deletion lib/__tests__/pipeline.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ test('autoBuild() can be configured to publish logs publically', () => {
template.hasResourceProperties('AWS::Serverless::Application', {
Location: {
ApplicationId: 'arn:aws:serverlessrepo:us-east-1:277187709615:applications/github-codebuild-logs',
SemanticVersion: '1.4.0',
SemanticVersion: '1.6.0',
},
Parameters: {
CodeBuildProjectName: {
Expand Down
2 changes: 1 addition & 1 deletion lib/__tests__/registry-sync/ecr-mirror.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ describe('EcrMirror', () => {
Value: '123aass:password-key:AWSCURRENT',
},
],
Image: 'public.ecr.aws/jsii/superchain:1-bullseye-slim-node18',
Image: 'public.ecr.aws/jsii/superchain:1-bookworm-slim',
},
Source: {
BuildSpec: {
Expand Down
2 changes: 1 addition & 1 deletion lib/__tests__/signing.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ describe('with standard pipeline', () => {
},
},
],
Image: 'public.ecr.aws/jsii/superchain:1-bullseye-slim-node18',
Image: 'public.ecr.aws/jsii/superchain:1-bookworm-slim',
ImagePullCredentialsType: 'SERVICE_ROLE',
PrivilegedMode: false,
Type: 'LINUX_CONTAINER',
Expand Down
2 changes: 1 addition & 1 deletion lib/__tests__/test-stack.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export class TestStack extends Stack {
DELIVLIB_ENV_TEST: 'MAGIC_1924',
},
dryRun: true,
buildImage: LinuxBuildImage.fromDockerRegistry('public.ecr.aws/jsii/superchain:1-bullseye-slim-node18'),
buildImage: LinuxBuildImage.fromDockerRegistry('public.ecr.aws/jsii/superchain:1-bookworm-slim'),
});

//
Expand Down
2 changes: 1 addition & 1 deletion lib/auto-build.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ export class AutoBuild extends Construct {
new serverless.CfnApplication(this, 'GitHubCodeBuildLogsSAR', {
location: {
applicationId: 'arn:aws:serverlessrepo:us-east-1:277187709615:applications/github-codebuild-logs',
semanticVersion: '1.4.0',
semanticVersion: '1.6.0',
},
parameters: {
CodeBuildProjectName: this.project.projectName,
Expand Down
2 changes: 1 addition & 1 deletion lib/build-env.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export function createBuildEnvironment(props: BuildEnvironmentProps) {
computeType: props.computeType || cbuild.ComputeType.SMALL,
privileged: props.privileged,
environmentVariables: renderEnvironmentVariables({ ...props.environment, ...props.env }),
buildImage: props.buildImage || cbuild.LinuxBuildImage.fromDockerRegistry('public.ecr.aws/jsii/superchain:1-bullseye-slim-node18'),
buildImage: props.buildImage || cbuild.LinuxBuildImage.fromDockerRegistry('public.ecr.aws/jsii/superchain:1-bookworm-slim'),
};

return environment;
Expand Down
4 changes: 2 additions & 2 deletions lib/publishing.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ export class PublishToMavenProject extends Construct implements IPublisher {
const forReal = props.dryRun === undefined ? 'false' : (!props.dryRun).toString();

const shellable = new Shellable(this, 'Default', {
platform: new LinuxPlatform(props.buildImage ?? cbuild.LinuxBuildImage.fromDockerRegistry('public.ecr.aws/jsii/superchain:1-bullseye-slim-node18')),
platform: new LinuxPlatform(props.buildImage ?? cbuild.LinuxBuildImage.fromDockerRegistry('public.ecr.aws/jsii/superchain:1-bookworm-slim')),
scriptDirectory: path.join(__dirname, 'publishing', 'maven'),
entrypoint: 'publish.sh',
environment: {
Expand Down Expand Up @@ -246,7 +246,7 @@ export class PublishToNuGetProject extends Construct implements IPublisher {
environment.NUGET_SECRET_ID = props.nugetApiKeySecret.secretArn;

const shellable = new Shellable(this, 'Default', {
platform: new LinuxPlatform(props.buildImage ?? cbuild.LinuxBuildImage.fromDockerRegistry('public.ecr.aws/jsii/superchain:1-bullseye-slim-node18')),
platform: new LinuxPlatform(props.buildImage ?? cbuild.LinuxBuildImage.fromDockerRegistry('public.ecr.aws/jsii/superchain:1-bookworm-slim')),
scriptDirectory: path.join(__dirname, 'publishing', 'nuget'),
entrypoint: 'publish.sh',
environment,
Expand Down
2 changes: 1 addition & 1 deletion lib/registry-sync/ecr-mirror.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ export class EcrMirror extends Construct {
this.project = new codebuild.Project(this, 'EcrPushImages', {
environment: {
privileged: true,
buildImage: codebuild.LinuxBuildImage.fromDockerRegistry('public.ecr.aws/jsii/superchain:1-bullseye-slim-node18'),
buildImage: codebuild.LinuxBuildImage.fromDockerRegistry('public.ecr.aws/jsii/superchain:1-bookworm-slim'),
},
environmentVariables: {
// DockerHub credentials to avoid throttling
Expand Down
2 changes: 1 addition & 1 deletion lib/signing.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ export class SignNuGetWithSigner extends Construct implements ISigner {
}

const shellable = new Shellable(this, 'Default', {
platform: new LinuxPlatform(props.buildImage ?? LinuxBuildImage.fromDockerRegistry('public.ecr.aws/jsii/superchain:1-bullseye-slim-node18')),
platform: new LinuxPlatform(props.buildImage ?? LinuxBuildImage.fromDockerRegistry('public.ecr.aws/jsii/superchain:1-bookworm-slim')),
scriptDirectory: path.join(__dirname, 'signing', 'nuget'),
entrypoint: 'sign.sh',
serviceRole: props.serviceRole,
Expand Down