aws-cost-calculator-cli 1.5.1__py3-none-any.whl → 1.6.0__py3-none-any.whl

{aws_cost_calculator_cli-1.5.1.dist-info → aws_cost_calculator_cli-1.6.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aws-cost-calculator-cli
-Version: 1.5.1
+Version: 1.6.0
 Summary: AWS Cost Calculator CLI - Calculate daily and annual AWS costs across multiple accounts
 Home-page: https://github.com/yourusername/cost-calculator
 Author: Cost Optimization Team
@@ -49,36 +49,51 @@ pip install -e .
 
 ## Quick Start
 
-### 1. Login to AWS SSO
+### Authentication Methods
 
+The CLI supports three authentication methods:
+
+#### 1. SSO (Recommended)
 ```bash
-aws sso login --profile my_aws_profile
+# The CLI will automatically trigger SSO login if needed
+cc calculate --profile khoros --sso khoros_umbrella
 ```
 
-**Note:** You need to do this before running cost calculations. The SSO session typically lasts 8-12 hours.
-
-### 2. Initialize a profile
+#### 2. Static Credentials
+```bash
+cc calculate --profile khoros \
+  --access-key-id ASIA3D3QOXPO6EBAPXVI \
+  --secret-access-key /9ijZEUoszN/S2A8IlCrHpW+1fMZ7aUb7fPvU0dL \
+  --session-token IQoJb3JpZ2luX2VjENr...
+```
 
+#### 3. Environment Variables
 ```bash
-cc init --profile myprofile \
-  --aws-profile my_aws_profile \
-  --accounts "123456789012,234567890123,345678901234"
+# For SSO
+export AWS_PROFILE=khoros_umbrella
+cc calculate --profile khoros
+
+# For static credentials
+export AWS_ACCESS_KEY_ID=ASIA...
+export AWS_SECRET_ACCESS_KEY=...
+export AWS_SESSION_TOKEN=...
+cc calculate --profile khoros
 ```
 
-### 3. Calculate costs
+### Basic Usage
 
 ```bash
 # Default: Today minus 2 days, going back 30 days
-cc calculate --profile myprofile
+cc calculate --profile khoros --sso khoros_umbrella
 
 # Specific start date
-cc calculate --profile myprofile --start-date 2025-11-04
+cc calculate --profile khoros --sso khoros_umbrella --start-date 2025-11-04
 
 # Custom offset and window
-cc calculate --profile myprofile --offset 2 --window 30
+cc calculate --profile khoros --sso khoros_umbrella --offset 2 --window 30
 
 # JSON output
-cc calculate --profile myprofile --json-output
+cc calculate --profile khoros --sso khoros_umbrella --json-output
 ```
 
 ### 4. Analyze cost trends

aws_cost_calculator_cli-1.6.0.dist-info/RECORD

@@ -0,0 +1,13 @@
+aws_cost_calculator_cli-1.6.0.dist-info/licenses/LICENSE,sha256=cYtmQZHNGGTXOtg3T7LHDRneleaH0dHXHfxFV3WR50Y,1079
+cost_calculator/__init__.py,sha256=PJeIqvWh5AYJVrJxPPkI4pJnAt37rIjasrNS0I87kaM,52
+cost_calculator/api_client.py,sha256=LUzQmveDF0X9MqAyThp9mbSzJzkOO73Pk4F7IEJjASU,2353
+cost_calculator/cli.py,sha256=sJYvzbdHCxOEcCgOjZs4o9MOogV1Yh8r7x0hJtd__K0,38639
+cost_calculator/drill.py,sha256=hGi-prLgZDvNMMICQc4fl3LenM7YaZ3To_Ei4LKwrdc,10543
+cost_calculator/executor.py,sha256=tVyyBtXIj9OPyG-xQj8CUmyFjDhb9IVK639360dUZDc,8076
+cost_calculator/monthly.py,sha256=6k9F8S7djhX1wGV3-T1MZP7CvWbbfhSTEaddwCfVu5M,7932
+cost_calculator/trends.py,sha256=k_s4ylBX50sqoiM_fwepi58HW01zz767FMJhQUPDznk,12246
+aws_cost_calculator_cli-1.6.0.dist-info/METADATA,sha256=AaLbUH-anBc1lv2o2DpdJR3v0tSavhPtDo5Sjb7VsHA,8612
+aws_cost_calculator_cli-1.6.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aws_cost_calculator_cli-1.6.0.dist-info/entry_points.txt,sha256=_5Qy4EcHbYVYrdgOu1E48faMHb9fLUl5VJ3djDHuJBo,47
+aws_cost_calculator_cli-1.6.0.dist-info/top_level.txt,sha256=PRwGPPlNqASfyhGHDjSfyl4SXeE7GF3OVTu1tY1Uqyc,16
+aws_cost_calculator_cli-1.6.0.dist-info/RECORD,,

{aws_cost_calculator_cli-1.5.1.dist-info → aws_cost_calculator_cli-1.6.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.7.1)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

cost_calculator/cli.py

@@ -19,49 +19,143 @@ from cost_calculator.drill import format_drill_down_markdown
 from cost_calculator.executor import execute_trends, execute_monthly, execute_drill
 
 
+def apply_auth_options(config, sso=None, access_key_id=None, secret_access_key=None, session_token=None):
+    """Apply authentication options to profile config
+    
+    Args:
+        config: Profile configuration dict
+        sso: AWS SSO profile name
+        access_key_id: AWS Access Key ID
+        secret_access_key: AWS Secret Access Key
+        session_token: AWS Session Token
+    
+    Returns:
+        Updated config dict
+    """
+    import subprocess
+    
+    if sso:
+        # SSO authentication - trigger login if needed
+        try:
+            # Test if SSO session is valid
+            result = subprocess.run(
+                ['aws', 'sts', 'get-caller-identity', '--profile', sso],
+                capture_output=True,
+                text=True,
+                timeout=5
+            )
+            if result.returncode != 0:
+                if 'expired' in result.stderr.lower() or 'token' in result.stderr.lower():
+                    click.echo(f"SSO session expired or not initialized. Logging in...")
+                    subprocess.run(['aws', 'sso', 'login', '--profile', sso], check=True)
+        except Exception as e:
+            click.echo(f"Warning: Could not verify SSO session: {e}")
+        
+        config['aws_profile'] = sso
+    elif access_key_id and secret_access_key:
+        # Static credentials provided via CLI
+        config['credentials'] = {
+            'aws_access_key_id': access_key_id,
+            'aws_secret_access_key': secret_access_key,
+            'region': 'us-east-1'
+        }
+        if session_token:
+            config['credentials']['aws_session_token'] = session_token
+    
+    return config
+
+
 def load_profile(profile_name):
-    """Load profile configuration from ~/.config/cost-calculator/profiles.json"""
+    """Load profile configuration from local file or DynamoDB API"""
+    import os
+    import requests
+    
     config_dir = Path.home() / '.config' / 'cost-calculator'
     config_file = config_dir / 'profiles.json'
     creds_file = config_dir / 'credentials.json'
     
-    if not config_file.exists():
+    # Try local file first
+    if config_file.exists():
+        with open(config_file) as f:
+            profiles = json.load(f)
+        
+        if profile_name in profiles:
+            profile = profiles[profile_name]
+            
+            # Load credentials if using static credentials (not SSO)
+            if 'aws_profile' not in profile:
+                if not creds_file.exists():
+                    # Try environment variables
+                    if os.environ.get('AWS_ACCESS_KEY_ID'):
+                        profile['credentials'] = {
+                            'aws_access_key_id': os.environ['AWS_ACCESS_KEY_ID'],
+                            'aws_secret_access_key': os.environ['AWS_SECRET_ACCESS_KEY'],
+                            'aws_session_token': os.environ.get('AWS_SESSION_TOKEN')
+                        }
+                        return profile
+                    
+                    raise click.ClickException(
+                        f"No credentials found for profile '{profile_name}'.\n"
+                        f"Run: cc configure --profile {profile_name}"
+                    )
+                
+                with open(creds_file) as f:
+                    creds = json.load(f)
+                
+                if profile_name not in creds:
+                    raise click.ClickException(
+                        f"No credentials found for profile '{profile_name}'.\n"
+                        f"Run: cc configure --profile {profile_name}"
+                    )
+                
+                profile['credentials'] = creds[profile_name]
+            
+            return profile
+    
+    # Profile not found locally - try DynamoDB API
+    api_secret = os.environ.get('COST_API_SECRET')
+    if not api_secret:
         raise click.ClickException(
-            f"Profile configuration not found at {config_file}\n"
+            f"Profile '{profile_name}' not found locally and COST_API_SECRET not set.\n"
             f"Run: cc init --profile {profile_name}"
         )
     
-    with open(config_file) as f:
-        profiles = json.load(f)
-    
-    if profile_name not in profiles:
-        raise click.ClickException(
-            f"Profile '{profile_name}' not found in {config_file}\n"
-            f"Available profiles: {', '.join(profiles.keys())}"
+    try:
+        response = requests.post(
+            'https://64g7jq7sjygec2zmll5lsghrpi0txrzo.lambda-url.us-east-1.on.aws/',
+            headers={'X-API-Secret': api_secret, 'Content-Type': 'application/json'},
+            json={'operation': 'get', 'profile_name': profile_name},
+            timeout=10
         )
-    
-    profile = profiles[profile_name]
-    
-    # Load credentials if using static credentials (not SSO)
-    if 'aws_profile' not in profile:
-        if not creds_file.exists():
-            raise click.ClickException(
-                f"No credentials found for profile '{profile_name}'.\n"
-                f"Run: cc configure --profile {profile_name}"
-            )
-        
-        with open(creds_file) as f:
-            creds = json.load(f)
         
-        if profile_name not in creds:
+        if response.status_code == 200:
+            response_data = response.json()
+            # API returns {"profile": {...}} wrapper
+            profile_data = response_data.get('profile', response_data)
+            profile = {'accounts': profile_data['accounts']}
+            
+            # Check for AWS_PROFILE environment variable (SSO support)
+            if os.environ.get('AWS_PROFILE'):
+                profile['aws_profile'] = os.environ['AWS_PROFILE']
+            # Use environment credentials
+            elif os.environ.get('AWS_ACCESS_KEY_ID'):
+                profile['credentials'] = {
+                    'aws_access_key_id': os.environ['AWS_ACCESS_KEY_ID'],
+                    'aws_secret_access_key': os.environ['AWS_SECRET_ACCESS_KEY'],
+                    'aws_session_token': os.environ.get('AWS_SESSION_TOKEN')
+                }
+            
+            return profile
+        else:
             raise click.ClickException(
-                f"No credentials found for profile '{profile_name}'.\n"
-                f"Run: cc configure --profile {profile_name}"
+                f"Profile '{profile_name}' not found in DynamoDB.\n"
+                f"Run: cc profile create --name {profile_name} --accounts \"...\""
             )
-        
-        profile['credentials'] = creds[profile_name]
-    
-    return profile
+    except requests.exceptions.RequestException as e:
+        raise click.ClickException(
+            f"Failed to fetch profile from API: {e}\n"
+            f"Run: cc init --profile {profile_name}"
+        )
 
 
 def calculate_costs(profile_config, accounts, start_date, offset, window):
@@ -296,12 +390,30 @@ def cli():
 @click.option('--offset', default=2, help='Days to go back from start date (default: 2)')
 @click.option('--window', default=30, help='Number of days to analyze (default: 30)')
 @click.option('--json-output', is_flag=True, help='Output as JSON')
-def calculate(profile, start_date, offset, window, json_output):
-    """Calculate AWS costs for the specified period"""
+@click.option('--sso', help='AWS SSO profile name (e.g., khoros_umbrella)')
+@click.option('--access-key-id', help='AWS Access Key ID (for static credentials)')
+@click.option('--secret-access-key', help='AWS Secret Access Key (for static credentials)')
+@click.option('--session-token', help='AWS Session Token (for static credentials)')
+def calculate(profile, start_date, offset, window, json_output, sso, access_key_id, secret_access_key, session_token):
+    """Calculate AWS costs for the specified period
+    
+    \b
+    Authentication Options:
+      1. SSO: --sso <profile_name>
+         Example: cc calculate --profile khoros --sso khoros_umbrella
+      
+      2. Static Credentials: --access-key-id, --secret-access-key, --session-token
+         Example: cc calculate --profile khoros --access-key-id ASIA... --secret-access-key ... --session-token ...
+      
+      3. Environment Variables: AWS_PROFILE or AWS_ACCESS_KEY_ID/AWS_SECRET_ACCESS_KEY
+    """
     
     # Load profile configuration
     config = load_profile(profile)
     
+    # Apply authentication options
+    config = apply_auth_options(config, sso, access_key_id, secret_access_key, session_token)
+    
     # Calculate costs
     result = calculate_costs(
         profile_config=config,
@@ -547,12 +659,17 @@ def configure(profile, access_key_id, secret_access_key, session_token, region):
 @click.option('--profile', required=True, help='Profile name')
 @click.option('--weeks', default=3, help='Number of weeks to analyze (default: 3)')
 @click.option('--output', default='cost_trends.md', help='Output markdown file (default: cost_trends.md)')
-@click.option('--json-output', is_flag=True, help='Output as JSON instead of markdown')
-def trends(profile, weeks, output, json_output):
+@click.option('--json-output', is_flag=True, help='Output as JSON')
+@click.option('--sso', help='AWS SSO profile name')
+@click.option('--access-key-id', help='AWS Access Key ID')
+@click.option('--secret-access-key', help='AWS Secret Access Key')
+@click.option('--session-token', help='AWS Session Token')
+def trends(profile, weeks, output, json_output, sso, access_key_id, secret_access_key, session_token):
     """Analyze cost trends with Week-over-Week and Trailing 30-Day comparisons"""
     
     # Load profile configuration
     config = load_profile(profile)
+    config = apply_auth_options(config, sso, access_key_id, secret_access_key, session_token)
     
     click.echo(f"Analyzing last {weeks} weeks...")
     click.echo("")
@@ -613,12 +730,17 @@ def trends(profile, weeks, output, json_output):
 @click.option('--profile', required=True, help='Profile name')
 @click.option('--months', default=6, help='Number of months to analyze (default: 6)')
 @click.option('--output', default='monthly_trends.md', help='Output markdown file (default: monthly_trends.md)')
-@click.option('--json-output', is_flag=True, help='Output as JSON instead of markdown')
-def monthly(profile, months, output, json_output):
+@click.option('--json-output', is_flag=True, help='Output as JSON')
+@click.option('--sso', help='AWS SSO profile name')
+@click.option('--access-key-id', help='AWS Access Key ID')
+@click.option('--secret-access-key', help='AWS Secret Access Key')
+@click.option('--session-token', help='AWS Session Token')
+def monthly(profile, months, output, json_output, sso, access_key_id, secret_access_key, session_token):
     """Analyze month-over-month cost trends at service level"""
     
-    # Load profile configuration
+    # Load profile
     config = load_profile(profile)
+    config = apply_auth_options(config, sso, access_key_id, secret_access_key, session_token)
     
     click.echo(f"Analyzing last {months} months...")
     click.echo("")
@@ -680,12 +802,17 @@ def monthly(profile, months, output, json_output):
 @click.option('--account', help='Filter by account ID')
 @click.option('--usage-type', help='Filter by usage type')
 @click.option('--output', default='drill_down.md', help='Output markdown file (default: drill_down.md)')
-@click.option('--json-output', is_flag=True, help='Output as JSON instead of markdown')
-def drill(profile, weeks, service, account, usage_type, output, json_output):
+@click.option('--json-output', is_flag=True, help='Output as JSON')
+@click.option('--sso', help='AWS SSO profile name')
+@click.option('--access-key-id', help='AWS Access Key ID')
+@click.option('--secret-access-key', help='AWS Secret Access Key')
+@click.option('--session-token', help='AWS Session Token')
+def drill(profile, weeks, service, account, usage_type, output, json_output, sso, access_key_id, secret_access_key, session_token):
     """Drill down into cost changes by service, account, or usage type"""
     
-    # Load profile configuration
+    # Load profile
     config = load_profile(profile)
+    config = apply_auth_options(config, sso, access_key_id, secret_access_key, session_token)
     
     # Show filters
     click.echo(f"Analyzing last {weeks} weeks...")

cost_calculator/executor.py

@@ -11,22 +11,33 @@ def get_credentials_dict(config):
     Extract credentials from config in format needed for API.
     
     Returns:
-        dict with access_key, secret_key, session_token
+        dict with access_key, secret_key, session_token, or None if profile is 'dummy'
     """
     if 'aws_profile' in config:
-        # Get temporary credentials from SSO session
-        session = boto3.Session(profile_name=config['aws_profile'])
-        credentials = session.get_credentials()
-        frozen_creds = credentials.get_frozen_credentials()
+        # Skip credential loading for dummy profile (API-only mode)
+        if config['aws_profile'] == 'dummy':
+            return None
         
-        return {
-            'access_key': frozen_creds.access_key,
-            'secret_key': frozen_creds.secret_key,
-            'session_token': frozen_creds.token
-        }
+        # Get temporary credentials from SSO session
+        try:
+            session = boto3.Session(profile_name=config['aws_profile'])
+            credentials = session.get_credentials()
+            frozen_creds = credentials.get_frozen_credentials()
+            
+            return {
+                'access_key': frozen_creds.access_key,
+                'secret_key': frozen_creds.secret_key,
+                'session_token': frozen_creds.token
+            }
+        except Exception:
+            # If profile not found, return None (API will handle)
+            return None
     else:
         # Use static credentials
-        creds = config['credentials']
+        creds = config.get('credentials', {})
+        if not creds:
+            return None
+        
         result = {
             'access_key': creds['aws_access_key_id'],
             'secret_key': creds['aws_secret_access_key']

aws_cost_calculator_cli-1.5.1.dist-info/RECORD

@@ -1,13 +0,0 @@
-aws_cost_calculator_cli-1.5.1.dist-info/licenses/LICENSE,sha256=cYtmQZHNGGTXOtg3T7LHDRneleaH0dHXHfxFV3WR50Y,1079
-cost_calculator/__init__.py,sha256=PJeIqvWh5AYJVrJxPPkI4pJnAt37rIjasrNS0I87kaM,52
-cost_calculator/api_client.py,sha256=LUzQmveDF0X9MqAyThp9mbSzJzkOO73Pk4F7IEJjASU,2353
-cost_calculator/cli.py,sha256=ufK28divdvrceEryWd8cCWjvG5pT2owaqprskX2epeQ,32589
-cost_calculator/drill.py,sha256=hGi-prLgZDvNMMICQc4fl3LenM7YaZ3To_Ei4LKwrdc,10543
-cost_calculator/executor.py,sha256=aPYEm8KdQl7xTpG1gvJ-2adAIJ2PW1_ly27xggQxNNE,7671
-cost_calculator/monthly.py,sha256=6k9F8S7djhX1wGV3-T1MZP7CvWbbfhSTEaddwCfVu5M,7932
-cost_calculator/trends.py,sha256=k_s4ylBX50sqoiM_fwepi58HW01zz767FMJhQUPDznk,12246
-aws_cost_calculator_cli-1.5.1.dist-info/METADATA,sha256=g9xQIorywmJ-Xq3zQO0IYdW7otVkkDkZhJwbXgN5PjU,8176
-aws_cost_calculator_cli-1.5.1.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-aws_cost_calculator_cli-1.5.1.dist-info/entry_points.txt,sha256=_5Qy4EcHbYVYrdgOu1E48faMHb9fLUl5VJ3djDHuJBo,47
-aws_cost_calculator_cli-1.5.1.dist-info/top_level.txt,sha256=PRwGPPlNqASfyhGHDjSfyl4SXeE7GF3OVTu1tY1Uqyc,16
-aws_cost_calculator_cli-1.5.1.dist-info/RECORD,,