@aws/ml-container-creator 0.2.5 → 0.3.0

package/bin/cli.js

@@ -90,6 +90,9 @@ program
 
     // --- Authentication ---
     .addOption(new Option('--hf-token <token>', 'HuggingFace token (or "$HF_TOKEN" for env var reference)'))
+    .addOption(new Option('--hf-token-arn <arn>', 'HuggingFace token ARN from Secrets Manager'))
+    .addOption(new Option('--ngc-token <token>', 'NVIDIA NGC token (or "$NGC_API_KEY" for env var reference)'))
+    .addOption(new Option('--ngc-token-arn <arn>', 'NVIDIA NGC token ARN from Secrets Manager'))
 
     // --- Optional Features ---
     .addOption(new Option('--include-sample', 'Include sample model code'))
@@ -101,11 +104,23 @@ program
     .addOption(new Option('--discover', 'Enable live registry lookups via MCP discovery'))
 
     // --- Validation ---
+    .addOption(new Option('--no-validate', 'Skip schema-driven validation at generation time'))
     .addOption(new Option('--validate-env-vars', 'Enable environment variable validation (default: true)'))
     .addOption(new Option('--validate-with-docker', 'Enable Docker introspection validation (opt-in)'))
     .addOption(new Option('--offline', 'Disable HuggingFace API lookups'))
 
-    .action((projectNameArgs, options) => run(projectNameArgs?.[0] || null, options));
+    .action((projectNameArgs, options) => {
+        // Mutual exclusion validation: plaintext token and ARN flags cannot both be provided
+        if (options.hfToken && options.hfTokenArn) {
+            console.error('❌ Cannot specify both --hf-token and --hf-token-arn. Use one or the other.');
+            process.exit(1);
+        }
+        if (options.ngcToken && options.ngcTokenArn) {
+            console.error('❌ Cannot specify both --ngc-token and --ngc-token-arn. Use one or the other.');
+            process.exit(1);
+        }
+        return run(projectNameArgs?.[0] || null, options);
+    });
 
 // Custom help formatting — group options into logical sections (root command only)
 program.configureHelp({
@@ -173,13 +188,13 @@ program.configureHelp({
                 groups.hyperpod.push(opt);
             } else if (['--model-env', '--server-env'].includes(long)) {
                 groups.env.push(opt);
-            } else if (['--hf-token'].includes(long)) {
+            } else if (['--hf-token', '--hf-token-arn', '--ngc-token', '--ngc-token-arn'].includes(long)) {
                 groups.auth.push(opt);
             } else if (['--include-sample', '--include-testing', '--test-types'].includes(long)) {
                 groups.features.push(opt);
             } else if (['--smart', '--discover'].includes(long)) {
                 groups.mcp.push(opt);
-            } else if (['--validate-env-vars', '--validate-with-docker', '--offline'].includes(long)) {
+            } else if (['--validate-env-vars', '--validate-with-docker', '--offline', '--no-validate'].includes(long)) {
                 groups.validation.push(opt);
             } else {
                 groups.general.push(opt);
@@ -241,7 +256,7 @@ program
     .command('bootstrap')
     .description('Set up AWS infrastructure (IAM role, ECR repo, S3 buckets)')
     .passThroughOptions()
-    .argument('[action]', 'Bootstrap action (status, use, list, remove, scan, prune, update)')
+    .argument('[action]', 'Bootstrap action (status, use, list, remove, scan, prune, update, sync-schemas)')
     .argument('[args...]', 'Additional arguments')
     .option('--profile <profile>', 'AWS profile name')
     .option('--region <region>', 'AWS region')
@@ -250,6 +265,11 @@ program
     .option('--force', 'Force removal without confirmation')
     .option('--verify', 'Verify resources exist (for status)')
     .option('--delete-stack', 'Delete CloudFormation stack on remove')
+    .option('--ignore-staleness', 'Suppress schema staleness warnings')
+    .option('--ci', 'Provision CI integration infrastructure')
+    .option('--skip-ci', 'Skip CI infrastructure provisioning')
+    .option('--skip-s3', 'Skip S3 bucket creation')
+    .option('--skip-post-setup', 'Skip post-setup chain (mcp init, sync-architectures, sync-schemas)')
     .action(async (action, args, options) => {
         const { default: BootstrapCommandHandler } = await import('../src/lib/bootstrap-command-handler.js');
         const handler = new BootstrapCommandHandler();
@@ -309,12 +329,33 @@ program
     .option('--project', 'Use project-level registry')
     .option('--parameters <json>', 'Parameters JSON string')
     .option('--generator-version <version>', 'Generator version')
+    // Options used by `registry list-architectures`
+    .option('--server <name>', 'Filter by server name (for list-architectures)')
+    .option('--verbose', 'Show full list of supported model types (for list-architectures)')
     .action(async (action, args, options) => {
         const { default: RegistryCommandHandler } = await import('../src/lib/registry-command-handler.js');
         const handler = new RegistryCommandHandler();
         await handler.handle([action, ...args], options);
     });
 
+program
+    .command('secrets')
+    .description('Manage secrets in AWS Secrets Manager (create, list, describe)')
+    .argument('[action]', 'Secrets action (create, list, describe)')
+    .argument('[args...]', 'Additional arguments')
+    .option('--type <type>', 'Secret type (e.g., hf-token, ngc-token)')
+    .option('--name <label>', 'Secret label (used in naming convention)')
+    .option('--secret-value <value>', 'Secret value (masked in terminal)')
+    .option('--description <text>', 'Secret description')
+    .option('--kms-key-id <key>', 'KMS key for encryption')
+    .option('--json <json-or-path>', 'JSON input (inline or file://path)')
+    .action(async (action, args, options) => {
+        const { default: SecretsCommandHandler } = await import('../src/lib/secrets-command-handler.js');
+        const handler = new SecretsCommandHandler();
+        const allArgs = action ? [action, ...args] : [];
+        await handler.handle(allArgs, options);
+    });
+
 program
     .command('configure')
     .description('Interactive configuration setup (experimental)')

package/config/bootstrap-stack.json

@@ -105,6 +105,20 @@
                     "arn:aws:s3:::ml-container-creator-*",
                     "arn:aws:s3:::ml-container-creator-*/*"
                   ]
+                },
+                {
+                  "Sid": "SecretsManagerRead",
+                  "Effect": "Allow",
+                  "Action": [
+                    "secretsmanager:GetSecretValue",
+                    "secretsmanager:DescribeSecret"
+                  ],
+                  "Resource": "arn:aws:secretsmanager:*:*:secret:mlcc/*",
+                  "Condition": {
+                    "StringEquals": {
+                      "aws:ResourceTag/mlcc:managed-by": "ml-container-creator"
+                    }
+                  }
                 }
               ]
             }

package/infra/ci-harness/package-lock.json

@@ -48,7 +48,6 @@
         "semver"
       ],
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "jsonschema": "~1.4.1",
         "semver": "^7.7.4"
@@ -2151,7 +2150,6 @@
       "integrity": "sha512-wGdMcf+vPYM6jikpS/qhg6WiqSV/OhG+jeeHT/KlVqxYfD40iYJf9/AE1uQxVWFvU7MipKRkRv8NSHiCGgPr8Q==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "undici-types": "~6.21.0"
       }
@@ -2791,8 +2789,7 @@
       "version": "10.6.0",
       "resolved": "https://registry.npmjs.org/constructs/-/constructs-10.6.0.tgz",
       "integrity": "sha512-TxHOnBO5zMo/G76ykzGF/wMpEHu257TbWiIxP9K0Yv/+t70UzgBQiTqjkAsWOPC6jW91DzJI0+ehQV6xDRNBuQ==",
-      "license": "Apache-2.0",
-      "peer": true
+      "license": "Apache-2.0"
     },
     "node_modules/create-require": {
       "version": "1.1.1",
@@ -2937,9 +2934,9 @@
       }
     },
     "node_modules/fast-xml-builder": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/fast-xml-builder/-/fast-xml-builder-1.1.5.tgz",
-      "integrity": "sha512-4TJn/8FKLeslLAH3dnohXqE3QSoxkhvaMzepOIZytwJXZO69Bfz0HBdDHzOTOon6G59Zrk6VQ2bEiv1t61rfkA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/fast-xml-builder/-/fast-xml-builder-1.2.0.tgz",
+      "integrity": "sha512-00aAWieqff+ZJhsXA4g1g7M8k+7AYoMUUHF+/zFb5U6Uv/P0Vl4QZo84/IcufzYalLuEj9928bXN9PbbFzMF0Q==",
       "dev": true,
       "funding": [
         {
@@ -2949,7 +2946,8 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "path-expression-matcher": "^1.1.3"
+        "path-expression-matcher": "^1.5.0",
+        "xml-naming": "^0.1.0"
       }
     },
     "node_modules/fast-xml-parser": {
@@ -3696,7 +3694,6 @@
       "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
       "dev": true,
       "license": "Apache-2.0",
-      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -3837,6 +3834,22 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
+    "node_modules/xml-naming": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/xml-naming/-/xml-naming-0.1.0.tgz",
+      "integrity": "sha512-k8KO9hrMyNk6tUWqUfkTEZbezRRpONVOzUTnc97VnCvyj6Tf9lyUR9EDAIeiVLv56jsMcoXEwjW8Kv5yPY52lw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/NaturalIntelligence"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
     "node_modules/y18n": {
       "version": "5.0.8",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws/ml-container-creator",
-  "version": "0.2.5",
+  "version": "0.3.0",
   "description": "Generator for SageMaker AI BYOC paradigm for predictive inference use-cases.",
   "type": "module",
   "main": "src/app.js",
@@ -19,25 +19,23 @@
     "bin/",
     "src/",
     "templates/",
-    "servers/base-image-picker/catalogs/",
+    "servers/lib/catalogs/",
     "servers/base-image-picker/index.js",
     "servers/base-image-picker/manifest.json",
     "servers/base-image-picker/package.json",
-    "servers/instance-recommender/catalogs/",
-    "servers/instance-recommender/index.js",
-    "servers/instance-recommender/manifest.json",
-    "servers/instance-recommender/package.json",
-    "servers/model-picker/catalogs/",
     "servers/model-picker/index.js",
     "servers/model-picker/manifest.json",
     "servers/model-picker/package.json",
-    "servers/region-picker/catalogs/",
     "servers/region-picker/index.js",
     "servers/region-picker/manifest.json",
     "servers/region-picker/package.json",
     "servers/hyperpod-cluster-picker/index.js",
     "servers/hyperpod-cluster-picker/manifest.json",
     "servers/hyperpod-cluster-picker/package.json",
+    "servers/instance-sizer/lib/",
+    "servers/instance-sizer/index.js",
+    "servers/instance-sizer/manifest.json",
+    "servers/instance-sizer/package.json",
     "servers/lib/bedrock-client.js",
     "servers/lib/custom-validators.js",
     "servers/lib/dynamic-resolver.js",
@@ -91,6 +89,7 @@
     "dev": "npm link && ml-container-creator",
     "clean": "rm -rf test-output-*",
     "validate": "npm run lint && npm run test:all",
+    "validate:catalogs": "node scripts/validate-catalog-enums.js",
     "validate:namespaces": "node scripts/validate-namespaces.js",
     "docs:serve": "mkdocs serve",
     "docs:build": "mkdocs build",

package/servers/base-image-picker/index.js

@@ -104,9 +104,9 @@ let PYTHON_SLIM_CATALOG
 let TRITON_IMAGE_CATALOG
 
 try {
-    TRANSFORMER_IMAGE_CATALOG = loadCatalog('./catalogs/model-servers.json')
-    PYTHON_SLIM_CATALOG = loadCatalog('./catalogs/python-slim.json')
-    TRITON_IMAGE_CATALOG = loadCatalog('./catalogs/triton.json')
+    TRANSFORMER_IMAGE_CATALOG = loadCatalog('../lib/catalogs/model-servers.json')
+    PYTHON_SLIM_CATALOG = loadCatalog('../lib/catalogs/python-slim.json')
+    TRITON_IMAGE_CATALOG = loadCatalog('../lib/catalogs/triton.json')
 } catch (err) {
     process.stderr.write(`[base-image-picker] Fatal: ${err.message}\n`)
     process.exit(1)

package/servers/base-image-picker/manifest.json

@@ -8,8 +8,10 @@
         "discover": true
     },
     "catalogs": {
-        "model-servers": "./catalogs/model-servers.json",
-        "python-slim": "./catalogs/python-slim.json"
+        "model-servers": "../lib/catalogs/model-servers.json",
+        "python-slim": "../lib/catalogs/python-slim.json",
+        "triton": "../lib/catalogs/triton.json",
+        "triton-backends": "../lib/catalogs/triton-backends.json"
     },
     "tool": {
         "name": "get_base_images"