Skip to content

Commit e3772c3

Browse files
adewesadewes
committed
Updated all dependencies; fixed incompatibilties.
1 parent c779196 commit e3772c3

26 files changed

Lines changed: 245 additions & 201 deletions

File tree

‎cmd/helpers/cli.go‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,11 @@ func Decorate(commands []cli.Command, decorator Decorator, service string) []cli
4040
}
4141

4242
func Settings(definitions *eps.Definitions) (*eps.Settings, error) {
43-
settingsPaths := helpers.SettingsPaths()
44-
return helpers.Settings(settingsPaths, definitions)
43+
if settingsPaths, fs, err := helpers.SettingsPaths("EPS_SETTINGS"); err != nil {
44+
return nil, err
45+
} else {
46+
return helpers.Settings(settingsPaths, fs, definitions)
47+
}
4548
}
4649

4750
var CommonCommands = []cli.Command{

‎cmd/proxy/main.go‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@ import (
2020
"github.com/iris-connect/eps"
2121
cmdHelpers "github.com/iris-connect/eps/cmd/helpers"
2222
"github.com/iris-connect/eps/definitions"
23+
"github.com/iris-connect/eps/helpers"
2324
"github.com/iris-connect/eps/metrics"
2425
"github.com/iris-connect/eps/proxy"
25-
"github.com/iris-connect/eps/proxy/helpers"
26+
proxyHelpers "github.com/iris-connect/eps/proxy/helpers"
2627
"github.com/urfave/cli"
2728
"os"
2829
"os/signal"
@@ -150,7 +151,10 @@ func CLI(settings *proxy.Settings) {
150151
}
151152

152153
func main() {
153-
if settings, err := helpers.Settings(helpers.SettingsPaths(), &definitions.Default); err != nil {
154+
if settingsPaths, fs, err := helpers.SettingsPaths("PROXY_SETTINGS"); err != nil {
155+
eps.Log.Error(err)
156+
return
157+
} else if settings, err := proxyHelpers.Settings(settingsPaths, fs, &definitions.Default); err != nil {
154158
eps.Log.Error(err)
155159
return
156160
} else {

‎cmd/sd/main.go‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@ import (
2020
"github.com/iris-connect/eps"
2121
cmdHelpers "github.com/iris-connect/eps/cmd/helpers"
2222
"github.com/iris-connect/eps/definitions"
23+
"github.com/iris-connect/eps/helpers"
2324
"github.com/iris-connect/eps/metrics"
2425
"github.com/iris-connect/eps/sd"
25-
"github.com/iris-connect/eps/sd/helpers"
26+
sdHelpers "github.com/iris-connect/eps/sd/helpers"
2627
"github.com/urfave/cli"
2728
"os"
2829
"os/signal"
@@ -93,7 +94,10 @@ func CLI(settings *sd.Settings) {
9394
}
9495

9596
func main() {
96-
if settings, err := helpers.Settings(helpers.SettingsPaths(), &definitions.Default); err != nil {
97+
if settingsPaths, fs, err := helpers.SettingsPaths("SD_SETTINGS"); err != nil {
98+
eps.Log.Error(err)
99+
return
100+
} else if settings, err := sdHelpers.Settings(settingsPaths, fs, &definitions.Default); err != nil {
97101
eps.Log.Error(err)
98102
return
99103
} else {

‎forms/directory.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ var SignedChangeRecordForm = forms.Form{
374374
forms.IsOptional{Default: ""},
375375
forms.IsString{},
376376
forms.MatchesRegex{
377-
Regex: regexp.MustCompile(`^([a-f0-9]{64}|)$`),
377+
Regexp: regexp.MustCompile(`^([a-f0-9]{64}|)$`),
378378
},
379379
},
380380
},

‎forms/signing.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ var SignatureForm = forms.Form{
4545
Validators: []forms.Validator{
4646
forms.IsString{},
4747
forms.MatchesRegex{
48-
Regex: regexp.MustCompile(`^\d{10,100}$`),
48+
Regexp: regexp.MustCompile(`^\d{10,100}$`),
4949
},
5050
},
5151
},
@@ -54,7 +54,7 @@ var SignatureForm = forms.Form{
5454
Validators: []forms.Validator{
5555
forms.IsString{},
5656
forms.MatchesRegex{
57-
Regex: regexp.MustCompile(`^\d{10,100}$`),
57+
Regexp: regexp.MustCompile(`^\d{10,100}$`),
5858
},
5959
},
6060
},

‎go.mod‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,17 @@ module github.com/iris-connect/eps
33
go 1.16
44

55
require (
6+
github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect
67
github.com/go-redis/redis v6.15.9+incompatible
78
github.com/golang/protobuf v1.5.2
8-
github.com/kiprotect/go-helpers v0.0.0-20210719141457-5b87e3cc7847
9+
github.com/kiprotect/go-helpers v0.0.0-20211210144244-79ce90e73e79
10+
github.com/onsi/ginkgo v1.16.5 // indirect
11+
github.com/onsi/gomega v1.17.0 // indirect
912
github.com/prometheus/client_golang v1.11.0
10-
github.com/protocolbuffers/protobuf v3.15.8+incompatible // indirect
1113
github.com/sirupsen/logrus v1.8.1
1214
github.com/urfave/cli v1.22.5
15+
golang.org/x/sys v0.0.0-20211210111614-af8b64212486 // indirect
1316
google.golang.org/grpc v1.37.0
14-
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0 // indirect
1517
google.golang.org/protobuf v1.26.0
1618
)
1719

‎go.sum‎

Lines changed: 58 additions & 14 deletions
Large diffs are not rendered by default.

‎helpers/settings.go‎

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,30 +25,44 @@ import (
2525
epsForms "github.com/iris-connect/eps/forms"
2626
"github.com/kiprotect/go-helpers/forms"
2727
"github.com/kiprotect/go-helpers/settings"
28+
"io/fs"
2829
"os"
30+
"path/filepath"
2931
"strings"
3032
)
3133

32-
var EnvSettingsName = "EPS_SETTINGS"
33-
34-
func SettingsPaths() []string {
35-
envValue := os.Getenv(EnvSettingsName)
36-
if envValue == "" {
37-
return []string{}
34+
func SettingsPaths(envSettingsName string) ([]string, fs.FS, error) {
35+
if paths, err := RealSettingsPaths(envSettingsName); err != nil {
36+
return nil, nil, err
37+
} else {
38+
modifiedPaths := make([]string, len(paths))
39+
for i, path := range paths {
40+
modifiedPaths[i] = path[1:]
41+
}
42+
return modifiedPaths, os.DirFS("/"), nil
3843
}
44+
}
45+
46+
func RealSettingsPaths(envSettingsName string) ([]string, error) {
47+
envValue := os.Getenv(envSettingsName)
3948
values := strings.Split(envValue, ":")
4049
sanitizedValues := make([]string, 0, len(values))
4150
for _, value := range values {
4251
if value == "" {
4352
continue
4453
}
54+
var err error
55+
if value, err = filepath.Abs(value); err != nil {
56+
return nil, err
57+
}
4558
sanitizedValues = append(sanitizedValues, value)
4659
}
47-
return sanitizedValues
60+
return sanitizedValues, nil
4861
}
4962

50-
func Settings(settingsPaths []string, definitions *eps.Definitions) (*eps.Settings, error) {
51-
if rawSettings, err := settings.MakeSettings(settingsPaths); err != nil {
63+
func Settings(settingsPaths []string, fs fs.FS, definitions *eps.Definitions) (*eps.Settings, error) {
64+
eps.Log.Info(settingsPaths)
65+
if rawSettings, err := settings.MakeSettings(settingsPaths, fs); err != nil {
5266
return nil, err
5367
} else if params, err := epsForms.SettingsForm.ValidateWithContext(rawSettings.Values, map[string]interface{}{"definitions": definitions}); err != nil {
5468
return nil, err

‎proxy/forms.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ var DirectorySettingsForm = forms.Form{
3535
forms.IsList{
3636
Validators: []forms.Validator{
3737
forms.IsString{},
38-
forms.MatchesRegex{Regex: regexp.MustCompile(`^\.`)},
38+
forms.MatchesRegex{Regexp: regexp.MustCompile(`^\.`)},
3939
},
4040
},
4141
},

‎proxy/helpers/settings.go‎

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -20,30 +20,11 @@ import (
2020
"github.com/iris-connect/eps"
2121
"github.com/iris-connect/eps/proxy"
2222
"github.com/kiprotect/go-helpers/settings"
23-
"os"
24-
"strings"
23+
"io/fs"
2524
)
2625

27-
var EnvSettingsName = "PROXY_SETTINGS"
28-
29-
func SettingsPaths() []string {
30-
envValue := os.Getenv(EnvSettingsName)
31-
if envValue == "" {
32-
return []string{}
33-
}
34-
values := strings.Split(envValue, ":")
35-
sanitizedValues := make([]string, 0, len(values))
36-
for _, value := range values {
37-
if value == "" {
38-
continue
39-
}
40-
sanitizedValues = append(sanitizedValues, value)
41-
}
42-
return sanitizedValues
43-
}
44-
45-
func Settings(settingsPaths []string, definitions *eps.Definitions) (*proxy.Settings, error) {
46-
if rawSettings, err := settings.MakeSettings(settingsPaths); err != nil {
26+
func Settings(settingsPaths []string, fs fs.FS, definitions *eps.Definitions) (*proxy.Settings, error) {
27+
if rawSettings, err := settings.MakeSettings(settingsPaths, fs); err != nil {
4728
return nil, err
4829
} else if params, err := proxy.SettingsForm.ValidateWithContext(rawSettings.Values, map[string]interface{}{"definitions": definitions}); err != nil {
4930
return nil, err

0 commit comments

Comments
 (0)