fjall 2.23.0 → 2.23.1

package/bin/assets/generators/compute/generator.js

@@ -431,7 +431,7 @@ ${o}`)}throw r}}function Yi(e,t){let n=F.createSourceFile("infrastructure.ts",e,
 `;return i.push(`Custom code from line ${t.originalLine} could not be positioned. Added at end of file.`),e+`
 `+r+t.sourceText}function ah(e,t,n){if(!t||t.length===0)return{content:e,success:!0};try{let i=Ex(e),r=St(i),o=[],a=jR(t),c=e;for(let u of a){let l=FR(i,r,u,n,o);c=UR(c,u,l,o)}return{content:c,success:!0,warnings:o.length>0?o:void 0}}catch(i){return Ax(i,e)}}function LR(e,t,n,i){if(!t.afterManagedResource)return null;let r=t.afterManagedResource,o=(r.name&&n?.get(r.name))??r.name,a=e.find(u=>u.type===r.type&&u.resourceName===o);if(a)return a.endPos;let c=e.filter(u=>u.type===r.type&&u.isManaged);return c.length===1?c[0].endPos:(i&&i.push(`Resource ${ih(t.afterManagedResource.type,t.afterManagedResource.name)} not found. Custom code may be orphaned.`),null)}function FR(e,t,n,i,r){switch(n.position){case"before-imports":return 0;case"after-imports":return xx(t,"import")?.endPos??0;case"after-app-init":return nh(t,"app-init")?.endPos??null;case"after-tags":return nh(t,"tags")?.endPos??null;case"after-resource":return LR(t,n,i,r);case"end-of-file":return e.getEnd();default:return null}}function ZR(e,t,n){let i=Ix(e,t),r=n.sourceText;return r=$x(i,r)+r,r.endsWith(`
 `)||(r+=`
-`),r}import*as Ht from"typescript";var Ji=s.enum(["A","AAAA","CNAME","MX","TXT","NS","SRV","CAA"]),BR=s.object({name:s.string(),type:Ji,ttl:s.number().optional(),value:s.string(),priority:s.number().optional(),weight:s.number().optional(),port:s.number().optional()}).strict(),VR=s.object({subdomain:s.string(),targetAccount:s.string(),auto:s.boolean()}).strict(),GR=s.object({domainName:s.string(),subjectAlternativeNames:s.array(s.string())}).strict(),W9=s.object({origin:s.string(),ttl:s.number(),records:s.array(BR),delegations:s.array(VR),certificates:s.array(GR)}).strict(),wx=Object.freeze({ORIGIN:"$ORIGIN",TTL:"$TTL",FJALL_DELEGATE:"$FJALL-DELEGATE",FJALL_CERT:"$FJALL-CERT"});var Nx=s.discriminatedUnion("kind",[s.object({kind:s.literal("ecs"),appName:s.string()}).strict(),s.object({kind:s.literal("cdn"),appName:s.string()}).strict(),s.object({kind:s.literal("bucket"),bucketName:s.string()}).strict(),s.object({kind:s.literal("custom"),dnsName:s.string(),hostedZoneId:s.string()}).strict()]),WR=Nx.options.map(e=>e.shape.kind.value),sh=s.enum(["A","AAAA"]),ch=s.enum(["route53","external-delegated","external-records"]),HR=s.object({kind:s.literal("standard"),type:s.enum(["A","AAAA","CNAME","MX","TXT","NS","SRV","CAA"]),name:s.string(),value:s.union([s.string(),s.array(s.string())]),ttl:s.number().int().positive().optional()}).strict(),qR=s.object({kind:s.literal("alias"),type:sh,name:s.string(),target:Nx}).strict(),KR=s.discriminatedUnion("kind",[HR,qR]),XR=s.object({domainName:s.string(),subjectAlternativeNames:s.array(s.string()).optional(),transparencyLogging:s.boolean().optional()}).strict(),YR=s.object({subdomain:s.string(),toAccount:s.string(),auto:s.boolean().optional()}).strict(),K9=s.object({zoneName:s.string(),registrar:ch,hostedZoneId:s.string().optional(),delegatedSubdomain:s.string().optional(),records:s.array(KR),certificates:s.array(XR),delegations:s.array(YR)}).strict().refine(e=>e.registrar!=="external-delegated"||e.delegatedSubdomain!==void 0,{message:"external-delegated requires delegatedSubdomain"}).refine(e=>e.registrar!=="external-records"||e.delegations.length===0,{message:"external-records forbids delegations"});var t3=ch.options,r3=Ji.options,n3=sh.options;function cc(e,t){let n=[Ff(e),Lf(e),Uf(e)];if(Vf(e))n.push(Qs(e),ec(e));else{let r=Bf(e);n.push(ec(e),Cf(e),Rf(e),Mf(e),zf(e),jf(e),Df(e,r),Zf(e))}let i=n.join("");if(e.customCodeBlocks&&e.customCodeBlocks.length>0){let r=ah(i,e.customCodeBlocks,t?.resourceMapping);return r.success?ke(r.content):Ce(new Error(`Custom code injection failed: ${r.error??"unknown error"}`))}return ke(i)}var P3=OS("standard");var iG=new Set(Ji.options);var dG=JSON.stringify({compilerOptions:{target:"ES2020",module:"commonjs",lib:["es2020","dom"],declaration:!0,strict:!0,noImplicitAny:!0,strictNullChecks:!0,noImplicitThis:!0,alwaysStrict:!0,noUnusedLocals:!1,noUnusedParameters:!1,noImplicitReturns:!0,noFallthroughCasesInSwitch:!1,inlineSourceMap:!0,inlineSources:!0,experimentalDecorators:!0,strictPropertyInitialization:!1,typeRoots:["./node_modules/@types"]},exclude:["node_modules","cdk.out"]},null,2)+`
+`),r}import*as Ht from"typescript";var Ji=s.enum(["A","AAAA","CNAME","MX","TXT","NS","SRV","CAA"]),BR=s.object({name:s.string(),type:Ji,ttl:s.number().optional(),value:s.string(),priority:s.number().optional(),weight:s.number().optional(),port:s.number().optional()}).strict(),VR=s.object({subdomain:s.string(),targetAccount:s.string(),auto:s.boolean()}).strict(),GR=s.object({domainName:s.string(),subjectAlternativeNames:s.array(s.string())}).strict(),W3=s.object({origin:s.string(),ttl:s.number(),records:s.array(BR),delegations:s.array(VR),certificates:s.array(GR)}).strict(),wx=Object.freeze({ORIGIN:"$ORIGIN",TTL:"$TTL",FJALL_DELEGATE:"$FJALL-DELEGATE",FJALL_CERT:"$FJALL-CERT"});var Nx=s.discriminatedUnion("kind",[s.object({kind:s.literal("ecs"),appName:s.string()}).strict(),s.object({kind:s.literal("cdn"),appName:s.string()}).strict(),s.object({kind:s.literal("bucket"),bucketName:s.string()}).strict(),s.object({kind:s.literal("custom"),dnsName:s.string(),hostedZoneId:s.string()}).strict()]),WR=Nx.options.map(e=>e.shape.kind.value),sh=s.enum(["A","AAAA"]),ch=s.enum(["route53","external-delegated","external-records"]),HR=s.object({kind:s.literal("standard"),type:s.enum(["A","AAAA","CNAME","MX","TXT","NS","SRV","CAA"]),name:s.string(),value:s.union([s.string(),s.array(s.string())]),ttl:s.number().int().positive().optional()}).strict(),qR=s.object({kind:s.literal("alias"),type:sh,name:s.string(),target:Nx}).strict(),KR=s.discriminatedUnion("kind",[HR,qR]),XR=s.object({domainName:s.string(),subjectAlternativeNames:s.array(s.string()).optional(),transparencyLogging:s.boolean().optional()}).strict(),YR=s.object({subdomain:s.string(),toAccount:s.string(),auto:s.boolean().optional()}).strict(),K3=s.object({zoneName:s.string(),registrar:ch,hostedZoneId:s.string().optional(),delegatedSubdomain:s.string().optional(),records:s.array(KR),certificates:s.array(XR),delegations:s.array(YR)}).strict().refine(e=>e.registrar!=="external-delegated"||e.delegatedSubdomain!==void 0,{message:"external-delegated requires delegatedSubdomain"}).refine(e=>e.registrar!=="external-records"||e.delegations.length===0,{message:"external-records forbids delegations"});var t9=ch.options,r9=Ji.options,n9=sh.options;function cc(e,t){let n=[Ff(e),Lf(e),Uf(e)];if(Vf(e))n.push(Qs(e),ec(e));else{let r=Bf(e);n.push(ec(e),Cf(e),Rf(e),Mf(e),zf(e),jf(e),Df(e,r),Zf(e))}let i=n.join("");if(e.customCodeBlocks&&e.customCodeBlocks.length>0){let r=ah(i,e.customCodeBlocks,t?.resourceMapping);return r.success?ke(r.content):Ce(new Error(`Custom code injection failed: ${r.error??"unknown error"}`))}return ke(i)}var P9=OS("standard");var iG=new Set(Ji.options);var dG=JSON.stringify({compilerOptions:{target:"ES2020",module:"commonjs",lib:["es2020","dom"],declaration:!0,strict:!0,noImplicitAny:!0,strictNullChecks:!0,noImplicitThis:!0,alwaysStrict:!0,noUnusedLocals:!1,noUnusedParameters:!1,noImplicitReturns:!0,noFallthroughCasesInSwitch:!1,inlineSourceMap:!0,inlineSources:!0,experimentalDecorators:!0,strictPropertyInitialization:!1,typeRoots:["./node_modules/@types"]},exclude:["node_modules","cdk.out"]},null,2)+`
 `,mG=JSON.stringify({app:"npx ts-node --prefer-ts-exts --transpile-only infrastructure.ts",assetMetadata:!1,pathMetadata:!1,versionReporting:!1,watch:{include:["**"],exclude:["README.md","cdk*.json","**/*.d.ts","**/*.js","tsconfig.json","package*.json","yarn.lock","node_modules","test"]},context:{"@aws-cdk/aws-lambda:recognizeLayerVersion":!0,"@aws-cdk/core:checkSecretUsage":!0,"@aws-cdk/core:target-partitions":["aws","aws-cn"],"@aws-cdk-containers/ecs-service-extensions:enableDefaultLogDriver":!0,"@aws-cdk/aws-ec2:uniqueImdsv2TemplateName":!0,"@aws-cdk/aws-ecs:arnFormatIncludesClusterName":!0,"@aws-cdk/aws-iam:minimizePolicies":!0,"@aws-cdk/core:validateSnapshotRemovalPolicy":!0,"@aws-cdk/aws-codepipeline:crossAccountKeyAliasStackSafeResourceName":!0,"@aws-cdk/aws-s3:createDefaultLoggingPolicy":!0,"@aws-cdk/aws-sns-subscriptions:restrictSqsDescryption":!0,"@aws-cdk/aws-apigateway:disableCloudWatchRole":!0,"@aws-cdk/core:enablePartitionLiterals":!0,"@aws-cdk/aws-events:eventsTargetQueueSameAccount":!0,"@aws-cdk/aws-iam:standardizedServicePrincipals":!0,"@aws-cdk/aws-ecs:disableExplicitDeploymentControllerForCircuitBreaker":!0,"@aws-cdk/aws-iam:importedRoleStackSafeDefaultPolicyName":!0,"@aws-cdk/aws-s3:serverAccessLogsUseBucketPolicy":!0,"@aws-cdk/aws-route53-patters:useCertificate":!0,"@aws-cdk/customresources:installLatestAwsSdkDefault":!1,"@aws-cdk/aws-rds:databaseProxyUniqueResourceName":!0,"@aws-cdk/aws-codedeploy:removeAlarmsFromDeploymentGroup":!0,"@aws-cdk/aws-apigateway:authorizerChangeDeploymentLogicalId":!0,"@aws-cdk/aws-ec2:launchTemplateDefaultUserData":!0,"@aws-cdk/aws-secretsmanager:useAttachedSecretResourcePolicyForSecretTargetAttachments":!0,"@aws-cdk/aws-redshift:columnId":!0,"@aws-cdk/aws-stepfunctions-tasks:enableEmrServicePolicyV2":!0,"@aws-cdk/aws-ec2:restrictDefaultSecurityGroup":!0,"@aws-cdk/aws-apigateway:requestValidatorUniqueId":!0,"@aws-cdk/aws-kms:aliasNameRef":!0,"@aws-cdk/aws-autoscaling:generateLaunchTemplateInsteadOfLaunchConfig":!0,"@aws-cdk/core:includePrefixInUniqueNameGeneration":!0,"@aws-cdk/aws-opensearchservice:enableOpensearchMultiAzWithStandby":!0}},null,2)+`
 `;function uP(e,t,n){let i=e.root?kx.join(e.root,t):t;try{if(wn.existsSync(i)){let r=`${i}.bak`,o=`${r}.tmp`;wn.writeFileSync(o,n),wn.renameSync(o,r)}return ke(void 0)}catch(r){let o=Rt(r);return fs.warn("Generator",`Failed to create backup of ${t}`,{error:Mn(o.message)}),Ce(o)}}function lP(e,t){try{let n=Yi(e,{extractCustomCode:!0}),i=Xi(n,t,{skipValidation:!0});return n.customCodeBlocks?.length&&(i.customCodeBlocks=n.customCodeBlocks),ke({parsed:n,plan:i})}catch(n){return Ce(Rt(n))}}function dP(e,t){let n=lP(e,t);if(!n.success)throw new Error(`Failed to parse infrastructure: ${n.error.message}`,{cause:n.error});return n.data}function mP(e,t,n){let i=e.safeParse(t);if(!i.success)throw new Error(`Invalid ${n} generator options:
 ${Ts(i.error)}`);return i.data}function pP(e,t){let n=Pn(t),i=e.read(n)?.toString();if(!i)throw new Error(`App '${t}' not found. Expected infrastructure.ts at: ${n}`);return{path:n,content:i}}async function Cx(e,t,n,i,r){let o=mP(t,n,i),{path:a,content:c}=pP(e,o.appName),{plan:u}=dP(c,o.appName),l=await r({tree:e,validated:o,plan:u,infrastructurePath:a,content:c}),m=fP(e,a,c,l);if(!m.success)throw new Error(m.error.message,{cause:m.error})}function fP(e,t,n,i){let r=cc(i);if(!r.success)return Ce(r.error);let o=uP(e,t,n);return o.success?(e.write(t,r.data),ke(void 0)):Ce(new Error(`Failed to create backup: ${o.error.message}`))}var Rx=1e3;function Px(e,t,n){if(!mo(e,t,n))return n;let i=n.match(/^(.+?)(\d*)$/);if(!i)return n;let r=i[1],o=i[2]?parseInt(i[2],10)+1:2;for(let a=o;a<=o+Rx;a++){let c=`${r}${a}`;if(!mo(e,t,c))return c}return`${r}${o+Rx}`}var yg=yA(uA(),1);async function lA(e,t,n,i){let r=`Connect to existing ${t}?`,o=`Found ${e} ${t}s. Configure connections?`,a=e===1?n??r:i?.replace("{count}",String(e))??o,c=await(0,yg.default)([{type:"confirm",name:"shouldConnect",message:a,initial:!0}]);return c?c.shouldConnect:!1}async function dA(e,t,n){if(e.length===1)return process.stdout.write(`

package/bin/assets/generators/shared/files/package.json

@@ -1,6 +1,6 @@
 {
   "name": "<%= packageName %>",
-  "version": "2.23.0",
+  "version": "2.23.1",
   "type": "module",
   "scripts": {},
   "devDependencies": {
@@ -9,7 +9,7 @@
     "typescript": "~6.0.3"
   },
   "dependencies": {
-    "@fjall/components-infrastructure": "^2.23.0",
+    "@fjall/components-infrastructure": "^2.23.1",
     "aws-cdk-lib": "^2.260.0",
     "constructs": "^10.6.0"
   }