Skip to content

Commit 6304a9f

Browse files
StarefossenStarefossen
committed
Refactor API client tests and update Go module dependencies
- Removed unused axios import in apiClient tests. - Updated Go version to 1.25.0 in go.mod. - Upgraded various dependencies including OpenTelemetry and gRPC to their latest versions. - Added new main file in quotes-loadgen directory.
1 parent b528334 commit 6304a9f

15 files changed

Lines changed: 835 additions & 2600 deletions

File tree

‎quotes-analytics/Tests/Tests.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.1" />
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
13+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.3" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
1515
<PackageReference Include="xunit" Version="2.9.3" />
1616
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
1717
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1818
<PrivateAssets>all</PrivateAssets>
1919
</PackageReference>
20-
<PackageReference Include="coverlet.collector" Version="6.0.4">
20+
<PackageReference Include="coverlet.collector" Version="8.0.0">
2121
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2222
<PrivateAssets>all</PrivateAssets>
2323
</PackageReference>

‎quotes-analytics/quotes-analytics.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="OpenTelemetry.Api" Version="1.14.0" />
12-
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.14.0" />
13-
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.14.0" />
14-
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.14.0" />
15-
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.14.0" />
16-
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.14.0" />
11+
<PackageReference Include="OpenTelemetry.Api" Version="1.15.0" />
12+
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.0" />
13+
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.15.0" />
14+
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.0" />
15+
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.15.0" />
16+
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.15.0" />
1717
</ItemGroup>
1818

1919
<ItemGroup>

‎quotes-backend/build.gradle.kts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
kotlin("jvm") version "2.2.21"
33
kotlin("plugin.serialization") version "2.2.21"
4-
id("io.ktor.plugin") version "3.3.3"
4+
id("io.ktor.plugin") version "3.4.1"
55
application
66
id("com.github.ben-manes.versions") version "0.53.0"
77
}
@@ -29,16 +29,16 @@ repositories {
2929
maven("https://jitpack.io") // For Ktor-OpenAPI-Generator
3030
}
3131

32-
val ktorVersion = "3.3.3"
33-
val kotlinxSerializationVersion = "1.9.0"
34-
val logbackVersion = "1.5.22"
32+
val ktorVersion = "3.4.1"
33+
val kotlinxSerializationVersion = "1.10.0"
34+
val logbackVersion = "1.5.32"
3535
val logstashLogbackEncoderVersion = "9.0"
36-
val opentelemetryVersion = "2.23.0-alpha"
36+
val opentelemetryVersion = "2.25.0-alpha"
3737
val kotlinTestVersion = "2.2.21"
38-
val exposedVersion = "0.57.0"
38+
val exposedVersion = "1.1.1"
3939
val postgresqlVersion = "42.7.5"
40-
val hikariVersion = "6.2.1"
41-
val unleashVersion = "10.1.1"
40+
val hikariVersion = "7.0.2"
41+
val unleashVersion = "12.2.0"
4242

4343
dependencies {
4444
// Ktor
@@ -78,7 +78,7 @@ dependencies {
7878
testImplementation("io.ktor:ktor-client-content-negotiation:$ktorVersion")
7979
testImplementation("io.ktor:ktor-client-mock:$ktorVersion")
8080
testImplementation("org.jetbrains.kotlin:kotlin-test:$kotlinTestVersion")
81-
testImplementation("com.h2database:h2:2.3.232")
81+
testImplementation("com.h2database:h2:2.4.240")
8282
}
8383

8484
tasks.withType<Test> {

‎quotes-backend/src/main/kotlin/io/nais/quotesbackend/database/DatabaseFactory.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ package io.nais.quotesbackend.database
22

33
import com.zaxxer.hikari.HikariConfig
44
import com.zaxxer.hikari.HikariDataSource
5-
import org.jetbrains.exposed.sql.Database
6-
import org.jetbrains.exposed.sql.SchemaUtils
7-
import org.jetbrains.exposed.sql.transactions.transaction
5+
import org.jetbrains.exposed.v1.jdbc.Database
6+
import org.jetbrains.exposed.v1.jdbc.SchemaUtils
7+
import org.jetbrains.exposed.v1.jdbc.transactions.transaction
88

99
object DatabaseFactory {
1010
private var dataSource: HikariDataSource? = null

‎quotes-backend/src/main/kotlin/io/nais/quotesbackend/database/QuoteService.kt‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,13 @@ package io.nais.quotesbackend.database
22

33
import io.nais.quotesbackend.Quote
44
import kotlinx.coroutines.Dispatchers
5-
import org.jetbrains.exposed.sql.*
6-
import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
7-
import org.jetbrains.exposed.sql.transactions.experimental.newSuspendedTransaction
5+
import org.jetbrains.exposed.v1.core.*
6+
import org.jetbrains.exposed.v1.jdbc.Database
7+
import org.jetbrains.exposed.v1.jdbc.insert
8+
import org.jetbrains.exposed.v1.jdbc.selectAll
9+
import org.jetbrains.exposed.v1.jdbc.deleteWhere
10+
import org.jetbrains.exposed.v1.jdbc.update
11+
import org.jetbrains.exposed.v1.jdbc.transactions.experimental.newSuspendedTransaction
812
class QuoteService(private val database: Database) {
913
private suspend fun <T> dbQuery(block: suspend () -> T): T =
1014
newSuspendedTransaction(Dispatchers.IO, database) { block() }

‎quotes-backend/src/main/kotlin/io/nais/quotesbackend/database/QuotesTable.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.nais.quotesbackend.database
22

3-
import org.jetbrains.exposed.sql.Table
3+
import org.jetbrains.exposed.v1.core.Table
44

55
object QuotesTable : Table("quotes") {
66
val id = integer("id").autoIncrement()

‎quotes-backend/src/test/kotlin/io/nais/quotesbackend/ApplicationIntegrationTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import io.nais.quotesbackend.database.DatabaseFactory
1111
import io.nais.quotesbackend.database.QuotesTable
1212
import kotlin.test.*
1313
import kotlinx.serialization.json.Json
14-
import org.jetbrains.exposed.sql.deleteAll
15-
import org.jetbrains.exposed.sql.transactions.transaction
14+
import org.jetbrains.exposed.v1.jdbc.deleteAll
15+
import org.jetbrains.exposed.v1.jdbc.transactions.transaction
1616

1717
class ApplicationIntegrationTest {
1818

‎quotes-backend/src/test/kotlin/io/nais/quotesbackend/DatabaseTest.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import io.nais.quotesbackend.database.QuoteService
44
import io.nais.quotesbackend.database.QuotesTable
55
import kotlin.test.*
66
import kotlinx.coroutines.runBlocking
7-
import org.jetbrains.exposed.sql.Database
8-
import org.jetbrains.exposed.sql.SchemaUtils
9-
import org.jetbrains.exposed.sql.deleteAll
10-
import org.jetbrains.exposed.sql.transactions.transaction
7+
import org.jetbrains.exposed.v1.jdbc.Database
8+
import org.jetbrains.exposed.v1.jdbc.SchemaUtils
9+
import org.jetbrains.exposed.v1.jdbc.deleteAll
10+
import org.jetbrains.exposed.v1.jdbc.transactions.transaction
1111

1212
class DatabaseTest {
1313

‎quotes-frontend/eslint.config.mjs‎

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,23 @@
1-
import nextPlugin from 'eslint-config-next';
1+
import { defineConfig } from 'eslint/config';
2+
import nextPlugin from '@next/eslint-plugin-next';
3+
import reactHooksPlugin from 'eslint-plugin-react-hooks';
4+
import tseslint from 'typescript-eslint';
25

3-
const eslintConfig = [
6+
const eslintConfig = defineConfig([
47
{ ignores: ['dist/**', '.next/**'] },
5-
...nextPlugin,
6-
];
8+
...tseslint.configs.recommended,
9+
{
10+
files: ['**/*.{js,mjs,cjs,ts,tsx,jsx}'],
11+
plugins: {
12+
'@next/next': nextPlugin,
13+
'react-hooks': reactHooksPlugin,
14+
},
15+
rules: {
16+
...nextPlugin.configs.recommended.rules,
17+
...nextPlugin.configs['core-web-vitals'].rules,
18+
...reactHooksPlugin.configs.recommended.rules,
19+
},
20+
},
21+
]);
722

823
export default eslintConfig;

‎quotes-frontend/package.json‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,31 +11,32 @@
1111
},
1212
"dependencies": {
1313
"@heroicons/react": "^2.2.0",
14-
"axios": "^1.12.2",
15-
"next": "16.0.10",
16-
"pino": "^10.1.0",
17-
"react": "^19.2.3",
18-
"react-dom": "^19.2.3",
19-
"unleash-client": "^6.3.1"
14+
"axios": "^1.13.6",
15+
"next": "16.1.6",
16+
"pino": "^10.3.1",
17+
"react": "^19.2.4",
18+
"react-dom": "^19.2.4",
19+
"unleash-client": "^6.10.0"
2020
},
2121
"devDependencies": {
22-
"@eslint/eslintrc": "^3",
23-
"@tailwindcss/postcss": "^4.1.18",
22+
"@next/eslint-plugin-next": "16.1.6",
23+
"@tailwindcss/postcss": "^4.2.1",
2424
"@testing-library/dom": "^10.4.1",
2525
"@testing-library/jest-dom": "^6.9.1",
2626
"@testing-library/react": "^16.3.2",
2727
"@testing-library/user-event": "^14.6.1",
28-
"@types/node": "^25",
29-
"@types/pino": "^7.0.4",
30-
"@types/react": "^19",
31-
"@types/react-dom": "^19",
28+
"@types/node": "^25.3.3",
29+
"@types/pino": "^7.0.5",
30+
"@types/react": "^19.2.14",
31+
"@types/react-dom": "^19.2.3",
3232
"@vitejs/plugin-react": "^5.1.4",
33-
"eslint": "^9.39.2",
34-
"eslint-config-next": "16.0.10",
33+
"eslint": "^10.0.2",
34+
"eslint-plugin-react-hooks": "^7.0.1",
3535
"jsdom": "^28.1.0",
36-
"pino-pretty": "^13.1.1",
37-
"tailwindcss": "^4.1.18",
38-
"typescript": "^5",
36+
"pino-pretty": "^13.1.3",
37+
"tailwindcss": "^4.2.1",
38+
"typescript": "^5.9.3",
39+
"typescript-eslint": "^8.56.1",
3940
"vitest": "^4.0.18"
4041
}
4142
}

0 commit comments

Comments
 (0)