PR changes

db/migrations/00008_skus.sql

@@ -21,6 +21,8 @@ CREATE TABLE public.server_sku (
 CREATE TABLE public.server_sku_disk (
     id UUID NOT NULL PRIMARY KEY DEFAULT gen_random_uuid(),
     sku_id UUID NOT NULL REFERENCES public.server_sku(id) ON DELETE CASCADE,
+    vendor STRING NOT NULL,
+    model STRING NOT NULL,
     bytes BIGINT NOT NULL,
     protocol STRING NOT NULL, -- SATA vs NVMe vs PCIE
     count INTEGER NOT NULL,
@@ -31,6 +33,8 @@ CREATE TABLE public.server_sku_disk (
 CREATE TABLE public.server_sku_memory (
     id UUID NOT NULL PRIMARY KEY DEFAULT gen_random_uuid(),
     sku_id UUID NOT NULL REFERENCES public.server_sku(id) ON DELETE CASCADE,
+    vendor STRING NOT NULL,
+    model STRING NOT NULL,
     bytes BIGINT NOT NULL,
     count INTEGER NOT NULL,
     created_at TIMESTAMPTZ NULL,
@@ -40,6 +44,8 @@ CREATE TABLE public.server_sku_memory (
 CREATE TABLE public.server_sku_nic (
     id UUID NOT NULL PRIMARY KEY DEFAULT gen_random_uuid(),
     sku_id UUID NOT NULL REFERENCES public.server_sku(id) ON DELETE CASCADE,
+    vendor STRING NOT NULL,
+    model STRING NOT NULL,
     port_bandwidth BIGINT NOT NULL,
     port_count INTEGER NOT NULL,
     count INTEGER NOT NULL,

pkg/api/v1/errors.go

@@ -21,9 +21,6 @@ var (
 	errRouteBase          = "error fullfilling %s request"
 	ErrRouteServerSku     = fmt.Errorf(errRouteBase, "server sku")
 	ErrRouteBiosConfigSet = fmt.Errorf(errRouteBase, "bios config set")
-
-	// SQL Boiler Erors
-	ErrNullRelation = errors.New("sqlboiler relation was unexpectedly null")
 )
 
 // ClientError is returned when invalid arguments are provided to the client

pkg/api/v1/router_bios_config_set.go

@@ -37,9 +37,9 @@ func (r *Router) serverBiosConfigSetCreate(c *gin.Context) {
 func (r *Router) serverBiosConfigSetGet(c *gin.Context) {
 	// Get Config Set
 	id := c.Param("uuid")
-	if id == "" || id == uuid.Nil.String() {
-		badRequestResponse(c, "no UUID query param", ErrRouteBiosConfigSet)
-		return
+	_, err := uuid.Parse(id)
+	if err != nil {
+		badRequestResponse(c, "invalid UUID query param", ErrRouteBiosConfigSet)
 	}
 
 	mods := []qm.QueryMod{
@@ -61,8 +61,9 @@ func (r *Router) serverBiosConfigSetGet(c *gin.Context) {
 
 func (r *Router) serverBiosConfigSetDelete(c *gin.Context) {
 	id := c.Param("uuid")
-	if id == "" || id == uuid.Nil.String() {
-		badRequestResponse(c, "no UUID query param", ErrRouteBiosConfigSet)
+	_, err := uuid.Parse(id)
+	if err != nil {
+		badRequestResponse(c, "invalid UUID query param", ErrRouteBiosConfigSet)
 	}
 
 	set := &models.BiosConfigSet{}
@@ -119,12 +120,13 @@ func (r *Router) serverBiosConfigSetUpdate(c *gin.Context) {
 
 	// Get ID
 	id := c.Param("uuid")
-	if id == "" || id == uuid.Nil.String() {
-		badRequestResponse(c, "no UUID query param", ErrRouteBiosConfigSet)
+	_, err := uuid.Parse(id)
+	if err != nil {
+		badRequestResponse(c, "invalid UUID query param", ErrRouteBiosConfigSet)
 	}
 
 	// Unmarshal JSON payload
-	err := c.ShouldBindJSON(&payload)
+	err = c.ShouldBindJSON(&payload)
 	if err != nil {
 		badRequestResponse(c, "invalid payload: BiosConfigSetUpdate{}; failed to unmarshal config set", err)
 		return
@@ -241,7 +243,7 @@ func updateBiosConfigSetDeleteHelper(ctx context.Context, tx *sql.Tx, components
 func updateBiosConfigSetInsertUpdateHelper(ctx context.Context, tx *sql.Tx, components []*models.BiosConfigComponent, componentsToUpdate []bool, settingsToUpdate [][]bool) error {
 	for c, component := range components {
 		if component.R == nil || component.R.FKBiosConfigSet == nil {
-			return ErrNullRelation
+			return nil
 		}
 
 		err := component.R.FKBiosConfigSet.AddFKBiosConfigSetBiosConfigComponents(ctx, tx, !componentsToUpdate[c], component)

pkg/api/v1/router_server_sku.go

@@ -36,8 +36,9 @@ func (r *Router) serverSkuCreate(c *gin.Context) {
 func (r *Router) serverSkuGet(c *gin.Context) {
 	// Get ID
 	id := c.Param("uuid")
-	if id == "" || id == uuid.Nil.String() {
-		badRequestResponse(c, "no UUID query param", ErrRouteServerSku)
+	_, err := uuid.Parse(id)
+	if err != nil {
+		badRequestResponse(c, "invalid UUID query param", ErrRouteServerSku)
 		return
 	}
 
@@ -65,12 +66,14 @@ func (r *Router) serverSkuUpdate(c *gin.Context) {
 
 	// Get ID
 	id := c.Param("uuid")
-	if id == "" || id == uuid.Nil.String() {
-		badRequestResponse(c, "no UUID query param", ErrRouteServerSku)
+	_, err := uuid.Parse(id)
+	if err != nil {
+		badRequestResponse(c, "invalid UUID query param", ErrRouteServerSku)
+		return
 	}
 
 	// Unmarshal JSON payload
-	err := c.ShouldBindJSON(&payload)
+	err = c.ShouldBindJSON(&payload)
 	if err != nil {
 		badRequestResponse(c, "invalid payload; failed to unmarshal sku", err)
 		return
@@ -103,8 +106,10 @@ func (r *Router) serverSkuUpdate(c *gin.Context) {
 func (r *Router) serverSkuDelete(c *gin.Context) {
 	// Get ID
 	id := c.Param("uuid")
-	if id == "" || id == uuid.Nil.String() {
-		badRequestResponse(c, "no UUID query param", ErrRouteServerSku)
+	_, err := uuid.Parse(id)
+	if err != nil {
+		badRequestResponse(c, "invalid UUID query param", ErrRouteServerSku)
+		return
 	}
 
 	set := &models.ServerSku{}
@@ -129,7 +134,7 @@ func (r *Router) serverSkuList(c *gin.Context) {
 
 	mods := params.queryMods()
 
-	count, err := models.BiosConfigSets().Count(c.Request.Context(), r.DB)
+	count, err := models.ServerSkus().Count(c.Request.Context(), r.DB)
 	if err != nil {
 		dbErrorResponse(c, err)
 		return