From 6ba9ee4f430f69210be0c6880c69fbf31dd14755 Mon Sep 17 00:00:00 2001
From: Ilya Savitsky <ilya.savitsky@codethink.co.uk>
Date: Wed, 4 Dec 2024 09:57:42 +0000
Subject: [PATCH 1/2] Add options to CreateServiceAccountUser

Signed-off-by: Ilya Savitsky <ilya.savitsky@codethink.co.uk>
---
 testdata/create_service_account_user.json |  6 +++---
 users.go                                  |  9 +++++++--
 users_test.go                             | 17 +++++++++++++----
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/testdata/create_service_account_user.json b/testdata/create_service_account_user.json
index e5354e550..6799e4aaa 100644
--- a/testdata/create_service_account_user.json
+++ b/testdata/create_service_account_user.json
@@ -1,9 +1,9 @@
 {
   "id": 999,
-  "username": "service_account_94e556c44d40d5a710ca59e3a0f40a3d",
-  "name": "Service account user",
+  "username": "serviceaccount",
+  "name": "Test Service Account",
   "state": "active",
   "locked": false,
   "avatar_url": "http://localhost:3000/uploads/user/avatar/999/cd8.jpeg",
-  "web_url": "http://localhost:3000/service_account_94e556c44d40d5a710ca59e3a0f40a3d"
+  "web_url": "http://localhost:3000/serviceaccount"
 }
diff --git a/users.go b/users.go
index f85667802..02c0c3ec8 100644
--- a/users.go
+++ b/users.go
@@ -1553,12 +1553,17 @@ func (s *UsersService) CreateUserRunner(opts *CreateUserRunnerOptions, options .
 	return r, resp, nil
 }
 
+type CreateServiceAccountUserOptions struct {
+	Name     *string `url:"name,omitempty" json:"name,omitempty"`
+	Username *string `url:"username,omitempty" json:"username,omitempty"`
+}
+
 // CreateServiceAccountUser creates a new service account user.
 //
 // GitLab API docs:
 // https://docs.gitlab.com/ee/api/users.html#create-service-account-user
-func (s *UsersService) CreateServiceAccountUser(options ...RequestOptionFunc) (*User, *Response, error) {
-	req, err := s.client.NewRequest(http.MethodPost, "service_accounts", nil, options)
+func (s *UsersService) CreateServiceAccountUser(opts *CreateServiceAccountUserOptions, options ...RequestOptionFunc) (*User, *Response, error) {
+	req, err := s.client.NewRequest(http.MethodPost, "service_accounts", opts, options)
 	if err != nil {
 		return nil, nil, err
 	}
diff --git a/users_test.go b/users_test.go
index a5e15ba00..68b9ad245 100644
--- a/users_test.go
+++ b/users_test.go
@@ -727,20 +727,29 @@ func TestCreateServiceAccountUser(t *testing.T) {
 
 	mux.HandleFunc(path, func(w http.ResponseWriter, r *http.Request) {
 		testMethod(t, r, http.MethodPost)
+		if !strings.Contains(r.Header.Get("Content-Type"), "application/json") {
+			t.Fatalf("Users.CreateServiceAccountUser request content-type %+v want application/json;", r.Header.Get("Content-Type"))
+		}
+		if r.ContentLength == -1 {
+			t.Fatalf("Users.CreateServiceAccountUser request content-length is -1")
+		}
 		mustWriteHTTPResponse(t, w, "testdata/create_service_account_user.json")
 	})
 
-	user, _, err := client.Users.CreateServiceAccountUser()
+	user, _, err := client.Users.CreateServiceAccountUser(&CreateServiceAccountUserOptions{
+		Name:     Ptr("Test Service Account"),
+		Username: Ptr("serviceaccount"),
+	})
 	require.NoError(t, err)
 
 	want := &User{
 		ID:        999,
-		Username:  "service_account_94e556c44d40d5a710ca59e3a0f40a3d",
-		Name:      "Service account user",
+		Username:  "serviceaccount",
+		Name:      "Test Service Account",
 		State:     "active",
 		Locked:    false,
 		AvatarURL: "http://localhost:3000/uploads/user/avatar/999/cd8.jpeg",
-		WebURL:    "http://localhost:3000/service_account_94e556c44d40d5a710ca59e3a0f40a3d",
+		WebURL:    "http://localhost:3000/serviceaccount",
 	}
 	require.Equal(t, want, user)
 }

From c3da1c2853a58ac16d6510762714b92f10085985 Mon Sep 17 00:00:00 2001
From: Patrick Rice <Patrick.Rice@Kingland.com>
Date: Wed, 4 Dec 2024 10:49:18 -0600
Subject: [PATCH 2/2] Add comment to CreateServiceAccountUserOptions

---
 users.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/users.go b/users.go
index 02c0c3ec8..5eee42833 100644
--- a/users.go
+++ b/users.go
@@ -1553,6 +1553,10 @@ func (s *UsersService) CreateUserRunner(opts *CreateUserRunnerOptions, options .
 	return r, resp, nil
 }
 
+
+// CreateServiceAccountUserOptions represents the available CreateServiceAccountUser() options.
+//
+// GitLab API docs: https://docs.gitlab.com/ee/api/user_service_accounts.html#create-a-service-account-user
 type CreateServiceAccountUserOptions struct {
 	Name     *string `url:"name,omitempty" json:"name,omitempty"`
 	Username *string `url:"username,omitempty" json:"username,omitempty"`