remove option to change expires at for sa token

Author: thokra-nav

integration_tests/serviceaccount_tokens.lua

@@ -146,6 +146,7 @@ Test.gql("Create service account token", function(t)
 					serviceAccountID: "%s"
 					name: "my-token"
 					description: "some description"
+					expiresAt: "2029-01-01"
 				}
 			) {
 				secret
@@ -156,6 +157,7 @@ Test.gql("Create service account token", function(t)
 					id
 					name
 					description
+					expiresAt
 				}
 			}
 		}
@@ -172,50 +174,20 @@ Test.gql("Create service account token", function(t)
 					id = Save("tokenID"),
 					name = "my-token",
 					description = "some description",
+					expiresAt = "2029-01-01",
 				},
 			},
 		},
 	}
 end)
 
-Test.gql("Update service account token with empty expiresAt", function(t)
-	t.query(string.format([[
-		mutation {
-			updateServiceAccountToken(
-				input: {
-					serviceAccountTokenID: "%s"
-					expiresAt: {  }
-				}
-			) {
-				serviceAccountToken {
-					expiresAt
-				}
-			}
-		}
-	]], State.tokenID))
-
-	t.check {
-		data = Null,
-		errors = {
-			{
-				extensions = {
-					code = "GRAPHQL_VALIDATION_FAILED",
-				},
-				locations = NotNull(),
-				message = "OneOf Input Object \"UpdateServiceAccountTokenExpiresAtInput\" must specify exactly one key.",
-			},
-		},
-	}
-end)
-
 Test.gql("Update service account token", function(t)
 	t.query(string.format([[
 		mutation {
 			updateServiceAccountToken(
 				input: {
 					serviceAccountTokenID: "%s"
 					description: "some other description"
-					expiresAt: { removeExpiry: true }
 				}
 			) {
 				serviceAccountToken {
@@ -233,58 +205,7 @@ Test.gql("Update service account token", function(t)
 				serviceAccountToken = {
 					id = State.tokenID,
 					description = "some other description",
-					expiresAt = Null,
-				},
-			},
-		},
-	}
-end)
-
-Test.gql("Update service account token set expiresAt", function(t)
-	t.query(string.format([[
-		mutation {
-			updateServiceAccountToken(
-				input: {
-					serviceAccountTokenID: "%s"
-					expiresAt: {
-						expiresAt: "2029-04-04"
-					}
-				}
-			) {
-				serviceAccount {
-					tokens {
-						nodes {
-							description
-							expiresAt
-						}
-					}
-				}
-				serviceAccountToken {
-					id
-					description
-					expiresAt
-				}
-			}
-		}
-	]], State.tokenID))
-
-	t.check {
-		data = {
-			updateServiceAccountToken = {
-				serviceAccountToken = {
-					id = State.tokenID,
-					description = "some other description",
-					expiresAt = "2029-04-04",
-				},
-				serviceAccount = {
-					tokens = {
-						nodes = {
-							{
-								description = "some other description",
-								expiresAt = "2029-04-04",
-							},
-						},
-					},
+					expiresAt = "2029-01-01",
 				},
 			},
 		},

internal/graph/gengql/generated.go

@@ -199,28 +199,6 @@ input UpdateServiceAccountTokenInput {
 	If not specified, the description will remain unchanged.
 	"""
 	description: String
-
-	"""
-	The new expiry date of the token.
-	"""
-	expiresAt: UpdateServiceAccountTokenExpiresAtInput
-}
-
-"""
-Input type for the expiresAt field.
-
-Only one of the fields must be specified.
-"""
-input UpdateServiceAccountTokenExpiresAtInput @oneOf {
-	"""
-	The new expiry date of the token.
-	"""
-	expiresAt: Date
-
-	"""
-	Remove the existing expiry date of the token, causing the token to never expire.
-	"""
-	removeExpiry: Boolean
 }
 
 input DeleteServiceAccountTokenInput {

internal/graph/schema/serviceaccounts.graphqls

@@ -120,16 +120,10 @@ type UpdateServiceAccountPayload struct {
 	ServiceAccount *ServiceAccount `json:"serviceAccount,omitempty"`
 }
 
-type UpdateServiceAccountTokenExpiresAtInput struct {
-	ExpiresAt    *scalar.Date `json:"expiresAt,omitempty"`
-	RemoveExpiry *bool        `json:"removeExpiry,omitempty"`
-}
-
 type UpdateServiceAccountTokenInput struct {
-	ServiceAccountTokenID ident.Ident                              `json:"serviceAccountTokenID"`
-	Name                  *string                                  `json:"name,omitempty"`
-	Description           *string                                  `json:"description,omitempty"`
-	ExpiresAt             *UpdateServiceAccountTokenExpiresAtInput `json:"expiresAt,omitempty"`
+	ServiceAccountTokenID ident.Ident `json:"serviceAccountTokenID"`
+	Name                  *string     `json:"name,omitempty"`
+	Description           *string     `json:"description,omitempty"`
 }
 
 type UpdateServiceAccountTokenPayload struct {

internal/serviceaccount/model.go

@@ -249,22 +249,10 @@ func UpdateToken(ctx context.Context, input UpdateServiceAccountTokenInput) (*Se
 		return nil, nil, err
 	}
 
-	expiresAt := token.ExpiresAt.PgDate()
-	if e := input.ExpiresAt; e != nil {
-		if e.ExpiresAt == nil && e.RemoveExpiry == nil {
-			return nil, nil, apierror.Errorf("Either expiresAt or removeExpiry must be set.")
-		} else if e.ExpiresAt != nil {
-			expiresAt = e.ExpiresAt.PgDate()
-		} else if *e.RemoveExpiry {
-			expiresAt = pgtype.Date{}
-		}
-	}
-
 	var t *serviceaccountsql.ServiceAccountToken
 	err = database.Transaction(ctx, func(ctx context.Context) error {
 		t, err = db(ctx).UpdateToken(ctx, serviceaccountsql.UpdateTokenParams{
 			ID:          token.UUID,
-			ExpiresAt:   expiresAt,
 			Name:        input.Name,
 			Description: input.Description,
 		})

internal/serviceaccount/queries.go

@@ -115,7 +115,6 @@ RETURNING
 -- name: UpdateToken :one
 UPDATE service_account_tokens
 SET
-	expires_at = @expires_at,
 	name = COALESCE(sqlc.narg('name'), name),
 	description = COALESCE(sqlc.narg('description'), description)
 WHERE