Merge pull request #139 from essentialkaos/develop

Version 1.4.0

.github/ISSUE_TEMPLATE/bug.yml

@@ -0,0 +1,64 @@
+name: ❗ Bug Report
+description: File a bug report
+title: "[Bug]: "
+labels: ["issue • bug"]
+assignees:
+  - andyone
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        > [!IMPORTANT]  
+        > Before you open an issue, search GitHub Issues for a similar bug reports. If so, please add a 👍 reaction to the existing issue.
+
+  - type: textarea
+    attributes:
+      label: Verbose application info
+      description: Output of `updown-badge-server -vv` command
+      render: shell
+    validations:
+      required: true
+
+  - type: dropdown
+    id: version
+    attributes:
+      label: Install tools
+      description: How did you install this application
+      options:
+        - From Sources
+        - RPM Package
+        - Prebuilt Binary
+      default: 0
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Steps to reproduce
+      description: Short guide on how to reproduce this problem on our site
+      placeholder: |
+        1. [First Step]
+        2. [Second Step]
+        3. [and so on...]
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Expected behavior
+      description: What you expected to happen
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Actual behavior
+      description: What actually happened
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Additional info
+      description: Include gist of relevant config, logs, etc.

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,14 @@
+blank_issues_enabled: false
+
+contact_links:
+  - name: Security Policies and Procedures
+    url: https://github.com/essentialkaos/.github/blob/master/SECURITY.md
+    about: Security procedures and general policies for all ESSENTIAL KAOS projects.
+
+  - name: Contributing Guidelines
+    url: https://github.com/essentialkaos/contributing-guidelines/blob/master/CONTRIBUTING.md
+    about: Contributing Guidelines for all ESSENTIAL KAOS projects
+
+  - name: Go Version Support Policy
+    url: https://github.com/essentialkaos/.github/blob/master/GO-VERSION-SUPPORT.md
+    about: Information about supported Go versions

.github/ISSUE_TEMPLATE/question.yml

@@ -0,0 +1,26 @@
+name: ❓ Question
+description: Question about application, configuration or code
+title: "[Question]: "
+labels: ["issue • question"]
+assignees:
+  - andyone
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        > [!IMPORTANT]  
+        > Before you open an issue, search GitHub Issues for a similar question. If so, please add a 👍 reaction to the existing issue.
+
+  - type: textarea
+    attributes:
+      label: Question
+      description: Detailed question
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Related version application info
+      description: Output of `updown-badge-server -vv` command
+      render: shell

.github/ISSUE_TEMPLATE/suggestion.yml

@@ -0,0 +1,43 @@
+name: ➕ Suggestion
+description: Suggest new feature or improvement
+title: "[Suggestion]: "
+labels: ["issue • suggestion"]
+assignees:
+  - andyone
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        > [!IMPORTANT]  
+        > Before you open an issue, search GitHub Issues for a similar feature requests. If so, please add a 👍 reaction to the existing issue.
+        >
+        > Opening a feature request kicks off a discussion. Requests may be closed if we're not actively planning to work on them.
+
+  - type: textarea
+    attributes:
+      label: Proposal
+      description: Description of the feature
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Current behavior
+      description: What currently happens
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Desired behavior
+      description: What you would like to happen
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Use case
+      description: Why is this important (helps with prioritizing requests)
+    validations:
+      required: true

.github/dependabot.yml

@@ -6,7 +6,7 @@ updates:
     target-branch: "develop"
     schedule:
       interval: "daily"
-      timezone: "Europe/London"
+      timezone: "Etc/UTC"
       time: "03:00"
     labels:
       - "PR • MAINTENANCE"
@@ -26,8 +26,8 @@ updates:
     target-branch: "develop"
     schedule:
       interval: "daily"
-      timezone: "Europe/London"
-      time: "04:00"
+      timezone: "Etc/UTC"
+      time: "03:00"
     labels:
       - "PR • MAINTENANCE"
     assignees:

.github/workflows/ci.yml

@@ -29,7 +29,7 @@ jobs:
 
     strategy:
       matrix:
-        go: [ '1.21.x', '1.22.x' ]
+        go: [ '1.22.x', '1.23.x' ]
 
     steps:
       - name: Checkout
@@ -59,7 +59,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.21.x'
+          go-version: '1.22.x'
 
       - name: Download dependencies
         run: make deps

Makefile

@@ -1,6 +1,6 @@
 ################################################################################
 
-# This Makefile generated by GoMakeGen 3.0.2 using next command:
+# This Makefile generated by GoMakeGen 3.2.2 using next command:
 # gomakegen --mod .
 #
 # More info: https://kaos.sh/gomakegen
@@ -11,7 +11,16 @@ ifdef VERBOSE ## Print verbose information (Flag)
 VERBOSE_FLAG = -v
 endif
 
-COMPAT ?= 1.19
+ifdef PROXY ## Force proxy usage for downloading dependencies (Flag)
+export GOPROXY=https://proxy.golang.org/cached-only,direct
+endif
+
+ifdef CGO ## Enable CGO usage (Flag)
+export CGO_ENABLED=1
+else
+export CGO_ENABLED=0
+endif
+
 MAKEDIR = $(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 GITREV ?= $(shell test -s $(MAKEDIR)/.git && git rev-parse --short HEAD)
 
@@ -45,19 +54,22 @@ update: mod-update ## Update dependencies to the latest versions
 vendor: mod-vendor ## Make vendored copy of dependencies
 
 mod-init:
-	@echo "[1/2] Modules initialization…"
+	@echo "[1/3] Modules initialization…"
+	@rm -f go.mod go.sum
 ifdef MODULE_PATH ## Module path for initialization (String)
 	@go mod init $(MODULE_PATH)
 else
 	@go mod init
 endif
 
-	@echo "[37m[2/2][0m [36;1mDependencies cleanup…[0m"
+	@echo "[37m[2/3][0m [36;1mDependencies cleanup…[0m"
 ifdef COMPAT ## Compatible Go version (String)
 	@go mod tidy $(VERBOSE_FLAG) -compat=$(COMPAT) -go=$(COMPAT)
 else
 	@go mod tidy $(VERBOSE_FLAG)
 endif
+	@echo "[3/3] Stripping toolchain info…"
+	@grep -q 'toolchain ' go.mod && go mod edit -toolchain=none || :
 
 mod-update:
 	@echo "[1/4] Updating dependencies…"
@@ -107,8 +119,9 @@ help: ## Show this info
 	@echo -e '\n\033[1mVariables:\033[0m\n'
 	@grep -E '^ifdef [A-Z_]+ .*?## .*$$' $(abspath $(lastword $(MAKEFILE_LIST))) \
 		| sed 's/ifdef //' \
+		| sort -h \
 		| awk 'BEGIN {FS = " .*?## "}; {printf "  \033[32m%-11s\033[0m  %s\n", $$1, $$2}'
 	@echo -e ''
-	@echo -e '\033[90mGenerated by GoMakeGen 3.0.2\033[0m\n'
+	@echo -e '\033[90mGenerated by GoMakeGen 3.2.2\033[0m\n'
 
 ################################################################################

README.md

@@ -2,7 +2,6 @@
 
 <p align="center">
   <a href="https://kaos.sh/w/updown-badge-server/ci"><img src="https://kaos.sh/w/updown-badge-server/ci.svg" alt="GitHub Actions CI Status" /></a>
-  <a href="https://kaos.sh/b/updown-badge-server"><img src="https://kaos.sh/b/e17e7c90-8b26-4af8-8737-22a86cea9b45.svg" alt="Codebeat badge" /></a>
   <a href="https://kaos.sh/w/updown-badge-server/codeql"><img src="https://kaos.sh/w/updown-badge-server/codeql.svg" alt="GitHub Actions CodeQL Status" /></a>
   <a href="#license"><img src=".github/images/license.svg"/></a>
 </p>
@@ -18,8 +17,8 @@
 #### From [ESSENTIAL KAOS Public Repository](https://kaos.sh/kaos-repo)
 
 ```bash
-sudo yum install -y https://pkgs.kaos.st/kaos-repo-latest.el$(grep 'CPE_NAME' /etc/os-release | tr -d '"' | cut -d':' -f5).noarch.rpm
-sudo yum install updown-badge-server
+sudo dnf install -y https://pkgs.kaos.st/kaos-repo-latest.el$(grep 'CPE_NAME' /etc/os-release | tr -d '"' | cut -d':' -f5).noarch.rpm
+sudo dnf install updown-badge-server
 ```
 
 ### Badges

common/updown-badge-server.spec

@@ -14,7 +14,7 @@
 
 Summary:        Service for generating badges for updown.io checks
 Name:           updown-badge-server
-Version:        1.3.2
+Version:        1.4.0
 Release:        0%{?dist}
 Group:          Applications/System
 License:        Apache License, Version 2.0
@@ -26,7 +26,7 @@ Source100:      checksum.sha512
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  golang >= 1.21
+BuildRequires:  golang >= 1.22
 
 Requires:       systemd
 
@@ -100,6 +100,10 @@ exit 0
 ################################################################################
 
 %changelog
+* Thu Oct 10 2024 Anton Novojilov <[email protected]> - 1.4.0-0
+- Code refactoring
+- Dependencies update
+
 * Mon Jun 24 2024 Anton Novojilov <[email protected]> - 1.3.2-0
 - Code refactoring
 - Dependencies update