Move loadbalancer delete auth relationships into resolver (#230)

* move loadbalancer delete auth relationships into resolver Signed-off-by: Matt Siwiec <rizzza@users.noreply.github.com> * bump to go 1.21 to get context.WithoutCancel Signed-off-by: Matt Siwiec <rizzza@users.noreply.github.com> * disable entc extension for generating hooks Signed-off-by: Matt Siwiec <rizzza@users.noreply.github.com> * use go 1.21 context.WithCancel for delete auth relationship Signed-off-by: Matt Siwiec <rizzza@users.noreply.github.com> * testcontainers bug fix, back to go.mod version Signed-off-by: Matt Siwiec <rizzza@users.noreply.github.com> --------- Signed-off-by: Matt Siwiec <rizzza@users.noreply.github.com>
infratographer · Oct 4, 2023 · 9935d1c · 9935d1c
1 parent 7340843
commit 9935d1c
Show file tree

Hide file tree

Showing 9 changed files with 134 additions and 50 deletions.
diff --git a/.devcontainer/.env b/.devcontainer/.env
@@ -7,6 +7,8 @@ COCKROACH_URL="postgresql://root@crdb:26257/load_balancer_api_dev?sslmode=disabl
 ATLAS_DB_URI="postgresql://root@crdb:26257/atlas_migrations?sslmode=disable"
 LOADBALANCERAPI_CRDB_URI="postgresql://root@crdb:26257/load_balancer_api_dev?sslmode=disable"
 LOADBALANCERAPI_EVENTS_NATS_CREDSFILE="/workspaces/load-balancer-api/.devcontainer/nsc/nkeys/creds/LOCAL/LBAAS/USER.creds"
+LOADBALANCERAPI_EVENTS_NATS_PUBLISHPREFIX=com.infratographer
+LOADBALANCERAPI_EVENTS_NATS_QUEUEGROUP=loadbalancerapi
 
 NKEYS_PATH="/workspaces/load-balancer-api/.devcontainer/nsc/nkeys"
 NSC_HOME="/workspaces/load-balancer-api/.devcontainer/nsc/nats"

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,7 +1,9 @@
+ARG GO_VERSION=1.21
+
 # Used to install CRDB into the devcontainer
 FROM cockroachdb/cockroach:latest-v22.2 as CRDB
 
-FROM mcr.microsoft.com/vscode/devcontainers/go:0-1.20-bullseye
+FROM mcr.microsoft.com/vscode/devcontainers/go:1-${GO_VERSION}-bullseye
 
 # Set up crdb
 RUN mkdir /usr/local/lib/cockroach

diff --git a/.github/workflows/test-go.yml b/.github/workflows/test-go.yml
@@ -36,9 +36,7 @@ jobs:
       - name: Set up Go for ${{ matrix.ci-database }}
         uses: actions/setup-go@v4
         with:
-          #pinning to 1.20.5 until https://github.com/testcontainers/testcontainers-go/issues/1359 is resolved
-          #go-version-file: "go.mod"
-          go-version: "1.20.5"
+          go-version-file: "go.mod"
       - name: Install atlas for db migrations on ${{ matrix.ci-database }}
         run: go install ariga.io/atlas/cmd/atlas@latest
 

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module go.infratographer.com/load-balancer-api
 
-go 1.20
+go 1.21
 
 require (
 	entgo.io/contrib v0.4.5

diff --git a/go.sum b/go.sum
diff --git a/internal/ent/entc.go b/internal/ent/entc.go
@@ -10,8 +10,6 @@ import (
 	"entgo.io/ent/entc/gen"
 	"entgo.io/ent/schema/field"
 	"go.infratographer.com/x/entx"
-
-	"go.infratographer.com/load-balancer-api/x/pubsubinfo"
 )
 
 func main() {
@@ -24,12 +22,15 @@ func main() {
 		log.Fatalf("creating entx extension: %v", err)
 	}
 
-	pubsubExt, err := pubsubinfo.NewExtension(
-		pubsubinfo.WithEventHooks(),
-	)
-	if err != nil {
-		log.Fatalf("creating pubsubinfo extension: %v", err)
-	}
+	// load-balancer-api currently uses manual maintained hooks, however, if the schema changes, we'll need to enable the pubsubExt
+	// to re-generate the hooks and merge the generated changes with the manual hooks.
+
+	// pubsubExt, err := pubsubinfo.NewExtension(
+	// 	pubsubinfo.WithEventHooks(),
+	// )
+	// if err != nil {
+	// 	log.Fatalf("creating pubsubinfo extension: %v", err)
+	// }
 
 	gqlExt, err := entgql.NewExtension(
 		// Tell Ent to generate a GraphQL schema for
@@ -48,7 +49,7 @@ func main() {
 		entc.Extensions(
 			xExt,
 			gqlExt,
-			pubsubExt,
+			// pubsubExt,
 		),
 		entc.TemplateDir("./internal/ent/templates"),
 		entc.FeatureNames("intercept"),

diff --git a/internal/graphapi/errors.go b/internal/graphapi/errors.go
@@ -2,14 +2,19 @@ package graphapi
 
 import "errors"
 
-// ErrPortNumberInUse is returned when a port number is already in use.
-var ErrPortNumberInUse = errors.New("port number already in use")
+var (
+	// ErrPortNumberInUse is returned when a port number is already in use.
+	ErrPortNumberInUse = errors.New("port number already in use")
 
-// ErrRestrictedPortNumber is returned when a port number is restricted.
-var ErrRestrictedPortNumber = errors.New("port number restricted")
+	// ErrRestrictedPortNumber is returned when a port number is restricted.
+	ErrRestrictedPortNumber = errors.New("port number restricted")
 
-// ErrPortNotFound is returned when one or more ports are not found
-var ErrPortNotFound = errors.New("one or more ports not found")
+	// ErrPortNotFound is returned when one or more ports are not found
+	ErrPortNotFound = errors.New("one or more ports not found")
 
-// ErrPoolNotFound is returned when one or more pools are not found
-var ErrPoolNotFound = errors.New("one or more pools not found")
+	// ErrPoolNotFound is returned when one or more pools are not found
+	ErrPoolNotFound = errors.New("one or more pools not found")
+
+	// ErrInternalServerError is returned when an internal error occurs.
+	ErrInternalServerError = errors.New("internal server error")
+)
diff --git a/internal/graphapi/loadbalancer.resolvers.go b/internal/graphapi/loadbalancer.resolvers.go
diff --git a/internal/manualhooks/hooks.go b/internal/manualhooks/hooks.go
@@ -252,11 +252,6 @@ func LoadBalancerHooks() []ent.Hook {
 
 					additionalSubjects = append(additionalSubjects, dbObj.OwnerID)
 
-					relationships = append(relationships, events.AuthRelationshipRelation{
-						Relation:  "owner",
-						SubjectID: dbObj.OwnerID,
-					})
-
 					lbs := getLoadBalancerIDs(ctx, objID, additionalSubjects)
 					for _, lb := range lbs {
 						lb, err := m.Client().LoadBalancer.Get(ctx, lb)