@studion/infra-code-blocks 2.0.0-alpha.1 → 2.0.0-alpha.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/components/cloudfront/index.js +1 -1
- package/dist/components/cloudfront/lb-cache-strategy.js +1 -1
- package/dist/components/cloudfront/s3-cache-strategy.js +1 -1
- package/dist/components/ecs-service/index.d.ts +1 -1
- package/dist/components/ecs-service/index.d.ts.map +1 -1
- package/dist/components/ecs-service/index.js +5 -1
- package/dist/components/ecs-service/task-size.d.ts +2 -2
- package/dist/components/ecs-service/task-size.d.ts.map +1 -1
- package/dist/components/ecs-service/task-size.js +4 -1
- package/dist/components/static-site/index.d.ts +1 -0
- package/dist/components/static-site/index.d.ts.map +1 -1
- package/dist/components/static-site/index.js +3 -3
- package/dist/components/static-site/s3-assets.d.ts +1 -0
- package/dist/components/static-site/s3-assets.d.ts.map +1 -1
- package/dist/components/static-site/s3-assets.js +5 -5
- package/dist/components/web-server/index.d.ts.map +1 -1
- package/dist/components/web-server/index.js +1 -1
- package/dist/components/web-server/load-balancer.js +1 -1
- package/dist/otel/builder.d.ts +3 -3
- package/dist/otel/builder.d.ts.map +1 -1
- package/dist/otel/builder.js +11 -15
- package/dist/otel/config.d.ts +3 -2
- package/dist/otel/config.d.ts.map +1 -1
- package/dist/otel/config.js +8 -3
- package/dist/otel/index.d.ts +1 -1
- package/dist/otel/index.d.ts.map +1 -1
- package/package.json +4 -2
|
@@ -9,7 +9,7 @@ const s3_cache_strategy_1 = require("./s3-cache-strategy");
|
|
|
9
9
|
const lb_cache_strategy_1 = require("./lb-cache-strategy");
|
|
10
10
|
class CloudFront extends pulumi.ComponentResource {
|
|
11
11
|
constructor(name, args, opts = {}) {
|
|
12
|
-
super('studion:cloudfront:CloudFront', name,
|
|
12
|
+
super('studion:cloudfront:CloudFront', name, {}, opts);
|
|
13
13
|
this.name = name;
|
|
14
14
|
const { behaviors, domain, certificate, hostedZoneId, tags } = args;
|
|
15
15
|
const hasCustomDomain = !!domain || !!certificate;
|
|
@@ -5,7 +5,7 @@ const aws = require("@pulumi/aws");
|
|
|
5
5
|
const pulumi = require("@pulumi/pulumi");
|
|
6
6
|
class LbCacheStrategy extends pulumi.ComponentResource {
|
|
7
7
|
constructor(name, args, opts = {}) {
|
|
8
|
-
super('studion:cloudfront:LbCacheStrategy', name,
|
|
8
|
+
super('studion:cloudfront:LbCacheStrategy', name, {}, opts);
|
|
9
9
|
this.name = name;
|
|
10
10
|
const { pathPattern, loadBalancer } = args;
|
|
11
11
|
this.pathPattern = pathPattern;
|
|
@@ -5,7 +5,7 @@ const aws = require("@pulumi/aws");
|
|
|
5
5
|
const pulumi = require("@pulumi/pulumi");
|
|
6
6
|
class S3CacheStrategy extends pulumi.ComponentResource {
|
|
7
7
|
constructor(name, args, opts = {}) {
|
|
8
|
-
super('studion:cloudfront:S3CacheStrategy', name,
|
|
8
|
+
super('studion:cloudfront:S3CacheStrategy', name, {}, opts);
|
|
9
9
|
this.name = name;
|
|
10
10
|
const { pathPattern, bucket, cacheTtl } = args;
|
|
11
11
|
this.pathPattern = pathPattern;
|
|
@@ -150,7 +150,7 @@ export declare class EcsService extends pulumi.ComponentResource {
|
|
|
150
150
|
private createContainerDefinition;
|
|
151
151
|
private createTaskExecutionRole;
|
|
152
152
|
private createTaskRole;
|
|
153
|
-
addSecurityGroup
|
|
153
|
+
private addSecurityGroup;
|
|
154
154
|
private createDefaultSecurityGroup;
|
|
155
155
|
private createEcsService;
|
|
156
156
|
private createServiceDiscovery;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/ecs-service/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/ecs-service/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -221,8 +221,12 @@ class EcsService extends pulumi.ComponentResource {
|
|
|
221
221
|
this.addSecurityGroup(securityGroup);
|
|
222
222
|
}
|
|
223
223
|
createEcsService(ecsServiceArgs) {
|
|
224
|
-
if (
|
|
224
|
+
if (ecsServiceArgs.securityGroup) {
|
|
225
|
+
this.addSecurityGroup(ecsServiceArgs.securityGroup);
|
|
226
|
+
}
|
|
227
|
+
if (!this.securityGroups.length) {
|
|
225
228
|
this.createDefaultSecurityGroup();
|
|
229
|
+
}
|
|
226
230
|
const networkConfiguration = {
|
|
227
231
|
assignPublicIp: ecsServiceArgs.assignPublicIp,
|
|
228
232
|
subnets: ecsServiceArgs.assignPublicIp
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import * as pulumi from '@pulumi/pulumi';
|
|
2
2
|
export type TaskSize = {
|
|
3
|
-
cpu: pulumi.Input<
|
|
4
|
-
memory: pulumi.Input<
|
|
3
|
+
cpu: pulumi.Input<number>;
|
|
4
|
+
memory: pulumi.Input<number>;
|
|
5
5
|
} | keyof typeof PredefinedSize;
|
|
6
6
|
export declare function parseTaskSize(size: pulumi.UnwrappedObject<TaskSize>): {
|
|
7
7
|
cpu: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-size.d.ts","sourceRoot":"","sources":["../../../src/components/ecs-service/task-size.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AAEzC,MAAM,MAAM,QAAQ,GAChB;IACE,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;CAC9B,GACD,MAAM,OAAO,cAAc,CAAC;AAEhC,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,CAAC,eAAe,CAAC,QAAQ,CAAC,GAAG;IACrE,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;CAChB,
|
|
1
|
+
{"version":3,"file":"task-size.d.ts","sourceRoot":"","sources":["../../../src/components/ecs-service/task-size.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AAEzC,MAAM,MAAM,QAAQ,GAChB;IACE,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;CAC9B,GACD,MAAM,OAAO,cAAc,CAAC;AAEhC,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,CAAC,eAAe,CAAC,QAAQ,CAAC,GAAG;IACrE,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;CAChB,CAWA;AAKD,QAAA,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;CAyBV,CAAC"}
|
|
@@ -6,7 +6,10 @@ function parseTaskSize(size) {
|
|
|
6
6
|
const { cpu, memory } = PredefinedSize[size];
|
|
7
7
|
return { cpu: `${cpu}`, memory: `${memory}` };
|
|
8
8
|
}
|
|
9
|
-
return
|
|
9
|
+
return {
|
|
10
|
+
cpu: `${size.cpu}`,
|
|
11
|
+
memory: `${size.memory}`,
|
|
12
|
+
};
|
|
10
13
|
}
|
|
11
14
|
const CPU_1_VCPU = 1024;
|
|
12
15
|
const MEMORY_1GB = 1024;
|
|
@@ -23,6 +23,7 @@ export declare namespace StaticSite {
|
|
|
23
23
|
domain?: pulumi.Input<string>;
|
|
24
24
|
certificate?: pulumi.Input<aws.acm.Certificate>;
|
|
25
25
|
hostedZoneId: pulumi.Input<string>;
|
|
26
|
+
bucketPrefix?: pulumi.Input<string>;
|
|
26
27
|
indexDocument?: pulumi.Input<string>;
|
|
27
28
|
errorDocument?: pulumi.Input<string>;
|
|
28
29
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/static-site/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AACzC,OAAO,KAAK,GAAG,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,YAAY,EAAqB,MAAM,kBAAkB,CAAC;AACnE,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,yBAAiB,UAAU,CAAC;IAC1B,KAAY,SAAS,GAAG;QACtB,WAAW,EAAE,MAAM,CAAC;QACpB;;;;;;;;;;WAUG;QACH,GAAG,EAAE,YAAY,CAAC;KACnB,CAAC;IAEF,KAAY,IAAI,GAAG;QAKjB,MAAM,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAK9B,WAAW,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAChD,YAAY,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACnC,aAAa,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACrC,aAAa,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACrC;;;;;WAKG;QACH,UAAU,CAAC,EAAE,SAAS,EAAE,CAAC;QACzB,IAAI,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC;YAClB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;SACrC,CAAC,CAAC;KACJ,CAAC;CACH;AAED,qBAAa,UAAW,SAAQ,MAAM,CAAC,iBAAiB;IACtD,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,QAAQ,CAAC;IACnB,EAAE,EAAE,UAAU,CAAC;gBAGb,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,UAAU,CAAC,IAAI,EACrB,IAAI,GAAE,MAAM,CAAC,wBAA6B;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/static-site/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AACzC,OAAO,KAAK,GAAG,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,YAAY,EAAqB,MAAM,kBAAkB,CAAC;AACnE,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,yBAAiB,UAAU,CAAC;IAC1B,KAAY,SAAS,GAAG;QACtB,WAAW,EAAE,MAAM,CAAC;QACpB;;;;;;;;;;WAUG;QACH,GAAG,EAAE,YAAY,CAAC;KACnB,CAAC;IAEF,KAAY,IAAI,GAAG;QAKjB,MAAM,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAK9B,WAAW,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAChD,YAAY,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACnC,YAAY,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACpC,aAAa,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACrC,aAAa,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACrC;;;;;WAKG;QACH,UAAU,CAAC,EAAE,SAAS,EAAE,CAAC;QACzB,IAAI,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC;YAClB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;SACrC,CAAC,CAAC;KACJ,CAAC;CACH;AAED,qBAAa,UAAW,SAAQ,MAAM,CAAC,iBAAiB;IACtD,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,QAAQ,CAAC;IACnB,EAAE,EAAE,UAAU,CAAC;gBAGb,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,UAAU,CAAC,IAAI,EACrB,IAAI,GAAE,MAAM,CAAC,wBAA6B;IA8C5C,OAAO,CAAC,sBAAsB;CAsB/B"}
|
|
@@ -7,13 +7,13 @@ const s3_assets_1 = require("./s3-assets");
|
|
|
7
7
|
const cloudfront_1 = require("../cloudfront");
|
|
8
8
|
class StaticSite extends pulumi.ComponentResource {
|
|
9
9
|
constructor(name, args, opts = {}) {
|
|
10
|
-
super('studion:static-site:StaticSite', name,
|
|
11
|
-
const { domain, hostedZoneId, certificate, indexDocument, errorDocument, cacheRules, tags, } = args;
|
|
10
|
+
super('studion:static-site:StaticSite', name, {}, Object.assign(Object.assign({}, opts), { aliases: [...(opts.aliases || []), { type: 'studion:StaticSite' }] }));
|
|
11
|
+
const { domain, hostedZoneId, certificate, bucketPrefix, indexDocument, errorDocument, cacheRules, tags, } = args;
|
|
12
12
|
if (!domain && !certificate) {
|
|
13
13
|
throw new Error('Provide either domain or certificate, or both');
|
|
14
14
|
}
|
|
15
15
|
this.name = name;
|
|
16
|
-
this.s3Assets = new s3_assets_1.S3Assets(`${this.name}-s3-assets`, { indexDocument, errorDocument, tags }, { parent: this });
|
|
16
|
+
this.s3Assets = new s3_assets_1.S3Assets(`${this.name}-s3-assets`, { bucketPrefix, indexDocument, errorDocument, tags }, { parent: this });
|
|
17
17
|
this.cf = new cloudfront_1.CloudFront(`${this.name}-cf`, {
|
|
18
18
|
behaviors: this.getCloudFrontBehaviors(cacheRules),
|
|
19
19
|
domain,
|
|
@@ -2,6 +2,7 @@ import * as pulumi from '@pulumi/pulumi';
|
|
|
2
2
|
import * as aws from '@pulumi/aws';
|
|
3
3
|
export declare namespace S3Assets {
|
|
4
4
|
type Args = {
|
|
5
|
+
bucketPrefix?: pulumi.Input<string>;
|
|
5
6
|
indexDocument?: pulumi.Input<string>;
|
|
6
7
|
errorDocument?: pulumi.Input<string>;
|
|
7
8
|
tags?: pulumi.Input<{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"s3-assets.d.ts","sourceRoot":"","sources":["../../../src/components/static-site/s3-assets.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AACzC,OAAO,KAAK,GAAG,MAAM,aAAa,CAAC;AAGnC,yBAAiB,QAAQ,CAAC;IACxB,KAAY,IAAI,GAAG;QACjB,aAAa,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACrC,aAAa,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACrC,IAAI,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC;YAClB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;SACrC,CAAC,CAAC;KACJ,CAAC;CACH;AAED,qBAAa,QAAS,SAAQ,MAAM,CAAC,iBAAiB;IACpD,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC;IACtB,aAAa,EAAE,GAAG,CAAC,EAAE,CAAC,0BAA0B,CAAC;gBAG/C,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,QAAQ,CAAC,IAAI,EACnB,IAAI,GAAE,MAAM,CAAC,wBAA6B;
|
|
1
|
+
{"version":3,"file":"s3-assets.d.ts","sourceRoot":"","sources":["../../../src/components/static-site/s3-assets.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AACzC,OAAO,KAAK,GAAG,MAAM,aAAa,CAAC;AAGnC,yBAAiB,QAAQ,CAAC;IACxB,KAAY,IAAI,GAAG;QACjB,YAAY,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACpC,aAAa,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACrC,aAAa,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACrC,IAAI,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC;YAClB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;SACrC,CAAC,CAAC;KACJ,CAAC;CACH;AAED,qBAAa,QAAS,SAAQ,MAAM,CAAC,iBAAiB;IACpD,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC;IACtB,aAAa,EAAE,GAAG,CAAC,EAAE,CAAC,0BAA0B,CAAC;gBAG/C,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,QAAQ,CAAC,IAAI,EACnB,IAAI,GAAE,MAAM,CAAC,wBAA6B;IAuB5C,OAAO,CAAC,wBAAwB;IAwBhC,OAAO,CAAC,mBAAmB;CAgC5B"}
|
|
@@ -6,10 +6,10 @@ const aws = require("@pulumi/aws");
|
|
|
6
6
|
const common_tags_1 = require("../../shared/common-tags");
|
|
7
7
|
class S3Assets extends pulumi.ComponentResource {
|
|
8
8
|
constructor(name, args, opts = {}) {
|
|
9
|
-
super('studion:static-site:S3Assets', name,
|
|
9
|
+
super('studion:static-site:S3Assets', name, {}, opts);
|
|
10
10
|
this.name = name;
|
|
11
|
-
const { indexDocument = 'index.html', errorDocument = 'index.html', tags, } = args;
|
|
12
|
-
const [bucket, websiteConfig] = this.createWebsiteBucket(indexDocument, errorDocument, tags);
|
|
11
|
+
const { bucketPrefix = `${this.name}-`, indexDocument = 'index.html', errorDocument = 'index.html', tags, } = args;
|
|
12
|
+
const [bucket, websiteConfig] = this.createWebsiteBucket(bucketPrefix, indexDocument, errorDocument, tags);
|
|
13
13
|
this.bucket = bucket;
|
|
14
14
|
this.websiteConfig = websiteConfig;
|
|
15
15
|
}
|
|
@@ -27,9 +27,9 @@ class S3Assets extends pulumi.ComponentResource {
|
|
|
27
27
|
policy: policy.json,
|
|
28
28
|
}, { parent: this, dependsOn: [bucketPublicAccessBlock] });
|
|
29
29
|
}
|
|
30
|
-
createWebsiteBucket(indexDocument, errorDocument, tags) {
|
|
30
|
+
createWebsiteBucket(bucketPrefix, indexDocument, errorDocument, tags) {
|
|
31
31
|
const bucket = new aws.s3.Bucket(`${this.name}-bucket`, {
|
|
32
|
-
bucketPrefix
|
|
32
|
+
bucketPrefix,
|
|
33
33
|
tags: Object.assign(Object.assign({}, common_tags_1.commonTags), tags),
|
|
34
34
|
}, { parent: this });
|
|
35
35
|
const config = new aws.s3.BucketWebsiteConfiguration(`${this.name}-bucket-website-config`, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/web-server/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/web-server/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,7 @@ const load_balancer_1 = require("./load-balancer");
|
|
|
10
10
|
class WebServer extends pulumi.ComponentResource {
|
|
11
11
|
constructor(name, args, opts = {}) {
|
|
12
12
|
var _a;
|
|
13
|
-
super('studion:web-server:WebServer', name,
|
|
13
|
+
super('studion:web-server:WebServer', name, {}, Object.assign(Object.assign({}, opts), { aliases: [...(opts.aliases || []), { type: 'studion:WebServer' }] }));
|
|
14
14
|
const { vpc, domain, hostedZoneId, certificate } = args;
|
|
15
15
|
const hasCustomDomain = !!domain || !!certificate;
|
|
16
16
|
if (hasCustomDomain && !hostedZoneId) {
|
|
@@ -34,7 +34,7 @@ const defaults = {
|
|
|
34
34
|
};
|
|
35
35
|
class WebServerLoadBalancer extends pulumi.ComponentResource {
|
|
36
36
|
constructor(name, args, opts = {}) {
|
|
37
|
-
super('studion:web-server:WebServerLoadBalancer', name,
|
|
37
|
+
super('studion:web-server:WebServerLoadBalancer', name, {}, opts);
|
|
38
38
|
this.name = name;
|
|
39
39
|
const vpc = pulumi.output(args.vpc);
|
|
40
40
|
const argsWithDefaults = (0, merge_with_defaults_1.mergeWithDefaults)(defaults, args);
|
package/dist/otel/builder.d.ts
CHANGED
|
@@ -8,7 +8,7 @@ export declare namespace OtelCollectorBuilder {
|
|
|
8
8
|
prometheusNamespace: PrometheusRemoteWriteExporter.Config['namespace'];
|
|
9
9
|
prometheusWorkspace: aws.amp.Workspace;
|
|
10
10
|
region: string;
|
|
11
|
-
|
|
11
|
+
logGroup: aws.cloudwatch.LogGroup;
|
|
12
12
|
logStreamName: OtelCollector.AwsCloudWatchLogsExporterConfig['log_stream_name'];
|
|
13
13
|
};
|
|
14
14
|
}
|
|
@@ -22,7 +22,7 @@ export declare class OtelCollectorBuilder {
|
|
|
22
22
|
withBatchProcessor(name?: string, size?: number, maxSize?: number, timeout?: string): this;
|
|
23
23
|
withMemoryLimiterProcessor(checkInterval?: string, limitPercentage?: number, spikeLimitPercentage?: number): this;
|
|
24
24
|
withAWSXRayExporter(region: string): this;
|
|
25
|
-
withCloudWatchLogsExporter(region: OtelCollector.AwsCloudWatchLogsExporterConfig['region'],
|
|
25
|
+
withCloudWatchLogsExporter(region: OtelCollector.AwsCloudWatchLogsExporterConfig['region'], logGroup: aws.cloudwatch.LogGroup, logStreamName: OtelCollector.AwsCloudWatchLogsExporterConfig['log_stream_name']): this;
|
|
26
26
|
withHealthCheckExtension(endpoint?: string): this;
|
|
27
27
|
withPprofExtension(endpoint?: string): this;
|
|
28
28
|
withAPS(namespace: pulumi.Input<string>, workspace: aws.amp.Workspace, region: string): this;
|
|
@@ -31,7 +31,7 @@ export declare class OtelCollectorBuilder {
|
|
|
31
31
|
withMetricsPipeline(receivers: OtelCollector.ReceiverType[], processors: OtelCollector.ProcessorType[], exporters: OtelCollector.ExporterType[]): this;
|
|
32
32
|
withTracesPipeline(receivers: OtelCollector.ReceiverType[], processors: OtelCollector.ProcessorType[], exporters: OtelCollector.ExporterType[]): this;
|
|
33
33
|
withLogsPipeline(receivers: OtelCollector.ReceiverType[], processors: OtelCollector.ProcessorType[], exporters: OtelCollector.ExporterType[]): this;
|
|
34
|
-
withDefault({ prometheusNamespace, prometheusWorkspace, region,
|
|
34
|
+
withDefault({ prometheusNamespace, prometheusWorkspace, region, logGroup, logStreamName, }: OtelCollectorBuilder.WithDefaultArgs): this;
|
|
35
35
|
build(): OtelCollector;
|
|
36
36
|
private createAPSInlinePolicy;
|
|
37
37
|
private createAWSXRayPolicy;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../../src/otel/builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AACzC,OAAO,KAAK,GAAG,MAAM,aAAa,CAAC;AAGnC,OAAO,EAAE,aAAa,EAAE,MAAM,GAAG,CAAC;AAGlC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,6BAA6B,EAAE,MAAM,oCAAoC,CAAC;AAEnF,yBAAiB,oBAAoB,CAAC;IACpC,KAAY,eAAe,GAAG;QAC5B,mBAAmB,EAAE,6BAA6B,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QACvE,mBAAmB,EAAE,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC;QACvC,MAAM,EAAE,MAAM,CAAC;QACf,
|
|
1
|
+
{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../../src/otel/builder.ts"],"names":[],"mappings":"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"}
|
package/dist/otel/builder.js
CHANGED
|
@@ -30,9 +30,9 @@ class OtelCollectorBuilder {
|
|
|
30
30
|
this.createAWSXRayPolicy();
|
|
31
31
|
return this;
|
|
32
32
|
}
|
|
33
|
-
withCloudWatchLogsExporter(region,
|
|
34
|
-
this._configBuilder.withCloudWatchLogsExporter(region,
|
|
35
|
-
this.createCloudWatchLogsPolicy(
|
|
33
|
+
withCloudWatchLogsExporter(region, logGroup, logStreamName) {
|
|
34
|
+
this._configBuilder.withCloudWatchLogsExporter(region, logGroup.name, logStreamName, logGroup.retentionInDays);
|
|
35
|
+
this.createCloudWatchLogsPolicy(logGroup);
|
|
36
36
|
return this;
|
|
37
37
|
}
|
|
38
38
|
withHealthCheckExtension(endpoint = '0.0.0.0:13133') {
|
|
@@ -68,17 +68,18 @@ class OtelCollectorBuilder {
|
|
|
68
68
|
this._configBuilder.withLogsPipeline(receivers, processors, exporters);
|
|
69
69
|
return this;
|
|
70
70
|
}
|
|
71
|
-
withDefault({ prometheusNamespace, prometheusWorkspace, region,
|
|
71
|
+
withDefault({ prometheusNamespace, prometheusWorkspace, region, logGroup, logStreamName, }) {
|
|
72
72
|
this._configBuilder.withDefault({
|
|
73
73
|
prometheusNamespace,
|
|
74
74
|
prometheusEndpoint: pulumi.interpolate `${prometheusWorkspace.prometheusEndpoint}api/v1/remote_write`,
|
|
75
75
|
region,
|
|
76
|
-
logGroupName,
|
|
76
|
+
logGroupName: logGroup.name,
|
|
77
77
|
logStreamName,
|
|
78
|
+
logRetention: logGroup.retentionInDays,
|
|
78
79
|
});
|
|
79
80
|
this.createAPSInlinePolicy(prometheusWorkspace);
|
|
80
81
|
this.createAWSXRayPolicy();
|
|
81
|
-
this.createCloudWatchLogsPolicy(
|
|
82
|
+
this.createCloudWatchLogsPolicy(logGroup);
|
|
82
83
|
return this;
|
|
83
84
|
}
|
|
84
85
|
build() {
|
|
@@ -124,20 +125,15 @@ class OtelCollectorBuilder {
|
|
|
124
125
|
}));
|
|
125
126
|
this._taskRoleInlinePolicies.push(policy);
|
|
126
127
|
}
|
|
127
|
-
createCloudWatchLogsPolicy(
|
|
128
|
+
createCloudWatchLogsPolicy(logGroup) {
|
|
128
129
|
const policy = pulumi
|
|
129
|
-
.all([this._serviceName,
|
|
130
|
-
.apply(([serviceName,
|
|
130
|
+
.all([this._serviceName, logGroup.arn])
|
|
131
|
+
.apply(([serviceName, logGroupArn]) => {
|
|
131
132
|
return {
|
|
132
133
|
name: `${serviceName}-task-role-cloudwatch-logs`,
|
|
133
134
|
policy: JSON.stringify({
|
|
134
135
|
Version: '2012-10-17',
|
|
135
136
|
Statement: [
|
|
136
|
-
{
|
|
137
|
-
Effect: 'Allow',
|
|
138
|
-
Action: ['logs:CreateLogGroup', 'logs:PutRetentionPolicy'],
|
|
139
|
-
Resource: '*',
|
|
140
|
-
},
|
|
141
137
|
{
|
|
142
138
|
Effect: 'Allow',
|
|
143
139
|
Action: [
|
|
@@ -145,7 +141,7 @@ class OtelCollectorBuilder {
|
|
|
145
141
|
'logs:DescribeLogStreams',
|
|
146
142
|
'logs:PutLogEvents',
|
|
147
143
|
],
|
|
148
|
-
Resource:
|
|
144
|
+
Resource: `${logGroupArn}:*`,
|
|
149
145
|
},
|
|
150
146
|
],
|
|
151
147
|
}),
|
package/dist/otel/config.d.ts
CHANGED
|
@@ -9,6 +9,7 @@ export declare namespace OtelCollectorConfigBuilder {
|
|
|
9
9
|
region: string;
|
|
10
10
|
logGroupName: OtelCollector.AwsCloudWatchLogsExporterConfig['log_group_name'];
|
|
11
11
|
logStreamName: OtelCollector.AwsCloudWatchLogsExporterConfig['log_stream_name'];
|
|
12
|
+
logRetention: OtelCollector.AwsCloudWatchLogsExporterConfig['log_retention'];
|
|
12
13
|
};
|
|
13
14
|
}
|
|
14
15
|
export declare class OtelCollectorConfigBuilder {
|
|
@@ -21,7 +22,7 @@ export declare class OtelCollectorConfigBuilder {
|
|
|
21
22
|
withBatchProcessor(name?: string, size?: number, maxSize?: number, timeout?: string): this;
|
|
22
23
|
withMemoryLimiterProcessor(checkInterval?: string, limitPercentage?: number, spikeLimitPercentage?: number): this;
|
|
23
24
|
withAWSXRayExporter(region: string): this;
|
|
24
|
-
withCloudWatchLogsExporter(region: OtelCollector.AwsCloudWatchLogsExporterConfig['region'], logGroupName: OtelCollector.AwsCloudWatchLogsExporterConfig['log_group_name'], logStreamName: OtelCollector.AwsCloudWatchLogsExporterConfig['log_stream_name'], logRetention
|
|
25
|
+
withCloudWatchLogsExporter(region: OtelCollector.AwsCloudWatchLogsExporterConfig['region'], logGroupName: OtelCollector.AwsCloudWatchLogsExporterConfig['log_group_name'], logStreamName: OtelCollector.AwsCloudWatchLogsExporterConfig['log_stream_name'], logRetention: OtelCollector.AwsCloudWatchLogsExporterConfig['log_retention']): this;
|
|
25
26
|
withHealthCheckExtension(endpoint?: string): this;
|
|
26
27
|
withPprofExtension(endpoint?: string): this;
|
|
27
28
|
withAPS(namespace: pulumi.Input<string>, endpoint: pulumi.Input<string>, region: string): this;
|
|
@@ -30,7 +31,7 @@ export declare class OtelCollectorConfigBuilder {
|
|
|
30
31
|
withMetricsPipeline(receivers: OtelCollector.ReceiverType[], processors: OtelCollector.ProcessorType[], exporters: OtelCollector.ExporterType[]): this;
|
|
31
32
|
withTracesPipeline(receivers: OtelCollector.ReceiverType[], processors: OtelCollector.ProcessorType[], exporters: OtelCollector.ExporterType[]): this;
|
|
32
33
|
withLogsPipeline(receivers: OtelCollector.ReceiverType[], processors: OtelCollector.ProcessorType[], exporters: OtelCollector.ExporterType[]): this;
|
|
33
|
-
withDefault({ prometheusNamespace, prometheusEndpoint, region, logGroupName, logStreamName, }: OtelCollectorConfigBuilder.WithDefaultArgs): this;
|
|
34
|
+
withDefault({ prometheusNamespace, prometheusEndpoint, region, logGroupName, logStreamName, logRetention, }: OtelCollectorConfigBuilder.WithDefaultArgs): this;
|
|
34
35
|
build(): OtelCollector.Config;
|
|
35
36
|
private validatePipelineProcessorOrder;
|
|
36
37
|
private validatePipelineComponents;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/otel/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,YAAY,EAAY,MAAM,iBAAiB,CAAC;AACzD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,GAAG,CAAC;AACvC,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,oCAAoC,CAAC;AAExF,yBAAiB,0BAA0B,CAAC;IAC1C,KAAY,eAAe,GAAG;QAC5B,mBAAmB,EAAE,6BAA6B,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QACvE,kBAAkB,EAAE,6BAA6B,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QACrE,MAAM,EAAE,MAAM,CAAC;QACf,YAAY,EAAE,aAAa,CAAC,+BAA+B,CAAC,gBAAgB,CAAC,CAAC;QAC9E,aAAa,EAAE,aAAa,CAAC,+BAA+B,CAAC,iBAAiB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/otel/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,YAAY,EAAY,MAAM,iBAAiB,CAAC;AACzD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,GAAG,CAAC;AACvC,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,oCAAoC,CAAC;AAExF,yBAAiB,0BAA0B,CAAC;IAC1C,KAAY,eAAe,GAAG;QAC5B,mBAAmB,EAAE,6BAA6B,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QACvE,kBAAkB,EAAE,6BAA6B,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QACrE,MAAM,EAAE,MAAM,CAAC;QACf,YAAY,EAAE,aAAa,CAAC,+BAA+B,CAAC,gBAAgB,CAAC,CAAC;QAC9E,aAAa,EAAE,aAAa,CAAC,+BAA+B,CAAC,iBAAiB,CAAC,CAAC;QAChF,YAAY,EAAE,aAAa,CAAC,+BAA+B,CAAC,eAAe,CAAC,CAAC;KAC9E,CAAC;CACH;AAED,qBAAa,0BAA0B;IACrC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA8B;IACzD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA+B;IAC3D,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA8B;IACzD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA+B;IAC3D,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAEvB;IAEF,gBAAgB,CAAC,SAAS,GAAE,YAAY,CAAC,QAAQ,EAAa,GAAG,IAAI;IAmBrE,kBAAkB,CAChB,IAAI,SAAU,EACd,IAAI,SAAO,EACX,OAAO,SAAQ,EACf,OAAO,SAAO,GACb,IAAI;IAUP,0BAA0B,CACxB,aAAa,SAAO,EACpB,eAAe,SAAK,EACpB,oBAAoB,SAAK,GACxB,IAAI;IAUP,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAMzC,0BAA0B,CACxB,MAAM,EAAE,aAAa,CAAC,+BAA+B,CAAC,QAAQ,CAAC,EAC/D,YAAY,EAAE,aAAa,CAAC,+BAA+B,CAAC,gBAAgB,CAAC,EAC7E,aAAa,EAAE,aAAa,CAAC,+BAA+B,CAAC,iBAAiB,CAAC,EAC/E,YAAY,EAAE,aAAa,CAAC,+BAA+B,CAAC,eAAe,CAAC,GAC3E,IAAI;IAWP,wBAAwB,CAAC,QAAQ,SAAkB,GAAG,IAAI;IAM1D,kBAAkB,CAAC,QAAQ,SAAiB,GAAG,IAAI;IAMnD,OAAO,CACL,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAC/B,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAC9B,MAAM,EAAE,MAAM,GACb,IAAI;IAiBP,SAAS,CAAC,SAAS,GAAE,QAAQ,GAAG,OAAO,GAAG,UAAuB,GAAG,IAAI;IAMxE,aAAa,CACX,QAAQ,GAAE,OAAO,GAAG,MAAM,GAAG,OAAiB,EAC9C,gBAAgB,GAAE,OAAO,GAAG,QAAQ,GAAG,UAAoB,GAC1D,IAAI;IASP,mBAAmB,CACjB,SAAS,EAAE,aAAa,CAAC,YAAY,EAAE,EACvC,UAAU,EAAE,aAAa,CAAC,aAAa,EAAE,EACzC,SAAS,EAAE,aAAa,CAAC,YAAY,EAAE,GACtC,IAAI;IAUP,kBAAkB,CAChB,SAAS,EAAE,aAAa,CAAC,YAAY,EAAE,EACvC,UAAU,EAAE,aAAa,CAAC,aAAa,EAAE,EACzC,SAAS,EAAE,aAAa,CAAC,YAAY,EAAE,GACtC,IAAI;IAUP,gBAAgB,CACd,SAAS,EAAE,aAAa,CAAC,YAAY,EAAE,EACvC,UAAU,EAAE,aAAa,CAAC,aAAa,EAAE,EACzC,SAAS,EAAE,aAAa,CAAC,YAAY,EAAE,GACtC,IAAI;IAUP,WAAW,CAAC,EACV,mBAAmB,EACnB,kBAAkB,EAClB,MAAM,EACN,YAAY,EACZ,aAAa,EACb,YAAY,GACb,EAAE,0BAA0B,CAAC,eAAe,GAAG,IAAI;IAiCpD,KAAK,IAAI,aAAa,CAAC,MAAM;IA0B7B,OAAO,CAAC,8BAA8B;IAiBtC,OAAO,CAAC,0BAA0B;CA2BnC"}
|
package/dist/otel/config.js
CHANGED
|
@@ -47,7 +47,12 @@ class OtelCollectorConfigBuilder {
|
|
|
47
47
|
return this;
|
|
48
48
|
}
|
|
49
49
|
withCloudWatchLogsExporter(region, logGroupName, logStreamName, logRetention) {
|
|
50
|
-
this._exporters.awscloudwatchlogs =
|
|
50
|
+
this._exporters.awscloudwatchlogs = {
|
|
51
|
+
region,
|
|
52
|
+
log_group_name: logGroupName,
|
|
53
|
+
log_stream_name: logStreamName,
|
|
54
|
+
log_retention: logRetention,
|
|
55
|
+
};
|
|
51
56
|
return this;
|
|
52
57
|
}
|
|
53
58
|
withHealthCheckExtension(endpoint = '0.0.0.0:13133') {
|
|
@@ -107,7 +112,7 @@ class OtelCollectorConfigBuilder {
|
|
|
107
112
|
};
|
|
108
113
|
return this;
|
|
109
114
|
}
|
|
110
|
-
withDefault({ prometheusNamespace, prometheusEndpoint, region, logGroupName, logStreamName, }) {
|
|
115
|
+
withDefault({ prometheusNamespace, prometheusEndpoint, region, logGroupName, logStreamName, logRetention, }) {
|
|
111
116
|
return this.withOTLPReceiver(['http'])
|
|
112
117
|
.withMemoryLimiterProcessor()
|
|
113
118
|
.withBatchProcessor('batch/metrics')
|
|
@@ -115,7 +120,7 @@ class OtelCollectorConfigBuilder {
|
|
|
115
120
|
.withBatchProcessor('batch/logs', 1024, 5000, '2s')
|
|
116
121
|
.withAPS(prometheusNamespace, prometheusEndpoint, region)
|
|
117
122
|
.withAWSXRayExporter(region)
|
|
118
|
-
.withCloudWatchLogsExporter(region, logGroupName, logStreamName)
|
|
123
|
+
.withCloudWatchLogsExporter(region, logGroupName, logStreamName, logRetention)
|
|
119
124
|
.withHealthCheckExtension()
|
|
120
125
|
.withMetricsPipeline(['otlp'], ['memory_limiter', 'batch/metrics'], ['prometheusremotewrite'])
|
|
121
126
|
.withTracesPipeline(['otlp'], ['memory_limiter', 'batch/traces'], ['awsxray'])
|
package/dist/otel/index.d.ts
CHANGED
|
@@ -24,7 +24,7 @@ export declare namespace OtelCollector {
|
|
|
24
24
|
region: string;
|
|
25
25
|
log_group_name: pulumi.Input<string>;
|
|
26
26
|
log_stream_name: pulumi.Input<string>;
|
|
27
|
-
log_retention
|
|
27
|
+
log_retention: pulumi.Input<number | undefined>;
|
|
28
28
|
};
|
|
29
29
|
type DebugExportedConfig = {
|
|
30
30
|
verbosity: string;
|
package/dist/otel/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/otel/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AAGzC,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,6BAA6B,EAAE,MAAM,oCAAoC,CAAC;AAEnF,yBAAiB,aAAa,CAAC;IAC7B,KAAY,QAAQ,GAAG;QACrB,IAAI,CAAC,EAAE,YAAY,CAAC,MAAM,CAAC;KAC5B,CAAC;IACF,KAAY,YAAY,GAAG,MAAM,QAAQ,CAAC;IAE1C,KAAY,SAAS,GAAG;QACtB,KAAK,CAAC,EAAE,cAAc,CAAC,MAAM,CAAC;QAC9B,cAAc,CAAC,EAAE,sBAAsB,CAAC,MAAM,CAAC;KAChD,GAAG;QACF,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,CAAC,MAAM,CAAC;KACvC,CAAC;IACF,KAAY,aAAa,GAAG,MAAM,SAAS,CAAC;IAE5C,KAAY,qBAAqB,GAAG;QAClC,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,CAAC;IAEF,KAAY,+BAA+B,GAAG;QAC5C,MAAM,EAAE,MAAM,CAAC;QACf,cAAc,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACrC,eAAe,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACtC,aAAa,CAAC,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/otel/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@studion/infra-code-blocks",
|
|
3
|
-
"version": "2.0.0-alpha.
|
|
3
|
+
"version": "2.0.0-alpha.3",
|
|
4
4
|
"description": "Studion common infra components",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"infrastructure",
|
|
@@ -62,6 +62,7 @@
|
|
|
62
62
|
"@aws-sdk/client-secrets-manager": "^3.973.5",
|
|
63
63
|
"@aws-sdk/client-servicediscovery": "^3.973.5",
|
|
64
64
|
"@aws-sdk/client-ssm": "^3.986.0",
|
|
65
|
+
"@aws-sdk/client-xray": "^3.989.0",
|
|
65
66
|
"@studion/prettier-config": "^0.1.0",
|
|
66
67
|
"@types/node": "^22",
|
|
67
68
|
"exponential-backoff": "^3.1.2",
|
|
@@ -73,7 +74,7 @@
|
|
|
73
74
|
"nanospinner": "^1.2.2",
|
|
74
75
|
"pathe": "^2.0.3",
|
|
75
76
|
"prettier": "^3.4.2",
|
|
76
|
-
"release-it": "^
|
|
77
|
+
"release-it": "^19.2.4",
|
|
77
78
|
"tstyche": "^4.0.0-beta.9",
|
|
78
79
|
"tsx": "^4.21.0",
|
|
79
80
|
"typescript": "^5.7.3",
|
|
@@ -82,6 +83,7 @@
|
|
|
82
83
|
"overrides": {
|
|
83
84
|
"@pulumi/pulumi": {
|
|
84
85
|
"glob": "10.5.0",
|
|
86
|
+
"minimatch": "10.2.2",
|
|
85
87
|
"tar": "7.5.9"
|
|
86
88
|
},
|
|
87
89
|
"@aws-sdk/core": {
|