Skip to content

Commit 8ed6fe7

Browse files
author
Taniya Mathur
committed
Fix circular import by moving DEPLOY_PATTERNS to separate config module
Break circular dependency between main.py and services
1 parent 18c060e commit 8ed6fe7

File tree

5 files changed

+15
-11
lines changed

5 files changed

+15
-11
lines changed

scripts/sdlc/idp-cli/src/idp_cli/cli/main.py

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

4-
# Global pattern configuration - modify these to control which patterns are deployed/tested
5-
DEPLOY_PATTERNS = {
6-
"p1": "Pattern1 - Packet or Media processing with Bedrock Data Automation (BDA)",
7-
# "p2": "Pattern2 - Packet processing with Textract and Bedrock",
8-
# "p3": "Pattern3 - Packet processing with Textract, SageMaker(UDOP), and Bedrock"
9-
}
10-
114
import os
125
import sys
136
from idp_cli.service.install_service import InstallService
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
# SPDX-License-Identifier: MIT-0
3+
4+
# Global pattern configuration - modify these to control which patterns are deployed/tested
5+
DEPLOY_PATTERNS = {
6+
"p1": "Pattern1 - Packet or Media processing with Bedrock Data Automation (BDA)",
7+
# "p2": "Pattern2 - Packet processing with Textract and Bedrock",
8+
# "p3": "Pattern3 - Packet processing with Textract, SageMaker(UDOP), and Bedrock"
9+
}

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

Lines changed: 2 additions & 2 deletions
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.cli.main import DEPLOY_PATTERNS
366+
from idp_cli.config import DEPLOY_PATTERNS
367367
patterns = DEPLOY_PATTERNS
368368

369369
def deploy_pattern(suffix, pattern_name):
@@ -389,7 +389,7 @@ def deploy_pattern(suffix, pattern_name):
389389

390390
all_patterns_succeeded = all(results.values())
391391
if all_patterns_succeeded:
392-
logger.info("Both patterns installed successfully!")
392+
logger.info("All configured patterns installed successfully!")
393393
else:
394394
logger.error(f"Some patterns failed: {results}")
395395

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ def __init__(self,
1616
file_path: str,
1717
verify_string: str):
1818

19-
from idp_cli.cli.main import DEPLOY_PATTERNS
19+
from idp_cli.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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,14 @@ 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
18+
1719
self.stack_name_prefix = stack_name_prefix
1820
self.account_id = account_id
1921
self.cfn_prefix = cfn_prefix
2022
self.region = os.environ.get('AWS_REGION', 'us-east-1')
2123
self.install_bucket_name = f"{self.cfn_prefix}-{self.account_id}-{self.region}"
22-
self.stack_names = [f"{stack_name_prefix}-p1", f"{stack_name_prefix}-p2"]
24+
self.stack_names = [f"{stack_name_prefix}-{suffix}" for suffix in DEPLOY_PATTERNS.keys()]
2325
logger.debug(f"stack_names: {self.stack_names}\naccount_id: {account_id}\ncfn_prefix: {cfn_prefix}\nregion:{self.region}")
2426

2527
def uninstall(self):

0 commit comments

Comments
 (0)