From 5f2f38d8155ec62522eed8b8064d90dfa96152df Mon Sep 17 00:00:00 2001 From: fit2bot <68588906+fit2bot@users.noreply.github.com> Date: Fri, 17 Feb 2023 19:00:44 +0800 Subject: [PATCH] perf: mysql psql database (#9609) Co-authored-by: feng <1304903146@qq.com> --- .../automations/change_secret/database/mysql/main.yml | 6 ++++-- .../automations/change_secret/database/postgresql/main.yml | 1 + apps/accounts/automations/push_account/manager.py | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/apps/accounts/automations/change_secret/database/mysql/main.yml b/apps/accounts/automations/change_secret/database/mysql/main.yml index c76b53b08..26858c94e 100644 --- a/apps/accounts/automations/change_secret/database/mysql/main.yml +++ b/apps/accounts/automations/change_secret/database/mysql/main.yml @@ -2,6 +2,7 @@ gather_facts: no vars: ansible_python_interpreter: /usr/local/bin/python + db_name: "{{ jms_asset.spec_info.db_name }}" tasks: - name: Test MySQL connection @@ -26,6 +27,7 @@ name: "{{ account.username }}" password: "{{ account.secret }}" host: "%" + priv: "{{ account.username + '.*:USAGE' if db_name == '' else db_name + '.*:ALL' }}" when: db_info is succeeded register: change_info @@ -37,5 +39,5 @@ login_port: "{{ jms_asset.port }}" filter: version when: - - db_info is succeeded - - change_info is succeeded \ No newline at end of file + - db_info is succeeded + - change_info is succeeded \ No newline at end of file diff --git a/apps/accounts/automations/change_secret/database/postgresql/main.yml b/apps/accounts/automations/change_secret/database/postgresql/main.yml index 96ee89dce..dbb11af12 100644 --- a/apps/accounts/automations/change_secret/database/postgresql/main.yml +++ b/apps/accounts/automations/change_secret/database/postgresql/main.yml @@ -28,6 +28,7 @@ db: "{{ jms_asset.spec_info.db_name }}" name: "{{ account.username }}" password: "{{ account.secret }}" + role_attr_flags: LOGIN when: result is succeeded register: change_info diff --git a/apps/accounts/automations/push_account/manager.py b/apps/accounts/automations/push_account/manager.py index 844649cc4..c974106a6 100644 --- a/apps/accounts/automations/push_account/manager.py +++ b/apps/accounts/automations/push_account/manager.py @@ -92,7 +92,7 @@ class PushAccountManager(ChangeSecretManager, AccountBasePlaybookManager): account_info = self.name_recorder_mapper.get(host) if not account_info: return - print('account_info', account_info) + account = account_info['account'] new_secret = account_info['new_secret'] if not account: