Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(legacy_esb): remove support for legacy_esb and bk-esb-buffet #628

Merged
merged 2 commits into from
May 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/dashboard/apigateway/apigateway/conf/celery_conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
"apigateway.apps.monitor.tasks",
"apigateway.apps.metrics.tasks",
"apigateway.apps.permission.tasks",
"apigateway.legacy_esb.tasks",
wklken marked this conversation as resolved.
Show resolved Hide resolved
"apigateway.apps.esb.component.tasks",
"apigateway.controller.tasks",
)
Expand Down
28 changes: 0 additions & 28 deletions src/dashboard/apigateway/apigateway/conf/default.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,6 @@
# "iam.contrib.iam_migration",
# 蓝鲸通知中心
"bk_notice_sdk",
# 开源版旧版 ESB 数据
"apigateway.legacy_esb",
"apigateway.legacy_esb.paas2",
]

MIDDLEWARE = [
Expand Down Expand Up @@ -326,24 +323,8 @@
"isolation_level": env.str("BK_ESB_DATABASE_ISOLATION_LEVEL", "READ COMMITTED"),
},
},
"paas2": {
"ENGINE": env.str("BK_PAAS2_DATABASE_ENGINE", "django.db.backends.mysql"),
"NAME": env.str("BK_PAAS2_DATABASE_NAME", ""),
"USER": env.str("BK_PAAS2_DATABASE_USER", ""),
"PASSWORD": env.str("BK_PAAS2_DATABASE_PASSWORD", ""),
"HOST": env.str("BK_PAAS2_DATABASE_HOST", ""),
"PORT": env.int("BK_PAAS2_DATABASE_PORT", 3306),
"OPTIONS": {
"isolation_level": env.str("BK_PAAS2_DATABASE_ISOLATION_LEVEL", "READ COMMITTED"),
},
},
}

# 如果 paas2 database 未配置,则去除
BK_PAAS2_ENABLED = all([DATABASES["paas2"]["NAME"], DATABASES["paas2"]["USER"], DATABASES["paas2"]["HOST"]])
if not BK_PAAS2_ENABLED:
DATABASES.pop("paas2", None)

# redis 配置
REDIS_HOST = env.str("BK_APIGW_REDIS_HOST", "localhost")
REDIS_PORT = env.int("BK_APIGW_REDIS_PORT", 6379)
Expand Down Expand Up @@ -438,15 +419,6 @@
"BK_APIGW_CELERY_TASK_DEFAULT_QUEUE", f"{REDIS_PREFIX}bk_apigateway_dashboard_celery"
)

CELERY_BEAT_SCHEDULE.update(
{
"apigateway.legacy_esb.tasks.sync_legacy_esb_reusable_data": {
"task": "apigateway.legacy_esb.tasks.sync_legacy_esb_reusable_data",
"schedule": crontab(minute="*/5"),
},
}
)

if env.bool("FEATURE_FLAG_ENABLE_RUN_DATA_METRICS", True):
CELERY_BEAT_SCHEDULE.update(
{
Expand Down
5 changes: 0 additions & 5 deletions src/dashboard/apigateway/apigateway/conf/log_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,6 @@ def get_logging_config(log_level: str, is_local: bool, log_dir: str, log_to_file
"level": "INFO",
"propagate": True,
},
"apigateway.legacy_esb.management": {
"handlers": ["console_simple"],
"level": "INFO",
"propagate": True,
},
},
}

Expand Down
7 changes: 0 additions & 7 deletions src/dashboard/apigateway/apigateway/conf/unittest_env
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,6 @@ export BK_ESB_DATABASE_PASSWORD=""
export BK_ESB_DATABASE_HOST=""
export BK_ESB_DATABASE_PORT="3306"
export BK_ESB_DATABASE_ISOLATION_LEVEL=""
export BK_PAAS2_DATABASE_ENGINE="django.db.backends.sqlite3"
export BK_PAAS2_DATABASE_NAME="paas2_unittest.sqlite3"
export BK_PAAS2_DATABASE_USER="paas2"
export BK_PAAS2_DATABASE_PASSWORD=""
export BK_PAAS2_DATABASE_HOST="localhost"
export BK_PAAS2_DATABASE_PORT="3306"
export BK_PAAS2_DATABASE_ISOLATION_LEVEL=""
export BK_APIGW_REDIS_HOST="dev.service"
export BK_APIGW_REDIS_PORT="6378"
export BK_APIGW_REDIS_PASSWORD=""
Expand Down
Empty file.
Empty file.

This file was deleted.

This file was deleted.

This file was deleted.

Empty file.
22 changes: 0 additions & 22 deletions src/dashboard/apigateway/apigateway/editions/ee/legacy_esb/apps.py

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading
Loading