From 2333a29a566de129ad0bc50b94c873d3ec76bc18 Mon Sep 17 00:00:00 2001 From: fit2bot <68588906+fit2bot@users.noreply.github.com> Date: Fri, 9 Jun 2023 16:52:54 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E6=94=B9=E5=AF=86=E5=8E=9F=E5=AD=90=E6=80=A7=20(#1066?= =?UTF-8?q?3)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: feng <1304903146@qq.com> --- .../accounts/automations/change_secret/custom/ssh/main.yml | 4 +--- .../automations/change_secret/database/mongodb/main.yml | 5 +---- .../automations/change_secret/database/mysql/main.yml | 5 +---- .../automations/change_secret/database/oracle/main.yml | 5 +---- .../automations/change_secret/database/postgresql/main.yml | 7 +------ .../automations/change_secret/database/sqlserver/main.yml | 7 ++----- .../automations/push_account/database/mongodb/main.yml | 5 +---- .../automations/push_account/database/mysql/main.yml | 5 +---- .../automations/push_account/database/oracle/main.yml | 5 +---- .../automations/push_account/database/postgresql/main.yml | 4 +--- .../automations/push_account/database/sqlserver/main.yml | 5 ++--- 11 files changed, 13 insertions(+), 44 deletions(-) diff --git a/apps/accounts/automations/change_secret/custom/ssh/main.yml b/apps/accounts/automations/change_secret/custom/ssh/main.yml index 027133496..853a666d4 100644 --- a/apps/accounts/automations/change_secret/custom/ssh/main.yml +++ b/apps/accounts/automations/change_secret/custom/ssh/main.yml @@ -26,6 +26,7 @@ password: "{{ account.secret }}" commands: "{{ params.commands }}" first_conn_delay_time: "{{ first_conn_delay_time | default(0.5) }}" + ignore_errors: true when: ping_info is succeeded register: change_info @@ -35,6 +36,3 @@ login_password: "{{ account.secret }}" login_host: "{{ jms_asset.address }}" login_port: "{{ jms_asset.port }}" - when: - - ping_info is succeeded - - change_info is succeeded diff --git a/apps/accounts/automations/change_secret/database/mongodb/main.yml b/apps/accounts/automations/change_secret/database/mongodb/main.yml index 42ccd78ea..168607289 100644 --- a/apps/accounts/automations/change_secret/database/mongodb/main.yml +++ b/apps/accounts/automations/change_secret/database/mongodb/main.yml @@ -38,8 +38,8 @@ db: "{{ jms_asset.spec_info.db_name }}" name: "{{ account.username }}" password: "{{ account.secret }}" + ignore_errors: true when: db_info is succeeded - register: change_info - name: Verify password mongodb_ping: @@ -53,6 +53,3 @@ ssl_certfile: "{{ jms_asset.secret_info.client_key }}" connection_options: - tlsAllowInvalidHostnames: "{{ jms_asset.spec_info.allow_invalid_cert}}" - when: - - db_info is succeeded - - change_info is succeeded diff --git a/apps/accounts/automations/change_secret/database/mysql/main.yml b/apps/accounts/automations/change_secret/database/mysql/main.yml index 26858c94e..2c6965df9 100644 --- a/apps/accounts/automations/change_secret/database/mysql/main.yml +++ b/apps/accounts/automations/change_secret/database/mysql/main.yml @@ -28,8 +28,8 @@ password: "{{ account.secret }}" host: "%" priv: "{{ account.username + '.*:USAGE' if db_name == '' else db_name + '.*:ALL' }}" + ignore_errors: true when: db_info is succeeded - register: change_info - name: Verify password community.mysql.mysql_info: @@ -38,6 +38,3 @@ login_host: "{{ jms_asset.address }}" login_port: "{{ jms_asset.port }}" filter: version - when: - - db_info is succeeded - - change_info is succeeded \ No newline at end of file diff --git a/apps/accounts/automations/change_secret/database/oracle/main.yml b/apps/accounts/automations/change_secret/database/oracle/main.yml index ad58e0584..873b0b007 100644 --- a/apps/accounts/automations/change_secret/database/oracle/main.yml +++ b/apps/accounts/automations/change_secret/database/oracle/main.yml @@ -29,8 +29,8 @@ mode: "{{ jms_account.mode }}" name: "{{ account.username }}" password: "{{ account.secret }}" + ignore_errors: true when: db_info is succeeded - register: change_info - name: Verify password oracle_ping: @@ -39,6 +39,3 @@ login_host: "{{ jms_asset.address }}" login_port: "{{ jms_asset.port }}" login_database: "{{ jms_asset.spec_info.db_name }}" - when: - - db_info is succeeded - - change_info is succeeded diff --git a/apps/accounts/automations/change_secret/database/postgresql/main.yml b/apps/accounts/automations/change_secret/database/postgresql/main.yml index dbb11af12..a60bdee84 100644 --- a/apps/accounts/automations/change_secret/database/postgresql/main.yml +++ b/apps/accounts/automations/change_secret/database/postgresql/main.yml @@ -29,8 +29,8 @@ name: "{{ account.username }}" password: "{{ account.secret }}" role_attr_flags: LOGIN + ignore_errors: true when: result is succeeded - register: change_info - name: Verify password community.postgresql.postgresql_ping: @@ -39,8 +39,3 @@ login_host: "{{ jms_asset.address }}" login_port: "{{ jms_asset.port }}" db: "{{ jms_asset.spec_info.db_name }}" - when: - - result is succeeded - - change_info is succeeded - register: result - failed_when: not result.is_available diff --git a/apps/accounts/automations/change_secret/database/sqlserver/main.yml b/apps/accounts/automations/change_secret/database/sqlserver/main.yml index da0427f5c..a1d83f179 100644 --- a/apps/accounts/automations/change_secret/database/sqlserver/main.yml +++ b/apps/accounts/automations/change_secret/database/sqlserver/main.yml @@ -41,8 +41,8 @@ login_port: "{{ jms_asset.port }}" name: '{{ jms_asset.spec_info.db_name }}' script: "ALTER LOGIN {{ account.username }} WITH PASSWORD = '{{ account.secret }}'; select @@version" + ignore_errors: true when: user_exist.query_results[0] | length != 0 - register: change_info - name: Add SQLServer user community.general.mssql_script: @@ -52,8 +52,8 @@ login_port: "{{ jms_asset.port }}" name: '{{ jms_asset.spec_info.db_name }}' script: "CREATE LOGIN {{ account.username }} WITH PASSWORD = '{{ account.secret }}'; select @@version" + ignore_errors: true when: user_exist.query_results[0] | length == 0 - register: change_info - name: Verify password community.general.mssql_script: @@ -64,6 +64,3 @@ name: '{{ jms_asset.spec_info.db_name }}' script: | SELECT @@version - when: - - db_info is succeeded - - change_info is succeeded diff --git a/apps/accounts/automations/push_account/database/mongodb/main.yml b/apps/accounts/automations/push_account/database/mongodb/main.yml index 42ccd78ea..168607289 100644 --- a/apps/accounts/automations/push_account/database/mongodb/main.yml +++ b/apps/accounts/automations/push_account/database/mongodb/main.yml @@ -38,8 +38,8 @@ db: "{{ jms_asset.spec_info.db_name }}" name: "{{ account.username }}" password: "{{ account.secret }}" + ignore_errors: true when: db_info is succeeded - register: change_info - name: Verify password mongodb_ping: @@ -53,6 +53,3 @@ ssl_certfile: "{{ jms_asset.secret_info.client_key }}" connection_options: - tlsAllowInvalidHostnames: "{{ jms_asset.spec_info.allow_invalid_cert}}" - when: - - db_info is succeeded - - change_info is succeeded diff --git a/apps/accounts/automations/push_account/database/mysql/main.yml b/apps/accounts/automations/push_account/database/mysql/main.yml index 26858c94e..2c6965df9 100644 --- a/apps/accounts/automations/push_account/database/mysql/main.yml +++ b/apps/accounts/automations/push_account/database/mysql/main.yml @@ -28,8 +28,8 @@ password: "{{ account.secret }}" host: "%" priv: "{{ account.username + '.*:USAGE' if db_name == '' else db_name + '.*:ALL' }}" + ignore_errors: true when: db_info is succeeded - register: change_info - name: Verify password community.mysql.mysql_info: @@ -38,6 +38,3 @@ login_host: "{{ jms_asset.address }}" login_port: "{{ jms_asset.port }}" filter: version - when: - - db_info is succeeded - - change_info is succeeded \ No newline at end of file diff --git a/apps/accounts/automations/push_account/database/oracle/main.yml b/apps/accounts/automations/push_account/database/oracle/main.yml index ad58e0584..873b0b007 100644 --- a/apps/accounts/automations/push_account/database/oracle/main.yml +++ b/apps/accounts/automations/push_account/database/oracle/main.yml @@ -29,8 +29,8 @@ mode: "{{ jms_account.mode }}" name: "{{ account.username }}" password: "{{ account.secret }}" + ignore_errors: true when: db_info is succeeded - register: change_info - name: Verify password oracle_ping: @@ -39,6 +39,3 @@ login_host: "{{ jms_asset.address }}" login_port: "{{ jms_asset.port }}" login_database: "{{ jms_asset.spec_info.db_name }}" - when: - - db_info is succeeded - - change_info is succeeded diff --git a/apps/accounts/automations/push_account/database/postgresql/main.yml b/apps/accounts/automations/push_account/database/postgresql/main.yml index dbb11af12..68fc95324 100644 --- a/apps/accounts/automations/push_account/database/postgresql/main.yml +++ b/apps/accounts/automations/push_account/database/postgresql/main.yml @@ -29,8 +29,8 @@ name: "{{ account.username }}" password: "{{ account.secret }}" role_attr_flags: LOGIN + ignore_errors: true when: result is succeeded - register: change_info - name: Verify password community.postgresql.postgresql_ping: @@ -42,5 +42,3 @@ when: - result is succeeded - change_info is succeeded - register: result - failed_when: not result.is_available diff --git a/apps/accounts/automations/push_account/database/sqlserver/main.yml b/apps/accounts/automations/push_account/database/sqlserver/main.yml index da0427f5c..17b64a66a 100644 --- a/apps/accounts/automations/push_account/database/sqlserver/main.yml +++ b/apps/accounts/automations/push_account/database/sqlserver/main.yml @@ -41,6 +41,7 @@ login_port: "{{ jms_asset.port }}" name: '{{ jms_asset.spec_info.db_name }}' script: "ALTER LOGIN {{ account.username }} WITH PASSWORD = '{{ account.secret }}'; select @@version" + ignore_errors: true when: user_exist.query_results[0] | length != 0 register: change_info @@ -52,6 +53,7 @@ login_port: "{{ jms_asset.port }}" name: '{{ jms_asset.spec_info.db_name }}' script: "CREATE LOGIN {{ account.username }} WITH PASSWORD = '{{ account.secret }}'; select @@version" + ignore_errors: true when: user_exist.query_results[0] | length == 0 register: change_info @@ -64,6 +66,3 @@ name: '{{ jms_asset.spec_info.db_name }}' script: | SELECT @@version - when: - - db_info is succeeded - - change_info is succeeded