fix: api creation

jaspeen · Jun 10, 2024 · a92be34 · a92be34
1 parent 14eb9aa
commit a92be34
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/api/api.go b/api/api.go
@@ -81,7 +81,7 @@ type Api struct {
  cache *ttlcache.Cache[string, *queries.GetApiKeyForVerifyRow]
 }
 
-func (a *Api) NewApi(log *slog.Logger, db *sql.DB, config Config) (*Api, error) {
+func NewApi(log *slog.Logger, db *sql.DB, config Config) (*Api, error) {
  var cache *ttlcache.Cache[string, *queries.GetApiKeyForVerifyRow]
  if config.CacheMaxSize > 0 {
  cache = ttlcache.New(

diff --git a/cmd/apikeyman/main.go b/cmd/apikeyman/main.go
@@ -137,10 +137,10 @@ func main() {
  panic(err)
  }
 
- a := api.Api{
- Log: slog.Default(),
- Db: db,
- Config: api.Config{
+ a, err := api.NewApi(
+ slog.Default(),
+ db,
+ api.Config{
  ApiKeyHeaderName: api.API_KEY_DEFAULT_HEADER,
  ApiKeyQueryParamName: "apikey",
  SignatureHeaderName: api.SIGNATURE_DEFAULT_HEADER,
@@ -151,7 +151,10 @@ func main() {
  DefaultKeyExpiration: 30 * 24 * time.Hour,
  CacheMaxSize: cCtx.Uint64("cache-max-size"),
  CacheTTL: cCtx.Duration("cache-ttl"),
- }}
+ })
+ if err != nil {
+ panic(err)
+ }
  r := a.Routes(cCtx.String("base-path"))
  return r.Run(cCtx.String("addr"))
  },

diff --git a/deploy/charts/apikeyman/Chart.yaml b/deploy/charts/apikeyman/Chart.yaml
@@ -7,5 +7,5 @@ keywords:
  - security
 sources:
  - https://github.com/jaspeen/apikeyman
-version: 0.1.10
-appVersion: "0.1.8"
+version: 0.1.11
+appVersion: "0.1.11"