Test for addServiceAccount CLI method

canonical · Jan 29, 2024 · 256ccf8 · 256ccf8
1 parent 492a3a1
commit 256ccf8
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/api/jimm.go b/api/jimm.go
@@ -193,5 +193,5 @@ func (c *Client) MigrateModel(req *params.MigrateModelRequest) (*jujuparams.Init
 
 // AddServiceAccount binds a service account to a user allowing them to manage it.
 func (c *Client) AddServiceAccount(req *params.AddServiceAccountRequest) error {
-	return c.caller.APICall("JIMM", 4, "", "UpdateServiceAccountCredentials", req, nil)
+	return c.caller.APICall("JIMM", 4, "", "AddServiceAccount", req, nil)
 }
diff --git a/cmd/serviceaccounts/cmd/addserviceaccount_test.go b/cmd/serviceaccounts/cmd/addserviceaccount_test.go
@@ -29,7 +29,7 @@ func (s *addServiceAccountSuite) TestAddServiceAccount(c *gc.C) {
 	_, err := cmdtesting.RunCommand(c, cmd.NewAddServiceAccountCommandForTesting(s.ClientStore(), bClient), clientID)
 	c.Assert(err, gc.IsNil)
 	tuple := openfga.Tuple{
-		Object:   ofganames.ConvertTag(names.NewUserTag("user-alice@external")),
+		Object:   ofganames.ConvertTag(names.NewUserTag("alice@external")),
 		Relation: ofganames.AdministratorRelation,
 		Target:   ofganames.ConvertTag(jimmnames.NewServiceAccountTag(clientID)),
 	}

diff --git a/internal/jimm/service_account.go b/internal/jimm/service_account.go
@@ -18,10 +18,6 @@ import (
 func (j *JIMM) AddServiceAccount(ctx context.Context, u *openfga.User, clientId string) error {
 	op := errors.Op("jimm.AddServiceAccount")
 
-	if !jimmnames.IsValidServiceAccountId(clientId) {
-		return errors.E(op, errors.CodeBadRequest, "invalid client ID")
-	}
-
 	svcTag := jimmnames.NewServiceAccountTag(clientId)
 	key := openfga.Tuple{
 		Relation: ofganames.AdministratorRelation,

diff --git a/internal/jujuapi/jimm.go b/internal/jujuapi/jimm.go
@@ -51,6 +51,8 @@ func init() {
 		migrateModel := rpc.Method(r.MigrateModel)
 		addServiceAccountMethod := rpc.Method(r.AddServiceAccount)
 		updateServiceAccountCredentials := rpc.Method(r.UpdateServiceAccountCredentials)
+		listServiceAccountCredentials := rpc.Method(r.ListServiceAccountCredentials)
+		grantServiceAccountAccess := rpc.Method(r.GrantServiceAccountAccess)
 
 		// JIMM Generic RPC
 		r.AddMethod("JIMM", 4, "AddController", addControllerMethod)
@@ -82,6 +84,8 @@ func init() {
 		// JIMM Service Accounts
 		r.AddMethod("JIMM", 4, "AddServiceAccount", addServiceAccountMethod)
 		r.AddMethod("JIMM", 4, "UpdateServiceAccountCredentials", updateServiceAccountCredentials)
+		r.AddMethod("JIMM", 4, "ListServiceAccountCredentials", listServiceAccountCredentials)
+		r.AddMethod("JIMM", 4, "GrantServiceAccountAccess", grantServiceAccountAccess)
 
 		return []int{4}
 	}

diff --git a/internal/jujuapi/service_account.go b/internal/jujuapi/service_account.go
@@ -23,6 +23,10 @@ import (
 func (r *controllerRoot) AddServiceAccount(ctx context.Context, req apiparams.AddServiceAccountRequest) error {
 	const op = errors.Op("jujuapi.AddServiceAccount")
 
+	if !jimmnames.IsValidServiceAccountId(req.ClientID) {
+		return errors.E(op, errors.CodeBadRequest, "invalid client ID")
+	}
+
 	return r.jimm.AddServiceAccount(ctx, r.user, req.ClientID)
 }