Skip to content

Commit

Permalink
Consolidate and validate sonar_edition variable
Browse files Browse the repository at this point in the history
PR: lrk#43
  • Loading branch information
chronicc committed Dec 10, 2021
1 parent 5e48001 commit acd0b5e
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 19 deletions.
2 changes: 2 additions & 0 deletions tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
---
# tasks file for ansible-role-sonarqube/

- include_tasks: validate_configuration.yaml

- name: "Create SonarQube system group"
group:
name: "{{ sonar_group }}"
Expand Down
17 changes: 1 addition & 16 deletions tasks/setup_prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,9 @@

- name: "Overwrite SonarQube download url for community edition"
set_fact:
sonar_download_url: "{{ __sonar_ce_download_url }}"
sonar_download_url: "{{ __sonar_download_url[sonar_edition] }}"
when:
- sonar_download_url is not defined
- sonar_edition == "community"

- name: "Overwrite SonarQube download url for developer edition"
set_fact:
sonar_download_url: "{{ __sonar_de_download_url }}"
when:
- sonar_download_url is not defined
- sonar_edition == "developer"

- name: "Overwrite SonarQube download url for enterprise edition"
set_fact:
sonar_download_url: "{{ __sonar_ee_download_url }}"
when:
- sonar_download_url is not defined
- sonar_edition == "enterprise"

- name: "Overwrite SonarQube plugin base url"
set_fact:
Expand Down
7 changes: 7 additions & 0 deletions tasks/validate_configuration.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---

- name: Validate sonar_edition
assert:
that:
- sonar_edition in __sonar_download_url
fail_msg: "'sonar_edition' must be one of 'community', 'developer', 'enterprise'"
7 changes: 4 additions & 3 deletions vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ __sonar_commercial_distribution_url: "{{ __sonarsource_url }}/CommercialDistribu
__sonar_archive: "sonarqube-{{ sonar_version }}.zip"
__sonar_de_archive: "sonarqube-developer-{{ sonar_version }}.zip"
__sonar_ee_archive: "sonarqube-enterprise-{{ sonar_version }}.zip"
__sonar_ce_download_url: "{{ __sonar_distribution_url }}/sonarqube/{{ __sonar_archive }}"
__sonar_de_download_url: "{{ __sonar_commercial_distribution_url }}/sonarqube-developer/{{ __sonar_de_archive }}"
__sonar_ee_download_url: "{{ __sonar_commercial_distribution_url }}/sonarqube-enterprise/{{ __sonar_ee_archive }}"
__sonar_download_url:
community: "{{ __sonar_distribution_url }}/sonarqube/{{ __sonar_archive }}"
developer: "{{ __sonar_commercial_distribution_url }}/sonarqube-developer/{{ __sonar_de_archive }}"
enterprise: "{{ __sonar_commercial_distribution_url }}/sonarqube-enterprise/{{ __sonar_ee_archive }}"
__sonar_commercial_download_url: "{{ __sonar_distribution_url }}/sonarqube/{{ __sonar_archive }}"
__sonar_plugin_home: "{{ sonar_base_dir }}/extensions/plugins"
__sonar_plugin_baseurl: "{{ __sonar_distribution_url }}"
Expand Down

0 comments on commit acd0b5e

Please sign in to comment.