simplify peer-query and remove REST-API for registration

Author: jhrv

apiserver/api/api.go

@@ -89,17 +89,6 @@ func (a *api) updateHealth(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
-func (a *api) registerClient(w http.ResponseWriter, r *http.Request) {
-	var reg ClientRegistrationRequest
-	if err := json.NewDecoder(r.Body).Decode(&reg); err != nil {
-		respondf(w, http.StatusBadRequest, "error during JSON unmarshal: %s\n", err)
-	}
-
-	if err := a.db.AddClient(reg.Username, reg.PublicKey, reg.Serial); err != nil {
-		respondf(w, http.StatusInternalServerError, "unable to add new peer: %s\n", err)
-	}
-}
-
 func respondf(w http.ResponseWriter, statusCode int, format string, args ...interface{}) {
 	w.WriteHeader(statusCode)
 

apiserver/api/router.go

@@ -16,7 +16,6 @@ func New(cfg Config) chi.Router {
 	r.Get("/gateways/{gateway}", api.gatewayConfig)
 	r.Get("/clients", api.clients)
 	r.Put("/clients/health", api.updateHealth)
-	r.Put("/clients/register", api.registerClient)
 
 	return r
 }

apiserver/database/database.go

@@ -190,19 +190,15 @@ INSERT
 	return tx.Commit(ctx)
 }
 
-func (d *APIServerDB) ReadControlPlanePeer(serial string) (*Peer, error) {
+func (d *APIServerDB) ReadControlPlanePeer(publicKey string) (*Peer, error) {
 	ctx := context.Background()
 
 	query := `
 SELECT public_key, ip
-  FROM client_peer
-         JOIN client c on c.id = client_id
-         JOIN peer p on p.id = peer_id
- WHERE c.serial = $1
-   AND p.type = 'control'
- LIMIT 1;`
-
-	row := d.conn.QueryRow(ctx, query, serial)
+  FROM peer
+ WHERE public_key = $1;`
+
+	row := d.conn.QueryRow(ctx, query, publicKey)
 
 	var peer Peer
 	err := row.Scan(&peer.PublicKey, &peer.IP)

apiserver/slack/slack.go

@@ -52,7 +52,7 @@ func (s *slackbot) handleRegister(msg slack.Msg) string {
 		log.Errorf("adding client to database: %v", err)
 		return "Something went wrong during registration :sweat_smile:, I've notified the nais device team for you. (1)"
 	} else {
-		c, err := s.database.ReadControlPlanePeer(serial)
+		c, err := s.database.ReadControlPlanePeer(publicKey)
 		if err != nil {
 			return "Something went wrong during registration :sweat_smile:, I've notified the nais device team for you. (2)"
 		}