Skip to content

Commit 7d98c00

Browse files
KeloranKeloran
authored
Merge pull request #69 from 1tn-pw/wildDev
anyhost dev and update deps
2 parents f46f791 + 576c39c commit 7d98c00

File tree

4 files changed

+52
-17
lines changed

4 files changed

+52
-17
lines changed

‎cmd/orchestrator/service.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ func main() {
1717

1818
cfg, err := config.Build()
1919
if err != nil {
20-
_ = logs.Local().Errorf("Error building config: %s", err.Error())
20+
_ = logs.Errorf("Error building config: %s", err.Error())
2121
return
2222
}
2323

2424
if err := service.New(cfg).Start(); err != nil {
25-
_ = logs.Local().Errorf("Error starting service: %s", err.Error())
25+
_ = logs.Errorf("Error starting service: %s", err.Error())
2626
return
2727
}
2828
}

‎go.mod

+14-12
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
module github.com/1tn-pw/orchestrator
22

3-
go 1.22
3+
go 1.23.0
4+
5+
toolchain go1.24.0
46

57
require (
68
github.com/1tn-pw/protobufs v0.1.2
79
github.com/bugfixes/go-bugfixes v0.13.0
810
github.com/caarlos0/env/v8 v8.0.0
9-
github.com/keloran/go-config v1.5.3
11+
github.com/keloran/go-config v1.5.5
1012
github.com/keloran/go-healthcheck v1.2.2
1113
github.com/keloran/go-probe v1.0.0
1214
golang.org/x/net v0.35.0
@@ -16,10 +18,10 @@ require (
1618
require (
1719
github.com/Nerzal/gocloak/v13 v13.9.0 // indirect
1820
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
19-
github.com/go-jose/go-jose/v4 v4.0.4 // indirect
21+
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
2022
github.com/go-logfmt/logfmt v0.6.0 // indirect
21-
github.com/go-ping/ping v1.1.0 // indirect
22-
github.com/go-resty/resty/v2 v2.16.2 // indirect
23+
github.com/go-ping/ping v1.2.0 // indirect
24+
github.com/go-resty/resty/v2 v2.16.5 // indirect
2325
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
2426
github.com/golang/snappy v0.0.4 // indirect
2527
github.com/google/uuid v1.6.0 // indirect
@@ -28,16 +30,16 @@ require (
2830
github.com/hashicorp/go-multierror v1.1.1 // indirect
2931
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
3032
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
31-
github.com/hashicorp/go-secure-stdlib/parseutil v0.1.8 // indirect
33+
github.com/hashicorp/go-secure-stdlib/parseutil v0.1.9 // indirect
3234
github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
3335
github.com/hashicorp/go-sockaddr v1.0.7 // indirect
3436
github.com/hashicorp/hcl v1.0.0 // indirect
35-
github.com/hashicorp/vault/api v1.15.0 // indirect
37+
github.com/hashicorp/vault/api v1.16.0 // indirect
3638
github.com/jackc/pgpassfile v1.0.0 // indirect
3739
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
3840
github.com/jackc/pgx/v5 v5.7.2 // indirect
3941
github.com/keloran/vault-helper v1.1.0 // indirect
40-
github.com/klauspost/compress v1.17.11 // indirect
42+
github.com/klauspost/compress v1.18.0 // indirect
4143
github.com/mitchellh/go-homedir v1.1.0 // indirect
4244
github.com/mitchellh/mapstructure v1.5.0 // indirect
4345
github.com/montanaflynn/stats v0.7.1 // indirect
@@ -51,11 +53,11 @@ require (
5153
github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
5254
go.mongodb.org/mongo-driver v1.17.3 // indirect
5355
go.uber.org/mock v0.5.0 // indirect
54-
golang.org/x/crypto v0.33.0 // indirect
56+
golang.org/x/crypto v0.35.0 // indirect
5557
golang.org/x/sync v0.11.0 // indirect
5658
golang.org/x/sys v0.30.0 // indirect
5759
golang.org/x/text v0.22.0 // indirect
58-
golang.org/x/time v0.9.0 // indirect
59-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241202173237-19429a94021a // indirect
60-
google.golang.org/protobuf v1.35.2 // indirect
60+
golang.org/x/time v0.10.0 // indirect
61+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250227231956-55c901821b1e // indirect
62+
google.golang.org/protobuf v1.36.5 // indirect
6163
)

‎go.sum

+22
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2
3939
github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
4040
github.com/go-jose/go-jose/v4 v4.0.4 h1:VsjPI33J0SB9vQM6PLmNjoHqMQNGPiZ0rHL7Ni7Q6/E=
4141
github.com/go-jose/go-jose/v4 v4.0.4/go.mod h1:NKb5HO1EZccyMpiZNbdUw/14tiXNyUJh188dfnMCAfc=
42+
github.com/go-jose/go-jose/v4 v4.0.5 h1:M6T8+mKZl/+fNNuFHvGIzDz7BTLQPIounk/b9dw3AaE=
43+
github.com/go-jose/go-jose/v4 v4.0.5/go.mod h1:s3P1lRrkT8igV8D9OjyL4WRyHvjB6a4JSllnOrmmBOA=
4244
github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4=
4345
github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
4446
github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
@@ -49,8 +51,12 @@ github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
4951
github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
5052
github.com/go-ping/ping v1.1.0 h1:3MCGhVX4fyEUuhsfwPrsEdQw6xspHkv5zHsiSoDFZYw=
5153
github.com/go-ping/ping v1.1.0/go.mod h1:xIFjORFzTxqIV/tDVGO4eDy/bLuSyawEeojSm3GfRGk=
54+
github.com/go-ping/ping v1.2.0 h1:vsJ8slZBZAXNCK4dPcI2PEE9eM9n9RbXbGouVQ/Y4yQ=
55+
github.com/go-ping/ping v1.2.0/go.mod h1:xIFjORFzTxqIV/tDVGO4eDy/bLuSyawEeojSm3GfRGk=
5256
github.com/go-resty/resty/v2 v2.16.2 h1:CpRqTjIzq/rweXUt9+GxzzQdlkqMdt8Lm/fuK/CAbAg=
5357
github.com/go-resty/resty/v2 v2.16.2/go.mod h1:0fHAoK7JoBy/Ch36N8VFeMsK7xQOHhvWaC3iOktwmIU=
58+
github.com/go-resty/resty/v2 v2.16.5 h1:hBKqmWrr7uRc3euHVqmh1HTHcKn99Smr7o5spptdhTM=
59+
github.com/go-resty/resty/v2 v2.16.5/go.mod h1:hkJtXbA2iKHzJheXYvQ8snQES5ZLGKMwQ07xAwp/fiA=
5460
github.com/go-test/deep v1.0.2 h1:onZX1rnHT3Wv6cqNgYyFOOlgVKJrksuCMCRvJStbMYw=
5561
github.com/go-test/deep v1.0.2/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
5662
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
@@ -81,6 +87,8 @@ github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5O
8187
github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
8288
github.com/hashicorp/go-secure-stdlib/parseutil v0.1.8 h1:iBt4Ew4XEGLfh6/bPk4rSYmuZJGizr6/x/AEizP0CQc=
8389
github.com/hashicorp/go-secure-stdlib/parseutil v0.1.8/go.mod h1:aiJI+PIApBRQG7FZTEBx5GiiX+HbOHilUdNxUZi4eV0=
90+
github.com/hashicorp/go-secure-stdlib/parseutil v0.1.9 h1:FW0YttEnUNDJ2WL9XcrrfteS1xW8u+sh4ggM8pN5isQ=
91+
github.com/hashicorp/go-secure-stdlib/parseutil v0.1.9/go.mod h1:Ll013mhdmsVDuoIXVfBtvgGJsXDYkTw1kooNcoCXuE0=
8492
github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 h1:kes8mmyCpxJsI7FTwtzRqEy9CdjCtrXrXGuOpxEA7Ts=
8593
github.com/hashicorp/go-secure-stdlib/strutil v0.1.2/go.mod h1:Gou2R9+il93BqX25LAKCLuM+y9U2T4hlwvT1yprcna4=
8694
github.com/hashicorp/go-sockaddr v1.0.7 h1:G+pTkSO01HpR5qCxg7lxfsFEZaG+C0VssTy/9dbT+Fw=
@@ -89,6 +97,8 @@ github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
8997
github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
9098
github.com/hashicorp/vault/api v1.15.0 h1:O24FYQCWwhwKnF7CuSqP30S51rTV7vz1iACXE/pj5DA=
9199
github.com/hashicorp/vault/api v1.15.0/go.mod h1:+5YTO09JGn0u+b6ySD/LLVf8WkJCPLAL2Vkmrn2+CM8=
100+
github.com/hashicorp/vault/api v1.16.0 h1:nbEYGJiAPGzT9U4oWgaaB0g+Rj8E59QuHKyA5LhwQN4=
101+
github.com/hashicorp/vault/api v1.16.0/go.mod h1:KhuUhzOD8lDSk29AtzNjgAu2kxRA9jL9NAbkFlqvkBA=
92102
github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
93103
github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
94104
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
@@ -101,6 +111,8 @@ github.com/jarcoal/httpmock v1.3.1 h1:iUx3whfZWVf3jT01hQTO/Eo5sAYtB2/rqaUuOtpInw
101111
github.com/jarcoal/httpmock v1.3.1/go.mod h1:3yb8rc4BI7TCBhFY8ng0gjuLKJNquuDNiPaZjnENuYg=
102112
github.com/keloran/go-config v1.5.3 h1:OYtcrtfZYGljDUGe5qsRUjqqrJCRKh8ZoXS9qxnNAAM=
103113
github.com/keloran/go-config v1.5.3/go.mod h1:i07NHq/+JcuR3MiIRBu//u9uqKM/2hn/Zvxfq/otBwg=
114+
github.com/keloran/go-config v1.5.5 h1:u27fqQXDfm0b11vd6vl3+MY31tPXS9wi0KQYKB+JPaE=
115+
github.com/keloran/go-config v1.5.5/go.mod h1:i07NHq/+JcuR3MiIRBu//u9uqKM/2hn/Zvxfq/otBwg=
104116
github.com/keloran/go-healthcheck v1.2.2 h1:C92m/ppWkY6OldY5RrDiqCTpXIaOZtSO0vMmHADsrUc=
105117
github.com/keloran/go-healthcheck v1.2.2/go.mod h1:XGZyWC9IMGoyMGUvh3v3cZQp+eHFuYCHIkDjQOsuUVk=
106118
github.com/keloran/go-probe v1.0.0 h1:OAO7f71lRJIz+rF7iGAeBj4i86NaUazL8DaVf9dVJGU=
@@ -109,6 +121,8 @@ github.com/keloran/vault-helper v1.1.0 h1:77TMcDLOqzDsGno1dMTdDzrX2ObWaoAIPlsNha
109121
github.com/keloran/vault-helper v1.1.0/go.mod h1:rfQHiF+iS2CdANtgtfAe7fsXaIqKEHp9mHT1jfp5IXE=
110122
github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
111123
github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
124+
github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
125+
github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
112126
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=
113127
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
114128
github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
@@ -206,6 +220,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
206220
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
207221
golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus=
208222
golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M=
223+
golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=
224+
golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=
209225
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
210226
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
211227
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
@@ -236,16 +252,22 @@ golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
236252
golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
237253
golang.org/x/time v0.9.0 h1:EsRrnYcQiGH+5FfbgvV4AP7qEZstoyrHB0DzarOQ4ZY=
238254
golang.org/x/time v0.9.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
255+
golang.org/x/time v0.10.0 h1:3usCWA8tQn0L8+hFJQNgzpWbd89begxN66o1Ojdn5L4=
256+
golang.org/x/time v0.10.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
239257
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
240258
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
241259
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
242260
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
243261
google.golang.org/genproto/googleapis/rpc v0.0.0-20241202173237-19429a94021a h1:hgh8P4EuoxpsuKMXX/To36nOFD7vixReXgn8lPGnt+o=
244262
google.golang.org/genproto/googleapis/rpc v0.0.0-20241202173237-19429a94021a/go.mod h1:5uTbfoYQed2U9p3KIj2/Zzm02PYhndfdmML0qC3q3FU=
263+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250227231956-55c901821b1e h1:YA5lmSs3zc/5w+xsRcHqpETkaYyK63ivEPzNTcUUlSA=
264+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250227231956-55c901821b1e/go.mod h1:LuRYeWDFV6WOn90g357N17oMCaxpgCnbi/44qJvDn2I=
245265
google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ=
246266
google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw=
247267
google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io=
248268
google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
269+
google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
270+
google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
249271
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
250272
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
251273
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

‎internal/service/service.go

+14-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package service
22

33
import (
4+
"crypto/tls"
45
"fmt"
56
"github.com/1tn-pw/orchestrator/internal/config"
67
"github.com/bugfixes/go-bugfixes/logs"
@@ -9,6 +10,7 @@ import (
910
"github.com/keloran/go-probe"
1011
"golang.org/x/net/context"
1112
"net/http"
13+
"time"
1214
)
1315

1416
type Service struct {
@@ -42,9 +44,18 @@ func (s *Service) startHTTP(errChan chan error) {
4244
mw.AddMiddleware(mw.CORS)
4345
mw.AddAllowedOrigins("https://www.1tn.pw", "https://1tn.pw")
4446
if s.Config.Local.Development {
45-
mw.AddAllowedOrigins("http://localhost:3000")
47+
mw.AddAllowedOrigins("http://localhost:3000", "*")
4648
}
4749

48-
logs.Local().Infof("Starting HTTP on %d", s.Config.Local.HTTPPort)
49-
errChan <- http.ListenAndServe(fmt.Sprintf(":%d", s.Config.Local.HTTPPort), mw.Handler(mux))
50+
logs.Infof("Starting HTTP on %d", s.Config.Local.HTTPPort)
51+
server := http.Server{
52+
Addr: fmt.Sprintf(":%d", s.Config.Local.HTTPPort),
53+
Handler: mw.Handler(mux),
54+
ReadTimeout: 10 * time.Second,
55+
WriteTimeout: 10 * time.Second,
56+
IdleTimeout: 10 * time.Second,
57+
ReadHeaderTimeout: 10 * time.Second,
58+
TLSNextProto: make(map[string]func(*http.Server, *tls.Conn, http.Handler)),
59+
}
60+
errChan <- server.ListenAndServe()
5061
}

0 commit comments

Comments
 (0)