@studion/infra-code-blocks 2.0.0-alpha.5 → 2.0.0-alpha.6

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.
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/cloudfront/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/cloudfront/index.ts"],"names":[],"mappings":"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"}
@@ -36,10 +36,10 @@ class CloudFront extends pulumi.ComponentResource {
36
36
  origins: this.createDistributionOrigins(behaviors),
37
37
  defaultCache: this.getCacheBehavior(defaultBehavior),
38
38
  orderedCaches: orderedBehaviors.length
39
- ? orderedBehaviors.map((it, idx) => ({
39
+ ? orderedBehaviors.map((it, idx) => this.getCacheBehavior(it, idx).apply(behavior => ({
40
40
  pathPattern: it.pathPattern,
41
- ...this.getCacheBehavior(it, idx),
42
- }))
41
+ ...behavior,
42
+ })))
43
43
  : undefined,
44
44
  domain,
45
45
  certificate: certificate || this.acmCertificate
@@ -105,27 +105,22 @@ class CloudFront extends pulumi.ComponentResource {
105
105
  bucket: behavior.bucket,
106
106
  cacheTtl: behavior.cacheTtl,
107
107
  }, { parent: this });
108
- return strategy.config;
108
+ return pulumi.output(strategy.config);
109
109
  }
110
110
  else if (isLbBehaviorType(behavior)) {
111
111
  const strategy = new lb_cache_strategy_1.LbCacheStrategy(getStrategyName('lb'), {
112
112
  pathPattern: behavior.pathPattern,
113
113
  loadBalancer: behavior.loadBalancer,
114
114
  }, { parent: this });
115
- return strategy.config;
115
+ return pulumi.output(strategy.config);
116
116
  }
117
117
  else if (isCustomBehaviorType(behavior)) {
118
- return {
118
+ return isS3Domain(behavior.domainName).apply(isS3 => ({
119
119
  targetOriginId: behavior.originId,
120
- allowedMethods: behavior.allowedMethods ?? [
121
- 'GET',
122
- 'HEAD',
123
- 'OPTIONS',
124
- 'PUT',
125
- 'POST',
126
- 'PATCH',
127
- 'DELETE',
128
- ],
120
+ allowedMethods: behavior.allowedMethods ??
121
+ (isS3
122
+ ? ['GET', 'HEAD']
123
+ : ['GET', 'HEAD', 'OPTIONS', 'PUT', 'POST', 'PATCH', 'DELETE']),
129
124
  cachedMethods: behavior.cachedMethods ?? ['GET', 'HEAD'],
130
125
  ...(behavior.compress != null && { compress: behavior.compress }),
131
126
  viewerProtocolPolicy: 'redirect-to-https',
@@ -134,20 +129,20 @@ class CloudFront extends pulumi.ComponentResource {
134
129
  .getCachePolicyOutput({ name: 'Managed-CachingDisabled' })
135
130
  .apply(p => p.id),
136
131
  originRequestPolicyId: behavior.originRequestPolicyId ??
137
- isS3Domain(behavior.domainName).apply(isS3 => aws.cloudfront
138
- .getOriginRequestPolicyOutput({
139
- name: isS3
140
- ? 'Managed-CORS-S3Origin'
141
- : 'Managed-AllViewerExceptHostHeader',
142
- })
143
- .apply(p => p.id)),
132
+ (isS3
133
+ ? undefined
134
+ : aws.cloudfront
135
+ .getOriginRequestPolicyOutput({
136
+ name: 'Managed-AllViewerExceptHostHeader',
137
+ })
138
+ .apply(p => p.id)),
144
139
  responseHeadersPolicyId: behavior.responseHeadersPolicyId ??
145
140
  aws.cloudfront
146
141
  .getResponseHeadersPolicyOutput({
147
142
  name: 'Managed-SecurityHeadersPolicy',
148
143
  })
149
144
  .apply(p => p.id),
150
- };
145
+ }));
151
146
  }
152
147
  else {
153
148
  throw new Error('Unknown CloudFront behavior encountered during mapping to distribution cache behaviors.');
@@ -205,7 +200,7 @@ class CloudFront extends pulumi.ComponentResource {
205
200
  });
206
201
  }
207
202
  createAliasRecord({ hostedZoneId, }) {
208
- return this.distribution.aliases.apply(aliases => aliases?.map((alias, index) => new aws.route53.Record(`${this.name}-cloudfront-alias-record-${index}`, {
203
+ return this.distribution.aliases.apply(aliases => aliases?.map((alias, index) => new aws.route53.Record(`${this.name}-dns-a-record-${index}`, {
209
204
  type: 'A',
210
205
  name: alias,
211
206
  zoneId: hostedZoneId,
@@ -208,7 +208,7 @@ class WebServer extends pulumi.ComponentResource {
208
208
  const certOutput = pulumi.output(certificate);
209
209
  return pulumi
210
210
  .all([domain, certOutput.domainName, certOutput.subjectAlternativeNames])
211
- .apply(([domain, certDomain, certSans = []]) => (domain ? [domain] : [...new Set([certDomain, ...certSans])]).map((alias, index) => new aws.route53.Record(`${this.name}-route53-record${index === 0 ? '' : `-${index}`}`, {
211
+ .apply(([domain, certDomain, certSans = []]) => (domain ? [domain] : [...new Set([certDomain, ...certSans])]).map((alias, index) => new aws.route53.Record(`${this.name}-dns-a-record-${index}`, {
212
212
  type: 'A',
213
213
  name: alias,
214
214
  zoneId: hostedZoneId,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@studion/infra-code-blocks",
3
- "version": "2.0.0-alpha.5",
3
+ "version": "2.0.0-alpha.6",
4
4
  "description": "Studion common infra components",
5
5
  "keywords": [
6
6
  "infrastructure",
@@ -35,41 +35,41 @@
35
35
  },
36
36
  "prettier": "@studion/prettier-config",
37
37
  "dependencies": {
38
- "@pulumi/aws": "^7.21.0",
39
- "@pulumi/aws-native": "^1.56.0",
40
- "@pulumi/awsx": "^3.2.1",
41
- "@pulumi/pulumi": "^3.225.0",
38
+ "@pulumi/aws": "^7.23.0",
39
+ "@pulumi/aws-native": "^1.57.0",
40
+ "@pulumi/awsx": "^3.3.0",
41
+ "@pulumi/pulumi": "^3.226.0",
42
42
  "@pulumi/random": "^4.19.1",
43
43
  "@pulumiverse/grafana": "^2.21.0",
44
44
  "@upstash/pulumi": "^0.5.0",
45
45
  "yaml": "^2.8.2"
46
46
  },
47
47
  "devDependencies": {
48
- "@aws-sdk/client-acm": "^3.1002.0",
49
- "@aws-sdk/client-application-auto-scaling": "^3.1002.0",
50
- "@aws-sdk/client-cloudfront": "^3.1002.0",
51
- "@aws-sdk/client-cloudwatch-logs": "^3.1002.0",
52
- "@aws-sdk/client-ec2": "^3.1002.0",
53
- "@aws-sdk/client-ecs": "^3.1002.0",
54
- "@aws-sdk/client-efs": "^3.1002.0",
55
- "@aws-sdk/client-elastic-load-balancing-v2": "^3.1002.0",
56
- "@aws-sdk/client-elasticache": "^3.1002.0",
57
- "@aws-sdk/client-iam": "^3.1002.0",
58
- "@aws-sdk/client-kms": "^3.1002.0",
59
- "@aws-sdk/client-rds": "^3.1002.0",
60
- "@aws-sdk/client-route-53": "^3.1002.0",
61
- "@aws-sdk/client-s3": "^3.1002.0",
62
- "@aws-sdk/client-secrets-manager": "^3.1002.0",
63
- "@aws-sdk/client-servicediscovery": "^3.1002.0",
64
- "@aws-sdk/client-ssm": "^3.1002.0",
65
- "@aws-sdk/client-xray": "^3.1002.0",
48
+ "@aws-sdk/client-acm": "^3.1009.0",
49
+ "@aws-sdk/client-application-auto-scaling": "^3.1009.0",
50
+ "@aws-sdk/client-cloudfront": "^3.1009.0",
51
+ "@aws-sdk/client-cloudwatch-logs": "^3.1009.0",
52
+ "@aws-sdk/client-ec2": "^3.1009.0",
53
+ "@aws-sdk/client-ecs": "^3.1009.0",
54
+ "@aws-sdk/client-efs": "^3.1009.0",
55
+ "@aws-sdk/client-elastic-load-balancing-v2": "^3.1009.0",
56
+ "@aws-sdk/client-elasticache": "^3.1009.0",
57
+ "@aws-sdk/client-iam": "^3.1009.0",
58
+ "@aws-sdk/client-kms": "^3.1009.0",
59
+ "@aws-sdk/client-rds": "^3.1009.0",
60
+ "@aws-sdk/client-route-53": "^3.1009.0",
61
+ "@aws-sdk/client-s3": "^3.1009.0",
62
+ "@aws-sdk/client-secrets-manager": "^3.1009.0",
63
+ "@aws-sdk/client-servicediscovery": "^3.1009.0",
64
+ "@aws-sdk/client-ssm": "^3.1009.0",
65
+ "@aws-sdk/client-xray": "^3.1009.0",
66
66
  "@studion/prettier-config": "^0.1.0",
67
67
  "@types/node": "^25",
68
68
  "exponential-backoff": "^3.1.3",
69
69
  "http-status": "^2.1.0",
70
70
  "husky": "^9.1.7",
71
71
  "ioredis": "^5.10.0",
72
- "lint-staged": "^16.3.2",
72
+ "lint-staged": "^16.4.0",
73
73
  "mime": "^4.1.0",
74
74
  "nanospinner": "^1.2.2",
75
75
  "pathe": "^2.0.3",
@@ -78,7 +78,12 @@
78
78
  "tstyche": "^6.2.0",
79
79
  "tsx": "^4.21.0",
80
80
  "typescript": "^5.9.3",
81
- "undici": "^7.22.0"
81
+ "undici": "^7.24.4"
82
+ },
83
+ "overrides": {
84
+ "release-it": {
85
+ "undici": "6.24.1"
86
+ }
82
87
  },
83
88
  "publishConfig": {
84
89
  "access": "public"