Merge pull request #21 from nais/sqlinstances_refactor

Sqlinstances refactor
nais · Apr 10, 2024 · 9afd5c7 · 9afd5c7
2 parents af6b30e + 8449f0a
commit 9afd5c7
Show file tree

Hide file tree

Showing 19 changed files with 947 additions and 420 deletions.
diff --git a/data/k8s/superprod/devteam/sqlinstance.yaml b/data/k8s/superprod/devteam/sqlinstance.yaml
@@ -18,11 +18,6 @@ metadata:
     team: nais
   name: contests
   namespace: nais-system
-  ownerReferences:
-    - apiVersion: nais.io/v1
-      kind: Application
-      name: contests
-      uid: 6957e4dd-2997-46b3-8f6f-b6d1e0606b1d
 spec:
   databaseVersion: POSTGRES_14
   instanceType: CLOUD_SQL_INSTANCE

diff --git a/data/k8s/superprod/devteam/sqlinstance_update_failed.yaml b/data/k8s/superprod/devteam/sqlinstance_update_failed.yaml
@@ -18,11 +18,6 @@ metadata:
     team: nais
   name: contests-failing
   namespace: nais-system
-  ownerReferences:
-    - apiVersion: nais.io/v1
-      kind: Application
-      name: contests-failing
-      uid: 6957e4dd-2997-46b3-8f6f-b6d1e0606b1d
 spec:
   databaseVersion: POSTGRES_14
   instanceType: CLOUD_SQL_INSTANCE

diff --git a/internal/cmd/api/api.go b/internal/cmd/api/api.go
@@ -162,9 +162,9 @@ func run(ctx context.Context, cfg *Config, log logrus.FieldLogger) error {
 
 	userSyncRuns := usersync.NewRunsHandler(cfg.UserSync.RunsToPersist)
 	resourceUsageClient := resourceusage.NewClient(cfg.K8s.AllClusterNames(), db, log)
-	sqlinstanceMetrics, err := sqlinstance.NewMetrics(ctx, log)
+	sqlInstanceClient, err := sqlinstance.NewClient(ctx, k8sClient.Informers(), log)
 	if err != nil {
-		return err
+		return fmt.Errorf("create sql instance client: %w", err)
 	}
 
 	resolver := graph.NewResolver(
@@ -180,7 +180,7 @@ func run(ctx context.Context, cfg *Config, log logrus.FieldLogger) error {
 		userSyncRuns,
 		pubsubTopic,
 		log,
-		sqlinstanceMetrics,
+		sqlInstanceClient,
 	)
 
 	graphHandler, err := graph.NewHandler(gengql.Config{

diff --git a/internal/database/cost.go b/internal/database/cost.go
@@ -2,6 +2,7 @@ package database
 
 import (
 	"context"
+	"time"
 
 	"github.com/jackc/pgx/v5/pgtype"
 	"github.com/nais/api/internal/database/gensql"
@@ -17,6 +18,7 @@ type CostRepo interface {
 	MonthlyCostForApp(ctx context.Context, teamSlug slug.Slug, app string, environment string) ([]*gensql.MonthlyCostForAppRow, error)
 	MonthlyCostForTeam(ctx context.Context, teamSlug slug.Slug) ([]*gensql.MonthlyCostForTeamRow, error)
 	CostForSqlInstance(ctx context.Context, fromDate, toDate pgtype.Date, teamSlug slug.Slug, appName, environment string) (float32, error)
+	CurrentSqlInstancesCostForTeam(ctx context.Context, teamSlug slug.Slug) (float32, error)
 }
 
 var _ CostRepo = (*database)(nil)
@@ -82,3 +84,17 @@ func (d *database) CostForSqlInstance(ctx context.Context, fromDate, toDate pgty
 
 	return cost, nil
 }
+
+func (d *database) CurrentSqlInstancesCostForTeam(ctx context.Context, teamSlug slug.Slug) (float32, error) {
+	now := time.Now()
+	var from, to pgtype.Date
+
+	_ = to.Scan(now)
+	_ = from.Scan(now.AddDate(0, 0, -32)) // we don't have cost for today or yesterday
+
+	return d.querier.CurrentSqlInstancesCostForTeam(ctx, gensql.CurrentSqlInstancesCostForTeamParams{
+		FromDate: from,
+		ToDate:   to,
+		TeamSlug: teamSlug,
+	})
+}
diff --git a/internal/database/gensql/cost.sql.go b/internal/database/gensql/cost.sql.go
diff --git a/internal/database/gensql/mock_querier.go b/internal/database/gensql/mock_querier.go
diff --git a/internal/database/gensql/querier.go b/internal/database/gensql/querier.go
diff --git a/internal/database/mock_database.go b/internal/database/mock_database.go
diff --git a/internal/database/queries/cost.sql b/internal/database/queries/cost.sql
@@ -120,4 +120,16 @@ WHERE
     AND app = @app_name
     AND date >= @from_date
     AND date <= @to_date
-    AND environment = @environment::text;
+    AND environment = @environment::text;
+
+-- name: CurrentSqlInstancesCostForTeam :one
+SELECT
+    COALESCE(SUM(daily_cost), 0)::real
+FROM
+    cost
+WHERE
+    team_slug = @team_slug
+    AND cost_type = 'Cloud SQL'
+    AND date >= @from_date
+    AND date <= @to_date;
+