Merge pull request #1524 from porter-dev/belanger/por-278-usage-cache-write

[POR-278] Add error logging and handling to usage cache service

internal/usage/usage.go

@@ -67,14 +67,14 @@ func GetUsage(opts *GetUsageOpts) (
 		}
 	}
 
-	oldUsageCache := usageCache
+	oldUsageCache := *usageCache
 
 	usageCache.Clusters = uint(len(clusters))
 	usageCache.Users = uint(len(countedRoles))
 
 	// if the usage cache is 1 hour old, was not found, usage is currently over limit, or the clusters/users
 	// counts have changed, re-query for the usage
-	if !isCacheFound || usageCache.Is1HrOld() || isUsageExceeded(usageCache, limit) || isUsageChanged(oldUsageCache, usageCache) {
+	if !isCacheFound || usageCache.Is1HrOld() || isUsageExceeded(usageCache, limit) || isUsageChanged(&oldUsageCache, usageCache) {
 		cpu, memory, err := getResourceUsage(opts, clusters)
 
 		if err != nil {
@@ -97,10 +97,14 @@ func GetUsage(opts *GetUsageOpts) (
 
 	if !isCacheFound {
 		usageCache, err = opts.Repo.ProjectUsage().CreateProjectUsageCache(usageCache)
-	} else if isUsageChanged(oldUsageCache, usageCache) {
+	} else if isUsageChanged(&oldUsageCache, usageCache) {
 		usageCache, err = opts.Repo.ProjectUsage().UpdateProjectUsageCache(usageCache)
 	}
 
+	if err != nil {
+		return nil, nil, nil, err
+	}
+
 	return &types.ProjectUsage{
 		ResourceCPU:    usageCache.ResourceCPU,
 		ResourceMemory: usageCache.ResourceMemory,

services/porter_cli_container/dev.Dockerfile

@@ -0,0 +1,35 @@
+
+# syntax=docker/dockerfile:1.1.7-experimental
+
+# Base Go environment
+# -------------------
+FROM golang:1.16 as base
+WORKDIR /porter
+
+RUN apt-get update && apt-get install -y gcc musl-dev git
+
+COPY go.mod go.sum Makefile ./
+COPY /cli ./cli
+COPY /internal ./internal
+COPY /api ./api
+COPY /ee ./ee
+
+RUN --mount=type=cache,target=$GOPATH/pkg/mod \
+    go mod download
+
+# Go build environment
+# --------------------
+FROM base AS build-go
+
+ARG version=dev
+
+RUN make build-cli-dev
+
+# Deployment environment
+# ----------------------
+FROM ubuntu:latest
+RUN apt-get update && apt-get install -y ca-certificates git
+
+COPY --from=build-go /porter/bin/porter /bin/porter
+
+ENTRYPOINT ["porter"]

services/usage/usage.go

@@ -3,6 +3,7 @@
 package usage
 
 import (
+	"fmt"
 	"sync"
 	"time"
 
@@ -102,7 +103,7 @@ func (u *UsageTracker) GetProjectUsage() (map[uint]*UsageTrackerResponse, error)
 	var mu sync.Mutex
 	var wg sync.WaitGroup
 
-	worker := func(project *models.Project) error {
+	worker := func(project *models.Project) {
 		defer wg.Done()
 
 		current, limit, cache, err := usage.GetUsage(&usage.GetUsageOpts{
@@ -113,14 +114,16 @@ func (u *UsageTracker) GetProjectUsage() (map[uint]*UsageTrackerResponse, error)
 		})
 
 		if err != nil {
-			return err
+			fmt.Printf("Project %d: error getting usage: %v\n", project.ID, err)
+			return
 		}
 
 		// get the admin emails for the project
 		roles, err := u.repo.Project().ListProjectRoles(project.ID)
 
 		if err != nil {
-			return err
+			fmt.Printf("Project %d: error getting admin emails: %v\n", project.ID, err)
+			return
 		}
 
 		adminEmails := make([]string, 0)
@@ -161,7 +164,7 @@ func (u *UsageTracker) GetProjectUsage() (map[uint]*UsageTrackerResponse, error)
 		}
 		mu.Unlock()
 
-		return nil
+		return
 	}
 
 	// iterate (count / stepSize) + 1 times using Limit and Offset