Merge pull request #59 from funbox/develop

Version 0.23.0

Author: andyone

.travis.yml

@@ -1,11 +1,8 @@
-dist: xenial
-
 language: go
 
 go:
-  - 1.10.x
-  - 1.11.x
-  - 1.12.x
+  - 1.13.x
+  - 1.14.x
   - tip
 
 os:

Makefile

@@ -1,14 +1,14 @@
 ################################################################################
 
-# This Makefile generated by GoMakeGen 1.1.2 using next command:
+# This Makefile generated by GoMakeGen 1.3.1 using next command:
 # gomakegen .
 #
 # More info: https://kaos.sh/gomakegen
 
 ################################################################################
 
 .DEFAULT_GOAL := help
-.PHONY = fmt all clean git-config deps deps-test test gen-fuzz help
+.PHONY = fmt vet all clean git-config deps deps-test test gen-fuzz help
 
 ################################################################################
 
@@ -27,12 +27,12 @@ git-config: ## Configure git redirects for stable import path services
 	git config --global http.https://pkg.re.followRedirects true
 
 deps: git-config ## Download dependencies
-	go get -d -v pkg.re/essentialkaos/ek.v10
-	go get -d -v pkg.re/essentialkaos/go-simpleyaml.v1
+	go get -d -v pkg.re/essentialkaos/ek.v12
+	go get -d -v pkg.re/essentialkaos/go-simpleyaml.v2
 
 deps-test: git-config ## Download dependencies for tests
 	go get -d -v pkg.re/check.v1
-	go get -d -v pkg.re/essentialkaos/ek.v10
+	go get -d -v pkg.re/essentialkaos/ek.v12
 
 test: ## Run tests
 	go test -covermode=count ./export ./procfile
@@ -44,6 +44,9 @@ gen-fuzz: ## Generate archives for fuzz testing
 fmt: ## Format source code with gofmt
 	find . -name "*.go" -exec gofmt -s -w {} \;
 
+vet: ## Runs go vet over sources
+	go vet -composites=false -printfuncs=LPrintf,TLPrintf,TPrintf,log.Debug,log.Info,log.Warn,log.Error,log.Critical,log.Print ./...
+
 clean: ## Remove generated files
 	rm -f init-exporter
 
@@ -52,6 +55,6 @@ help: ## Show this info
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) \
 		| awk 'BEGIN {FS = ":.*?## "}; {printf "  \033[33m%-15s\033[0m %s\n", $$1, $$2}'
 	@echo -e ''
-	@echo -e '\033[90mGenerated by GoMakeGen 1.1.2\033[0m\n'
+	@echo -e '\033[90mGenerated by GoMakeGen 1.3.1\033[0m\n'
 
 ################################################################################

README.md

@@ -23,7 +23,7 @@ Before the initial install allows git to use redirects for [pkg.re](https://gith
 git config --global http.https://pkg.re.followRedirects true
 ```
 
-To build the init-exporter from scratch, make sure you have a working Go 1.10+ workspace ([instructions](https://golang.org/doc/install)), then:
+To build the init-exporter from scratch, make sure you have a working Go 1.13+ workspace ([instructions](https://golang.org/doc/install)), then:
 
 ```bash
 go get -d github.com/funbox/init-exporter
@@ -33,18 +33,11 @@ make all
 [sudo] make install
 ```
 
-#### From ESSENTIAL KAOS Public repo for RHEL6/CentOS6
+#### From [ESSENTIAL KAOS Public Repository](https://yum.kaos.st)
 
-```
-[sudo] yum install -y https://yum.kaos.st/kaos-repo-latest.el6.noarch.rpm
-[sudo] yum install init-exporter
-```
-
-#### From ESSENTIAL KAOS Public repo for RHEL7/CentOS7
-
-```
-[sudo] yum install -y https://yum.kaos.st/kaos-repo-latest.el7.noarch.rpm
-[sudo] yum install init-exporter
+```bash
+sudo yum install -y https://yum.kaos.st/get/$(uname -r).rpm
+sudo yum install init-exporter
 ```
 
 ### Configuration

cli/cli.go

@@ -4,7 +4,7 @@ package cli
 
 // ////////////////////////////////////////////////////////////////////////////////// //
 //                                                                                    //
-//                       Copyright (c) 2006-2019 FB GROUP LLC                         //
+//                       Copyright (c) 2006-2020 FB GROUP LLC                         //
 //                                                                                    //
 // ////////////////////////////////////////////////////////////////////////////////// //
 
@@ -13,15 +13,19 @@ import (
 	"os"
 	"runtime"
 
-	"pkg.re/essentialkaos/ek.v10/env"
-	"pkg.re/essentialkaos/ek.v10/fmtc"
-	"pkg.re/essentialkaos/ek.v10/fsutil"
-	"pkg.re/essentialkaos/ek.v10/knf"
-	"pkg.re/essentialkaos/ek.v10/log"
-	"pkg.re/essentialkaos/ek.v10/options"
-	"pkg.re/essentialkaos/ek.v10/system"
-	"pkg.re/essentialkaos/ek.v10/usage"
-	"pkg.re/essentialkaos/ek.v10/usage/update"
+	"pkg.re/essentialkaos/ek.v12/env"
+	"pkg.re/essentialkaos/ek.v12/fmtc"
+	"pkg.re/essentialkaos/ek.v12/fsutil"
+	"pkg.re/essentialkaos/ek.v12/knf"
+	"pkg.re/essentialkaos/ek.v12/log"
+	"pkg.re/essentialkaos/ek.v12/options"
+	"pkg.re/essentialkaos/ek.v12/system"
+	"pkg.re/essentialkaos/ek.v12/usage"
+	"pkg.re/essentialkaos/ek.v12/usage/update"
+
+	knfv "pkg.re/essentialkaos/ek.v12/knf/validators"
+	knff "pkg.re/essentialkaos/ek.v12/knf/validators/fs"
+	knfs "pkg.re/essentialkaos/ek.v12/knf/validators/system"
 
 	"github.com/funbox/init-exporter/export"
 	"github.com/funbox/init-exporter/procfile"
@@ -32,7 +36,7 @@ import (
 // App props
 const (
 	APP  = "init-exporter"
-	VER  = "0.22.0"
+	VER  = "0.23.0"
 	DESC = "Utility for exporting services described by Procfile to init system"
 )
 
@@ -209,70 +213,37 @@ func loadConfig() {
 
 // validateConfig validate config values
 func validateConfig() {
-	var permsChecker = func(config *knf.Config, prop string, value interface{}) error {
-		if !fsutil.CheckPerms(value.(string), config.GetS(prop)) {
-			switch value.(string) {
-			case "DRX":
-				return fmt.Errorf("Property %s must be path to readable directory", prop)
-			case "DWX":
-				return fmt.Errorf("Property %s must be path to writable directory", prop)
-			case "DRWX":
-				return fmt.Errorf("Property %s must be path to writable/readable directory", prop)
-			case "FR":
-				return fmt.Errorf("Property %s must be path to readable file", prop)
-			}
-		}
-
-		return nil
-	}
-
-	var userChecker = func(config *knf.Config, prop string, value interface{}) error {
-		if !system.IsUserExist(knf.GetS(prop)) {
-			return fmt.Errorf("Property %s contains user which not exist on this system", prop)
-		}
-
-		return nil
-	}
-
-	var groupChecker = func(config *knf.Config, prop string, value interface{}) error {
-		if !system.IsGroupExist(knf.GetS(prop)) {
-			return fmt.Errorf("Property %s contains group which not exist on this system", prop)
-		}
-
-		return nil
-	}
-
 	validators := []*knf.Validator{
-		{MAIN_RUN_USER, knf.Empty, nil},
-		{MAIN_RUN_GROUP, knf.Empty, nil},
-		{PATHS_WORKING_DIR, knf.Empty, nil},
-		{PATHS_HELPER_DIR, knf.Empty, nil},
-		{PATHS_SYSTEMD_DIR, knf.Empty, nil},
-		{PATHS_UPSTART_DIR, knf.Empty, nil},
-		{DEFAULTS_NPROC, knf.Empty, nil},
-		{DEFAULTS_NOFILE, knf.Empty, nil},
-		{DEFAULTS_RESPAWN_COUNT, knf.Empty, nil},
-		{DEFAULTS_RESPAWN_INTERVAL, knf.Empty, nil},
-		{DEFAULTS_KILL_TIMEOUT, knf.Empty, nil},
-
-		{DEFAULTS_NPROC, knf.Less, 0},
-		{DEFAULTS_NOFILE, knf.Less, 0},
-		{DEFAULTS_RESPAWN_COUNT, knf.Less, 0},
-		{DEFAULTS_RESPAWN_INTERVAL, knf.Less, 0},
-		{DEFAULTS_KILL_TIMEOUT, knf.Less, 0},
-
-		{MAIN_RUN_USER, userChecker, nil},
-		{MAIN_RUN_GROUP, groupChecker, nil},
-
-		{PATHS_WORKING_DIR, permsChecker, "DRWX"},
-		{PATHS_HELPER_DIR, permsChecker, "DRWX"},
+		{MAIN_RUN_USER, knfv.Empty, nil},
+		{MAIN_RUN_GROUP, knfv.Empty, nil},
+		{PATHS_WORKING_DIR, knfv.Empty, nil},
+		{PATHS_HELPER_DIR, knfv.Empty, nil},
+		{PATHS_SYSTEMD_DIR, knfv.Empty, nil},
+		{PATHS_UPSTART_DIR, knfv.Empty, nil},
+		{DEFAULTS_NPROC, knfv.Empty, nil},
+		{DEFAULTS_NOFILE, knfv.Empty, nil},
+		{DEFAULTS_RESPAWN_COUNT, knfv.Empty, nil},
+		{DEFAULTS_RESPAWN_INTERVAL, knfv.Empty, nil},
+		{DEFAULTS_KILL_TIMEOUT, knfv.Empty, nil},
+
+		{DEFAULTS_NPROC, knfv.Less, 0},
+		{DEFAULTS_NOFILE, knfv.Less, 0},
+		{DEFAULTS_RESPAWN_COUNT, knfv.Less, 0},
+		{DEFAULTS_RESPAWN_INTERVAL, knfv.Less, 0},
+		{DEFAULTS_KILL_TIMEOUT, knfv.Less, 0},
+
+		{MAIN_RUN_USER, knfs.User, nil},
+		{MAIN_RUN_GROUP, knfs.Group, nil},
+
+		{PATHS_WORKING_DIR, knff.Perms, "DRWX"},
+		{PATHS_HELPER_DIR, knff.Perms, "DRWX"},
 	}
 
 	if knf.GetB(LOG_ENABLED, true) {
 		validators = append(validators,
-			&knf.Validator{LOG_DIR, knf.Empty, nil},
-			&knf.Validator{LOG_FILE, knf.Empty, nil},
-			&knf.Validator{LOG_DIR, permsChecker, "DWX"},
+			&knf.Validator{LOG_DIR, knfv.Empty, nil},
+			&knf.Validator{LOG_FILE, knfv.Empty, nil},
+			&knf.Validator{LOG_DIR, knff.Perms, "DWX"},
 		)
 	}
 

common/init-exporter.spec

@@ -42,7 +42,7 @@
 
 Summary:         Utility for exporting services described by Procfile to init system
 Name:            init-exporter
-Version:         0.22.0
+Version:         0.23.0
 Release:         0%{?dist}
 Group:           Development/Tools
 License:         MIT
@@ -52,7 +52,7 @@ Source0:         %{name}-%{version}.tar.gz
 
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:   golang >= 1.12
+BuildRequires:   golang >= 1.14
 
 Provides:        upstart-exporter = %{version}-%{release}
 Provides:        systemd-exporter = %{version}-%{release}
@@ -111,7 +111,15 @@ rm -rf %{buildroot}
 ################################################################################
 
 %changelog
-* Fri Jul 12 2019 Anton Novojilov <andy@essentialkaos.com> - 0.22.0-0
+* Fri Jan 24 2020 Anton Novojilov <andyone@fun-box.ru> - 0.23.0-0
+- Migrated to ek.v12
+- Migrated to go-simpleyaml.v12
+- Added support of required dependencies definition
+- Added option 'strong_dependencies' for strong dependencies configuration (for
+  using 'Requires' instead of 'Wants' for systemd units)
+- Added option 'resources:cpu_affinity' for CPU affinity configuration
+
+* Fri Jul 12 2019 Anton Novojilov <andyone@fun-box.ru> - 0.22.0-0
 - Added 'start_on_device' option for v2 procfile format
 - Dropped 'reload_signal' support for Upstart ≤ 1.10.0
 - Fixed 'reload_signal' support for Systemd