aws-lambda-layer-cli 1.4.1 → 2.0.2

package/README.md

@@ -4,384 +4,87 @@ A command-line tool for creating and publishing AWS Lambda layers for Node.js an
 
 ## Features
 
-- **Create Layers**: Generate Lambda layer zip files for Node.js and Python
-- **Publish to AWS**: Directly publish layers to AWS Lambda with IAM credentials
-- **Version Management**: Support for package version specification
-- **Security**: Input validation and sanitization
-- **Smart Naming**: Automatic layer naming with package versions
-- **Multiple Packages**: Support for multiple packages in a single layer
-- **Runtime Versioning**: Specify Node.js or Python versions
-- **Package Managers**: Support for npm (Node.js) and uv/pip (Python)
-- **AWS Profile Support**: Use different AWS profiles for publishing
-- **Region Specification**: Target specific AWS regions
+- Create and publish Lambda layers for Node.js (npm) and Python (uv/pip)
+- Automatic version management and smart naming
+- Direct publishing to AWS with IAM credentials and region support
+- Support for multiple packages in a single layer
 
 ## Installation
 
-### Package managers (recommended)
-
-These installs do **not** write to `/usr/local` and do **not** require `sudo`.
+### Package Managers (Recommended)
 
 #### npm (Node.js)
-
 ```bash
 npm i -g aws-lambda-layer-cli
-aws-lambda-layer --help
-```
-
-#### pip (Python)
-
-```bash
-python -m pip install --user aws-lambda-layer-cli
-aws-lambda-layer --help
 ```
 
 #### uv (Python)
-
 ```bash
 uv tool install aws-lambda-layer-cli
-aws-lambda-layer --help
 ```
 
-### Linux/macOS
-
-```bash
-# Clone or download the repository
-git clone <repository-url>
-cd aws-lambda-layer-cli
-
-# Run installation script (requires sudo)
-sudo ./scripts/install.sh
-```
-
-The installation will:
-- Copy scripts to `/usr/local/lib/aws-lambda-layer`
-- Create a symlink in `/usr/local/bin` for global access
-- Install shell completions for bash and zsh
-
-### Windows
-
-#### Option 1: PowerShell (Recommended)
-
-```powershell
-# One-liner installation
-powershell -ExecutionPolicy ByPass -c "irm https://raw.githubusercontent.com/yukcw/aws-lambda-layer-cli/main/scripts/install.ps1 | iex"
-```
-
-Or download and run manually:
-
-```powershell
-# Download the installer
-Invoke-WebRequest -Uri "https://raw.githubusercontent.com/yukcw/aws-lambda-layer-cli/main/scripts/install.ps1" -OutFile "install.ps1"
-
-# Run the installer (as Administrator)
-.\install.ps1
-```
-
-This will:
-- Download the tool to `%USERPROFILE%\.aws-lambda-layer`
-- Add it to your PATH
-- Create Windows wrapper scripts
-
-#### Option 2: Manual Installation
-
-1. Install prerequisites:
-   - [Git for Windows](https://gitforwindows.org/) (includes Git Bash)
-   - [AWS CLI](https://aws.amazon.com/cli/) (for publish command)
-
-2. Download the scripts from the [repository](https://github.com/yukcw/aws-lambda-layer-cli)
-
-3. Extract to a directory and add to PATH
-
 ### Requirements
+- **System**: Linux, macOS, or Windows (WSL recommended)
+- **Tools**: `zip`, `aws-cli` (for publishing), `node` (for Node.js layers), `python` (for Python layers)
 
-- **Linux/macOS**: Bash shell
-- **Windows**: Windows Subsystem for Linux (WSL) (recommended), or Git Bash/Cygwin
-- **AWS CLI**: Required for `publish` command
-- **Node.js**: Required for Node.js layer creation
-- **Python**: Required for Python layer creation (uv recommended)
-- **zip**: Required for creating zip archives
-
-**Note**: If using WSL, ensure that AWS CLI, Node.js, Python, and zip are installed within WSL for proper functionality.
-
-## Uninstallation
-
-### Package managers
-
-```bash
-# npm
-npm uninstall -g aws-lambda-layer-cli
-
-# pip
-python -m pip uninstall aws-lambda-layer-cli
-
-# uv
-uv tool uninstall aws-lambda-layer-cli
-```
-
-### Linux/macOS
-
-```bash
-sudo ./scripts/uninstall.sh
-```
-
-### Windows
-
-#### Using PowerShell
-
-```powershell
-# Download and run the uninstaller
-Invoke-WebRequest -Uri "https://raw.githubusercontent.com/yukcw/aws-lambda-layer-cli/main/scripts/uninstall.ps1" -OutFile "uninstall.ps1"
-.\uninstall.ps1
-```
-
-Or run directly without downloading:
-
-```powershell
-powershell -ExecutionPolicy ByPass -c "irm https://raw.githubusercontent.com/yukcw/aws-lambda-layer-cli/main/scripts/uninstall.ps1 | iex"
-```
-#### Troubleshooting Windows Installation
-
-If you encounter issues:
-
-1. **"bash: command not found"**
-   - Install [Git for Windows](https://gitforwindows.org/) or [WSL](https://docs.microsoft.com/en-us/windows/wsl/install)
-   - Restart PowerShell/Command Prompt after installation
-
-2. **"No such file or directory"**
-   - Try running: `bash "$env:USERPROFILE\.aws-lambda-layer\aws-lambda-layer" --help`
-   - Or reinstall: `powershell -ExecutionPolicy ByPass -c "irm https://raw.githubusercontent.com/yukcw/aws-lambda-layer-cli/main/scripts/install.ps1 | iex"`
-
-3. **Permission issues**
-   - Run PowerShell as Administrator
-   - Or run: `Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser`
 ## Usage
 
-### Basic Syntax
-
 ```bash
-# Create a local zip file
-aws-lambda-layer zip --nodejs <packages> [options]
-aws-lambda-layer zip --python <packages> [options]
-
-# Publish directly to AWS
-aws-lambda-layer publish --nodejs <packages> [options]
-aws-lambda-layer publish --python <packages> [options]
+aws-lambda-layer-cli <command> [options]
 ```
 
 ### Commands
-
-- **zip**: Create and package a Lambda layer as zip file
-- **publish**: Create and publish a Lambda layer to AWS (uses IAM credentials)
-- **help**: Show help message
-
-### Runtime Options
-
-- `--nodejs`, `--node`, `-n`: Create a Node.js Lambda layer
-- `--python`, `--py`, `-p`: Create a Python Lambda layer
-- `--runtime=RUNTIME`: Specify runtime (nodejs or python)
-
-### Common Options
-
-- `--name`: Name for the output zip file / layer name
-- `--description`: Description for the layer (publish command only)
-- `-h`, `--help`: Show help message
-
-### AWS Options (publish command only)
-
-- `--profile`: AWS CLI profile to use (default: default profile)
-- `--region`: AWS region (e.g., us-east-1, ap-east-1)
-
-### Node.js Specific Options
-
-- `--node-version`: Node.js version (default: 24)
-
-### Python Specific Options
-
-- `--python-version`: Python version (default: 3.14)
-- `--no-uv`: Use pip/venv instead of uv
+- `zip`: Create a local zip file
+- `publish`: Create and publish a layer to AWS
+- `completion`: Generate shell completion scripts
+- `uninstall`: Uninstall the tool
+- `help`: Show help message
+
+### Options
+
+| Option | Description |
+|--------|-------------|
+| `--nodejs, -n <pkgs>` | Create Node.js layer (comma-separated packages) |
+| `--python, -p <pkgs>` | Create Python layer (comma-separated packages) |
+| `--name` | Custom layer name |
+| `--description` | Layer description (publish only) |
+| `--profile` | AWS CLI profile (publish only) |
+| `--region` | AWS region (publish only) |
+| `--node-version` | Node.js version (default: 24) |
+| `--python-version` | Python version (default: 3.14) |
+| `--no-uv` | Use pip/venv instead of uv |
+| `-v, --version` | Show version |
 
 ## Examples
 
-### Node.js Examples
-
-#### Create Local Zip Files
-
-```bash
-# Single package with version
-aws-lambda-layer zip --nodejs express@4.18.2
-
-# Multiple packages with versions
-aws-lambda-layer zip --nodejs express@4.18.2,axios@1.6.2,lodash@4.17.21
-
-# With custom name
-aws-lambda-layer zip --nodejs axios,lodash --name utility-layer
-
-# With specific Node.js version
-aws-lambda-layer zip --nodejs express@4.18.2 --node-version 20
-
-# Scoped packages
-aws-lambda-layer zip --nodejs @babel/core@7.23.0,@babel/types@7.23.0
-```
-
-#### Publish to AWS
-
-```bash
-# Basic publish
-aws-lambda-layer publish --nodejs express@4.18.2 --description "Express layer"
-
-# With custom layer name
-aws-lambda-layer publish --nodejs date-fns,uuid --name utility-layer --description "Utility packages"
-
-# Using specific AWS profile
-aws-lambda-layer publish --nodejs express@4.18.2 --profile production --description "Express layer"
-
-# Specify AWS region
-aws-lambda-layer publish --nodejs axios --region ap-east-1 --description "Axios layer"
-
-# With both profile and region
-aws-lambda-layer publish --nodejs lodash --profile dev --region us-east-1 --description "Lodash layer"
-```
-
-### Python Examples
-
-#### Create Local Zip Files
-
+### Node.js
 ```bash
-# Single package with version
-aws-lambda-layer zip --python numpy==1.26.0
-
-# Multiple packages
-aws-lambda-layer zip --python numpy==1.26.0,pandas==2.1.3,requests>=2.31.0
-
-# With custom name
-aws-lambda-layer zip --python requests,pytz --name web-utils
+# Create local zip with multiple packages
+aws-lambda-layer-cli zip --nodejs express@4.18.2,axios --name my-layer
 
-# With specific Python version
-aws-lambda-layer zip --python numpy==1.26.0 --python-version 3.12
-
-# Using pip instead of uv
-aws-lambda-layer zip --python pandas==2.1.3 --no-uv
+# Publish to AWS with specific profile and region
+aws-lambda-layer-cli publish --nodejs lodash --profile prod --region us-east-1 --description "Utils"
 ```
 
-#### Publish to AWS
-
+### Python
 ```bash
-# Basic publish
-aws-lambda-layer publish --python numpy==1.26.0 --description "NumPy layer"
+# Create local zip with specific python version
+aws-lambda-layer-cli zip --python numpy==1.26.0,pandas --python-version 3.12
 
-# Multiple packages with description
-aws-lambda-layer publish --python requests==2.31.0,pytz==2023.3 --description "Web utilities"
-
-# Using specific AWS profile
-aws-lambda-layer publish --python pandas==2.1.3 --profile production --description "Pandas layer"
-
-# Specify AWS region
-aws-lambda-layer publish --python numpy==1.26.0 --region us-west-2 --description "NumPy layer"
-
-# With both profile and region
-aws-lambda-layer publish --python scikit-learn --profile ml-account --region eu-west-1 --description "ML layer"
+# Publish to AWS
+aws-lambda-layer-cli publish --python requests --name web-layer
 ```
 
-## Package Version Formats
-
-### Node.js
-- `express@4.18.2` - Exact version
-- `axios` - Latest version
-- `lodash@^4.17.0` - Compatible version
-- `@babel/core@7.23.0,@babel/types@7.23.0` - Multiple scoped packages
-
-### Python
-- `numpy==1.26.0` - Exact version
-- `pandas` - Latest version
-- `requests>=2.31.0` - Minimum version
-- `pytz~=2023.3` - Compatible version
-
-## Publishing to AWS
-
-### Requirements
-
-Before using the `publish` command, ensure you have:
-
-1. **AWS CLI installed and configured**
-   ```bash
-   aws configure
-   # or for specific profile
-   aws configure --profile production
-   ```
-
-2. **IAM Permissions**: Your IAM user/role needs:
-   - `lambda:PublishLayerVersion`
-   - `sts:GetCallerIdentity` (for account verification)
-   - `iam:ListAccountAliases` (optional, for account info)
-
-3. **Region Configuration**: Either:
-   - Set default region: `aws configure set region us-east-1`
-   - Or use `--region` flag when publishing
-
-4. **zip command installed**: Ensure the `zip` command is available on your system.
-
-### Confirmation Prompt
-
-When publishing, you'll see:
-1. AWS Account ID
-2. AWS Profile (if specified)
-3. Account Aliases (if available)
-4. Target Region
-5. Confirmation prompt: `Do you want to proceed? [Y/n]:`
-
-Press Y (or Enter for default Yes) to proceed, or N to cancel.
-
-## Output
-
-### Zip Command
-Creates a zip file in the current directory with format:
-- Node.js: `<package-name>-<version>-nodejs<node-version>.zip`
-- Python: `<package-name>-<version>-python<python-version>.zip`
-
-### Publish Command
-- Uploads layer to AWS Lambda
-- Returns Layer ARN
-- Shows usage examples
-- Provides command to attach to existing Lambda functions
-
-## Troubleshooting
-
-### Common Issues
-
-1. **AWS credentials not configured**
-   ```bash
-   aws configure
-   # or
-   aws configure --profile your-profile
-   ```
-
-2. **IAM permissions missing**
-   - Ensure your AWS credentials has `lambda:PublishLayerVersion` permission
-
-3. **Layer name already exists**
-   - Use `--name` option to specify a different name
-   - Or delete the existing layer version
-
-4. **Zip file too large**
-   - AWS limit: 50MB for direct upload
-   - Consider using fewer packages or S3 upload for larger layers
-
-5. **Region not configured**
-   - Use `--region` flag or configure default region:
-   ```bash
-   aws configure set region us-east-1
-   ```
-
 ## Shell Completion
 
-Completions are installed for bash and zsh. Restart your shell or source the completion files:
+Add to your shell config (`~/.bashrc` or `~/.zshrc`):
 
 ```bash
 # Bash
-source /etc/bash_completion.d/aws-lambda-layer-completion.bash
+source <(aws-lambda-layer-cli completion --bash)
 
 # Zsh
-source /usr/local/share/zsh/site-functions/_aws-lambda-layer
+source <(aws-lambda-layer-cli completion --zsh)
 ```
 
 ## License

package/bin/aws-lambda-layer-cli.js

@@ -0,0 +1,183 @@
+#!/usr/bin/env node
+
+'use strict';
+
+const { spawnSync } = require('child_process');
+const fs = require('fs');
+const path = require('path');
+
+function which(cmd) {
+  const isWin = process.platform === 'win32';
+  const exts = isWin ? (process.env.PATHEXT || '.EXE;.CMD;.BAT;.COM').split(';') : [''];
+  const paths = (process.env.PATH || '').split(path.delimiter);
+
+  for (const p of paths) {
+    if (!p) continue;
+    for (const ext of exts) {
+      const full = path.join(p, isWin ? cmd + ext.toLowerCase() : cmd);
+      if (fs.existsSync(full)) return full;
+      // Also check original case on Windows
+      const full2 = path.join(p, cmd + ext);
+      if (fs.existsSync(full2)) return full2;
+    }
+  }
+  return null;
+}
+
+function shQuote(s) {
+  // Single-quote for bash -lc
+  return `'${String(s).replace(/'/g, `'\\''`)}'`;
+}
+
+function windowsPathToWsl(p) {
+  // C:\Users\me\x -> /mnt/c/Users/me/x
+  const m = /^([a-zA-Z]):\\(.*)$/.exec(p);
+  if (!m) return null;
+  return `/mnt/${m[1].toLowerCase()}/${m[2].replace(/\\/g, '/')}`;
+}
+
+function cygpathConvert(mode, p) {
+  const cygpath = which('cygpath');
+  if (!cygpath) return null;
+  const res = spawnSync(cygpath, [mode, p], { encoding: 'utf8' });
+  if (res.status !== 0) return null;
+  return (res.stdout || '').trim();
+}
+
+function run(cmd, args) {
+  const res = spawnSync(cmd, args, { stdio: 'inherit' });
+  process.exit(res.status ?? 1);
+}
+
+const args = process.argv.slice(2);
+
+if (args[0] === 'completion') {
+  const hasZsh = args.includes('--zsh');
+  const hasBash = args.includes('--bash');
+  
+  if (args.includes('--help') || args.includes('-h') || (!hasZsh && !hasBash)) {
+    const GREEN = '\x1b[0;32m';
+    const YELLOW = '\x1b[0;33m';
+    const BLUE = '\x1b[0;34m';
+    const MAGENTA = '\x1b[0;35m';
+    const NC = '\x1b[0m';
+    const UNDERLINE = '\x1b[4m';
+
+    console.log(`${BLUE}Usage:${NC}`);
+    console.log(`  aws-lambda-layer-cli ${GREEN}completion${NC} [options]`);
+    console.log('');
+    console.log(`${BLUE}Options:${NC}`);
+    console.log(`  ${YELLOW}--zsh${NC}     Output zsh completion script`);
+    console.log(`  ${YELLOW}--bash${NC}    Output bash completion script`);
+    console.log('');
+    console.log(`${MAGENTA}${UNDERLINE}Examples:${NC}`);
+    console.log('  # Load completion in current shell');
+    console.log(`  source <(aws-lambda-layer-cli ${GREEN}completion${NC} ${YELLOW}--bash${NC})`);
+    console.log('');
+    console.log('  # Add to .zshrc');
+    console.log(`  aws-lambda-layer-cli ${GREEN}completion${NC} ${YELLOW}--zsh${NC} >> ~/.zshrc`);
+    process.exit(0);
+  }
+
+  const completionDir = path.resolve(__dirname, '..', 'completion');
+  let shell = '';
+
+  if (hasZsh) {
+    shell = 'zsh';
+  } else if (hasBash) {
+    shell = 'bash';
+  }
+
+  if (shell === 'zsh') {
+    const file = path.join(completionDir, 'aws-lambda-layer-completion.zsh');
+    if (fs.existsSync(file)) {
+      let content = fs.readFileSync(file, 'utf8');
+      // Remove the auto-execution line if present, to make it safe for sourcing
+      content = content.replace(/_aws-lambda-layer-cli "\$@"\s*$/, '');
+      console.log(content);
+      console.log('\n# Register completion');
+      console.log('if type compdef &>/dev/null; then');
+      console.log('  compdef _aws-lambda-layer-cli aws-lambda-layer-cli');
+      console.log('fi');
+    } else {
+      console.error('Completion script not found for zsh');
+      process.exit(1);
+    }
+  } else {
+    // bash
+    const file = path.join(completionDir, 'aws-lambda-layer-completion.bash');
+    if (fs.existsSync(file)) {
+      console.log(fs.readFileSync(file, 'utf8'));
+    } else {
+      console.error('Completion script not found for bash');
+      process.exit(1);
+    }
+  }
+  process.exit(0);
+}
+
+if (args[0] === 'uninstall') {
+  if (args.includes('--help') || args.includes('-h')) {
+    const GREEN = '\x1b[0;32m';
+    const BLUE = '\x1b[0;34m';
+    const NC = '\x1b[0m';
+    
+    console.log(`${BLUE}Usage:${NC}`);
+    console.log(`  aws-lambda-layer-cli ${GREEN}uninstall${NC}`);
+    console.log('');
+    console.log(`${BLUE}Description:${NC}`);
+    console.log('  Uninstalls the AWS Lambda Layer CLI tool and removes all associated files.');
+    console.log('  This includes:');
+    console.log('  - The CLI executable and symlinks');
+    console.log('  - The installation directory');
+    console.log('  - Shell completion scripts');
+    process.exit(0);
+  }
+
+  const uninstallScript = path.resolve(__dirname, '..', 'scripts', 'uninstall.js');
+  if (fs.existsSync(uninstallScript)) {
+    run(process.execPath, [uninstallScript, ...args.slice(1)]);
+  } else {
+    console.error('Uninstall script not found');
+    process.exit(1);
+  }
+  return;
+}
+
+const bashScript = path.resolve(__dirname, '..', 'scripts', 'aws-lambda-layer-cli');
+
+if (!fs.existsSync(bashScript)) {
+  console.error('Error: packaged bash script not found:', bashScript);
+  process.exit(1);
+}
+
+// POSIX platforms
+if (process.platform !== 'win32') {
+  run('bash', [bashScript, ...args]);
+}
+
+// Windows platforms:
+// - Prefer Git Bash / MSYS / Cygwin: convert to POSIX path using cygpath -u
+// - Else attempt WSL: convert to /mnt/<drive>/... and run via wsl.exe
+// - Else give a clear message
+
+const posixPath = cygpathConvert('-u', bashScript);
+if (posixPath) {
+  run('bash', [posixPath, ...args]);
+}
+
+const wsl = which('wsl.exe') || which('wsl');
+if (wsl) {
+  const wslPath = windowsPathToWsl(bashScript);
+  if (!wslPath) {
+    console.error('Error: unable to convert path for WSL:', bashScript);
+    process.exit(1);
+  }
+
+  const cmd = `bash ${shQuote(wslPath)} ${args.map(shQuote).join(' ')}`.trim();
+  run(wsl, ['bash', '-lc', cmd]);
+}
+
+console.error('Error: no compatible bash found on Windows.');
+console.error('Install and run this tool inside WSL, or install Git Bash and ensure `bash`/`cygpath` are on PATH.');
+process.exit(1);

package/completion/aws-lambda-layer-completion.bash

@@ -1,8 +1,12 @@
-# bash completion for aws-lambda-layer
+# bash completion for aws-lambda-layer-cli
 
-_aws_lambda_layer() {
+_aws_lambda_layer_cli() {
     local cur prev words cword
-    _init_completion || return
+    # Use fallback variables for older bash versions
+    cur="${COMP_WORDS[COMP_CWORD]}"
+    prev="${COMP_WORDS[COMP_CWORD-1]}"
+    words=("${COMP_WORDS[@]}")
+    cword=$COMP_CWORD
 
     local commands="zip publish help --help --version"
     local runtime_opts="--nodejs --node -n --python --py -p --runtime"
@@ -98,4 +102,4 @@ _aws_lambda_layer() {
     esac
 }
 
-complete -F _aws_lambda_layer aws-lambda-layer
+complete -F _aws_lambda_layer_cli aws-lambda-layer-cli

package/completion/aws-lambda-layer-completion.zsh

@@ -1,6 +1,6 @@
-#compdef aws-lambda-layer
+#compdef aws-lambda-layer-cli
 
-_aws-lambda-layer() {
+_aws-lambda-layer-cli() {
     local -a commands runtime_opts common_opts node_opts python_opts
     
     commands=(
@@ -107,4 +107,4 @@ _aws-lambda-layer() {
     esac
 }
 
-_aws-lambda-layer "$@"
+# _aws-lambda-layer-cli "$@"

package/package.json

@@ -1,7 +1,19 @@
 {
   "name": "aws-lambda-layer-cli",
-  "version": "1.4.1",
+  "version": "2.0.2",
   "description": "CLI tool for creating and publishing AWS Lambda layers for Node.js and Python.",
+  "keywords": [
+    "aws",
+    "lambda",
+    "nodejs",
+    "serverless",
+    "amazon",
+    "cli",
+    "zip",
+    "publish",
+    "layer",
+    "tools"
+  ],
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -13,10 +25,12 @@
   "homepage": "https://github.com/yukcw/aws-lambda-layer-cli#readme",
   "scripts": {
     "sync-version": "node scripts/sync_version.js",
-    "prepublishOnly": "npm run sync-version"
+    "prepublishOnly": "npm run sync-version",
+    "postinstall": "node scripts/install.js",
+    "preuninstall": "node scripts/uninstall.js"
   },
   "bin": {
-    "aws-lambda-layer": "bin/aws-lambda-layer.js"
+    "aws-lambda-layer-cli": "bin/aws-lambda-layer-cli.js"
   },
   "engines": {
     "node": ">=18"