Skip to content

Commit aaa8fb4

Browse files
committed
changes by review
1 parent 8ac075e commit aaa8fb4

File tree

9 files changed

+11
-10
lines changed

9 files changed

+11
-10
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
.cache
22
*.swp
33
__pycache__*
4-
.vscode
4+
.vscode

docs/module-elasticsearch_role.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Module arguments
2323
* *host*: API endpoint (**Required**)
2424
* *auth_user*: User to authenticate on the Elasticsearch API (**Required**)
2525
* *auth_pass*: Password for the given user (**Required**)
26-
* *verify_certs*: Verify certificates (Default: True)
26+
* *verify_certs*: Verify certificates (Default: `true`)
2727
* *ca_certs*: Verify HTTPS connection by using ca certificate. Path to ca needs to be given
2828

2929
Example usage

docs/module-elasticsearch_user.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Module arguments
2424
* *host*: API endpoint (**Required**)
2525
* *auth_user*: User to authenticate on the Elasticsearch API (**Required**)
2626
* *auth_pass*: Password for the given user (**Required**)
27-
* *verify_certs*: Verify certificates (Default: True)
27+
* *verify_certs*: Verify certificates (Default: `true`)
2828
* *ca_certs*: Verify HTTPS connection by using ca certificate. Path to ca needs to be given
2929

3030
Example usage

molecule/elasticsearch_test_modules/converge.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
- netways.elasticstack
77
hosts: all
88
vars:
9-
#elasticsearch_security: true # needed for tests of > 7 releases
109
elasticstack_full_stack: false
1110
elasticsearch_jna_workaround: true
1211
elasticsearch_disable_systemcallfilterchecks: true
13-
elasticstack_release: "{{ lookup('env', 'ELASTIC_RELEASE') | int}}"
12+
#elasticstack_release: "{{ lookup('env', 'ELASTIC_RELEASE') | int}}"
13+
elasticstack_release: 8
1414
elasticsearch_heap: "1"
1515
elasticstack_no_log: false
1616
tasks:

molecule/elasticsearch_test_modules/molecule.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,7 @@ platforms:
1818
pre_build_image: true
1919
provisioner:
2020
name: ansible
21+
env:
22+
ANSIBLE_VERBOSITY: 3
2123
verifier:
2224
name: ansible

molecule/elasticsearch_test_modules/prepare.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,3 @@
2020
name: "{{ item }}"
2121
loop:
2222
- elasticsearch
23-
- certifi

plugins/module_utils/api.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ def new_client_basic_auth(host, auth_user, auth_pass, ca_certs, verify_certs) ->
1212
ctx = ssl.create_default_context(cafile=ca_certs)
1313
ctx.check_hostname = False
1414
ctx.verify_mode = False
15-
return Elasticsearch(hosts=[host], basic_auth=(auth_user, auth_pass), ssl_context=ctx, verify_certs=verify_certs)
15+
return Elasticsearch(hosts=[host], basic_auth=(auth_user, auth_pass), ssl_context=ctx, verify_certs=verify_certs)

plugins/modules/elasticsearch_role.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def run_module():
5454
# Auth args
5555
host=dict(type=str, required=True),
5656
auth_user=dict(type=str, required=True),
57-
auth_pass=dict(type=str, required=True),
57+
auth_pass=dict(type=str, required=True, no_log=True),
5858
ca_certs=dict(type=str, required=False),
5959
verify_certs=dict(type=bool, required=False, default=True)
6060
)

plugins/modules/elasticsearch_user.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def run_module():
4040
# User args
4141
name=dict(type=str, required=True),
4242
fullname=dict(type=str, required=False),
43-
password=dict(type=str, required=True),
43+
password=dict(type=str, required=True, no_log=True),
4444
email=dict(type=str, required=False),
4545
roles=dict(type=list, required=True),
4646
enabled=dict(type=bool, required=False, default=True),
@@ -49,7 +49,7 @@ def run_module():
4949
# Auth args
5050
host=dict(type=str, required=True),
5151
auth_user=dict(type=str, required=True),
52-
auth_pass=dict(type=str, required=True),
52+
auth_pass=dict(type=str, required=True, no_log=True),
5353
ca_certs=dict(type=str, required=False),
5454
verify_certs=dict(type=bool, required=False, default=True)
5555
)

0 commit comments

Comments
 (0)