@xube/kit-aws-infrastructure 0.0.103 → 0.0.105

package/dist/pipeline/helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/pipeline/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,eAAO,MAAM,cAAc,QACpB,eAAe,QACd,MAAM,KACX,MAC0D,CAAC"}
+{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/pipeline/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,eAAO,MAAM,cAAc,QAAS,eAAe,QAAQ,MAAM,KAAG,MACC,CAAC"}

package/dist/pipeline/helpers.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPipelineArn = void 0;
-const getPipelineArn = (env, name) => `arn:aws:codepipeline:${env.region}:${env.account}:${name}`;
+const getPipelineArn = (env, name) => `arn:aws:codepipeline:${env.env.region}:${env.env.account}:${name}`;
 exports.getPipelineArn = getPipelineArn;

package/dist/pipeline/xube-build-step.d.ts

@@ -30,7 +30,7 @@ interface XubeBuildStepProps extends XubeEnvironment {
     buildStepName: string;
 }
 export declare class XubeBuildStep extends Construct {
-    synthCodeBuildStep: CodeBuildStep;
+    buildStep: CodeBuildStep;
     constructor(scope: Construct, id: string, props: XubeBuildStepProps);
 }
 export {};

package/dist/pipeline/xube-build-step.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"xube-build-step.d.ts","sourceRoot":"","sources":["../../src/pipeline/xube-build-step.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAY1E,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAQvD;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,UAAU,kBAAmB,SAAQ,eAAe;IAClD,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,kBAAkB,CAAC;IACnC,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,qBAAa,aAAc,SAAQ,SAAS;IAC1C,kBAAkB,EAAE,aAAa,CAAC;gBACtB,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,kBAAkB;CA6BpE"}
+{"version":3,"file":"xube-build-step.d.ts","sourceRoot":"","sources":["../../src/pipeline/xube-build-step.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAY1E,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAQvD;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,UAAU,kBAAmB,SAAQ,eAAe;IAClD,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,kBAAkB,CAAC;IACnC,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,qBAAa,aAAc,SAAQ,SAAS;IAC1C,SAAS,EAAE,aAAa,CAAC;gBACb,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,kBAAkB;CA6BpE"}

package/dist/pipeline/xube-build-step.js

@@ -8,7 +8,7 @@ const constants_1 = require("./constants");
 class XubeBuildStep extends constructs_1.Construct {
     constructor(scope, id, props) {
         super(scope, id);
-        this.synthCodeBuildStep = new pipelines_1.CodeBuildStep(id + "synth-step", {
+        this.buildStep = new pipelines_1.CodeBuildStep(id + "synth-step", {
             input: props.pipelineSource,
             env: {},
             role: new aws_iam_1.Role(scope, id + "-build-synth-role", {

package/dist/pipeline/xube-deploy-stage.js

@@ -5,7 +5,7 @@ const aws_cdk_lib_1 = require("aws-cdk-lib");
 class XubeDeploymentStage extends aws_cdk_lib_1.Stage {
     constructor(scope, id, props) {
         super(scope, id, {
-            env: props,
+            ...props,
             stageName: props.stageName,
         });
         this.stacks = [];

package/dist/pipeline/xube-pipeline.d.ts

@@ -1,11 +1,11 @@
 import { Construct } from "constructs";
+import { CodeBuildStep } from "aws-cdk-lib/pipelines";
+import { Stage } from "aws-cdk-lib";
 import { XubeEnvironment } from "@xube/kit-aws-schema";
-import { XubeBuildStep } from "./xube-build-step";
-import { XubeDeploymentStage } from "./xube-deploy-stage";
 interface XubeDeployPipelineProps extends XubeEnvironment {
-    name: string;
-    xubeBuildStep: XubeBuildStep;
-    xubeDeployStage: XubeDeploymentStage;
+    pipelineName: string;
+    buildStep: CodeBuildStep;
+    deployStage: Stage;
 }
 export declare class XubeDeployPipeline extends Construct {
     constructor(scope: Construct, id: string, props: XubeDeployPipelineProps);

package/dist/pipeline/xube-pipeline.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"xube-pipeline.d.ts","sourceRoot":"","sources":["../../src/pipeline/xube-pipeline.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAE1D,UAAU,uBAAwB,SAAQ,eAAe;IACvD,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,aAAa,CAAC;IAC7B,eAAe,EAAE,mBAAmB,CAAC;CACtC;AAED,qBAAa,kBAAmB,SAAQ,SAAS;gBACnC,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,uBAAuB;CAYzE"}
+{"version":3,"file":"xube-pipeline.d.ts","sourceRoot":"","sources":["../../src/pipeline/xube-pipeline.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,aAAa,EAAgB,MAAM,uBAAuB,CAAC;AACpE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,UAAU,uBAAwB,SAAQ,eAAe;IACvD,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,aAAa,CAAC;IACzB,WAAW,EAAE,KAAK,CAAC;CACpB;AAED,qBAAa,kBAAmB,SAAQ,SAAS;gBACnC,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,uBAAuB;CAYzE"}

package/dist/pipeline/xube-pipeline.js

@@ -7,12 +7,12 @@ class XubeDeployPipeline extends constructs_1.Construct {
     constructor(scope, id, props) {
         super(scope, id);
         const pipeline = new pipelines_1.CodePipeline(this, id + "Pipeline", {
-            pipelineName: props.name,
-            synth: props.xubeBuildStep.synthCodeBuildStep,
+            pipelineName: props.pipelineName,
+            synth: props.buildStep,
             dockerEnabledForSynth: true,
             dockerEnabledForSelfMutation: true,
         });
-        pipeline.addStage(props.xubeDeployStage);
+        pipeline.addStage(props.deployStage);
     }
 }
 exports.XubeDeployPipeline = XubeDeployPipeline;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xube/kit-aws-infrastructure",
-  "version": "0.0.103",
+  "version": "0.0.105",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -17,13 +17,13 @@
   },
   "homepage": "https://github.com/XubeLtd/dev-kit#readme",
   "devDependencies": {
-    "@xube/kit-build": "^0.0.103",
+    "@xube/kit-build": "^0.0.105",
     "aws-cdk": "^2.159.1"
   },
   "dependencies": {
-    "@xube/kit-aws-schema": "^0.0.103",
-    "@xube/kit-log": "^0.0.103",
-    "@xube/kit-request": "^0.0.103",
+    "@xube/kit-aws-schema": "^0.0.105",
+    "@xube/kit-log": "^0.0.105",
+    "@xube/kit-request": "^0.0.105",
     "aws-cdk-lib": "^2.159.1",
     "aws-lambda": "^1.0.7",
     "constructs": "^10.3.0"

package/src/pipeline/helpers.ts

@@ -1,7 +1,4 @@
 import { XubeEnvironment } from "@xube/kit-aws-schema";
 
-export const getPipelineArn = (
-  env: XubeEnvironment,
-  name: string
-): string =>
-  `arn:aws:codepipeline:${env.region}:${env.account}:${name}`;
+export const getPipelineArn = (env: XubeEnvironment, name: string): string =>
+  `arn:aws:codepipeline:${env.env.region}:${env.env.account}:${name}`;

package/src/pipeline/xube-build-step.ts

@@ -49,11 +49,11 @@ interface XubeBuildStepProps extends XubeEnvironment {
 }
 
 export class XubeBuildStep extends Construct {
-  synthCodeBuildStep: CodeBuildStep;
+  buildStep: CodeBuildStep;
   constructor(scope: Construct, id: string, props: XubeBuildStepProps) {
     super(scope, id);
 
-    this.synthCodeBuildStep = new CodeBuildStep(id + "synth-step", {
+    this.buildStep = new CodeBuildStep(id + "synth-step", {
       input: props.pipelineSource,
       env: {},
       role: new Role(scope, id + "-build-synth-role", {

package/src/pipeline/xube-deploy-stage.ts

@@ -12,7 +12,7 @@ export class XubeDeploymentStage extends Stage {
 
   constructor(scope: Construct, id: string, props: XubeDeploymentStageProps) {
     super(scope, id, {
-      env: props,
+      ...props,
       stageName: props.stageName,
     });
 

package/src/pipeline/xube-pipeline.ts

@@ -1,14 +1,12 @@
 import { Construct } from "constructs";
-import { CodePipeline } from "aws-cdk-lib/pipelines";
-import { pipelines } from "aws-cdk-lib";
+import { CodeBuildStep, CodePipeline } from "aws-cdk-lib/pipelines";
+import { Stage } from "aws-cdk-lib";
 import { XubeEnvironment } from "@xube/kit-aws-schema";
-import { XubeBuildStep } from "./xube-build-step";
-import { XubeDeploymentStage } from "./xube-deploy-stage";
 
 interface XubeDeployPipelineProps extends XubeEnvironment {
-  name: string;
-  xubeBuildStep: XubeBuildStep;
-  xubeDeployStage: XubeDeploymentStage;
+  pipelineName: string;
+  buildStep: CodeBuildStep;
+  deployStage: Stage;
 }
 
 export class XubeDeployPipeline extends Construct {
@@ -16,12 +14,12 @@ export class XubeDeployPipeline extends Construct {
     super(scope, id);
 
     const pipeline = new CodePipeline(this, id + "Pipeline", {
-      pipelineName: props.name,
-      synth: props.xubeBuildStep.synthCodeBuildStep,
+      pipelineName: props.pipelineName,
+      synth: props.buildStep,
       dockerEnabledForSynth: true,
       dockerEnabledForSelfMutation: true,
     });
 
-    pipeline.addStage(props.xubeDeployStage);
+    pipeline.addStage(props.deployStage);
   }
 }