From 97eba0fc6056984551aa85a3c471fe76834ffc95 Mon Sep 17 00:00:00 2001 From: Andrey Klychkov Date: Mon, 16 Sep 2019 18:37:13 +0300 Subject: [PATCH] Backport of 62125: Fix typos in database modules and their integration tests (#62173) --- .../modules/database/aerospike/aerospike_migrations.py | 6 +++--- lib/ansible/modules/database/mongodb/mongodb_user.py | 2 +- .../modules/database/proxysql/proxysql_backend_servers.py | 2 +- .../modules/database/proxysql/proxysql_global_variables.py | 2 +- .../database/proxysql/proxysql_replication_hostgroups.py | 2 +- .../integration/targets/postgresql/tasks/postgresql_ext.yml | 2 +- .../integration/targets/postgresql/tasks/postgresql_idx.yml | 4 ++-- .../targets/postgresql/tasks/postgresql_membership.yml | 2 +- .../targets/postgresql/tasks/postgresql_owner.yml | 2 +- .../targets/postgresql/tasks/postgresql_privs.yml | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lib/ansible/modules/database/aerospike/aerospike_migrations.py b/lib/ansible/modules/database/aerospike/aerospike_migrations.py index 793b36310b5..fc90e14a870 100644 --- a/lib/ansible/modules/database/aerospike/aerospike_migrations.py +++ b/lib/ansible/modules/database/aerospike/aerospike_migrations.py @@ -266,7 +266,7 @@ class Migrations: return aerospike.client(config) def _info_cmd_helper(self, cmd, node=None, delimiter=';'): - """delimiter is for seperate stats that come back, NOT for kv + """delimiter is for separate stats that come back, NOT for kv separation which is =""" if node is None: # If no node passed, use the first one (local) node = self._nodes[0] @@ -316,7 +316,7 @@ class Migrations: def _update_cluster_namespace_list(self): """ make a unique list of namespaces TODO: does this work on a rolling namespace add/deletion? - thankfully if it doesnt, we dont need this on builds >=4.3""" + thankfully if it doesn't, we dont need this on builds >=4.3""" self._namespaces = set() for node in self._nodes: namespaces = self._info_cmd_helper('namespaces', node) @@ -418,7 +418,7 @@ class Migrations: def _is_min_cluster_size(self): """checks that all nodes in the cluster are returning the - mininimum cluster size specified in their statistics output""" + minimum cluster size specified in their statistics output""" sizes = set() for node in self._cluster_statistics: sizes.add(int(self._cluster_statistics[node]['cluster_size'])) diff --git a/lib/ansible/modules/database/mongodb/mongodb_user.py b/lib/ansible/modules/database/mongodb/mongodb_user.py index b93601c4387..ce4d150cead 100644 --- a/lib/ansible/modules/database/mongodb/mongodb_user.py +++ b/lib/ansible/modules/database/mongodb/mongodb_user.py @@ -150,7 +150,7 @@ EXAMPLES = ''' state: present # add a user 'oplog_reader' with read only access to the 'local' database on the replica_set 'belcher'. This is useful for oplog access (MONGO_OPLOG_URL). -# please notice the credentials must be added to the 'admin' database because the 'local' database is not syncronized and can't receive user credentials +# please notice the credentials must be added to the 'admin' database because the 'local' database is not synchronized and can't receive user credentials # To login with such user, the connection string should be MONGO_OPLOG_URL="mongodb://oplog_reader:oplog_reader_password@server1,server2/local?authSource=admin" # This syntax requires mongodb 2.6+ and pymongo 2.5+ - mongodb_user: diff --git a/lib/ansible/modules/database/proxysql/proxysql_backend_servers.py b/lib/ansible/modules/database/proxysql/proxysql_backend_servers.py index 5ea18b14e29..4595813c7d0 100644 --- a/lib/ansible/modules/database/proxysql/proxysql_backend_servers.py +++ b/lib/ansible/modules/database/proxysql/proxysql_backend_servers.py @@ -59,7 +59,7 @@ options: is 1000. max_replication_lag: description: - - If greater than 0, ProxySQL will reguarly monitor replication lag. If + - If greater than 0, ProxySQL will regularly monitor replication lag. If replication lag goes above I(max_replication_lag), proxysql will temporarily shun the server until replication catches up. If omitted the proxysql database default for I(max_replication_lag) is 0. diff --git a/lib/ansible/modules/database/proxysql/proxysql_global_variables.py b/lib/ansible/modules/database/proxysql/proxysql_global_variables.py index ab0e9a431e4..92b02b62e0d 100644 --- a/lib/ansible/modules/database/proxysql/proxysql_global_variables.py +++ b/lib/ansible/modules/database/proxysql/proxysql_global_variables.py @@ -53,7 +53,7 @@ EXAMPLES = ''' RETURN = ''' stdout: - description: Returns the mysql variable supplied with it's associted value. + description: Returns the mysql variable supplied with it's associated value. returned: Returns the current variable and value, or the newly set value for the variable supplied.. type: dict diff --git a/lib/ansible/modules/database/proxysql/proxysql_replication_hostgroups.py b/lib/ansible/modules/database/proxysql/proxysql_replication_hostgroups.py index 22ef86cfaa4..6cde01d9299 100644 --- a/lib/ansible/modules/database/proxysql/proxysql_replication_hostgroups.py +++ b/lib/ansible/modules/database/proxysql/proxysql_replication_hostgroups.py @@ -30,7 +30,7 @@ options: required: True comment: description: - - Text field that can be used for any purposed defined by the user. + - Text field that can be used for any purposes defined by the user. state: description: - When C(present) - adds the replication hostgroup, when C(absent) - diff --git a/test/integration/targets/postgresql/tasks/postgresql_ext.yml b/test/integration/targets/postgresql/tasks/postgresql_ext.yml index e24c8a5471b..2137e52b0f4 100644 --- a/test/integration/targets/postgresql/tasks/postgresql_ext.yml +++ b/test/integration/targets/postgresql/tasks/postgresql_ext.yml @@ -157,7 +157,7 @@ # I couldn't check it for two or more extension in one time # because most of the common extensions are available in postgresql-contrib package # that tries to change the default python interpreter and fails during tests respectively. -# Anyway, that's enough to be sure that the proper SQL was exequted. +# Anyway, that's enough to be sure that the proper SQL was executed. # # Drop extension cascade diff --git a/test/integration/targets/postgresql/tasks/postgresql_idx.yml b/test/integration/targets/postgresql/tasks/postgresql_idx.yml index 236821ffa9c..467c9e49083 100644 --- a/test/integration/targets/postgresql/tasks/postgresql_idx.yml +++ b/test/integration/targets/postgresql/tasks/postgresql_idx.yml @@ -253,7 +253,7 @@ - result.schema == 'public' - result.query == 'CREATE INDEX CONCURRENTLY test1_idx ON public.test_table USING BTREE (id) WHERE id > 1 AND id != 10' -# Drop index from spacific schema with cascade in check_mode +# Drop index from specific schema with cascade in check_mode - name: postgresql_idx - drop index from specific schema cascade in check_mode become_user: "{{ pg_user }}" become: yes @@ -295,7 +295,7 @@ - result.rowcount == 1 when: tablespace.rc == 0 -# Drop index from spacific schema with cascade +# Drop index from specific schema with cascade - name: postgresql_idx - drop index from specific schema cascade become_user: "{{ pg_user }}" become: yes diff --git a/test/integration/targets/postgresql/tasks/postgresql_membership.yml b/test/integration/targets/postgresql/tasks/postgresql_membership.yml index 574354fcc00..70051c494b9 100644 --- a/test/integration/targets/postgresql/tasks/postgresql_membership.yml +++ b/test/integration/targets/postgresql/tasks/postgresql_membership.yml @@ -93,7 +93,7 @@ - result.state == "present" - result.target_roles == ["user1"] -# Grant group1 to user1 againt to check that nothing changes: +# Grant group1 to user1 again to check that nothing changes: - name: postgresql_membership - grant group1 to user1 again become_user: "{{ pg_user }}" become: yes diff --git a/test/integration/targets/postgresql/tasks/postgresql_owner.yml b/test/integration/targets/postgresql/tasks/postgresql_owner.yml index 5894f0ab93c..1eca1ce362b 100644 --- a/test/integration/targets/postgresql/tasks/postgresql_owner.yml +++ b/test/integration/targets/postgresql/tasks/postgresql_owner.yml @@ -776,7 +776,7 @@ - result.rowcount == 1 # true mode obj_type: view again -- name: postgresql_owner - set vatview owner again +- name: postgresql_owner - set view owner again become_user: "{{ pg_user }}" become: yes postgresql_owner: diff --git a/test/integration/targets/postgresql/tasks/postgresql_privs.yml b/test/integration/targets/postgresql/tasks/postgresql_privs.yml index 588d747cea2..8b2b47fec5b 100644 --- a/test/integration/targets/postgresql/tasks/postgresql_privs.yml +++ b/test/integration/targets/postgresql/tasks/postgresql_privs.yml @@ -499,7 +499,7 @@ # Test ALL_IN_SCHEMA for 'partioned tables type # ################################################# -# Partioning tables is a feature introduced in Postgresql 10. +# Partitioning tables is a feature introduced in Postgresql 10. # (see https://www.postgresql.org/docs/10/ddl-partitioning.html ) # The test below check for this version