Skip to content

Commit 4d300b8

Browse files
nicolereneenicolerenee
authored
fix: schema file can't be set via env var
Signed-off-by: GitHub <[email protected]>
1 parent 4b5508d commit 4d300b8

File tree

4 files changed

+32
-35
lines changed

4 files changed

+32
-35
lines changed

‎cmd/serve.go

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@ import (
1616
"go.infratographer.com/node-resolver/internal/graphapi"
1717
)
1818

19-
var (
20-
defaultListenAddr = ":7904"
21-
schemaFile = ""
22-
)
19+
var defaultListenAddr = ":7904"
2320

2421
var serveCmd = &cobra.Command{
2522
Use: "serve",
@@ -34,7 +31,7 @@ func init() {
3431

3532
echox.MustViperFlags(viper.GetViper(), serveCmd.Flags(), defaultListenAddr)
3633

37-
serveCmd.Flags().StringVar(&schemaFile, "schema", "", "path to graphql schema file")
34+
serveCmd.Flags().String("schema", "", "path to graphql schema file")
3835
viperx.MustBindFlag(viper.GetViper(), "schema", serveCmd.Flags().Lookup("schema"))
3936
}
4037

@@ -47,8 +44,8 @@ func serve(ctx context.Context) {
4744
srv, err := echox.NewServer(
4845
logger.Desugar(),
4946
echox.Config{
50-
Listen: viper.GetString("server.listen"),
51-
ShutdownGracePeriod: viper.GetDuration("server.shutdown-grace-period"),
47+
Listen: config.AppConfig.Server.Listen,
48+
ShutdownGracePeriod: config.AppConfig.Server.ShutdownGracePeriod,
5249
},
5350
versionx.BuildDetails(),
5451
)
@@ -57,10 +54,10 @@ func serve(ctx context.Context) {
5754
}
5855

5956
schema := defaultSchema
60-
if schemaFile == "" {
57+
if config.AppConfig.SchemaFile == "" {
6158
logger.Warn("no schema file provided, starting with default schema")
6259
} else {
63-
schemaBytes, err := os.ReadFile(schemaFile)
60+
schemaBytes, err := os.ReadFile(config.AppConfig.SchemaFile)
6461
if err != nil {
6562
logger.Fatalw("failed to read graphql schema file", "error", err)
6663
}

‎go.mod

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module go.infratographer.com/node-resolver
22

3-
go 1.23.0
3+
go 1.24.0
44

55
toolchain go1.24.1
66

@@ -12,7 +12,7 @@ require (
1212
github.com/spf13/viper v1.20.0
1313
github.com/stretchr/testify v1.10.0
1414
github.com/vektah/gqlparser/v2 v2.5.23
15-
go.infratographer.com/x v0.7.2
15+
go.infratographer.com/x v0.7.3
1616
go.uber.org/zap v1.27.0
1717
)
1818

@@ -30,18 +30,18 @@ require (
3030
github.com/go-logr/logr v1.4.2 // indirect
3131
github.com/go-logr/stdr v1.2.2 // indirect
3232
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
33-
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
33+
github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
3434
github.com/google/uuid v1.6.0 // indirect
3535
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1 // indirect
3636
github.com/inconshreveable/mousetrap v1.1.0 // indirect
3737
github.com/jackc/pgpassfile v1.0.0 // indirect
3838
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
39-
github.com/jackc/pgx/v5 v5.7.2 // indirect
39+
github.com/jackc/pgx/v5 v5.7.4 // indirect
4040
github.com/jackc/puddle/v2 v2.2.2 // indirect
4141
github.com/jaevor/go-nanoid v1.4.0 // indirect
4242
github.com/klauspost/compress v1.18.0 // indirect
4343
github.com/labstack/echo-contrib v0.17.2 // indirect
44-
github.com/labstack/echo-jwt/v4 v4.3.0 // indirect
44+
github.com/labstack/echo-jwt/v4 v4.3.1 // indirect
4545
github.com/labstack/gommon v0.4.2 // indirect
4646
github.com/lib/pq v1.10.9 // indirect
4747
github.com/mattn/go-colorable v0.1.14 // indirect
@@ -80,10 +80,10 @@ require (
8080
golang.org/x/sync v0.12.0 // indirect
8181
golang.org/x/sys v0.31.0 // indirect
8282
golang.org/x/text v0.23.0 // indirect
83-
golang.org/x/time v0.10.0 // indirect
84-
google.golang.org/genproto/googleapis/api v0.0.0-20250219182151-9fdb1cabc7b2 // indirect
85-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250219182151-9fdb1cabc7b2 // indirect
83+
golang.org/x/time v0.11.0 // indirect
84+
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
85+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250313205543-e70fdf4c4cb4 // indirect
8686
google.golang.org/grpc v1.71.0 // indirect
87-
google.golang.org/protobuf v1.36.5 // indirect
87+
google.golang.org/protobuf v1.36.6 // indirect
8888
gopkg.in/yaml.v3 v3.0.1 // indirect
8989
)

‎go.sum

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ github.com/go-viper/mapstructure/v2 v2.2.1 h1:ZAaOCxANMuZx5RCeg0mBdEZk7DZasvvZIx
3737
github.com/go-viper/mapstructure/v2 v2.2.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
3838
github.com/gofrs/flock v0.12.1 h1:MTLVXXHf8ekldpJk3AKicLij9MdwOWkZ+a/jHHZby9E=
3939
github.com/gofrs/flock v0.12.1/go.mod h1:9zxTsyu5xtJ9DK+1tFZyibEV7y3uwDxPPfbxeeHCoD0=
40-
github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk=
41-
github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
40+
github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeDy8=
41+
github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
4242
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
4343
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
4444
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
@@ -55,8 +55,8 @@ github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsI
5555
github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
5656
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
5757
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
58-
github.com/jackc/pgx/v5 v5.7.2 h1:mLoDLV6sonKlvjIEsV56SkWNCnuNv531l94GaIzO+XI=
59-
github.com/jackc/pgx/v5 v5.7.2/go.mod h1:ncY89UGWxg82EykZUwSpUKEfccBGGYq1xjrOpsbsfGQ=
58+
github.com/jackc/pgx/v5 v5.7.4 h1:9wKznZrhWa2QiHL+NjTSPP6yjl3451BX3imWDnokYlg=
59+
github.com/jackc/pgx/v5 v5.7.4/go.mod h1:ncY89UGWxg82EykZUwSpUKEfccBGGYq1xjrOpsbsfGQ=
6060
github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo=
6161
github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
6262
github.com/jaevor/go-nanoid v1.4.0 h1:mPz0oi3CrQyEtRxeRq927HHtZCJAAtZ7zdy7vOkrvWs=
@@ -71,8 +71,8 @@ github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0
7171
github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
7272
github.com/labstack/echo-contrib v0.17.2 h1:K1zivqmtcC70X9VdBFdLomjPDEVHlrcAObqmuFj1c6w=
7373
github.com/labstack/echo-contrib v0.17.2/go.mod h1:NeDh3PX7j/u+jR4iuDt1zHmWZSCz9c/p9mxXcDpyS8E=
74-
github.com/labstack/echo-jwt/v4 v4.3.0 h1:8JcvVCrK9dRkPx/aWY3ZempZLO336Bebh4oAtBcxAv4=
75-
github.com/labstack/echo-jwt/v4 v4.3.0/go.mod h1:OlWm3wqfnq3Ma8DLmmH7GiEAz2S7Bj23im2iPMEAR+Q=
74+
github.com/labstack/echo-jwt/v4 v4.3.1 h1:d8+/qf8nx7RxeL46LtoIwHJsH2PNN8xXCQ/jDianycE=
75+
github.com/labstack/echo-jwt/v4 v4.3.1/go.mod h1:yJi83kN8S/5vePVPd+7ID75P4PqPNVRs2HVeuvYJH00=
7676
github.com/labstack/echo/v4 v4.13.3 h1:pwhpCPrTl5qry5HRdM5FwdXnhXSLSY+WE+YQSeCaafY=
7777
github.com/labstack/echo/v4 v4.13.3/go.mod h1:o90YNEeQWjDozo584l7AwhJMHN0bOC4tAfg+Xox9q5g=
7878
github.com/labstack/gommon v0.4.2 h1:F8qTUNXgG1+6WQmqoUWnz8WiEU60mXVVw0P4ht1WRA0=
@@ -132,8 +132,8 @@ github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQ
132132
github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
133133
github.com/vektah/gqlparser/v2 v2.5.23 h1:PurJ9wpgEVB7tty1seRUwkIDa/QH5RzkzraiKIjKLfA=
134134
github.com/vektah/gqlparser/v2 v2.5.23/go.mod h1:D1/VCZtV3LPnQrcPBeR/q5jkSQIPti0uYCP/RI0gIeo=
135-
go.infratographer.com/x v0.7.2 h1:uUeQ1mN0MiDxDLEWfjXZOw9TG/txn0aUxLMVzA2mFTA=
136-
go.infratographer.com/x v0.7.2/go.mod h1:lxM860tBp2S11EMBp6W3ZF2ORRz9duLD2b8DBFIV1j0=
135+
go.infratographer.com/x v0.7.3 h1:PYJlMpV+SUSl7+SmFewSED5e1/rIWvZpWRg4vjwc31k=
136+
go.infratographer.com/x v0.7.3/go.mod h1:U8P4zz3pBQ3Thkv2uw2yq+YiVHQfl10MyurWCi1lMXk=
137137
go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
138138
go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
139139
go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho v0.60.0 h1:vmDg6SXfGUXSkivp53zPNWbmqFBz5P+DBHlf3PROB9E=
@@ -183,16 +183,16 @@ golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
183183
golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
184184
golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
185185
golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
186-
golang.org/x/time v0.10.0 h1:3usCWA8tQn0L8+hFJQNgzpWbd89begxN66o1Ojdn5L4=
187-
golang.org/x/time v0.10.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
188-
google.golang.org/genproto/googleapis/api v0.0.0-20250219182151-9fdb1cabc7b2 h1:35ZFtrCgaAjF7AFAK0+lRSf+4AyYnWRbH7og13p7rZ4=
189-
google.golang.org/genproto/googleapis/api v0.0.0-20250219182151-9fdb1cabc7b2/go.mod h1:W9ynFDP/shebLB1Hl/ESTOap2jHd6pmLXPNZC7SVDbA=
190-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250219182151-9fdb1cabc7b2 h1:DMTIbak9GhdaSxEjvVzAeNZvyc03I61duqNbnm3SU0M=
191-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250219182151-9fdb1cabc7b2/go.mod h1:LuRYeWDFV6WOn90g357N17oMCaxpgCnbi/44qJvDn2I=
186+
golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0=
187+
golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
188+
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb h1:p31xT4yrYrSM/G4Sn2+TNUkVhFCbG9y8itM2S6Th950=
189+
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb/go.mod h1:jbe3Bkdp+Dh2IrslsFCklNhweNTBgSYanP1UXhJDhKg=
190+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250313205543-e70fdf4c4cb4 h1:iK2jbkWL86DXjEx0qiHcRE9dE4/Ahua5k6V8OWFb//c=
191+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250313205543-e70fdf4c4cb4/go.mod h1:LuRYeWDFV6WOn90g357N17oMCaxpgCnbi/44qJvDn2I=
192192
google.golang.org/grpc v1.71.0 h1:kF77BGdPTQ4/JZWMlb9VpJ5pa25aqvVqogsxNHHdeBg=
193193
google.golang.org/grpc v1.71.0/go.mod h1:H0GRtasmQOh9LkFoCPDu3ZrwUtD1YGE+b2vYBYd/8Ec=
194-
google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
195-
google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
194+
google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
195+
google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
196196
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
197197
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
198198
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

‎internal/config/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ var AppConfig struct {
1414
Logging loggingx.Config
1515
Server echox.Config
1616
Tracing otelx.Config
17-
SchemaFile *string
17+
SchemaFile string `mapstructure:"schema"`
1818
}

0 commit comments

Comments
 (0)