@fy-stack/cli 0.0.142 → 0.0.144

package/dist/commands/assets/get-infra.js.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-infra.js.d.ts","sourceRoot":"","sources":["../../../src/commands/assets/get-infra.js.ts"],"names":[],"mappings":"AAEA,KAAK,kBAAkB,GAAG;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,wBAAgB,QAAQ,CAAC,MAAM,EAAE,kBAAkB;;;EAyClD"}
+{"version":3,"file":"get-infra.js.d.ts","sourceRoot":"","sources":["../../../src/commands/assets/get-infra.js.ts"],"names":[],"mappings":"AAEA,KAAK,kBAAkB,GAAG;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,wBAAgB,QAAQ,CAAC,MAAM,EAAE,kBAAkB;;;EA4DlD"}

package/dist/commands/assets/get-infra.js.js

@@ -6,6 +6,7 @@ function getInfra(params) {
     const infraFile = `#!/usr/bin/env node
 const cdk = require("aws-cdk-lib");
 const { FullStackConstruct, AppType } = require("@fy-stack/fullstack-construct");
+const { STSClient, GetCallerIdentityCommand } = require('@aws-sdk/client-sts');
 
 const env = {
   account: process.env.CDK_DEFAULT_ACCOUNT,
@@ -15,27 +16,40 @@ const env = {
 const environment = process.env.ENVIRONMENT
 if (!environment) throw new Error("ENVIRONMENT is required");
 
+const appName = ${params.app}
+
 class AppStack extends cdk.Stack {
   constructor(scope, id, props) {
     super(scope, id, props);
     
-    ${params.domain ? `const domainName = ${params.domain}` : ''}
+    ${params.domain
+        ? `const domainName = environment === 'production' ? ${params.domain} : \`\${environment}.${params.domain}\``
+        : ''}
 
     const app = new FullStackConstruct(this, "App", {
+      environment,
+      name: \${appName},
+      ownerArn: props.ownerArn,
       storage: { retainOnDelete: false },
       apps: {}
     });
-
-    cdk.Tags.of(this).add("App", "${params.app}");
   }
 }
 
-const app = new cdk.App();
-new AppStack(
-  app,
-  "app",
-  { env, stackName: \`${params.app}-\${process.env.ENVIRONMENT}\` }
-);`;
+(async () => {
+  const sts = new STSClient();
+  const res = await sts.send(new GetCallerIdentityCommand());
+  if (!res.Arn) throw new Error('caller not found');
+
+  const app = new cdk.App();
+  const stackName = \`\${appName}-\${environment}\`;
+
+  new AppStack(app, stackName, {
+    env,
+    stackName,
+    ownerArn: res.Arn,
+  });
+})();`;
     const cdkJsonFile = JSON.stringify((0, get_cdk_json_1.getCdkJson)({
         command: 'node infra.js',
     }), null, 2);

package/dist/commands/init-app.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init-app.d.ts","sourceRoot":"","sources":["../../src/commands/init-app.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAavC,wBAAsB,OAAO,CAAC,KAAK,EAAE,YAAY,iBA+JhD"}
+{"version":3,"file":"init-app.d.ts","sourceRoot":"","sources":["../../src/commands/init-app.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAavC,wBAAsB,OAAO,CAAC,KAAK,EAAE,YAAY,iBAgKhD"}

package/dist/commands/init-app.js

@@ -141,10 +141,11 @@ async function initApp(props) {
     const packageJsonFile = JSON.parse(fs.readFileSync(path.join(workingDir, 'package.json'), "utf8"));
     packageJsonFile["devDependencies"] = {
         ...packageJsonFile["devDependencies"],
-        "aws-cdk": "^2.174.1",
-        "aws-cdk-lib": "^2.174.1",
+        "aws-cdk": "^2.1016.1",
+        "aws-cdk-lib": "^2.198.0",
+        "@aws-sdk/client-sts": "^3.799.0",
         "constructs": "^10.4.2",
-        "@fy-stack/fullstack-construct": "^0.0.142"
+        "@fy-stack/fullstack-construct": "^0.0.144"
     };
     if (!fs.existsSync(cdkPath))
         fs.writeFileSync(cdkPath, cdkJsonFile);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fy-stack/cli",
-  "version": "0.0.142",
+  "version": "0.0.144",
   "dependencies": {
     "@aws-sdk/client-iam": "^3.731.1",
     "@aws-sdk/client-sts": "^3.731.1",