Revert "add type to enrollement key"

This reverts commit 0cf342dd6e5dcbc1a3b3962350e6dcb7739380df.

logic/enrollmentkey.go

@@ -41,18 +41,12 @@ func CreateEnrollmentKey(uses int, expiration time.Time, networks, tags []string
 		Unlimited:     unlimited,
 		Networks:      []string{},
 		Tags:          []string{},
-		Type:          models.Undefined,
 	}
 	if uses > 0 {
 		k.UsesRemaining = uses
-		k.Type = models.Uses
 	}
 	if !expiration.IsZero() {
 		k.Expiration = expiration
-		k.Type = models.TimeExpiration
-	}
-	if k.Unlimited {
-		k.Type = models.Unlimited
 	}
 	if len(networks) > 0 {
 		k.Networks = networks

main.go

@@ -19,7 +19,6 @@ import (
 	"github.com/gravitl/netmaker/logger"
 	"github.com/gravitl/netmaker/logic"
 	"github.com/gravitl/netmaker/logic/pro"
-	"github.com/gravitl/netmaker/migrate"
 	"github.com/gravitl/netmaker/models"
 	"github.com/gravitl/netmaker/mq"
 	"github.com/gravitl/netmaker/netclient/ncutils"
@@ -75,7 +74,6 @@ func initialize() { // Client Mode Prereq Check
 		logger.FatalLog("Error connecting to database: ", err.Error())
 	}
 	logger.Log(0, "database successfully connected")
-	migrate.Run()
 
 	logic.SetJWTSecret()
 

migrate/migrate.go

@@ -1,51 +0,0 @@
-package migrate
-
-import (
-	"encoding/json"
-
-	"github.com/gravitl/netmaker/database"
-	"github.com/gravitl/netmaker/logger"
-	"github.com/gravitl/netmaker/models"
-)
-
-func Run() {
-	updateEnrollmentKeys()
-}
-
-func updateEnrollmentKeys() {
-	rows, err := database.FetchRecords(database.ENROLLMENT_KEYS_TABLE_NAME)
-	if err != nil {
-		return
-	}
-	for _, row := range rows {
-		var key models.EnrollmentKey
-		if err = json.Unmarshal([]byte(row), &key); err != nil {
-			continue
-		}
-		if key.Type != models.Undefined {
-			logger.Log(2, "migration: enrollment key type already set")
-			continue
-		} else {
-			logger.Log(2, "migration: updating enrollment key type")
-			if key.Unlimited {
-				key.Type = models.Unlimited
-			}
-			if key.UsesRemaining > 0 {
-				key.Type = models.Uses
-			}
-			if !key.Expiration.IsZero() {
-				key.Type = models.TimeExpiration
-			}
-		}
-		data, err := json.Marshal(key)
-		if err != nil {
-			logger.Log(0, "migration: marshalling enrollment key: "+err.Error())
-			continue
-		}
-		if err = database.Insert(key.Value, string(data), database.ENROLLMENT_KEYS_TABLE_NAME); err != nil {
-			logger.Log(0, "migration: inserting enrollment key: "+err.Error())
-			continue
-		}
-
-	}
-}

models/enrollment_key.go

@@ -4,19 +4,6 @@ import (
 	"time"
 )
 
-const (
-	Undefined KeyType = iota
-	TimeExpiration
-	Uses
-	Unlimited
-)
-
-type KeyType int
-
-func (k KeyType) String() string {
-	return [...]string{"Undefined", "TimeExpiration", "Uses", "Unlimited"}[k]
-}
-
 // EnrollmentToken - the tokenized version of an enrollmentkey;
 // to be used for host registration
 type EnrollmentToken struct {
@@ -36,7 +23,6 @@ type EnrollmentKey struct {
 	Unlimited     bool      `json:"unlimited"`
 	Tags          []string  `json:"tags"`
 	Token         string    `json:"token,omitempty"` // B64 value of EnrollmentToken
-	Type          KeyType   `json:"type"`
 }
 
 // APIEnrollmentKey - used to create enrollment keys via API
@@ -65,9 +51,6 @@ func (k *EnrollmentKey) IsValid() bool {
 	if !k.Expiration.IsZero() && time.Now().Before(k.Expiration) {
 		return true
 	}
-	if k.Type == Undefined {
-		return false
-	}
 
 	return k.Unlimited
 }