From cf447a84b0efa8b99004dd56f5ad137f099a1888 Mon Sep 17 00:00:00 2001 From: Manfred Touron Date: Thu, 2 Nov 2017 10:27:58 +0100 Subject: [PATCH] Remove unimplemented group code --- db.go | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/db.go b/db.go index ef49c0c..f6e2680 100644 --- a/db.go +++ b/db.go @@ -29,25 +29,16 @@ type Host struct { User string Password string SSHKey *SSHKey - SSHKeyID uint `gorm:"index"` - Fingerprint string // FIXME: replace with hostkey ? - Groups []Group `gorm:"many2many:host_groups;"` + SSHKeyID uint `gorm:"index"` + Fingerprint string // FIXME: replace with hostkey ? Comment string } -type Group struct { - // FIXME: use uuid for ID - gorm.Model - Name string // FIXME: govalidator: min length 3, alphanum - Comment string -} - type User struct { // FIXME: use uuid for ID gorm.Model Name string // FIXME: govalidator: min length 3, alphanum SSHKeys []SSHKey - Groups []Group `gorm:"many2many:user_groups;"` Comment string } @@ -55,11 +46,9 @@ func dbInit(db *gorm.DB) error { db.AutoMigrate(&User{}) db.AutoMigrate(&SSHKey{}) db.AutoMigrate(&Host{}) - db.AutoMigrate(&Group{}) - db.Exec(`CREATE UNIQUE INDEX uix_keys_name ON "keys"("name") WHERE ("deleted_at" IS NULL)`) - db.Exec(`CREATE UNIQUE INDEX uix_hosts_name ON "hosts"("name") WHERE ("deleted_at" IS NULL)`) - db.Exec(`CREATE UNIQUE INDEX uix_users_name ON "users"("name") WHERE ("deleted_at" IS NULL)`) - db.Exec(`CREATE UNIQUE INDEX uix_groups_name ON "groups"("name") WHERE ("deleted_at" IS NULL)`) + db.Exec(`CREATE UNIQUE INDEX uix_keys_name ON "ssh_keys"("name") WHERE ("deleted_at" IS NULL)`) + db.Exec(`CREATE UNIQUE INDEX uix_hosts_name ON "hosts"("name") WHERE ("deleted_at" IS NULL)`) + db.Exec(`CREATE UNIQUE INDEX uix_users_name ON "users"("name") WHERE ("deleted_at" IS NULL)`) // create default ssh key var count uint