From d521051e33a0c2c98e6450088783f9245ad1f4b6 Mon Sep 17 00:00:00 2001
From: Nicholas Wiersma <nick@wiersma.co.za>
Date: Tue, 17 Dec 2024 21:40:57 +0200
Subject: [PATCH] feat: set resource revision for connectors (#3868)
Signed-off-by: Nicholas Wiersma <nick@wiersma.co.za>
---
server/api.go | 24 +++++++++++++++++++-----
1 file changed, 19 insertions(+), 5 deletions(-)
diff --git a/server/api.go b/server/api.go
index 4b210df3..4454c3ca 100644
--- a/server/api.go
+++ b/server/api.go
@@ -6,6 +6,7 @@ import (
"errors"
"fmt"
"log/slog"
+ "strconv"
"golang.org/x/crypto/bcrypt"
@@ -430,10 +431,11 @@ func (d dexAPI) CreateConnector(ctx context.Context, req *api.CreateConnectorReq
}
c := storage.Connector{
- ID: req.Connector.Id,
- Name: req.Connector.Name,
- Type: req.Connector.Type,
- Config: req.Connector.Config,
+ ID: req.Connector.Id,
+ Name: req.Connector.Name,
+ Type: req.Connector.Type,
+ ResourceVersion: "1",
+ Config: req.Connector.Config,
}
if err := d.s.CreateConnector(ctx, c); err != nil {
if err == storage.ErrAlreadyExists {
@@ -446,7 +448,7 @@ func (d dexAPI) CreateConnector(ctx context.Context, req *api.CreateConnectorReq
return &api.CreateConnectorResp{}, nil
}
-func (d dexAPI) UpdateConnector(ctx context.Context, req *api.UpdateConnectorReq) (*api.UpdateConnectorResp, error) {
+func (d dexAPI) UpdateConnector(_ context.Context, req *api.UpdateConnectorReq) (*api.UpdateConnectorResp, error) {
if !featureflags.APIConnectorsCRUD.Enabled() {
return nil, fmt.Errorf("%s feature flag is not enabled", featureflags.APIConnectorsCRUD.Name)
}
@@ -476,6 +478,10 @@ func (d dexAPI) UpdateConnector(ctx context.Context, req *api.UpdateConnectorReq
old.Config = req.NewConfig
}
+ if rev, err := strconv.Atoi(defaultTo(old.ResourceVersion, "0")); err == nil {
+ old.ResourceVersion = strconv.Itoa(rev + 1)
+ }
+
return old, nil
}
@@ -536,3 +542,11 @@ func (d dexAPI) ListConnectors(ctx context.Context, req *api.ListConnectorReq) (
Connectors: connectors,
}, nil
}
+
+func defaultTo[T comparable](v, def T) T {
+ var zeroT T
+ if v == zeroT {
+ return def
+ }
+ return v
+}
--
GitLab