diff --git a/.config/manifest.txt b/.config/manifest.txt index 685b2d68..78420d66 100644 --- a/.config/manifest.txt +++ b/.config/manifest.txt @@ -106,5 +106,6 @@ schemas/event/range.json schemas/event/README.md schemas/README.md tests/ +tests/config.yml tests/integration/ tests/__init__.py diff --git a/examples/eda-setup.yml b/examples/eda-setup.yml index d531355b..18081c30 100644 --- a/examples/eda-setup.yml +++ b/examples/eda-setup.yml @@ -1,8 +1,9 @@ # Example playbook that demonstrates how to use the Ansible EDA collection to perform a basic setup. -- hosts: localhost +- name: Example playbook for Ansible EDA collection + hosts: localhost connection: local - gather_facts: no + gather_facts: false vars: controller_host: your eda controller url, e.g. https://eda-controller.example.com controller_username: your eda controller username @@ -15,7 +16,7 @@ quay_password: your quay.io password organization_name: Default - validate_certs: no + validate_certs: false module_defaults: group/ansible.eda.eda: controller_host: "{{ controller_host }}" @@ -88,17 +89,17 @@ name: basic event stream - name: Print the event stream url - debug: + ansible.builtin.debug: msg: "Event Stream URL: {{ event_stream_data.event_streams[0].url }}" - name: Remove the activation if it exists - ansible.eda.activation: + ansible.eda.rulebook_activation: organization_name: "{{ organization_name }}" name: activation-example state: absent - name: Activate a rulebook - ansible.eda.activation: + ansible.eda.rulebook_activation: organization_name: "{{ organization_name }}" decision_environment_name: upstream decision environment project_name: test project @@ -112,5 +113,5 @@ until: activation_status.activations | length > 0 and activation_status.activations[0].status == "running" retries: 30 delay: 2 - ansible.eda.activation_info: + ansible.eda.rulebook_activation_info: name: activation-example diff --git a/galaxy.yml b/galaxy.yml index 03add643..e0110566 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -96,7 +96,6 @@ build_ignore: - pyproject.toml - run_pytest.yml - start_app.yml - - tests/config.yml - tests/conftest.py - tests/integration/* - tests/run-staging diff --git a/meta/runtime.yml b/meta/runtime.yml index fd43884c..0e158333 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -26,14 +26,14 @@ plugin_routing: activation: redirect: ansible.eda.rulebook_activation deprecation: - removal_version: 4.0.0 - warning_text: >- - activation has been renamed to rulebook_activation. - Please update your tasks. + removal_version: 4.0.0 + warning_text: >- + activation has been renamed to rulebook_activation. + Please update your tasks. activation_info: redirect: ansible.eda.rulebook_activation_info deprecation: - removal_version: 4.0.0 - warning_text: >- - activation_info has been renamed to rulebook_activation_info. - Please update your tasks. + removal_version: 4.0.0 + warning_text: >- + activation_info has been renamed to rulebook_activation_info. + Please update your tasks. diff --git a/plugins/modules/credential_info.py b/plugins/modules/credential_info.py index 3e1bebc7..6036f937 100644 --- a/plugins/modules/credential_info.py +++ b/plugins/modules/credential_info.py @@ -32,12 +32,12 @@ EXAMPLES = """ - - name: Get information about a credential - ansible.eda.credential_info: - name: "Test" +- name: Get information about a credential + ansible.eda.credential_info: + name: "Test" - - name: List all credentials - ansible.eda.credential_info: +- name: List all credentials + ansible.eda.credential_info: """ diff --git a/plugins/modules/credential_type.py b/plugins/modules/credential_type.py index ed085667..d79dcc38 100644 --- a/plugins/modules/credential_type.py +++ b/plugins/modules/credential_type.py @@ -54,24 +54,24 @@ EXAMPLES = """ - - name: Create a credential type - ansible.eda.credential_type: - name: "Test" - state: present - description: "A test credential type" - inputs: - fields: - - id: "Field1" - type: "string" - label: "Label1" - injectors: - extra_vars: - field1: "field1" - - - name: Delete a credential type - ansible.eda.credential_type: - name: "Test" - state: absent +- name: Create a credential type + ansible.eda.credential_type: + name: "Test" + state: present + description: "A test credential type" + inputs: + fields: + - id: "Field1" + type: "string" + label: "Label1" + injectors: + extra_vars: + field1: "field1" + +- name: Delete a credential type + ansible.eda.credential_type: + name: "Test" + state: absent """ diff --git a/plugins/modules/credential_type_info.py b/plugins/modules/credential_type_info.py index e0f3e3dd..047a45e8 100644 --- a/plugins/modules/credential_type_info.py +++ b/plugins/modules/credential_type_info.py @@ -32,12 +32,12 @@ EXAMPLES = """ - - name: Get information about a credential type - ansible.eda.credential_type_info: - name: "Test" +- name: Get information about a credential type + ansible.eda.credential_type_info: + name: "Test" - - name: List all credential types - ansible.eda.credential_type_info: +- name: List all credential types + ansible.eda.credential_type_info: """ diff --git a/plugins/modules/event_stream_info.py b/plugins/modules/event_stream_info.py index d57f33d9..b89beda5 100644 --- a/plugins/modules/event_stream_info.py +++ b/plugins/modules/event_stream_info.py @@ -32,12 +32,12 @@ EXAMPLES = r""" - - name: Get information about a event stream - ansible.eda.event_stream_info: - name: "Test" +- name: Get information about a event stream + ansible.eda.event_stream_info: + name: "Test" - - name: List all event streams - ansible.eda.event_stream_info: +- name: List all event streams + ansible.eda.event_stream_info: """ diff --git a/plugins/modules/rulebook_activation.py b/plugins/modules/rulebook_activation.py index 27d73abf..709f8f23 100644 --- a/plugins/modules/rulebook_activation.py +++ b/plugins/modules/rulebook_activation.py @@ -151,7 +151,7 @@ project_name: "Example Project" rulebook_name: "hello_controller.yml" decision_environment_name: "Example Decision Environment" - enabled: False + enabled: false awx_token_name: "Example Token" - name: Create a rulebook activation with event_streams option @@ -161,7 +161,7 @@ project_name: "Example Project" rulebook_name: "hello_controller.yml" decision_environment_name: "Example Decision Environment" - enabled: False + enabled: false awx_token_name: "Example Token" organization_name: "Default" event_streams: diff --git a/plugins/modules/rulebook_activation_info.py b/plugins/modules/rulebook_activation_info.py index 2572327d..7b5a28c8 100644 --- a/plugins/modules/rulebook_activation_info.py +++ b/plugins/modules/rulebook_activation_info.py @@ -30,12 +30,12 @@ EXAMPLES = """ - - name: Get information about a rulebook activation - ansible.eda.rulebook_activation_info: - name: "Example Rulebook Activation" +- name: Get information about a rulebook activation + ansible.eda.rulebook_activation_info: + name: "Example Rulebook Activation" - - name: List all rulebook activations - ansible.eda.rulebook_activation_info: +- name: List all rulebook activations + ansible.eda.rulebook_activation_info: """ diff --git a/plugins/modules/rulebook_info.py b/plugins/modules/rulebook_info.py index f4c25ae4..7c1966fd 100644 --- a/plugins/modules/rulebook_info.py +++ b/plugins/modules/rulebook_info.py @@ -39,13 +39,13 @@ EXAMPLES = """ - - name: Get information about a rulebook - ansible.eda.rulebook_info: - name: "Example Rulebook Activation" - project_name: "Example Project" +- name: Get information about a rulebook + ansible.eda.rulebook_info: + name: "Example Rulebook Activation" + project_name: "Example Project" - - name: List all rulebooks - ansible.eda.rulebook_info: +- name: List all rulebooks + ansible.eda.rulebook_info: """ diff --git a/plugins/modules/user.py b/plugins/modules/user.py index c1d02878..6cdc73c4 100644 --- a/plugins/modules/user.py +++ b/plugins/modules/user.py @@ -88,7 +88,7 @@ last_name: "Test Collection User" email: "test@test.com" password: "test" - is_superuser: True + is_superuser: true state: present no_log: true