Skip to content
This repository has been archived by the owner on May 31, 2024. It is now read-only.

fix: Comment out Lambda return value to avoid nodejs14.x #637

Merged
merged 2 commits into from
Feb 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export class CromwellEngineConstruct extends EngineConstruct {
userId: params.userId,
engineEndpoint: this.engine.loadBalancer.loadBalancerDnsName,
});
this.adapterLogGroup = lambda.logGroup;
this.adapterLogGroup = LogGroup.fromLogGroupName(this, "CromwellAdapterLogGroup", "/aws/lambda/" + lambda.functionName);

this.apiProxy = new ApiProxy(this, {
apiName: `${params.projectName}${params.contextName}${engineContainer.serviceName}ApiProxy`,
Expand Down
6 changes: 3 additions & 3 deletions packages/cdk/lib/stacks/engines/miniwdl-engine-construct.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Bucket, IBucket } from "aws-cdk-lib/aws-s3";
import { ApiProxy, Batch } from "../../constructs";
import { EngineConstruct, EngineOutputs } from "./engine-construct";
import { Effect, IRole, ManagedPolicy, PolicyDocument, PolicyStatement, Role, ServicePrincipal } from "aws-cdk-lib/aws-iam";
import { ILogGroup } from "aws-cdk-lib/aws-logs";
import { LogGroup, ILogGroup } from "aws-cdk-lib/aws-logs";
import { MiniWdlEngine } from "../../constructs/engines/miniwdl/miniwdl-engine";
import { IMachineImage, IVpc, SubnetSelection } from "aws-cdk-lib/aws-ec2";
import { ENGINE_MINIWDL } from "../../constants";
Expand Down Expand Up @@ -96,8 +96,8 @@ export class MiniwdlEngineConstruct extends EngineConstruct {
vpc: props.contextParameters.usePublicSubnets ? undefined : props.vpc,
vcpSubnets: props.contextParameters.usePublicSubnets ? undefined : props.subnets,
});
this.adapterLogGroup = lambda.logGroup;

this.adapterLogGroup = LogGroup.fromLogGroupName(this, "MiniWdlAdapterLogGroup", "/aws/lambda/" + lambda.functionName);
this.apiProxy = new ApiProxy(this, {
apiName: `${params.projectName}${params.userId}${params.contextName}MiniWdlApiProxy`,
lambda,
Expand Down
6 changes: 3 additions & 3 deletions packages/cdk/lib/stacks/engines/nextflow-engine-construct.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { EngineOptions } from "../../types";
import { Bucket } from "aws-cdk-lib/aws-s3";
import { ApiProxy } from "../../constructs";
import { EngineOutputs, EngineConstruct } from "./engine-construct";
import { ILogGroup } from "aws-cdk-lib/aws-logs";
import { LogGroup, ILogGroup } from "aws-cdk-lib/aws-logs";
import { IJobQueue } from "@aws-cdk/aws-batch-alpha";
import { NextflowEngineRole } from "../../roles/nextflow-engine-role";
import { NextflowAdapterRole } from "../../roles/nextflow-adapter-role";
Expand Down Expand Up @@ -71,8 +71,8 @@ export class NextflowEngineConstruct extends EngineConstruct {
vpc: props.contextParameters.usePublicSubnets ? undefined : props.vpc,
subnets: props.contextParameters.usePublicSubnets ? undefined : props.subnets,
});
this.adapterLogGroup = lambda.logGroup;

this.adapterLogGroup = LogGroup.fromLogGroupName(this, "NextflowAdapterLogGroup", "/aws/lambda/" + lambda.functionName);
this.apiProxy = new ApiProxy(this, {
apiName: `${params.projectName}${params.userId}${params.contextName}NextflowApiProxy`,
lambda,
Expand Down
4 changes: 2 additions & 2 deletions packages/cdk/lib/stacks/engines/snakemake-engine-construct.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { SnakemakeEngine } from "../../constructs/engines/snakemake/snakemake-en
import { EngineOptions } from "../../types";
import { ApiProxy, Batch } from "../../constructs";
import { EngineOutputs, EngineConstruct } from "./engine-construct";
import { ILogGroup } from "aws-cdk-lib/aws-logs";
import { LogGroup, ILogGroup } from "aws-cdk-lib/aws-logs";
import { ComputeResourceType } from "@aws-cdk/aws-batch-alpha";
import { ENGINE_SNAKEMAKE } from "../../constants";
import { Construct } from "constructs";
Expand Down Expand Up @@ -61,7 +61,7 @@ export class SnakemakeEngineConstruct extends EngineConstruct {
fsapId: this.snakemakeEngine.fsap.accessPointId,
outputBucket: params.getEngineBucketPath(),
});
this.adapterLogGroup = lambda.logGroup;
this.adapterLogGroup = LogGroup.fromLogGroupName(this, "SnakemakeAdapterLogGroup", "/aws/lambda/" + lambda.functionName);

// Generate our api gateway proxy
this.apiProxy = this.createApiProxy(params, lambda);
Expand Down
Loading