Merge pull request #29 from 0xsequence/tenant-not-found

Specify "tenant not found"  error in ridl file

proto/authenticator.ridl

@@ -139,6 +139,7 @@ struct SessionData
 ##
 
 error 1000 Unauthorized "Unauthorized access" HTTP 401
+error 1001 TenantNotFound "Tenant not found" HTTP 404
 
 
 ##

proto/clients/authenticator.gen.ts

@@ -1,5 +1,5 @@
 /* eslint-disable */
-// sequence-waas-authenticator v0.1.0 c02d115f8e54a1d15199e321aa744883a7c2946e
+// sequence-waas-authenticator v0.1.0 a753d63c2d2bbb862ca2c9efb16ba355b19a81aa
 // --
 // Code generated by [email protected] with typescript generator. DO NOT EDIT.
 //
@@ -12,7 +12,7 @@ export const WebRPCVersion = "v1"
 export const WebRPCSchemaVersion = "v0.1.0"
 
 // Schema hash generated from your RIDL schema
-export const WebRPCSchemaHash = "c02d115f8e54a1d15199e321aa744883a7c2946e"
+export const WebRPCSchemaHash = "a753d63c2d2bbb862ca2c9efb16ba355b19a81aa"
 
 //
 // Types
@@ -606,6 +606,19 @@ export class UnauthorizedError extends WebrpcError {
   }
 }
 
+export class TenantNotFoundError extends WebrpcError {
+  constructor(
+    name: string = 'TenantNotFound',
+    code: number = 1001,
+    message: string = 'Tenant not found',
+    status: number = 0,
+    cause?: string
+  ) {
+    super(name, code, message, status, cause)
+    Object.setPrototypeOf(this, TenantNotFoundError.prototype)
+  }
+}
+
 
 export enum errors {
   WebrpcEndpoint = 'WebrpcEndpoint',
@@ -620,6 +633,7 @@ export enum errors {
   WebrpcStreamLost = 'WebrpcStreamLost',
   WebrpcStreamFinished = 'WebrpcStreamFinished',
   Unauthorized = 'Unauthorized',
+  TenantNotFound = 'TenantNotFound',
 }
 
 const webrpcErrorByCode: { [code: number]: any } = {
@@ -635,6 +649,7 @@ const webrpcErrorByCode: { [code: number]: any } = {
   [-9]: WebrpcStreamLostError,
   [-10]: WebrpcStreamFinishedError,
   [1000]: UnauthorizedError,
+  [1001]: TenantNotFoundError,
 }
 
 export type Fetch = (input: RequestInfo, init?: RequestInit) => Promise<Response>

proto/proto.go

@@ -1,8 +1,8 @@
 // Server
-//go:generate go run github.com/webrpc/webrpc/cmd/webrpc-gen -schema=authenticator.ridl -target=golang -pkg=proto -server -client -out=./authenticator.gen.go
+//go:generate go run github.com/webrpc/webrpc/cmd/webrpc-gen -schema=authenticator.ridl -target=golang@v0.13.6 -pkg=proto -server -client -out=./authenticator.gen.go
 
 // Clients
-//go:generate go run github.com/webrpc/webrpc/cmd/webrpc-gen -schema=authenticator.ridl -target=golang -pkg=proto -client -out=./clients/authenticator.gen.go
+//go:generate go run github.com/webrpc/webrpc/cmd/webrpc-gen -schema=authenticator.ridl -target=golang@v0.13.6 -pkg=proto -client -out=./clients/authenticator.gen.go
 //go:generate go run github.com/webrpc/webrpc/cmd/webrpc-gen -schema=authenticator.ridl -target=typescript -client -out=./clients/authenticator.gen.ts
 
 package proto

rpc/admin.go

@@ -22,7 +22,7 @@ func (s *RPC) GetTenant(ctx context.Context, projectID uint64) (*proto.Tenant, e
 		return nil, err
 	}
 	if tnt == nil {
-		return nil, fmt.Errorf("tenant not found")
+		return nil, proto.ErrTenantNotFound
 	}
 
 	tenantData, _, err := crypto.DecryptData[*proto.TenantData](ctx, tnt.EncryptedKey, tnt.Ciphertext, s.Config.KMS.TenantKeys)
@@ -151,7 +151,7 @@ func (s *RPC) UpdateTenant(
 		return nil, err
 	}
 	if !found {
-		return nil, fmt.Errorf("tenant not found")
+		return nil, proto.ErrTenantNotFound
 	}
 
 	tntData, _, err := crypto.DecryptData[*proto.TenantData](ctx, tnt.EncryptedKey, tnt.Ciphertext, s.Config.KMS.TenantKeys)

rpc/admin_test.go

@@ -58,7 +58,7 @@ func TestRPC_GetTenant(t *testing.T) {
 
 	t.Run("MissingTenant", func(t *testing.T) {
 		tnt, err := c.GetTenant(ctx, 2)
-		assert.ErrorContains(t, err, "tenant not found")
+		assert.ErrorIs(t, err, proto.ErrTenantNotFound)
 		assert.Nil(t, tnt)
 	})
 }