Merge pull request #205 from funbox/develop

andyone · web-flow · commit 50b447e9a02f · 2025-10-28T00:24:02.000+03:00
Version 0.27.0
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -33,10 +33,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version: ${{ matrix.go }}
 
@@ -54,10 +54,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version: 'stable'
 
@@ -78,7 +78,7 @@ jobs:
 
     steps:
       - name: Code checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
@@ -100,7 +100,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Check spelling
         uses: crate-ci/typos@master
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -15,14 +15,14 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
         fetch-depth: 2
 
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v4
       with:
         languages: go
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v4
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 ################################################################################
 
-# This Makefile generated by GoMakeGen 3.2.3 using next command:
+# This Makefile generated by GoMakeGen 3.3.3 using next command:
 # gomakegen --mod .
 #
 # More info: https://kaos.sh/gomakegen
@@ -27,7 +27,7 @@ GITREV ?= $(shell test -s $(MAKEDIR)/.git && git rev-parse --short HEAD)
 ################################################################################
 
 .DEFAULT_GOAL := help
-.PHONY = fmt vet all install uninstall clean deps update test init vendor gen-fuzz mod-init mod-update mod-download mod-vendor help
+.PHONY = fmt vet all install uninstall clean deps update test init vendor gen-fuzz tidy mod-init mod-update mod-download mod-vendor help
 
 ################################################################################
 
@@ -66,43 +66,53 @@ gen-fuzz: ## Generate archives for fuzz testing
 	@echo "[36;1mGenerating fuzzing data…[0m"
 	@go-fuzz-build -o procfile-fuzz.zip github.com/funbox/init-exporter/procfile
 
+tidy: ## Cleanup dependencies
+	@echo "[32m•[0m[90m•[0m [36;1mTidying up dependencies…[0m"
+ifdef COMPAT ## Compatible Go version (String)
+	@go mod tidy $(VERBOSE_FLAG) -compat=$(COMPAT) -go=$(COMPAT)
+else
+	@go mod tidy $(VERBOSE_FLAG)
+endif
+	@echo "[32m••[0m [36;1mUpdating vendored dependencies…[0m"
+	@test -d vendor && rm -rf vendor && go mod vendor $(VERBOSE_FLAG) || :
+
 mod-init:
-	@echo "[37m[1/3][0m [36;1mModules initialization…[0m"
+	@echo "[32m•[0m[90m••[0m [36;1mModules initialization…[0m"
 	@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/3][0m [36;1mDependencies cleanup…[0m"
+	@echo "[32m••[0m[90m•[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 "[37m[3/3][0m [36;1mStripping toolchain info…[0m"
+	@echo "[32m•••[0m [36;1mStripping toolchain info…[0m"
 	@grep -q 'toolchain ' go.mod && go mod edit -toolchain=none || :
 
 mod-update:
-	@echo "[37m[1/4][0m [36;1mUpdating dependencies…[0m"
+	@echo "[32m•[0m[90m•••[0m [36;1mUpdating dependencies…[0m"
 ifdef UPDATE_ALL ## Update all dependencies (Flag)
 	@go get -u $(VERBOSE_FLAG) all
 else
 	@go get -u $(VERBOSE_FLAG) ./...
 endif
 
-	@echo "[37m[2/4][0m [36;1mStripping toolchain info…[0m"
+	@echo "[32m••[0m[90m••[0m [36;1mStripping toolchain info…[0m"
 	@grep -q 'toolchain ' go.mod && go mod edit -toolchain=none || :
 
-	@echo "[37m[3/4][0m [36;1mDependencies cleanup…[0m"
+	@echo "[32m•••[0m[90m•[0m [36;1mDependencies cleanup…[0m"
 ifdef COMPAT
 	@go mod tidy $(VERBOSE_FLAG) -compat=$(COMPAT)
 else
 	@go mod tidy $(VERBOSE_FLAG)
 endif
 
-	@echo "[37m[4/4][0m [36;1mUpdating vendored dependencies…[0m"
+	@echo "[32m••••[0m [36;1mUpdating vendored dependencies…[0m"
 	@test -d vendor && rm -rf vendor && go mod vendor $(VERBOSE_FLAG) || :
 
 mod-download:
@@ -126,15 +136,15 @@ clean: ## Remove generated files
 	@rm -f init-exporter
 
 help: ## Show this info
-	@echo -e '\n\033[1mTargets:\033[0m\n'
+	@printf '\n\033[1mTargets:\033[0m\n\n'
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) \
 		| awk 'BEGIN {FS = ":.*?## "}; {printf "  \033[33m%-9s\033[0m  %s\n", $$1, $$2}'
-	@echo -e '\n\033[1mVariables:\033[0m\n'
+	@printf '\n\033[1mVariables:\033[0m\n\n'
 	@grep -E '^ifdef [A-Z_]+ .*?## .*$$' $(abspath $(lastword $(MAKEFILE_LIST))) \
 		| sed 's/ifdef //' \
 		| sort -h \
 		| awk 'BEGIN {FS = " .*?## "}; {printf "  \033[32m%-13s\033[0m  %s\n", $$1, $$2}'
-	@echo -e ''
-	@echo -e '\033[90mGenerated by GoMakeGen 3.2.3\033[0m\n'
+	@echo ''
+	@printf '\033[90mGenerated by GoMakeGen 3.3.3\033[0m\n\n'
 
 ################################################################################
diff --git a/cli/cli.go b/cli/cli.go
@@ -44,7 +44,7 @@ import (
 // App props
 const (
 	APP  = "init-exporter"
-	VER  = "0.26.0"
+	VER  = "0.27.0"
 	DESC = "Utility for exporting services described by Procfile to init system"
 )
 
diff --git a/common/init-exporter.spec b/common/init-exporter.spec
@@ -10,7 +10,7 @@
 
 Summary:        Utility for exporting services described by Procfile to init system
 Name:           init-exporter
-Version:        0.26.0
+Version:        0.27.0
 Release:        0%{?dist}
 Group:          Development/Tools
 License:        MIT
@@ -20,7 +20,7 @@ Source0:        %{name}-%{version}.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  golang >= 1.23
+BuildRequires:  golang >= 1.24
 
 Provides:       upstart-exporter = %{version}-%{release}
 Provides:       systemd-exporter = %{version}-%{release}
@@ -83,6 +83,12 @@ rm -rf %{buildroot}
 ################################################################################
 
 %changelog
+* Fri Oct 24 2025 Anton Novojilov <andy@essentialkaos.com> - 0.27.0-0
+- Added suffix support for service dependencies
+- Improved service dependencies processing for the systemd provider
+- Code refactoring
+- Dependencies update
+
 * Tue Mar 04 2025 Anton Novojilov <andyone@fun-box.ru> - 0.26.0-0
 - Dependencies update
 - Code refactoring
diff --git a/export/systemd.go b/export/systemd.go
@@ -397,7 +397,16 @@ func (sp *SystemdProvider) depsToServiceList(deps []string) []string {
 			".service", ".target", ".path", ".timer", ".slice", ".scope") {
 			result = append(result, dep)
 		} else {
-			result = append(result, dep+".service")
+			switch dep {
+			case "basic", "cryptsetup", "getty", "integritysetup", "local-fs-pre",
+				"local-fs", "multi-user", "network-online", "network-pre", "network",
+				"nfs-client", "nss-user-lookup", "paths", "remote-fs-pre", "remote-fs",
+				"rpc_pipefs", "rpcbind", "slices", "sockets", "sshd-keygen", "swap",
+				"sysinit", "timers", "veritysetup":
+				result = append(result, dep+".target")
+			default:
+				result = append(result, dep+".service")
+			}
 		}
 	}
 
diff --git a/go.mod b/go.mod
@@ -1,18 +1,18 @@
 module github.com/funbox/init-exporter
 
-go 1.23.6
+go 1.24.0
 
 require (
 	github.com/essentialkaos/check v1.4.1
-	github.com/essentialkaos/ek/v13 v13.19.0
-	github.com/essentialkaos/go-simpleyaml/v2 v2.1.5
+	github.com/essentialkaos/ek/v13 v13.36.0
+	github.com/essentialkaos/go-simpleyaml/v2 v2.2.0
 )
 
 require (
 	github.com/essentialkaos/depsy v1.3.1 // indirect
+	github.com/essentialkaos/yaml/v2 v2.4.1 // indirect
 	github.com/kr/pretty v0.3.1 // indirect
 	github.com/kr/text v0.2.0 // indirect
-	github.com/rogpeppe/go-internal v1.13.1 // indirect
-	golang.org/x/sys v0.30.0 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
+	github.com/rogpeppe/go-internal v1.14.1 // indirect
+	golang.org/x/sys v0.37.0 // indirect
 )
diff --git a/go.sum b/go.sum
@@ -3,21 +3,19 @@ github.com/essentialkaos/check v1.4.1 h1:SuxXzrbokPGTPWxGRnzy0hXvtb44mtVrdNxgPa1
 github.com/essentialkaos/check v1.4.1/go.mod h1:xQOYwFvnxfVZyt5Qvjoa1SxcRqu5VyP77pgALr3iu+M=
 github.com/essentialkaos/depsy v1.3.1 h1:00k9QcMsdPM4IzDaEFHsTHBD/zoM0oxtB5+dMUwbQa8=
 github.com/essentialkaos/depsy v1.3.1/go.mod h1:B5+7Jhv2a2RacOAxIKU2OeJp9QfZjwIpEEPI5X7auWM=
-github.com/essentialkaos/ek/v13 v13.19.0 h1:iO6ohr4ena7CufxNnOz0B0GlwGNPwuFA2iNrwpojmWY=
-github.com/essentialkaos/ek/v13 v13.19.0/go.mod h1:hgPkEuoijmk9oWtEx+dj5stOYKnndyoxAwLEc2wKPqM=
-github.com/essentialkaos/go-simpleyaml/v2 v2.1.5 h1:HrFk4JhgBT5pzEkwFW4MqdgsAW4KN7/Um6rTHq1GTJk=
-github.com/essentialkaos/go-simpleyaml/v2 v2.1.5/go.mod h1:m3Ub1npzYSZTgSzW68wUT1ak7p9hOSFvTnyhtwKlvSA=
+github.com/essentialkaos/ek/v13 v13.36.0 h1:uV6A7TzQX+/te97gPmizdqTJb95AnAei9amXlEcwnmU=
+github.com/essentialkaos/ek/v13 v13.36.0/go.mod h1:Ofa/zFc7kYG8QbKv8/JjiVaxcmp0WYjqSevOtE8vczk=
+github.com/essentialkaos/go-simpleyaml/v2 v2.2.0 h1:MtTJMjRYeba3AoSald0oVF6/aiShTHHwlLl7pfs29pQ=
+github.com/essentialkaos/go-simpleyaml/v2 v2.2.0/go.mod h1:DggbDjR+uPz/En63o6HvoycYRZw+mSywrXc5ySvk8MU=
+github.com/essentialkaos/yaml/v2 v2.4.1 h1:smhmufQ6t+QYu1k3/rUPQ35qf3ymWoRUaQEOiBuTrIg=
+github.com/essentialkaos/yaml/v2 v2.4.1/go.mod h1:LgnGU0KlVWLyTExdsrWpdJEldaRpYN+r/Pcqh8NWSz8=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
-github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
-github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
-golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
-golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
+github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
+github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
+golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ=
+golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
diff --git a/procfile/procfile.go b/procfile/procfile.go

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ import (`
`44`	`44`	`// App props`
`45`	`45`	`const (`
`46`	`46`	`APP = "init-exporter"`
`47`		`- VER = "0.26.0"`
	`47`	`+ VER = "0.27.0"`
`48`	`48`	`DESC = "Utility for exporting services described by Procfile to init system"`
`49`	`49`	`)`
`50`	`50`