ic-code 1.2.1__tar.gz → 1.2.3__tar.gz

{ic_code-1.2.1/src/ic_code.egg-info → ic_code-1.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ic-code
-Version: 1.2.1
+Version: 1.2.3
 Summary: Infrastructure CLI tool for managing AWS, Azure, GCP, OCI, NCP, CloudFlare, SSH, and more
 Home-page: https://github.com/dgr009/ic
 Author: SangYun Kim

{ic_code-1.2.1 → ic_code-1.2.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ic-code"
-version = "1.2.1"
+version = "1.2.3"
 authors = [
     {name = "sykim", email = "cruiser594@gmail.com"},
 ]

{ic_code-1.2.1 → ic_code-1.2.3}/src/ic/__init__.py

@@ -4,7 +4,7 @@ IC (Infra Resource Management CLI) - A comprehensive tool for managing cloud inf
 This package provides CLI tools and libraries for managing AWS, Azure, GCP, OCI, and CloudFlare resources.
 """
 
-__version__ = "1.2.1"
+__version__ = "1.2.3"
 __author__ = "SangYun"
 __email__ = "cruiser594@gmail.com"
 

{ic_code-1.2.1 → ic_code-1.2.3}/src/ic/cli.py

@@ -464,12 +464,24 @@ def main():
         usage="ic <platform|config> <service> <command> [options]",
         formatter_class=argparse.RawDescriptionHelpFormatter
     )
+    
+    # Add version argument
+    try:
+        from . import __version__
+    except ImportError:
+        from ic import __version__
+    parser.add_argument('--version', '-v', action='version', version=f'ic-code {__version__}')
+    
     platform_subparsers = parser.add_subparsers(
         dest="platform",
-        required=True,
+        required=False,
         help="클라우드 플랫폼 (aws, oci, cf, ssh, azure, gcp) 또는 config 관리"
     )
     
+    # Add version command
+    version_parser = platform_subparsers.add_parser('version', help='Show IC version')
+    version_parser.set_defaults(func=lambda args: print(f'ic-code {__version__}'))
+    
     # Add config commands
     try:
         from .commands.config import ConfigCommands

{ic_code-1.2.1 → ic_code-1.2.3}/src/ic/platforms/aws/ec2/list_tags.py

@@ -11,39 +11,45 @@ except ImportError:
     from rich.console import Console
     from rich.table import Table
 
-# 새로운 설정 시스템 import
-try:
-    from src.ic.config.manager import ConfigManager
-    config_manager = ConfigManager()
-    config = config_manager.get_config()
-except ImportError:
-    try:
-        from ic.config.manager import ConfigManager
-        config_manager = ConfigManager()
-        config = config_manager.get_config()
-    except ImportError:
-        # Legacy fallback for development
-        import sys
-        import os
-        sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', '..', '..'))
-        from ic.config.manager import ConfigManager
-        config_manager = ConfigManager()
-        config = config_manager.get_config()
-except ImportError:
-    # 호환성을 위한 fallback
-    from dotenv import load_dotenv
-    load_dotenv()
-    config = {}
-
 console = Console()
 
 # 새로운 설정 시스템에서 태그 키 가져오기
 def get_tag_keys():
     """설정에서 태그 키를 가져옵니다."""
+    # 함수 내부에서 ConfigManager 로드
+    try:
+        from src.ic.config.manager import ConfigManager
+        config_manager = ConfigManager()
+        config_manager.load_config()  # 기본 설정 로드
+        secrets = config_manager.load_secrets_config()  # secrets.yaml 로드
+        config = config_manager.get_config()  # 기본 설정 가져오기
+        
+        # secrets의 aws 설정을 config에 병합
+        if secrets and 'aws' in secrets:
+            if 'aws' not in config:
+                config['aws'] = {}
+            config['aws'].update(secrets['aws'])
+    except ImportError:
+        try:
+            from ic.config.manager import ConfigManager
+            config_manager = ConfigManager()
+            config_manager.load_config()  # 기본 설정 로드
+            secrets = config_manager.load_secrets_config()  # secrets.yaml 로드
+            config = config_manager.get_config()  # 기본 설정 가져오기
+            
+            # secrets의 aws 설정을 config에 병합
+            if secrets and 'aws' in secrets:
+                if 'aws' not in config:
+                    config['aws'] = {}
+                config['aws'].update(secrets['aws'])
+        except ImportError:
+            # Legacy fallback
+            config = {}
+    
     if config and 'aws' in config and 'tags' in config['aws']:
         aws_tags = config['aws']['tags']
-        required_tags = aws_tags.get('required', ['User', 'Team', 'Environment'])
-        optional_tags = aws_tags.get('optional', ['Service', 'Application'])
+        required_tags = aws_tags.get('required', [])
+        optional_tags = aws_tags.get('optional', [])
     else:
         # Fallback to environment variables
         env_required = os.getenv("REQUIRED_TAGS", "User,Team,Environment")

{ic_code-1.2.1 → ic_code-1.2.3}/src/ic/platforms/aws/lb/list_tags.py

@@ -14,41 +14,42 @@ except ImportError:
     from rich.console import Console
     from rich.table import Table
 
-# 새로운 설정 시스템 import
-try:
-    from src.ic.config.manager import ConfigManager
-    config_manager = ConfigManager()
-    config = config_manager.get_config()
-except ImportError:
-    try:
-        from ic.config.manager import ConfigManager
-        config_manager = ConfigManager()
-        config = config_manager.get_config()
-    except ImportError:
-        # Legacy fallback for development
-        import sys
-        import os
-        sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', '..', '..'))
-        from ic.config.manager import ConfigManager
-        config_manager = ConfigManager()
-        config = config_manager.get_config()
-except ImportError:
-    # 호환성을 위한 fallback
-    from dotenv import load_dotenv
-    load_dotenv()
-    config = {}
-
 console = Console()
 
 # 새로운 설정 시스템에서 태그 키 가져오기
 def get_tag_keys():
     """설정에서 태그 키를 가져옵니다."""
+    try:
+        from src.ic.config.manager import ConfigManager
+        config_manager = ConfigManager()
+        config_manager.load_config()
+        secrets = config_manager.load_secrets_config()
+        config = config_manager.get_config()
+        
+        if secrets and 'aws' in secrets:
+            if 'aws' not in config:
+                config['aws'] = {}
+            config['aws'].update(secrets['aws'])
+    except ImportError:
+        try:
+            from ic.config.manager import ConfigManager
+            config_manager = ConfigManager()
+            config_manager.load_config()
+            secrets = config_manager.load_secrets_config()
+            config = config_manager.get_config()
+            
+            if secrets and 'aws' in secrets:
+                if 'aws' not in config:
+                    config['aws'] = {}
+                config['aws'].update(secrets['aws'])
+        except ImportError:
+            config = {}
+    
     if config and 'aws' in config and 'tags' in config['aws']:
         aws_tags = config['aws']['tags']
-        required_tags = aws_tags.get('required', ['User', 'Team', 'Environment'])
-        optional_tags = aws_tags.get('optional', ['Service', 'Application'])
+        required_tags = aws_tags.get('required', [])
+        optional_tags = aws_tags.get('optional', [])
     else:
-        # Fallback to environment variables
         env_required = os.getenv("REQUIRED_TAGS", "User,Team,Environment")
         env_optional = os.getenv("OPTIONAL_TAGS", "Service,Application")
         required_tags = [t.strip() for t in env_required.split(",") if t.strip()]

{ic_code-1.2.1 → ic_code-1.2.3}/src/ic/platforms/aws/nat/list_tags.py

@@ -18,17 +18,50 @@ except ImportError:
     from rich.console import Console
     from rich.table import Table
 
-load_dotenv()
-
 console = Console()
 
-# .env에서 공통 태그 키를 읽기 (EC2 / LB와 동일)
-env_required = os.getenv("REQUIRED_TAGS", "User,Team,Environment")
-env_optional = os.getenv("OPTIONAL_TAGS", "Service,Application")
+# 새로운 설정 시스템에서 태그 키 가져오기
+def get_tag_keys():
+    """설정에서 태그 키를 가져옵니다."""
+    try:
+        from src.ic.config.manager import ConfigManager
+        config_manager = ConfigManager()
+        config_manager.load_config()
+        secrets = config_manager.load_secrets_config()
+        config = config_manager.get_config()
+        
+        if secrets and 'aws' in secrets:
+            if 'aws' not in config:
+                config['aws'] = {}
+            config['aws'].update(secrets['aws'])
+    except ImportError:
+        try:
+            from ic.config.manager import ConfigManager
+            config_manager = ConfigManager()
+            config_manager.load_config()
+            secrets = config_manager.load_secrets_config()
+            config = config_manager.get_config()
+            
+            if secrets and 'aws' in secrets:
+                if 'aws' not in config:
+                    config['aws'] = {}
+                config['aws'].update(secrets['aws'])
+        except ImportError:
+            config = {}
+    
+    if config and 'aws' in config and 'tags' in config['aws']:
+        aws_tags = config['aws']['tags']
+        required_tags = aws_tags.get('required', [])
+        optional_tags = aws_tags.get('optional', [])
+    else:
+        env_required = os.getenv("REQUIRED_TAGS", "User,Team,Environment")
+        env_optional = os.getenv("OPTIONAL_TAGS", "Service,Application")
+        required_tags = [t.strip() for t in env_required.split(",") if t.strip()]
+        optional_tags = [t.strip() for t in env_optional.split(",") if t.strip()]
+    
+    return required_tags + optional_tags
 
-required_tags = [t.strip() for t in env_required.split(",") if t.strip()]
-optional_tags = [t.strip() for t in env_optional.split(",") if t.strip()]
-TAG_KEYS = required_tags + optional_tags
+TAG_KEYS = get_tag_keys()
 
 @log_decorator
 def fetch_nat_tags(account_id, profile_name, region):

{ic_code-1.2.1 → ic_code-1.2.3}/src/ic/platforms/aws/rds/list_tags.py

@@ -14,16 +14,50 @@ except ImportError:
     from rich.console import Console
     from rich.table import Table
 
-load_dotenv()
 console = Console()
 
-# .env에서 공통 태그 키 불러오기
-env_required = os.getenv("REQUIRED_TAGS", "User,Team,Environment")
-env_optional = os.getenv("OPTIONAL_TAGS", "Service,Application")
-
-required_tags = [t.strip() for t in env_required.split(",") if t.strip()]
-optional_tags = [t.strip() for t in env_optional.split(",") if t.strip()]
-TAG_KEYS = required_tags + optional_tags
+# 새로운 설정 시스템에서 태그 키 가져오기
+def get_tag_keys():
+    """설정에서 태그 키를 가져옵니다."""
+    try:
+        from src.ic.config.manager import ConfigManager
+        config_manager = ConfigManager()
+        config_manager.load_config()
+        secrets = config_manager.load_secrets_config()
+        config = config_manager.get_config()
+        
+        if secrets and 'aws' in secrets:
+            if 'aws' not in config:
+                config['aws'] = {}
+            config['aws'].update(secrets['aws'])
+    except ImportError:
+        try:
+            from ic.config.manager import ConfigManager
+            config_manager = ConfigManager()
+            config_manager.load_config()
+            secrets = config_manager.load_secrets_config()
+            config = config_manager.get_config()
+            
+            if secrets and 'aws' in secrets:
+                if 'aws' not in config:
+                    config['aws'] = {}
+                config['aws'].update(secrets['aws'])
+        except ImportError:
+            config = {}
+    
+    if config and 'aws' in config and 'tags' in config['aws']:
+        aws_tags = config['aws']['tags']
+        required_tags = aws_tags.get('required', [])
+        optional_tags = aws_tags.get('optional', [])
+    else:
+        env_required = os.getenv("REQUIRED_TAGS", "User,Team,Environment")
+        env_optional = os.getenv("OPTIONAL_TAGS", "Service,Application")
+        required_tags = [t.strip() for t in env_required.split(",") if t.strip()]
+        optional_tags = [t.strip() for t in env_optional.split(",") if t.strip()]
+    
+    return required_tags + optional_tags
+
+TAG_KEYS = get_tag_keys()
 
 @log_decorator
 def fetch_rds_tags(account_id, profile_name, region):

{ic_code-1.2.1 → ic_code-1.2.3}/src/ic/platforms/aws/s3/list_tags.py

@@ -15,14 +15,50 @@ except ImportError:
     from rich.console import Console
     from rich.table import Table
 
-load_dotenv()
 console = Console()
 
-env_required = os.getenv("REQUIRED_TAGS", "User,Team,Environment")
-env_optional = os.getenv("OPTIONAL_TAGS", "Service,Application")
-required_tags = [t.strip() for t in env_required.split(",") if t.strip()]
-optional_tags = [t.strip() for t in env_optional.split(",") if t.strip()]
-TAG_KEYS = required_tags + optional_tags
+# 새로운 설정 시스템에서 태그 키 가져오기
+def get_tag_keys():
+    """설정에서 태그 키를 가져옵니다."""
+    try:
+        from src.ic.config.manager import ConfigManager
+        config_manager = ConfigManager()
+        config_manager.load_config()
+        secrets = config_manager.load_secrets_config()
+        config = config_manager.get_config()
+        
+        if secrets and 'aws' in secrets:
+            if 'aws' not in config:
+                config['aws'] = {}
+            config['aws'].update(secrets['aws'])
+    except ImportError:
+        try:
+            from ic.config.manager import ConfigManager
+            config_manager = ConfigManager()
+            config_manager.load_config()
+            secrets = config_manager.load_secrets_config()
+            config = config_manager.get_config()
+            
+            if secrets and 'aws' in secrets:
+                if 'aws' not in config:
+                    config['aws'] = {}
+                config['aws'].update(secrets['aws'])
+        except ImportError:
+            config = {}
+    
+    if config and 'aws' in config and 'tags' in config['aws']:
+        aws_tags = config['aws']['tags']
+        required_tags = aws_tags.get('required', [])
+        optional_tags = aws_tags.get('optional', [])
+    else:
+        env_required = os.getenv("REQUIRED_TAGS", "User,Team,Environment")
+        env_optional = os.getenv("OPTIONAL_TAGS", "Service,Application")
+        required_tags = [t.strip() for t in env_required.split(",") if t.strip()]
+        optional_tags = [t.strip() for t in env_optional.split(",") if t.strip()]
+    
+    return required_tags + optional_tags
+
+TAG_KEYS = get_tag_keys()
 
 @log_decorator
 def fetch_s3_tags(account_id, profile_name, region):

{ic_code-1.2.1 → ic_code-1.2.3}/src/ic/platforms/aws/vpc/list_tags.py

@@ -14,41 +14,42 @@ except ImportError:
     from rich.console import Console
     from rich.table import Table
 
-# 새로운 설정 시스템 import
-try:
-    from src.ic.config.manager import ConfigManager
-    config_manager = ConfigManager()
-    config = config_manager.get_config()
-except ImportError:
-    try:
-        from ic.config.manager import ConfigManager
-        config_manager = ConfigManager()
-        config = config_manager.get_config()
-    except ImportError:
-        # Legacy fallback for development
-        import sys
-        import os
-        sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', '..', '..'))
-        from ic.config.manager import ConfigManager
-        config_manager = ConfigManager()
-        config = config_manager.get_config()
-except ImportError:
-    # 호환성을 위한 fallback
-    from dotenv import load_dotenv
-    load_dotenv()
-    config = {}
-
 console = Console()
 
 # 새로운 설정 시스템에서 태그 키 가져오기
 def get_tag_keys():
     """설정에서 태그 키를 가져옵니다."""
+    try:
+        from src.ic.config.manager import ConfigManager
+        config_manager = ConfigManager()
+        config_manager.load_config()
+        secrets = config_manager.load_secrets_config()
+        config = config_manager.get_config()
+        
+        if secrets and 'aws' in secrets:
+            if 'aws' not in config:
+                config['aws'] = {}
+            config['aws'].update(secrets['aws'])
+    except ImportError:
+        try:
+            from ic.config.manager import ConfigManager
+            config_manager = ConfigManager()
+            config_manager.load_config()
+            secrets = config_manager.load_secrets_config()
+            config = config_manager.get_config()
+            
+            if secrets and 'aws' in secrets:
+                if 'aws' not in config:
+                    config['aws'] = {}
+                config['aws'].update(secrets['aws'])
+        except ImportError:
+            config = {}
+    
     if config and 'aws' in config and 'tags' in config['aws']:
         aws_tags = config['aws']['tags']
-        required_tags = aws_tags.get('required', ['User', 'Team', 'Environment'])
-        optional_tags = aws_tags.get('optional', ['Service', 'Application'])
+        required_tags = aws_tags.get('required', [])
+        optional_tags = aws_tags.get('optional', [])
     else:
-        # Fallback to environment variables
         env_required = os.getenv("REQUIRED_TAGS", "User,Team,Environment")
         env_optional = os.getenv("OPTIONAL_TAGS", "Service,Application")
         required_tags = [t.strip() for t in env_required.split(",") if t.strip()]

{ic_code-1.2.1 → ic_code-1.2.3/src/ic_code.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ic-code
-Version: 1.2.1
+Version: 1.2.3
 Summary: Infrastructure CLI tool for managing AWS, Azure, GCP, OCI, NCP, CloudFlare, SSH, and more
 Home-page: https://github.com/dgr009/ic
 Author: SangYun Kim