From df15319d95742356133edb817bf9ef682a1b6414 Mon Sep 17 00:00:00 2001
From: Mike Coutermarsh <coutermarsh.mike@gmail.com>
Date: Tue, 13 Jan 2026 17:04:23 -0500
Subject: [PATCH 1/2] Add ttl for service tokens

---
 planetscale/service_tokens.go      |  1 +
 planetscale/service_tokens_test.go | 42 ++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/planetscale/service_tokens.go b/planetscale/service_tokens.go
index 5dde069..ad08aa7 100644
--- a/planetscale/service_tokens.go
+++ b/planetscale/service_tokens.go
@@ -115,6 +115,7 @@ func (s *serviceTokenService) DeleteAccess(ctx context.Context, delReq *DeleteSe
 type CreateServiceTokenRequest struct {
 	Organization string  `json:"-"`
 	Name         *string `json:"name,omitempty"`
+	TTL          *int    `json:"ttl,omitempty"`
 }
 
 type ListServiceTokenGrantsRequest struct {
diff --git a/planetscale/service_tokens_test.go b/planetscale/service_tokens_test.go
index 9f4336c..c8ea325 100644
--- a/planetscale/service_tokens_test.go
+++ b/planetscale/service_tokens_test.go
@@ -51,6 +51,48 @@ func TestServiceTokens_Create(t *testing.T) {
 	c.Assert(snapshot, qt.DeepEquals, want)
 }
 
+func TestServiceTokens_CreateWithTTL(t *testing.T) {
+	c := qt.New(t)
+
+	wantBody := []byte("{\"name\":\"my-token\",\"ttl\":3600}\n")
+
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.WriteHeader(200)
+		data, err := io.ReadAll(r.Body)
+		c.Assert(err, qt.IsNil)
+		c.Assert(data, qt.DeepEquals, wantBody)
+
+		out := `{"id":"test-id","type":"ServiceToken","token":"d2980bbd91a4ab878601ef0573a7af7b1b15e705","name":"my-token","created_at":"2021-01-14T10:19:23.000Z","last_used_at":"2021-01-15T12:30:00.000Z"}`
+		_, err = w.Write([]byte(out))
+		c.Assert(err, qt.IsNil)
+	}))
+
+	client, err := NewClient(WithBaseURL(ts.URL))
+	c.Assert(err, qt.IsNil)
+
+	ctx := context.Background()
+	tokenName := "my-token"
+	ttl := 3600
+
+	snapshot, err := client.ServiceTokens.Create(ctx, &CreateServiceTokenRequest{
+		Organization: testOrg,
+		Name:         &tokenName,
+		TTL:          &ttl,
+	})
+	lastUsedAt := time.Date(2021, 1, 15, 12, 30, 0, 0, time.UTC)
+	want := &ServiceToken{
+		ID:         "test-id",
+		Type:       "ServiceToken",
+		Token:      "d2980bbd91a4ab878601ef0573a7af7b1b15e705",
+		Name:       &tokenName,
+		CreatedAt:  time.Date(2021, 1, 14, 10, 19, 23, 0, time.UTC),
+		LastUsedAt: &lastUsedAt,
+	}
+
+	c.Assert(err, qt.IsNil)
+	c.Assert(snapshot, qt.DeepEquals, want)
+}
+
 func TestServiceTokens_ListGrants(t *testing.T) {
 	c := qt.New(t)
 

From ebc19d8d134f6cac55f92e25b8a654fcf33e1d57 Mon Sep 17 00:00:00 2001
From: Mike Coutermarsh <coutermarsh.mike@gmail.com>
Date: Tue, 13 Jan 2026 17:06:26 -0500
Subject: [PATCH 2/2] add expires at

---
 planetscale/service_tokens.go      | 1 +
 planetscale/service_tokens_test.go | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/planetscale/service_tokens.go b/planetscale/service_tokens.go
index ad08aa7..28fde95 100644
--- a/planetscale/service_tokens.go
+++ b/planetscale/service_tokens.go
@@ -158,6 +158,7 @@ type ServiceToken struct {
 	Name       *string    `json:"name"`
 	CreatedAt  time.Time  `json:"created_at"`
 	LastUsedAt *time.Time `json:"last_used_at"`
+	ExpiresAt  *time.Time `json:"expires_at"`
 }
 
 type ServiceTokenGrant struct {
diff --git a/planetscale/service_tokens_test.go b/planetscale/service_tokens_test.go
index c8ea325..39efe46 100644
--- a/planetscale/service_tokens_test.go
+++ b/planetscale/service_tokens_test.go
@@ -62,7 +62,7 @@ func TestServiceTokens_CreateWithTTL(t *testing.T) {
 		c.Assert(err, qt.IsNil)
 		c.Assert(data, qt.DeepEquals, wantBody)
 
-		out := `{"id":"test-id","type":"ServiceToken","token":"d2980bbd91a4ab878601ef0573a7af7b1b15e705","name":"my-token","created_at":"2021-01-14T10:19:23.000Z","last_used_at":"2021-01-15T12:30:00.000Z"}`
+		out := `{"id":"test-id","type":"ServiceToken","token":"d2980bbd91a4ab878601ef0573a7af7b1b15e705","name":"my-token","created_at":"2021-01-14T10:19:23.000Z","last_used_at":"2021-01-15T12:30:00.000Z","expires_at":"2021-01-14T11:19:23.000Z"}`
 		_, err = w.Write([]byte(out))
 		c.Assert(err, qt.IsNil)
 	}))
@@ -80,6 +80,7 @@ func TestServiceTokens_CreateWithTTL(t *testing.T) {
 		TTL:          &ttl,
 	})
 	lastUsedAt := time.Date(2021, 1, 15, 12, 30, 0, 0, time.UTC)
+	expiresAt := time.Date(2021, 1, 14, 11, 19, 23, 0, time.UTC)
 	want := &ServiceToken{
 		ID:         "test-id",
 		Type:       "ServiceToken",
@@ -87,6 +88,7 @@ func TestServiceTokens_CreateWithTTL(t *testing.T) {
 		Name:       &tokenName,
 		CreatedAt:  time.Date(2021, 1, 14, 10, 19, 23, 0, time.UTC),
 		LastUsedAt: &lastUsedAt,
+		ExpiresAt:  &expiresAt,
 	}
 
 	c.Assert(err, qt.IsNil)