From ad5ad2bff323f34d5a79a9df474cf387169ab439 Mon Sep 17 00:00:00 2001 From: OrdonioSa Date: Fri, 4 Jun 2021 15:17:21 +0200 Subject: [PATCH] fix: returned buildspec as dict in custom extension pipeline --- API.md | 4 ++-- src/BuildSpecPipeline.ts | 2 -- src/CustomExtensionPipeline.ts | 9 +++++---- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/API.md b/API.md index 3a7528f..4c61d16 100644 --- a/API.md +++ b/API.md @@ -116,7 +116,7 @@ new CustomExtensionPipeline(scope: Construct, name: string, props: CustomExtensi ```ts -protected createCustomExtensionBuildSpec(projectName: string, distBucketName: string, codeArtifactRepository: string, codeArtifactDomain: string, codeArtifactDomainOwner: string): BuildSpec +protected createCustomExtensionBuildSpec(projectName: string, distBucketName: string, codeArtifactRepository: string, codeArtifactDomain: string, codeArtifactDomainOwner: string): Map ``` * **projectName** (string) *No description* @@ -126,7 +126,7 @@ protected createCustomExtensionBuildSpec(projectName: string, distBucketName: st * **codeArtifactDomainOwner** (string) *No description* __Returns__: -* [BuildSpec](#aws-cdk-aws-codebuild-buildspec) +* Map diff --git a/src/BuildSpecPipeline.ts b/src/BuildSpecPipeline.ts index d9d399d..da45d78 100644 --- a/src/BuildSpecPipeline.ts +++ b/src/BuildSpecPipeline.ts @@ -159,8 +159,6 @@ export class BuildSpecPipeline extends Construct { buildSpec = this.readBuildSpecFromFile('buildspec.yml'); } - console.log(buildSpec); - this.extendBuildSpec(buildSpec); return BuildSpec.fromObject(buildSpec); diff --git a/src/CustomExtensionPipeline.ts b/src/CustomExtensionPipeline.ts index 920c7ef..0a2be25 100644 --- a/src/CustomExtensionPipeline.ts +++ b/src/CustomExtensionPipeline.ts @@ -1,9 +1,10 @@ -import { BuildEnvironment, BuildSpec } from '@aws-cdk/aws-codebuild'; +import { BuildEnvironment } from '@aws-cdk/aws-codebuild'; import { Repository, RepositoryProps } from '@aws-cdk/aws-codecommit'; import { Effect, PolicyStatement } from '@aws-cdk/aws-iam'; import { Construct } from '@aws-cdk/core'; import { BuildSpecPipeline } from './BuildSpecPipeline'; +type dict = { [key: string]: any }; export interface CustomExtensionPipelineProps { readonly projectName?: string; @@ -48,8 +49,8 @@ export class CustomExtensionPipeline extends Construct { } protected createCustomExtensionBuildSpec(projectName: String, distBucketName: String, codeArtifactRepository: String, - codeArtifactDomain: String, codeArtifactDomainOwner: String): BuildSpec { - return BuildSpec.fromObject({ + codeArtifactDomain: String, codeArtifactDomainOwner: String): dict { + return { version: 0.2, phases: { install: { @@ -72,6 +73,6 @@ export class CustomExtensionPipeline extends Construct { ], }, }, - }); + }; } }