@aws/nx-plugin 0.117.0 → 0.119.0

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.
Files changed (55) hide show
  1. package/package.json +1 -1
  2. package/src/infra/app/generator.js +30 -18
  3. package/src/infra/app/generator.js.map +1 -1
  4. package/src/mcp-server/tools/create-workspace-command.js +5 -0
  5. package/src/mcp-server/tools/create-workspace-command.js.map +1 -1
  6. package/src/mcp-server/tools/general-guidance.js +3 -3
  7. package/src/mcp-server/tools/general-guidance.js.map +1 -1
  8. package/src/preset/__snapshots__/generator.spec.ts.snap +5 -1
  9. package/src/preset/generator.d.ts +1 -1
  10. package/src/preset/generator.js +29 -3
  11. package/src/preset/generator.js.map +1 -1
  12. package/src/preset/git-secrets-files/git-secrets-dir/git-secrets +206 -0
  13. package/src/preset/git-secrets-files/husky-dir/pre-commit +4 -0
  14. package/src/preset/schema.d.ts +5 -0
  15. package/src/preset/schema.json +13 -0
  16. package/src/py/agent/__snapshots__/generator.spec.ts.snap +2 -2
  17. package/src/py/agent/generator.js +4 -1
  18. package/src/py/agent/generator.js.map +1 -1
  19. package/src/py/mcp-server/__snapshots__/generator.spec.ts.snap +2 -2
  20. package/src/py/mcp-server/generator.js +4 -1
  21. package/src/py/mcp-server/generator.js.map +1 -1
  22. package/src/smithy/project/generator.js +3 -1
  23. package/src/smithy/project/generator.js.map +1 -1
  24. package/src/ts/agent/__snapshots__/generator.spec.ts.snap +2 -2
  25. package/src/ts/agent/files/ag-ui/index.ts.template +37 -0
  26. package/src/ts/agent/generator.js +31 -19
  27. package/src/ts/agent/generator.js.map +1 -1
  28. package/src/ts/agent/react-connection/generator.js +23 -1
  29. package/src/ts/agent/react-connection/generator.js.map +1 -1
  30. package/src/ts/agent/react-connection/serve-local.js +5 -1
  31. package/src/ts/agent/react-connection/serve-local.js.map +1 -1
  32. package/src/ts/agent/schema.json +1 -1
  33. package/src/ts/mcp-server/__snapshots__/generator.spec.ts.snap +2 -2
  34. package/src/ts/mcp-server/generator.js +4 -1
  35. package/src/ts/mcp-server/generator.js.map +1 -1
  36. package/src/ts/rdb/__snapshots__/generator.spec.ts.snap +128 -107
  37. package/src/ts/rdb/files/scripts/docker-pull.ts.template +11 -11
  38. package/src/ts/rdb/files/scripts/docker-start.ts.template +58 -56
  39. package/src/ts/rdb/generator.js +5 -6
  40. package/src/ts/rdb/generator.js.map +1 -1
  41. package/src/utils/agent-core-constructs/agent-core-constructs.d.ts +4 -0
  42. package/src/utils/agent-core-constructs/agent-core-constructs.js +3 -1
  43. package/src/utils/agent-core-constructs/agent-core-constructs.js.map +1 -1
  44. package/src/utils/agent-core-constructs/files/terraform/core/agent-core/runtime.tf.template +6 -6
  45. package/src/utils/config/index.d.ts +6 -0
  46. package/src/utils/config/index.js.map +1 -1
  47. package/src/utils/containers.d.ts +29 -0
  48. package/src/utils/containers.js +47 -0
  49. package/src/utils/containers.js.map +1 -0
  50. package/src/utils/rdb-constructs/files/terraform/app/dbs/__nameKebabCase__/__nameKebabCase__.tf.template +4 -4
  51. package/src/utils/rdb-constructs/rdb-constructs.d.ts +2 -0
  52. package/src/utils/rdb-constructs/rdb-constructs.js.map +1 -1
  53. package/src/utils/versions.d.ts +11 -3
  54. package/src/utils/versions.js +11 -3
  55. package/src/utils/versions.js.map +1 -1
@@ -23,83 +23,94 @@ datasource db {
23
23
  `;
24
24
 
25
25
  exports[`ts#rdb generator > should add mysql prisma dependencies when engine is MySQL > packages/db/scripts/docker-pull.ts 1`] = `
26
- "import Docker from 'dockerode';
27
- import { promisify } from 'util';
26
+ "import { spawnSync } from 'child_process';
28
27
 
29
- const docker = new Docker();
28
+ const ENGINE = 'docker';
30
29
  const image = process.argv[2];
31
30
 
32
- try {
33
- await docker.getImage(image).inspect();
34
- } catch (e) {
35
- if ((e as { statusCode?: number }).statusCode !== 404) throw e;
36
- const stream = (await promisify(docker.pull.bind(docker))(
37
- image,
38
- )) as NodeJS.ReadableStream;
39
- await promisify(docker.modem.followProgress.bind(docker.modem))(stream);
31
+ const inspect = spawnSync(ENGINE, ['image', 'inspect', image], {
32
+ stdio: 'ignore',
33
+ });
34
+
35
+ if (inspect.status !== 0) {
36
+ const pull = spawnSync(ENGINE, ['pull', image], { stdio: 'inherit' });
37
+ if (pull.status !== 0) {
38
+ process.exit(pull.status ?? 1);
39
+ }
40
40
  }
41
41
  "
42
42
  `;
43
43
 
44
44
  exports[`ts#rdb generator > should add mysql prisma dependencies when engine is MySQL > packages/db/scripts/docker-start.ts 1`] = `
45
- "import Docker from 'dockerode';
45
+ "import { spawn, spawnSync } from 'child_process';
46
+
47
+ const ENGINE = 'docker';
46
48
 
47
49
  const [containerName, image, hostPort, dbName, dbPassword] =
48
50
  process.argv.slice(2);
49
51
 
50
- const docker = new Docker();
52
+ const containerExists = (): boolean =>
53
+ spawnSync(ENGINE, ['container', 'inspect', containerName], {
54
+ stdio: 'ignore',
55
+ }).status === 0;
51
56
 
52
- let container: Docker.Container;
57
+ const isRunning = (): boolean => {
58
+ const result = spawnSync(
59
+ ENGINE,
60
+ ['container', 'inspect', '-f', '{{.State.Running}}', containerName],
61
+ { encoding: 'utf-8' },
62
+ );
63
+ return result.status === 0 && result.stdout.trim() === 'true';
64
+ };
53
65
 
54
- try {
55
- const existing = docker.getContainer(containerName);
56
- const info = await existing.inspect();
57
- container = existing;
58
- if (!info.State.Running) {
59
- await container.start();
66
+ if (containerExists()) {
67
+ if (!isRunning()) {
68
+ const start = spawnSync(ENGINE, ['start', containerName], {
69
+ stdio: 'inherit',
70
+ });
71
+ if (start.status !== 0) process.exit(start.status ?? 1);
60
72
  }
61
- } catch (e) {
62
- if ((e as { statusCode?: number }).statusCode !== 404) throw e;
63
- container = await docker.createContainer({
64
- name: containerName,
65
- Image: image,
66
- Env: [\`MYSQL_DATABASE=\${dbName}\`, \`MYSQL_ROOT_PASSWORD=\${dbPassword}\`],
67
- ExposedPorts: { '3306/tcp': {} },
68
- HostConfig: {
69
- AutoRemove: true,
70
- PortBindings: { '3306/tcp': [{ HostPort: hostPort }] },
71
- Binds: [\`\${containerName}-data:/var/lib/mysql\`],
72
- },
73
- });
74
- await container.start();
73
+ } else {
74
+ const runArgs = [
75
+ 'run',
76
+ '--name',
77
+ containerName,
78
+ '-e',
79
+ \`MYSQL_DATABASE=\${dbName}\`,
80
+ '-e',
81
+ \`MYSQL_ROOT_PASSWORD=\${dbPassword}\`,
82
+ '-p',
83
+ \`\${hostPort}:3306\`,
84
+ '-v',
85
+ \`\${containerName}-data:/var/lib/mysql\`,
86
+ '-d',
87
+ image,
88
+ ];
89
+ const create = spawnSync(ENGINE, runArgs, { stdio: 'inherit' });
90
+ if (create.status !== 0) process.exit(create.status ?? 1);
75
91
  }
76
92
 
77
- const stream = await container.attach({
78
- stream: true,
79
- stdout: true,
80
- stderr: true,
93
+ const logs = spawn(ENGINE, ['logs', '-f', containerName], {
94
+ stdio: ['ignore', 'inherit', 'inherit'],
81
95
  });
82
- container.modem.demuxStream(stream, process.stdout, process.stderr);
83
96
 
84
97
  let exiting = false;
85
98
 
86
- async function cleanup() {
99
+ const cleanup = () => {
87
100
  if (exiting) return;
88
101
  exiting = true;
89
- try {
90
- await container.stop();
91
- } catch (e) {
92
- if ((e as { statusCode?: number }).statusCode !== 404) console.error(e);
93
- }
102
+ spawnSync(ENGINE, ['stop', containerName], { stdio: 'ignore' });
103
+ logs.kill();
94
104
  process.exit(0);
95
- }
105
+ };
96
106
 
97
- process.on('SIGTERM', () => void cleanup());
98
- process.on('SIGINT', () => void cleanup());
99
- process.on('SIGHUP', () => void cleanup());
107
+ process.on('SIGTERM', cleanup);
108
+ process.on('SIGINT', cleanup);
109
+ process.on('SIGHUP', cleanup);
100
110
 
101
- const { StatusCode } = await container.wait();
102
- if (!exiting) process.exit(StatusCode);
111
+ logs.on('exit', (code) => {
112
+ if (!exiting) process.exit(code ?? 0);
113
+ });
103
114
  "
104
115
  `;
105
116
 
@@ -3814,88 +3825,98 @@ datasource db {
3814
3825
  `;
3815
3826
 
3816
3827
  exports[`ts#rdb generator > should generate the aurora shared construct > packages/db/scripts/docker-pull.ts 1`] = `
3817
- "import Docker from 'dockerode';
3818
- import { promisify } from 'util';
3828
+ "import { spawnSync } from 'child_process';
3819
3829
 
3820
- const docker = new Docker();
3830
+ const ENGINE = 'docker';
3821
3831
  const image = process.argv[2];
3822
3832
 
3823
- try {
3824
- await docker.getImage(image).inspect();
3825
- } catch (e) {
3826
- if ((e as { statusCode?: number }).statusCode !== 404) throw e;
3827
- const stream = (await promisify(docker.pull.bind(docker))(
3828
- image,
3829
- )) as NodeJS.ReadableStream;
3830
- await promisify(docker.modem.followProgress.bind(docker.modem))(stream);
3833
+ const inspect = spawnSync(ENGINE, ['image', 'inspect', image], {
3834
+ stdio: 'ignore',
3835
+ });
3836
+
3837
+ if (inspect.status !== 0) {
3838
+ const pull = spawnSync(ENGINE, ['pull', image], { stdio: 'inherit' });
3839
+ if (pull.status !== 0) {
3840
+ process.exit(pull.status ?? 1);
3841
+ }
3831
3842
  }
3832
3843
  "
3833
3844
  `;
3834
3845
 
3835
3846
  exports[`ts#rdb generator > should generate the aurora shared construct > packages/db/scripts/docker-start.ts 1`] = `
3836
- "import Docker from 'dockerode';
3847
+ "import { spawn, spawnSync } from 'child_process';
3848
+
3849
+ const ENGINE = 'docker';
3837
3850
 
3838
3851
  const [containerName, image, hostPort, dbName, dbUser, dbPassword] =
3839
3852
  process.argv.slice(2);
3840
3853
 
3841
- const docker = new Docker();
3854
+ const containerExists = (): boolean =>
3855
+ spawnSync(ENGINE, ['container', 'inspect', containerName], {
3856
+ stdio: 'ignore',
3857
+ }).status === 0;
3842
3858
 
3843
- let container: Docker.Container;
3859
+ const isRunning = (): boolean => {
3860
+ const result = spawnSync(
3861
+ ENGINE,
3862
+ ['container', 'inspect', '-f', '{{.State.Running}}', containerName],
3863
+ { encoding: 'utf-8' },
3864
+ );
3865
+ return result.status === 0 && result.stdout.trim() === 'true';
3866
+ };
3844
3867
 
3845
- try {
3846
- const existing = docker.getContainer(containerName);
3847
- const info = await existing.inspect();
3848
- container = existing;
3849
- if (!info.State.Running) {
3850
- await container.start();
3868
+ if (containerExists()) {
3869
+ if (!isRunning()) {
3870
+ const start = spawnSync(ENGINE, ['start', containerName], {
3871
+ stdio: 'inherit',
3872
+ });
3873
+ if (start.status !== 0) process.exit(start.status ?? 1);
3851
3874
  }
3852
- } catch (e) {
3853
- if ((e as { statusCode?: number }).statusCode !== 404) throw e;
3854
- container = await docker.createContainer({
3855
- name: containerName,
3856
- Image: image,
3857
- Env: [
3858
- \`POSTGRES_DB=\${dbName}\`,
3859
- \`POSTGRES_USER=\${dbUser}\`,
3860
- \`POSTGRES_PASSWORD=\${dbPassword}\`,
3861
- \`PGDATA=/var/lib/postgresql/17/docker\`,
3862
- ],
3863
- ExposedPorts: { '5432/tcp': {} },
3864
- HostConfig: {
3865
- AutoRemove: true,
3866
- PortBindings: { '5432/tcp': [{ HostPort: hostPort }] },
3867
- Binds: [\`\${containerName}-data:/var/lib/postgresql\`],
3868
- },
3869
- });
3870
- await container.start();
3875
+ } else {
3876
+ const runArgs = [
3877
+ 'run',
3878
+ '--name',
3879
+ containerName,
3880
+ '-e',
3881
+ \`POSTGRES_DB=\${dbName}\`,
3882
+ '-e',
3883
+ \`POSTGRES_USER=\${dbUser}\`,
3884
+ '-e',
3885
+ \`POSTGRES_PASSWORD=\${dbPassword}\`,
3886
+ '-e',
3887
+ \`PGDATA=/var/lib/postgresql/17/docker\`,
3888
+ '-p',
3889
+ \`\${hostPort}:5432\`,
3890
+ '-v',
3891
+ \`\${containerName}-data:/var/lib/postgresql\`,
3892
+ '-d',
3893
+ image,
3894
+ ];
3895
+ const create = spawnSync(ENGINE, runArgs, { stdio: 'inherit' });
3896
+ if (create.status !== 0) process.exit(create.status ?? 1);
3871
3897
  }
3872
3898
 
3873
- const stream = await container.attach({
3874
- stream: true,
3875
- stdout: true,
3876
- stderr: true,
3899
+ const logs = spawn(ENGINE, ['logs', '-f', containerName], {
3900
+ stdio: ['ignore', 'inherit', 'inherit'],
3877
3901
  });
3878
- container.modem.demuxStream(stream, process.stdout, process.stderr);
3879
3902
 
3880
3903
  let exiting = false;
3881
3904
 
3882
- async function cleanup() {
3905
+ const cleanup = () => {
3883
3906
  if (exiting) return;
3884
3907
  exiting = true;
3885
- try {
3886
- await container.stop();
3887
- } catch (e) {
3888
- if ((e as { statusCode?: number }).statusCode !== 404) console.error(e);
3889
- }
3908
+ spawnSync(ENGINE, ['stop', containerName], { stdio: 'ignore' });
3909
+ logs.kill();
3890
3910
  process.exit(0);
3891
- }
3911
+ };
3892
3912
 
3893
- process.on('SIGTERM', () => void cleanup());
3894
- process.on('SIGINT', () => void cleanup());
3895
- process.on('SIGHUP', () => void cleanup());
3913
+ process.on('SIGTERM', cleanup);
3914
+ process.on('SIGINT', cleanup);
3915
+ process.on('SIGHUP', cleanup);
3896
3916
 
3897
- const { StatusCode } = await container.wait();
3898
- if (!exiting) process.exit(StatusCode);
3917
+ logs.on('exit', (code) => {
3918
+ if (!exiting) process.exit(code ?? 0);
3919
+ });
3899
3920
  "
3900
3921
  `;
3901
3922
 
@@ -1,15 +1,15 @@
1
- import Docker from 'dockerode';
2
- import { promisify } from 'util';
1
+ import { spawnSync } from 'child_process';
3
2
 
4
- const docker = new Docker();
3
+ const ENGINE = '<%= containerEngine %>';
5
4
  const image = process.argv[2];
6
5
 
7
- try {
8
- await docker.getImage(image).inspect();
9
- } catch (e) {
10
- if ((e as { statusCode?: number }).statusCode !== 404) throw e;
11
- const stream = (await promisify(docker.pull.bind(docker))(
12
- image,
13
- )) as NodeJS.ReadableStream;
14
- await promisify(docker.modem.followProgress.bind(docker.modem))(stream);
6
+ const inspect = spawnSync(ENGINE, ['image', 'inspect', image], {
7
+ stdio: 'ignore',
8
+ });
9
+
10
+ if (inspect.status !== 0) {
11
+ const pull = spawnSync(ENGINE, ['pull', image], { stdio: 'inherit' });
12
+ if (pull.status !== 0) {
13
+ process.exit(pull.status ?? 1);
14
+ }
15
15
  }
@@ -1,4 +1,6 @@
1
- import Docker from 'dockerode';
1
+ import { spawn, spawnSync } from 'child_process';
2
+
3
+ const ENGINE = '<%= containerEngine %>';
2
4
 
3
5
  <%_ if (engine === 'MySQL') { _%>
4
6
  const [containerName, image, hostPort, dbName, dbPassword] =
@@ -8,75 +10,75 @@ const [containerName, image, hostPort, dbName, dbUser, dbPassword] =
8
10
  process.argv.slice(2);
9
11
  <%_ } _%>
10
12
 
11
- const docker = new Docker();
13
+ const containerExists = (): boolean =>
14
+ spawnSync(ENGINE, ['container', 'inspect', containerName], {
15
+ stdio: 'ignore',
16
+ }).status === 0;
12
17
 
13
- let container: Docker.Container;
18
+ const isRunning = (): boolean => {
19
+ const result = spawnSync(
20
+ ENGINE,
21
+ ['container', 'inspect', '-f', '{{.State.Running}}', containerName],
22
+ { encoding: 'utf-8' },
23
+ );
24
+ return result.status === 0 && result.stdout.trim() === 'true';
25
+ };
14
26
 
15
- try {
16
- const existing = docker.getContainer(containerName);
17
- const info = await existing.inspect();
18
- container = existing;
19
- if (!info.State.Running) {
20
- await container.start();
27
+ if (containerExists()) {
28
+ if (!isRunning()) {
29
+ const start = spawnSync(ENGINE, ['start', containerName], {
30
+ stdio: 'inherit',
31
+ });
32
+ if (start.status !== 0) process.exit(start.status ?? 1);
21
33
  }
22
- } catch (e) {
23
- if ((e as { statusCode?: number }).statusCode !== 404) throw e;
24
- container = await docker.createContainer({
25
- name: containerName,
34
+ } else {
26
35
  <%_ if (engine === 'MySQL') { _%>
27
- Image: image,
28
- Env: [
29
- `MYSQL_DATABASE=${dbName}`,
30
- `MYSQL_ROOT_PASSWORD=${dbPassword}`,
31
- ],
32
- ExposedPorts: { '3306/tcp': {} },
33
- HostConfig: {
34
- AutoRemove: true,
35
- PortBindings: { '3306/tcp': [{ HostPort: hostPort }] },
36
- Binds: [`${containerName}-data:/var/lib/mysql`],
37
- },
36
+ const runArgs = [
37
+ 'run',
38
+ '--name', containerName,
39
+ '-e', `MYSQL_DATABASE=${dbName}`,
40
+ '-e', `MYSQL_ROOT_PASSWORD=${dbPassword}`,
41
+ '-p', `${hostPort}:3306`,
42
+ '-v', `${containerName}-data:/var/lib/mysql`,
43
+ '-d',
44
+ image,
45
+ ];
38
46
  <%_ } else { _%>
39
- Image: image,
40
- Env: [
41
- `POSTGRES_DB=${dbName}`,
42
- `POSTGRES_USER=${dbUser}`,
43
- `POSTGRES_PASSWORD=${dbPassword}`,
44
- `PGDATA=/var/lib/postgresql/17/docker`,
45
- ],
46
- ExposedPorts: { '5432/tcp': {} },
47
- HostConfig: {
48
- AutoRemove: true,
49
- PortBindings: { '5432/tcp': [{ HostPort: hostPort }] },
50
- Binds: [`${containerName}-data:/var/lib/postgresql`],
51
- },
47
+ const runArgs = [
48
+ 'run',
49
+ '--name', containerName,
50
+ '-e', `POSTGRES_DB=${dbName}`,
51
+ '-e', `POSTGRES_USER=${dbUser}`,
52
+ '-e', `POSTGRES_PASSWORD=${dbPassword}`,
53
+ '-e', `PGDATA=/var/lib/postgresql/17/docker`,
54
+ '-p', `${hostPort}:5432`,
55
+ '-v', `${containerName}-data:/var/lib/postgresql`,
56
+ '-d',
57
+ image,
58
+ ];
52
59
  <%_ } _%>
53
- });
54
- await container.start();
60
+ const create = spawnSync(ENGINE, runArgs, { stdio: 'inherit' });
61
+ if (create.status !== 0) process.exit(create.status ?? 1);
55
62
  }
56
63
 
57
- const stream = await container.attach({
58
- stream: true,
59
- stdout: true,
60
- stderr: true,
64
+ const logs = spawn(ENGINE, ['logs', '-f', containerName], {
65
+ stdio: ['ignore', 'inherit', 'inherit'],
61
66
  });
62
- container.modem.demuxStream(stream, process.stdout, process.stderr);
63
67
 
64
68
  let exiting = false;
65
69
 
66
- async function cleanup() {
70
+ const cleanup = () => {
67
71
  if (exiting) return;
68
72
  exiting = true;
69
- try {
70
- await container.stop();
71
- } catch (e) {
72
- if ((e as { statusCode?: number }).statusCode !== 404) console.error(e);
73
- }
73
+ spawnSync(ENGINE, ['stop', containerName], { stdio: 'ignore' });
74
+ logs.kill();
74
75
  process.exit(0);
75
- }
76
+ };
76
77
 
77
- process.on('SIGTERM', () => void cleanup());
78
- process.on('SIGINT', () => void cleanup());
79
- process.on('SIGHUP', () => void cleanup());
78
+ process.on('SIGTERM', cleanup);
79
+ process.on('SIGINT', cleanup);
80
+ process.on('SIGHUP', cleanup);
80
81
 
81
- const { StatusCode } = await container.wait();
82
- if (!exiting) process.exit(StatusCode);
82
+ logs.on('exit', (code) => {
83
+ if (!exiting) process.exit(code ?? 0);
84
+ });
@@ -20,6 +20,7 @@ const eslint_1 = require("../lib/eslint");
20
20
  const bundle_1 = require("../../utils/bundle/bundle");
21
21
  const versions_1 = require("../../utils/versions");
22
22
  const iac_1 = require("../../utils/iac");
23
+ const containers_1 = require("../../utils/containers");
23
24
  const npm_scope_1 = require("../../utils/npm-scope");
24
25
  const git_1 = require("../../utils/git");
25
26
  const port_1 = require("../../utils/port");
@@ -31,6 +32,7 @@ const tsRdbGenerator = async (tree, options) => {
31
32
  const databaseUser = options.databaseUser ?? 'dbadmin';
32
33
  const databaseName = (0, names_1.snakeCase)(options.databaseName ?? options.name);
33
34
  const iacProvider = await (0, iac_1.resolveIacProvider)(tree, options.iacProvider);
35
+ const containerEngine = await (0, containers_1.resolveContainerEngine)(tree, 'Inherit');
34
36
  const { fullyQualifiedName, dir } = (0, generator_1.getTsLibDetails)(tree, {
35
37
  name: options.name,
36
38
  directory: options.directory,
@@ -65,6 +67,7 @@ const tsRdbGenerator = async (tree, options) => {
65
67
  localDbName: databaseName,
66
68
  localDbUser,
67
69
  localDbPassword,
70
+ containerEngine,
68
71
  };
69
72
  (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), dir, templateOptions);
70
73
  (0, git_1.updateGitIgnore)(tree, dir, (patterns) => [...patterns, 'generated/prisma']);
@@ -147,7 +150,7 @@ const tsRdbGenerator = async (tree, options) => {
147
150
  cache: true,
148
151
  executor: 'nx:run-commands',
149
152
  options: {
150
- command: `docker build --platform linux/arm64 --provenance=false -t ${dockerImageTag} ${migrationBundleDir}`,
153
+ command: `${containerEngine} build --platform linux/arm64 --provenance=false -t ${dockerImageTag} ${migrationBundleDir}`,
151
154
  },
152
155
  dependsOn: ['bundle'],
153
156
  };
@@ -171,6 +174,7 @@ const tsRdbGenerator = async (tree, options) => {
171
174
  migrationBundleDir,
172
175
  createDbUserBundleDir: (0, devkit_1.joinPathFragments)('dist', projectConfig.root, 'bundle', 'create-db-user'),
173
176
  dockerImageTag,
177
+ containerEngine,
174
178
  });
175
179
  (0, devkit_1.addDependenciesToPackageJson)(tree, (0, versions_1.withVersions)([
176
180
  '@aws-lambda-powertools/parameters',
@@ -184,8 +188,6 @@ const tsRdbGenerator = async (tree, options) => {
184
188
  ]), (0, versions_1.withVersions)([
185
189
  'prisma',
186
190
  'tsx',
187
- 'dockerode',
188
- '@types/dockerode',
189
191
  '@types/aws-lambda',
190
192
  ...(options.engine === 'MySQL'
191
193
  ? []
@@ -194,9 +196,6 @@ const tsRdbGenerator = async (tree, options) => {
194
196
  (0, pnpm_workspace_1.registerPnpmBuiltDependencies)(tree, {
195
197
  '@prisma/engines': false,
196
198
  prisma: false,
197
- ssh2: false,
198
- 'cpu-features': false,
199
- protobufjs: false,
200
199
  });
201
200
  await (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [exports.TS_RDB_GENERATOR_INFO]);
202
201
  await (0, format_1.formatFilesInSubtree)(tree);
@@ -1 +1 @@
1
- {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/ts/rdb/generator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/ts/rdb/generator.ts"],"names":[],"mappings":"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"}
@@ -4,6 +4,7 @@
4
4
  */
5
5
  import { Tree } from '@nx/devkit';
6
6
  import { IacProvider } from '../iac';
7
+ import { ContainerEngine } from '../containers';
7
8
  type IACProvider = {
8
9
  iacProvider: IacProvider;
9
10
  };
@@ -17,6 +18,7 @@ export interface AddAgentCoreInfraProps {
17
18
  appDirectory: string;
18
19
  serverProtocol: 'MCP' | 'HTTP' | 'A2A';
19
20
  auth: AgentCoreAuth;
21
+ containerEngine: ContainerEngine;
20
22
  }
21
23
  export interface AddMcpServerInfraProps {
22
24
  mcpServerNameClassName: string;
@@ -25,6 +27,7 @@ export interface AddMcpServerInfraProps {
25
27
  dockerImageTag: string;
26
28
  dockerOutputDir: string;
27
29
  auth: AgentCoreAuth;
30
+ containerEngine: ContainerEngine;
28
31
  }
29
32
  /**
30
33
  * Add an MCP server CDK construct
@@ -38,6 +41,7 @@ export interface AddAgentInfraProps {
38
41
  dockerOutputDir: string;
39
42
  auth: AgentCoreAuth;
40
43
  serverProtocol?: 'HTTP' | 'A2A';
44
+ containerEngine: ContainerEngine;
41
45
  }
42
46
  /**
43
47
  * Add an agent CDK construct
@@ -45,7 +45,7 @@ const addAgentCoreCDKInfra = async (tree, options) => {
45
45
  };
46
46
  const addAgentCoreTerraformInfra = (tree, options) => {
47
47
  // Add the AgentCore shared module
48
- (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'terraform', 'core', 'agent-core'), (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_TERRAFORM_DIR, 'src', 'core', 'agent-core'), {}, {
48
+ (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'terraform', 'core', 'agent-core'), (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_TERRAFORM_DIR, 'src', 'core', 'agent-core'), { containerEngine: options.containerEngine }, {
49
49
  overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
50
50
  });
51
51
  // Generate app specific agent core configuration
@@ -67,6 +67,7 @@ const addMcpServerInfra = async (tree, options) => {
67
67
  serverProtocol: 'MCP',
68
68
  iacProvider: options.iacProvider,
69
69
  auth: options.auth,
70
+ containerEngine: options.containerEngine,
70
71
  });
71
72
  };
72
73
  exports.addMcpServerInfra = addMcpServerInfra;
@@ -84,6 +85,7 @@ const addAgentInfra = async (tree, options) => {
84
85
  serverProtocol: options.serverProtocol ?? 'HTTP',
85
86
  iacProvider: options.iacProvider,
86
87
  auth: options.auth,
88
+ containerEngine: options.containerEngine,
87
89
  });
88
90
  };
89
91
  exports.addAgentInfra = addAgentInfra;
@@ -1 +1 @@
1
- {"version":3,"file":"agent-core-constructs.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/utils/agent-core-constructs/agent-core-constructs.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"agent-core-constructs.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/utils/agent-core-constructs/agent-core-constructs.ts"],"names":[],"mappings":"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"}