Skip to content

Commit 33404d5

Browse files
author
Taniya Mathur
committed
Rename SDLC CLI package from idp_cli to idpcli to avoid package conflict
- Rename package directory: src/idp_cli/ → src/idpcli/ - Update pyproject.toml: package name and entry point - Update all imports: from idp_cli.* → from idpcli.* Fix ModuleNotFoundError when CLI smoketest installs main IDP CLI package which was overwriting the SDLC CLI package with same name
1 parent 30a0096 commit 33404d5

File tree

14 files changed

+15
-15
lines changed

14 files changed

+15
-15
lines changed

scripts/sdlc/idp-cli/pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ dependencies = [
1919
]
2020

2121
[tool.poetry]
22-
packages = [{include = "idp_cli", from = "src"}]
22+
packages = [{include = "idpcli", from = "src"}]
2323

2424
[tool.poetry.scripts]
25-
idpcli = "idp_cli.cli.main:app"
25+
idpcli = "idpcli.cli.main:app"
2626

2727
[tool.poetry.group.dev.dependencies]
2828
ipykernel = "^6.29.5"
File renamed without changes.
File renamed without changes.

scripts/sdlc/idp-cli/src/idp_cli/cli/main.py renamed to scripts/sdlc/idp-cli/src/idpcli/cli/main.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33

44
import os
55
import sys
6-
from idp_cli.service.install_service import InstallService
7-
from idp_cli.util.codepipeline_util import CodePipelineUtil
6+
from idpcli.service.install_service import InstallService
7+
from idpcli.util.codepipeline_util import CodePipelineUtil
88
import typer
9-
from idp_cli.service.uninstall_service import UninstallService
10-
from idp_cli.service.smoketest_service import SmokeTestService
11-
from idp_cli.service.smoketest_idp_cli_service import SmokeTestIdpCliService
9+
from idpcli.service.uninstall_service import UninstallService
10+
from idpcli.service.smoketest_service import SmokeTestService
11+
from idpcli.service.smoketest_idp_cli_service import SmokeTestIdpCliService
1212
from dotenv import load_dotenv
1313

1414
from loguru import logger
File renamed without changes.

scripts/sdlc/idp-cli/src/idp_cli/service/install_service.py renamed to scripts/sdlc/idp-cli/src/idpcli/service/install_service.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ def install(self, admin_email: str):
363363
Args:
364364
admin_email: Email address for the admin user
365365
"""
366-
from idp_cli.config import DEPLOY_PATTERNS
366+
from idpcli.config import DEPLOY_PATTERNS
367367
patterns = DEPLOY_PATTERNS
368368

369369
def deploy_pattern(suffix, pattern_name):

scripts/sdlc/idp-cli/src/idp_cli/service/smoketest_idp_cli_service.py renamed to scripts/sdlc/idp-cli/src/idpcli/service/smoketest_idp_cli_service.py

File renamed without changes.

scripts/sdlc/idp-cli/src/idp_cli/service/smoketest_service.py renamed to scripts/sdlc/idp-cli/src/idpcli/service/smoketest_service.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
22
# SPDX-License-Identifier: MIT-0
33

4-
from idp_cli.util.cfn_util import CfnUtil
5-
from idp_cli.util.path_util import PathUtil
6-
from idp_cli.util.s3_util import S3Util
4+
from idpcli.util.cfn_util import CfnUtil
5+
from idpcli.util.path_util import PathUtil
6+
from idpcli.util.s3_util import S3Util
77
import time
88
import json
99
import os
@@ -16,7 +16,7 @@ def __init__(self,
1616
file_path: str,
1717
verify_string: str):
1818

19-
from idp_cli.config import DEPLOY_PATTERNS
19+
from idpcli.config import DEPLOY_PATTERNS
2020

2121
self.stack_name_prefix = stack_name_prefix
2222
self.stack_names = [f"{stack_name_prefix}-{suffix}" for suffix in DEPLOY_PATTERNS.keys()]

scripts/sdlc/idp-cli/src/idp_cli/service/uninstall_service.py renamed to scripts/sdlc/idp-cli/src/idpcli/service/uninstall_service.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
import concurrent.futures
77
from typing import Any, Dict, Optional
88
from botocore.exceptions import ClientError
9-
from idp_cli.util.cfn_util import CfnUtil
10-
from idp_cli.util.s3_util import S3Util
9+
from idpcli.util.cfn_util import CfnUtil
10+
from idpcli.util.s3_util import S3Util
1111
from loguru import logger
1212

1313
class UninstallService():
1414
def __init__(self, stack_name_prefix: str,
1515
account_id: str,
1616
cfn_prefix: Optional[str] = "idp-dev"):
17-
from idp_cli.config import DEPLOY_PATTERNS
17+
from idpcli.config import DEPLOY_PATTERNS
1818

1919
self.stack_name_prefix = stack_name_prefix
2020
self.account_id = account_id
File renamed without changes.

0 commit comments

Comments
 (0)