Merge pull request #93 from Yaish25491/ACA-1656_default_values

ACA-1656: Removing redundant default variables from the role's default file.

changelogs/fragments/20241308-azure_manage_postgresql.yml

@@ -0,0 +1,2 @@
+bugfixes:
+  - Removing redundant default variables from the role's default file.

roles/azure_manage_postgresql/defaults/main.yml

@@ -1,8 +1,3 @@
 ---
 azure_manage_postgresql_operation: create
-azure_manage_postgresql_postgresql_version: "9.5"
-azure_manage_postgresql_postgresql_settings: []
-azure_manage_postgresql_postgresql_firewall_rules: []
-azure_manage_postgresql_postgresql_database_instances: []
-azure_manage_postgresql_delete_server: false
-azure_manage_postgresql_delete_resource_group: false
+azure_manage_postgresql_postgresql_version: "11"

roles/azure_manage_postgresql/tasks/delete.yml

@@ -30,12 +30,16 @@
     resource_group: "{{ azure_manage_postgresql_resource_group }}"
     name: "{{ azure_manage_postgresql_postgresql_name }}"
     state: absent
-  when: azure_manage_postgresql_delete_server
+  when:
+    - azure_manage_postgresql_delete_server is defined
+    - azure_manage_postgresql_delete_server
 
 - name: Delete Resource group if requested
   ansible.builtin.include_role:
     name: cloud.azure_ops.azure_manage_resource_group
   vars:
     azure_manage_resource_group_operation: delete
     azure_manage_resource_group_name: "{{ azure_manage_postgresql_resource_group }}"
-  when: azure_manage_postgresql_delete_resource_group
+  when:
+    - azure_manage_postgresql_delete_resource_group is defined
+    - azure_manage_postgresql_delete_resource_group

tests/integration/targets/test_azure_manage_postgresql/tasks/create_and_delete_postgresql.yml

@@ -7,7 +7,6 @@
 
     - name: Set vars for test
       ansible.builtin.set_fact:
-        azure_manage_postgresql_postgresql_version: "9.6"
         azure_manage_postgresql_postgresql_firewall_rules:
           - name: "rule_0"
             start_ip_address: "172.10.1.0"
@@ -39,7 +38,7 @@
           - _postgresql.servers[0].sku.name == azure_manage_postgresql_postgresql_sku.name
           - _postgresql.servers[0].storage_mb == azure_manage_postgresql_postgresql_storage_mb
           - _postgresql.servers[0].admin_username == azure_manage_postgresql_postgresql_admin_username
-          - _postgresql.servers[0].version == azure_manage_postgresql_postgresql_version
+          - _postgresql.servers[0].version == "11"
 
     # Verify that PostgreSQL Server firewall rule was created as expected
     - name: Gather PostgreSQL Server firewall rule info