From ceec906aa960245dc3400949ecf34f790d014d40 Mon Sep 17 00:00:00 2001
From: Eric Haag <ehaag@gradle.com>
Date: Thu, 13 Mar 2025 08:44:52 -0500
Subject: [PATCH] Reorder function arguments alphabetically

---
 sources/src/develocity/build-scan.ts        |  4 ++--
 sources/src/develocity/short-lived-token.ts | 12 ++++++------
 sources/test/jest/short-lived-token.test.ts | 16 ++++++++--------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/sources/src/develocity/build-scan.ts b/sources/src/develocity/build-scan.ts
index 2fded06..9af174a 100644
--- a/sources/src/develocity/build-scan.ts
+++ b/sources/src/develocity/build-scan.ts
@@ -30,8 +30,8 @@ export async function setup(config: BuildScanConfig): Promise<void> {
 
     return setupToken(
         config.getDevelocityAccessKey(),
-        config.getDevelocityTokenExpiry(),
-        config.getDevelocityAllowUntrustedServer()
+        config.getDevelocityAllowUntrustedServer(),
+        config.getDevelocityTokenExpiry()
     )
 }
 
diff --git a/sources/src/develocity/short-lived-token.ts b/sources/src/develocity/short-lived-token.ts
index 14a05f3..37362ba 100644
--- a/sources/src/develocity/short-lived-token.ts
+++ b/sources/src/develocity/short-lived-token.ts
@@ -5,13 +5,13 @@ import {recordDeprecation} from '../deprecation-collector'
 
 export async function setupToken(
     develocityAccessKey: string,
-    develocityTokenExpiry: string,
-    develocityAllowUntrustedServer: boolean | undefined
+    develocityAllowUntrustedServer: boolean | undefined,
+    develocityTokenExpiry: string
 ): Promise<void> {
     if (develocityAccessKey) {
         try {
             core.debug('Fetching short-lived token...')
-            const tokens = await getToken(develocityAccessKey, develocityTokenExpiry, develocityAllowUntrustedServer)
+            const tokens = await getToken(develocityAccessKey, develocityAllowUntrustedServer, develocityTokenExpiry)
             if (tokens != null && !tokens.isEmpty()) {
                 core.debug(`Got token(s), setting the access key env vars`)
                 const token = tokens.raw()
@@ -47,12 +47,12 @@ function handleMissingAccessToken(): void {
 
 export async function getToken(
     accessKey: string,
-    expiry: string,
-    develocityAllowUntrustedServer: undefined | boolean
+    allowUntrustedServer: undefined | boolean,
+    expiry: string
 ): Promise<DevelocityAccessCredentials | null> {
     const empty: Promise<DevelocityAccessCredentials | null> = new Promise(r => r(null))
     const develocityAccessKey = DevelocityAccessCredentials.parse(accessKey)
-    const shortLivedTokenClient = new ShortLivedTokenClient(develocityAllowUntrustedServer)
+    const shortLivedTokenClient = new ShortLivedTokenClient(allowUntrustedServer)
 
     if (develocityAccessKey == null) {
         return empty
diff --git a/sources/test/jest/short-lived-token.test.ts b/sources/test/jest/short-lived-token.test.ts
index 994f3eb..0bc83c8 100644
--- a/sources/test/jest/short-lived-token.test.ts
+++ b/sources/test/jest/short-lived-token.test.ts
@@ -39,7 +39,7 @@ describe('short lived tokens', () => {
                 message: 'connect ECONNREFUSED 127.0.0.1:3333',
                 code: 'ECONNREFUSED'
             })
-        await expect(getToken('localhost=key0', '', false))
+        await expect(getToken('localhost=key0', false, ''))
             .resolves
             .toBeNull()
     })
@@ -50,14 +50,14 @@ describe('short lived tokens', () => {
             .times(3)
             .reply(500, 'Internal error')
         expect.assertions(1)
-        await expect(getToken('dev=xyz', '', false))
+        await expect(getToken('dev=xyz', false, ''))
             .resolves
             .toBeNull()
     })
 
     it('get short lived token returns null when access key is empty', async () => {
         expect.assertions(1)
-        await expect(getToken('', '', false))
+        await expect(getToken('', false, ''))
             .resolves
             .toBeNull()
     })
@@ -67,7 +67,7 @@ describe('short lived tokens', () => {
             .post('/api/auth/token')
             .reply(200, 'token')
         expect.assertions(1)
-        await expect(getToken('dev=key1', '', false))
+        await expect(getToken('dev=key1', false, ''))
             .resolves
             .toEqual({"keys": [{"hostname": "dev", "key": "token"}]})
     })
@@ -80,7 +80,7 @@ describe('short lived tokens', () => {
             .post('/api/auth/token')
             .reply(200, 'token2')
         expect.assertions(1)
-        await expect(getToken('dev=key1;prod=key2', '', false))
+        await expect(getToken('dev=key1;prod=key2', false, ''))
             .resolves
             .toEqual({"keys": [{"hostname": "dev", "key": "token1"}, {"hostname": "prod", "key": "token2"}]})
     })
@@ -97,7 +97,7 @@ describe('short lived tokens', () => {
             .post('/api/auth/token')
             .reply(200, 'token2')
         expect.assertions(1)
-        await expect(getToken('dev=key1;bogus=key0;prod=key2', '', false))
+        await expect(getToken('dev=key1;bogus=key0;prod=key2', false, ''))
             .resolves
             .toEqual({"keys": [{"hostname": "dev", "key": "token1"}, {"hostname": "prod", "key": "token2"}]})
     })
@@ -112,7 +112,7 @@ describe('short lived tokens', () => {
             .times(3)
             .reply(500, 'Internal Error')
         expect.assertions(1)
-        await expect(getToken('dev=key1;bogus=key0', '', false))
+        await expect(getToken('dev=key1;bogus=key0', false, ''))
             .resolves
             .toBeNull()
     })
@@ -122,7 +122,7 @@ describe('short lived tokens', () => {
             .post('/api/auth/token?expiresInHours=4')
             .reply(200, 'token')
         expect.assertions(1)
-        await expect(getToken('dev=key1', '4', false))
+        await expect(getToken('dev=key1', false, '4'))
             .resolves
             .toEqual({"keys": [{"hostname": "dev", "key": "token"}]})
     })