From e95394b9d5c7125b5dd0928bdfbc14633892d222 Mon Sep 17 00:00:00 2001 From: trfore Date: Sun, 31 Mar 2024 11:51:43 -0500 Subject: [PATCH 1/8] docs: add code of conduct --- .github/CODE_OF_CONDUCT.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .github/CODE_OF_CONDUCT.md diff --git a/.github/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md new file mode 100644 index 0000000..0164155 --- /dev/null +++ b/.github/CODE_OF_CONDUCT.md @@ -0,0 +1,3 @@ +# Community Code of Conduct + +Please see the official [Ansible Community Code of Conduct](https://docs.ansible.com/ansible/latest/community/code_of_conduct.html). From d9362b7cdf144630069d50e95e65f564e68ec41d Mon Sep 17 00:00:00 2001 From: trfore Date: Sun, 31 Mar 2024 11:51:53 -0500 Subject: [PATCH 2/8] docs: mv to new template format --- .github/ISSUE_TEMPLATE/bug_report.md | 42 ------------------- .github/ISSUE_TEMPLATE/bug_report.yml | 49 ++++++++++++++++++++++ .github/ISSUE_TEMPLATE/feature_request.md | 18 -------- .github/ISSUE_TEMPLATE/feature_request.yml | 35 ++++++++++++++++ 4 files changed, 84 insertions(+), 60 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/bug_report.md create mode 100644 .github/ISSUE_TEMPLATE/bug_report.yml delete mode 100644 .github/ISSUE_TEMPLATE/feature_request.md create mode 100644 .github/ISSUE_TEMPLATE/feature_request.yml diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index c37fad0..0000000 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,42 +0,0 @@ ---- -name: Bug report -about: Create a report to help us improve -title: '' -labels: '' ---- - -### Describe the bug - -A clear and concise description of what the bug is. - -### To Reproduce - -Steps to reproduce the behavior: - -1. Deploy the role / collection using the following playbook: - -```YAML ---- -# Your Playbook -``` - -2. See error - -```sh -# Your Error Message(s) -``` - -### Expected behavior - -A clear and concise description of what you expected to happen. - -### Your environment - -- Version of Ansible, Molecule, and Python (Please paste the output from `ansible --version && molecule --version && python --version`): -- Version of Jinja2: -- Control node OS (e.g. Ubuntu 20.04, `cat /etc/os-release`): -- Target node OS: - -### Additional context - -Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml new file mode 100644 index 0000000..1b0acbd --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -0,0 +1,49 @@ +name: Bug Report +description: File a bug report +title: "[Bug]: " +labels: ["bug"] +assignees: + - trfore +body: + - type: markdown + attributes: + value: | + Thanks for taking the time to fill out this bug report! + - type: textarea + id: what-happened + attributes: + label: What happened? + description: Also tell us, what did you expect to happen? + placeholder: Tell us what you see! + validations: + required: true + - type: textarea + id: yaml-playbook + attributes: + label: Relevant code or playbook + description: Please copy and paste any relevant code / playbook. This will be automatically formatted into YAML, so no need for backticks. + render: yaml + - type: textarea + id: logs + attributes: + label: Relevant log output + description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks. + render: shell + - type: textarea + id: ansible-version + attributes: + label: Ansible version + description: What version of Ansible, Molecule, and Python? (Please paste the output from `ansible --version && molecule --version && python --version`) + placeholder: "Example: ansible-core 2.10.0, python 3.8" + - type: input + id: control-node + attributes: + label: Control node OS + description: What OS is the Ansible controller running on? + placeholder: "Ubuntu 22.04" + - type: input + id: target-node + attributes: + label: Target node OS + description: What OS are you targeting in the plays? + placeholder: "CentOS 8" diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md deleted file mode 100644 index 446d19a..0000000 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ /dev/null @@ -1,18 +0,0 @@ ---- -name: Feature request -about: Suggest an idea for this project -title: '' -labels: '' ---- - -### Is your feature request related to a problem? Please describe. - -A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] - -### Describe the solution you'd like - -A clear and concise description of what you want to happen. - -### Additional context - -Add any other context or screenshots about the feature request here. diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml new file mode 100644 index 0000000..e528103 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.yml @@ -0,0 +1,35 @@ +--- +name: Feature request +description: Suggest an idea for this project +title: "[Feature]: " +labels: ["enhancement"] +assignees: + - trfore +body: + - type: markdown + attributes: + value: | + Thanks for taking the time to suggest new features! + - type: textarea + id: problem-statement + attributes: + label: General problem or idea + description: Is your feature request related to a problem? Please describe. + placeholder: "Example: I'm always frustrated when ..." + validations: + required: true + - type: textarea + id: solution-statement + attributes: + label: Describe the solution you'd like + description: A clear and concise description of what you want to happen. + - type: textarea + id: alternative-solutions + attributes: + label: Describe alternatives you've considered + description: A clear and concise description of any alternative solutions or features you've considered. + - type: textarea + id: additional-context + attributes: + label: Additional Context + description: Add any other context about the feature request. From 018bb69d19b30800da2bce45874175aed5346c9e Mon Sep 17 00:00:00 2001 From: trfore Date: Mon, 1 Apr 2024 15:19:18 -0500 Subject: [PATCH 3/8] test: additional pre-commit hooks --- .pre-commit-config.yaml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b4bf93a..9a5aaf0 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,11 +2,21 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks rev: v4.4.0 hooks: - - id: check-yaml - args: [--allow-multiple-documents] + - id: check-merge-conflict + - id: check-symlinks + - id: debug-statements - id: end-of-file-fixer + - id: no-commit-to-branch + args: [--branch, main] - id: trailing-whitespace args: [--markdown-linebreak-ext=md] + - id: check-yaml + args: [--allow-multiple-documents] + + - repo: https://github.com/asottile/add-trailing-comma + rev: v3.0.0 + hooks: + - id: add-trailing-comma - repo: https://github.com/adrienverge/yamllint rev: v1.31.0 From 9234e95991c36c4575c1b8f18cf07b78f08fca1a Mon Sep 17 00:00:00 2001 From: trfore Date: Mon, 1 Apr 2024 15:22:58 -0500 Subject: [PATCH 4/8] docs: add omada migration links --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index abb8f44..5258342 100644 --- a/README.md +++ b/README.md @@ -154,6 +154,9 @@ Taylor Fore (https://github.com/trfore) - https://www.tp-link.com/hk/support/faq/3583/ - Omada SDN Port List - https://www.tp-link.com/us/support/faq/865/ +- Omada Controller - Site Migration + - https://www.tp-link.com/us/omada-sdn/controller-upgrade/ + - https://www.tp-link.com/us/omada-sdn/controller-upgrade/#content-5_1_2 [ansible-role-jsvc]: https://github.com/trfore/ansible-role-jsvc [trfore.jsvc]: https://galaxy.ansible.com/trfore/jsvc From 080f43d0cd48dbb35888681c511ad66e84212311 Mon Sep 17 00:00:00 2001 From: trfore Date: Mon, 1 Apr 2024 15:23:37 -0500 Subject: [PATCH 5/8] chore: update ansible metadata --- meta/main.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/meta/main.yml b/meta/main.yml index a9d7f09..77b70f2 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -6,7 +6,7 @@ galaxy_info: license: MIT - min_ansible_version: "2.14" + min_ansible_version: 2.14 platforms: - name: Debian @@ -16,6 +16,7 @@ galaxy_info: - name: Ubuntu versions: [focal, jammy] - galaxy_tags: - - networking - - omada + galaxy_tags: [networking, omada] + repository: https://github.com/trfore/ansible-role-omada-install + homepage: https://github.com/trfore/ansible-role-omada-install + issues: https://github.com/trfore/ansible-role-omada-install/issues From 6ab3098ee1455be918147f8bd4271b8a7a7fe139 Mon Sep 17 00:00:00 2001 From: trfore Date: Mon, 1 Apr 2024 15:25:00 -0500 Subject: [PATCH 6/8] fix: version updater accepts two-digit semver --- .github/workflows/update_omada.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/update_omada.yml b/.github/workflows/update_omada.yml index df1e902..9fb8fcc 100644 --- a/.github/workflows/update_omada.yml +++ b/.github/workflows/update_omada.yml @@ -18,12 +18,12 @@ jobs: TARGET="https://static.tp-link.com/upload/software/.*.gz" latest_url=$(curl -s $URL | grep -om1 "${TARGET}") - latest_version=$(echo $latest_url | grep -o "[0-9]\.[0-9]\.[0-9][0-9]\?") + latest_version=$(echo $latest_url | grep -o "[0-9]\{1,2\}\.[0-9]\{1,2\}\.[0-9]\{1,2\}") echo "latest_url=$latest_url" >>$GITHUB_OUTPUT echo "latest_version=$latest_version" >>$GITHUB_OUTPUT current_url=$(>$GITHUB_OUTPUT echo "current_version=$current_version" >>$GITHUB_OUTPUT From a2e141ff6c70d7060c353c432ab2ba914fb17bcb Mon Sep 17 00:00:00 2001 From: trfore Date: Mon, 1 Apr 2024 15:29:57 -0500 Subject: [PATCH 7/8] docs: rm forbidden metadata --- meta/main.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/meta/main.yml b/meta/main.yml index 77b70f2..2e96d5a 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -17,6 +17,3 @@ galaxy_info: versions: [focal, jammy] galaxy_tags: [networking, omada] - repository: https://github.com/trfore/ansible-role-omada-install - homepage: https://github.com/trfore/ansible-role-omada-install - issues: https://github.com/trfore/ansible-role-omada-install/issues From 29c9f350069f9c173ebfae5a4da6c894774f4d0d Mon Sep 17 00:00:00 2001 From: trfore Date: Mon, 1 Apr 2024 15:32:09 -0500 Subject: [PATCH 8/8] docs: formatting min_ver to string --- meta/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/main.yml b/meta/main.yml index 2e96d5a..5ed88ae 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -6,7 +6,7 @@ galaxy_info: license: MIT - min_ansible_version: 2.14 + min_ansible_version: "2.14" platforms: - name: Debian