Skip to content

Guard URI retry loops against missing .json attribute #57

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.

Sign up for GitHub

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

Merged
Oddly merged 1 commit into from
Mar 4, 2026
Merged

Guard URI retry loops against missing .json attribute #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions roles/elasticsearch/tasks/elasticsearch-rolling-upgrade.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
validate_certs: "{{ elasticsearch_validate_api_certs }}"
force_basic_auth: true
register: elasticsearch_response
until: elasticsearch_response.json.acknowledged | default(false)
until: (elasticsearch_response.json | default({})).acknowledged | default(false)
retries: 10
delay: 30
no_log: "{{ elasticstack_no_log }}"
Expand All @@ -119,7 +119,7 @@
validate_certs: "{{ elasticsearch_validate_api_certs }}"
force_basic_auth: true
register: elasticsearch_response
until: (elasticsearch_response.json.status | default('')) in ['green', 'yellow']
until: ((elasticsearch_response.json | default({})).status | default('')) in ['green', 'yellow']
retries: 50
delay: 30
no_log: "{{ elasticstack_no_log }}"
Expand All @@ -137,7 +137,7 @@
validate_certs: "{{ elasticsearch_validate_api_certs }}"
force_basic_auth: true
register: elasticsearch_response
until: elasticsearch_response.json.acknowledged | default(false)
until: (elasticsearch_response.json | default({})).acknowledged | default(false)
retries: 5
delay: 10
no_log: "{{ elasticstack_no_log }}"
Expand Down Expand Up @@ -235,7 +235,7 @@
validate_certs: "{{ elasticsearch_validate_api_certs }}"
force_basic_auth: true
register: elasticsearch_response
until: elasticsearch_response.json.acknowledged | default(false)
until: (elasticsearch_response.json | default({})).acknowledged | default(false)
retries: 5
delay: 30
no_log: "{{ elasticstack_no_log }}"
Expand All @@ -249,7 +249,7 @@
validate_certs: "{{ elasticsearch_validate_api_certs }}"
force_basic_auth: true
register: elasticsearch_response
until: (elasticsearch_response.json.status | default('')) in ['green', 'yellow']
until: ((elasticsearch_response.json | default({})).status | default('')) in ['green', 'yellow']
retries: 30
delay: 30
no_log: "{{ elasticstack_no_log }}"
Expand Down
8 changes: 4 additions & 4 deletions roles/elasticsearch/tasks/elasticsearch-security.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@

# Extract CA chain from the already-deployed transport cert on the node.
# Uses copy+content for idempotency (only writes when content changes).
- name: Read CA chain from PEM bundle (transport cert)

Check warning on line 269 in roles/elasticsearch/tasks/elasticsearch-security.yml

View workflow job for this annotation

GitHub Actions / lint_elasticsearch / lint

var-naming[no-role-prefix] 

Variables names from within roles should use elasticsearch_ as a prefix. (register: _extracted_ca_chain)

Check warning on line 269 in roles/elasticsearch/tasks/elasticsearch-security.yml

View workflow job for this annotation

GitHub Actions / lint

var-naming[no-role-prefix] 

Variables names from within roles should use elasticsearch_ as a prefix. (register: _extracted_ca_chain)

Check warning on line 269 in roles/elasticsearch/tasks/elasticsearch-security.yml

View workflow job for this annotation

GitHub Actions / lint_full / lint

var-naming[no-role-prefix] 

Variables names from within roles should use elasticsearch_ as a prefix. (register: _extracted_ca_chain)
ansible.builtin.shell:
cmd: >-
awk '/-----BEGIN CERTIFICATE-----/{n++} n>1'
Expand Down Expand Up @@ -300,7 +300,7 @@

# -- Remove stale auto-generated P12 files from a previous elasticsearch_ca deployment --

- name: Find stale auto-generated P12 certificate files

Check warning on line 303 in roles/elasticsearch/tasks/elasticsearch-security.yml

View workflow job for this annotation

GitHub Actions / lint_elasticsearch / lint

var-naming[no-role-prefix] 

Variables names from within roles should use elasticsearch_ as a prefix. (register: _stale_p12_files)

Check warning on line 303 in roles/elasticsearch/tasks/elasticsearch-security.yml

View workflow job for this annotation

GitHub Actions / lint

var-naming[no-role-prefix] 

Variables names from within roles should use elasticsearch_ as a prefix. (register: _stale_p12_files)

Check warning on line 303 in roles/elasticsearch/tasks/elasticsearch-security.yml

View workflow job for this annotation

GitHub Actions / lint_full / lint

var-naming[no-role-prefix] 

Variables names from within roles should use elasticsearch_ as a prefix. (register: _stale_p12_files)
ansible.builtin.find:
paths: /etc/elasticsearch/certs
patterns: "*.p12"
Expand Down Expand Up @@ -366,7 +366,7 @@
# The CA backup removes the entire elasticstack_ca_dir, which also
# contains Kibana encryption key files. If those are regenerated,
# Kibana can't decrypt its existing saved objects and enters 503.
- name: Check for Kibana encryption keys before CA backup

Check warning on line 369 in roles/elasticsearch/tasks/elasticsearch-security.yml

View workflow job for this annotation

GitHub Actions / lint_elasticsearch / lint

var-naming[no-role-prefix] 

Variables names from within roles should use elasticsearch_ as a prefix. (register: _kibana_enckeys_before_backup)

Check warning on line 369 in roles/elasticsearch/tasks/elasticsearch-security.yml

View workflow job for this annotation

GitHub Actions / lint

var-naming[no-role-prefix] 

Variables names from within roles should use elasticsearch_ as a prefix. (register: _kibana_enckeys_before_backup)

Check warning on line 369 in roles/elasticsearch/tasks/elasticsearch-security.yml

View workflow job for this annotation

GitHub Actions / lint_full / lint

var-naming[no-role-prefix] 

Variables names from within roles should use elasticsearch_ as a prefix. (register: _kibana_enckeys_before_backup)
ansible.builtin.stat:
path: "{{ elasticstack_ca_dir }}/{{ item }}"
loop:
Expand Down Expand Up @@ -675,7 +675,7 @@
no_log: "{{ elasticstack_no_log }}"
when:
- not elasticsearch_passwords_file.stat.exists | bool
until: elasticsearch_api_status_bootstrap.json.cluster_name is defined
until: (elasticsearch_api_status_bootstrap.json | default({})).cluster_name is defined
retries: 30
delay: 10

Expand All @@ -694,7 +694,7 @@
no_log: "{{ elasticstack_no_log }}"
when:
- not elasticsearch_passwords_file.stat.exists | bool
until: elasticsearch_cluster_status_bootstrap.json.status in ["green", "yellow"]
until: (elasticsearch_cluster_status_bootstrap.json | default({})).status | default('') in ["green", "yellow"]
retries: 30
delay: 10

Expand All @@ -718,7 +718,7 @@
no_log: "{{ elasticstack_no_log }}"
when:
- elasticsearch_passwords_file.stat.exists | bool
until: elasticsearch_api_status.json.cluster_name is defined
until: (elasticsearch_api_status.json | default({})).cluster_name is defined
retries: 20
delay: 10

Expand Down Expand Up @@ -768,7 +768,7 @@
no_log: "{{ elasticstack_no_log }}"
when:
- elasticsearch_passwords_file.stat.exists | bool
until: (elasticsearch_cluster_status.json.status | default('')) in ['green', 'yellow']
until: ((elasticsearch_cluster_status.json | default({})).status | default('')) in ['green', 'yellow']
retries: 20
delay: 10

Expand Down
2 changes: 1 addition & 1 deletion roles/elasticsearch/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@

- name: Construct exact name of Elasticsearch package
ansible.builtin.set_fact:
elasticsearch_package: >-

Check warning on line 144 in roles/elasticsearch/tasks/main.yml

View workflow job for this annotation

GitHub Actions / lint_elasticsearch / lint

jinja[spacing] 

Jinja2 spacing could be improved: {{ 'elasticsearch' + ((elasticstack_versionseparator + elasticstack_version | string ) if (elasticstack_version is defined and elasticstack_version | length > 0 and elasticstack_version != 'latest') else '') | replace(' ', '') }} -> {{ 'elasticsearch' + ((elasticstack_versionseparator + elasticstack_version | string) if (elasticstack_version is defined and elasticstack_version | length > 0 and elasticstack_version != 'latest') else '') | replace(' ', '') }}
{{
'elasticsearch' +
((elasticstack_versionseparator +
Expand Down Expand Up @@ -251,7 +251,7 @@

# Pre-detect external cert state so the template renders consistently
# across first and subsequent runs (idempotency).
- name: Detect existing external CA for template rendering

Check warning on line 254 in roles/elasticsearch/tasks/main.yml

View workflow job for this annotation

GitHub Actions / lint_elasticsearch / lint

var-naming[no-role-prefix] 

Variables names from within roles should use elasticsearch_ as a prefix. (register: _existing_ca_cert)
ansible.builtin.stat:
path: /etc/elasticsearch/certs/ca.crt
register: _existing_ca_cert
Expand Down Expand Up @@ -471,7 +471,7 @@
url: "http://{{ elasticsearch_api_host }}:{{ elasticstack_elasticsearch_http_port }}/_cluster/health?pretty"
register: elasticsearch_cluster_status
ignore_errors: "{{ ansible_check_mode }}"
until: (elasticsearch_cluster_status.json.status | default('')) in ['green', 'yellow']
until: ((elasticsearch_cluster_status.json | default({})).status | default('')) in ['green', 'yellow']
retries: 30
delay: 10
no_log: "{{ elasticstack_no_log }}"
Expand Down
Loading