Skip to content

Commit 41c81d4

Browse files
dhasani23dhasani23
authored
Merge branch 'aws:main' into main
2 parents 3286c26 + 2ee83b6 commit 41c81d4

File tree

36 files changed

+1356
-272
lines changed

36 files changed

+1356
-272
lines changed

‎telemetry/csharp/AwsToolkit.Telemetry.Events.Generator.Tests/AwsToolkit.Telemetry.Events.Generator.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="FluentAssertions" Version="6.12.1" />
14+
<PackageReference Include="FluentAssertions" Version="6.12.2" />
1515
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
1616
<PackageReference Include="xunit" Version="2.9.2" />
1717
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">

‎telemetry/csharp/AwsToolkit.Telemetry.Events.Tests/AwsToolkit.Telemetry.Events.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<Reference Include="System.Core" />
1212
</ItemGroup>
1313
<ItemGroup>
14-
<PackageReference Include="FluentAssertions" Version="6.12.1" />
14+
<PackageReference Include="FluentAssertions" Version="6.12.2" />
1515
<PackageReference Include="Moq" Version="4.18.4" />
1616
<PackageReference Include="xunit" Version="2.9.2" />
1717
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">

‎telemetry/definitions/commonDefinitions.json‎

Lines changed: 81 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,17 @@
257257
"local"
258258
]
259259
},
260+
{
261+
"name": "codeFixAction",
262+
"type": "string",
263+
"description": "Captures the type of fix that was accepted",
264+
"allowedValues": [
265+
"openDiff",
266+
"insertAtCursor",
267+
"copyDiff",
268+
"applyFix"
269+
]
270+
},
260271
{
261272
"name": "codeScanServiceInvocationsDuration",
262273
"type": "int",
@@ -559,6 +570,8 @@
559570
"description": "The scope of the security scan being performed",
560571
"allowedValues": [
561572
"FILE",
573+
"FILE_AUTO",
574+
"FILE_ON_DEMAND",
562575
"PROJECT"
563576
]
564577
},
@@ -890,7 +903,8 @@
890903
"infobar",
891904
"hover",
892905
"webview",
893-
"quickfix"
906+
"quickfix",
907+
"tree"
894908
],
895909
"description": "The IDE or OS component used for the action. (Examples: S3 download to filesystem, S3 upload from editor, ...). See also `featureId` for specific feature names, `module` for low-level modules, and `resourceType`."
896910
},
@@ -4344,10 +4358,23 @@
43444358
],
43454359
"passive": true
43464360
},
4361+
{
4362+
"name": "codewhisperer_codeScanChatNewTab",
4363+
"description": "Called when a new chat tab is opened in the code scan view",
4364+
"metadata": [
4365+
{
4366+
"type": "credentialSourceId",
4367+
"required": false
4368+
}
4369+
]
4370+
},
43474371
{
43484372
"name": "codewhisperer_codeScanIssueApplyFix",
43494373
"description": "Called when a code scan issue suggested fix is applied",
43504374
"metadata": [
4375+
{
4376+
"type": "codeFixAction"
4377+
},
43514378
{
43524379
"type": "component"
43534380
},
@@ -4362,15 +4389,35 @@
43624389
"type": "findingId"
43634390
},
43644391
{
4365-
"type": "reason",
4392+
"type": "ruleId",
43664393
"required": false
4394+
}
4395+
]
4396+
},
4397+
{
4398+
"name": "codewhisperer_codeScanIssueGenerateFix",
4399+
"description": "Generated fix for a code scan issue. variant=refresh means the user chose to generate a fix again after one already exists.",
4400+
"metadata": [
4401+
{
4402+
"type": "component"
43674403
},
43684404
{
4369-
"type": "result"
4405+
"type": "credentialStartUrl",
4406+
"required": false
4407+
},
4408+
{
4409+
"type": "detectorId"
4410+
},
4411+
{
4412+
"type": "findingId"
43704413
},
43714414
{
43724415
"type": "ruleId",
43734416
"required": false
4417+
},
4418+
{
4419+
"type": "variant",
4420+
"required": false
43744421
}
43754422
]
43764423
},
@@ -4397,6 +4444,33 @@
43974444
}
43984445
]
43994446
},
4447+
{
4448+
"name": "codewhisperer_codeScanIssueIgnore",
4449+
"description": "User ignored a code scan issue. variant=all means the user ignored all issues of a specific type.",
4450+
"metadata": [
4451+
{
4452+
"type": "component"
4453+
},
4454+
{
4455+
"type": "credentialStartUrl",
4456+
"required": false
4457+
},
4458+
{
4459+
"type": "detectorId"
4460+
},
4461+
{
4462+
"type": "findingId"
4463+
},
4464+
{
4465+
"type": "ruleId",
4466+
"required": false
4467+
},
4468+
{
4469+
"type": "variant",
4470+
"required": false
4471+
}
4472+
]
4473+
},
44004474
{
44014475
"name": "codewhisperer_codeScanIssueViewDetails",
44024476
"description": "Called when a code scan issue webview is opened",
@@ -4550,6 +4624,10 @@
45504624
},
45514625
{
45524626
"type": "result"
4627+
},
4628+
{
4629+
"type": "source",
4630+
"required": false
45534631
}
45544632
]
45554633
},

‎telemetry/jetbrains/.editorconfig‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
[*]
2+
charset = utf-8
3+
end_of_line = lf
4+
indent_size = 4
5+
indent_style = space
6+
insert_final_newline = true
7+
max_line_length = 160
8+
tab_width = 4
9+
ij_continuation_indent_size = 4
10+
11+
[*.{kt,kts}]
12+
ij_kotlin_allow_trailing_comma = true
13+
ij_kotlin_code_style_defaults = KOTLIN_OFFICIAL
14+
ij_kotlin_name_count_to_use_star_import = 2147483647
15+
ij_kotlin_name_count_to_use_star_import_for_members = 2147483647
16+
ij_kotlin_packages_to_use_import_on_demand = unset

‎telemetry/jetbrains/build.gradle.kts‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ plugins {
1111
`maven-publish`
1212
signing
1313
alias(libs.plugins.nexus.publishing)
14+
alias(libs.plugins.jlleitschuh.ktlint)
1415
}
1516

1617
java {
@@ -38,13 +39,19 @@ dependencies {
3839
implementation(libs.kotlin.poet)
3940
implementation(libs.jackson.module.kotlin)
4041
implementation(libs.json.schema)
41-
testImplementation(libs.junit4)
42+
43+
testImplementation(platform(libs.junit5.bom))
44+
testImplementation(libs.junit5.jupiter)
4245
testImplementation(libs.assertj)
46+
47+
testRuntimeOnly(libs.junit5.launcher)
4348
}
4449

4550
tasks {
4651
withType<KotlinCompile> {
47-
compilerOptions.jvmTarget = JvmTarget.JVM_17
52+
compilerOptions {
53+
jvmTarget = JvmTarget.JVM_17
54+
}
4855
}
4956

5057
val validatePackagedSchema by registering {
@@ -104,6 +111,8 @@ tasks.withType<GenerateModuleMetadata> {
104111
}
105112

106113
tasks.withType<Test> {
114+
useJUnitPlatform()
115+
107116
testLogging {
108117
exceptionFormat = TestExceptionFormat.FULL
109118
}
@@ -146,9 +155,10 @@ publishing {
146155
gradlePlugin { setAutomatedPublishing(false) }
147156

148157
signing {
149-
if (project.hasProperty("signing.keyId")
150-
&& project.hasProperty("signing.password")
151-
&& project.hasProperty("signing.secretKeyRingFile")) {
158+
if (project.hasProperty("signing.keyId") &&
159+
project.hasProperty("signing.password") &&
160+
project.hasProperty("signing.secretKeyRingFile")
161+
) {
152162
sign(publishing.publications["mavenJava"])
153163
}
154164
}

‎telemetry/jetbrains/gradle/libs.versions.toml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,24 @@
11
[versions]
22
assertJ = "3.26.3"
33
jackson = "2.17.2"
4+
jlleitschuh-ktlint = "12.1.1"
45
# deprecated; should move to json-skema
56
jsonSchema = "1.14.4"
6-
junit4 = "4.13.2"
7+
junit5 = "5.11.3"
78
kotlin = "2.0.20"
8-
kotlin-poet = "1.18.1"
9+
kotlin-poet = "2.0.0"
910
nexus = "2.0.0"
1011

1112
[libraries]
1213
assertj = { module = "org.assertj:assertj-core", version.ref = "assertJ" }
1314
kotlin-poet = { module = "com.squareup:kotlinpoet", version.ref = "kotlin-poet" }
1415
jackson-module-kotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin", version.ref = "jackson" }
1516
json-schema = { module = "com.github.erosb:everit-json-schema", version.ref = "jsonSchema" }
16-
junit4 = { module = "junit:junit", version.ref = "junit4" }
17+
junit5-bom = { module = "org.junit:junit-bom", version.ref = "junit5" }
18+
junit5-jupiter = { module = "org.junit.jupiter:junit-jupiter" }
19+
junit5-launcher = { module = "org.junit.platform:junit-platform-launcher" }
1720

1821
[plugins]
22+
jlleitschuh-ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "jlleitschuh-ktlint" }
1923
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
2024
nexus-publishing = { id = "io.github.gradle-nexus.publish-plugin", version.ref = "nexus" }

0 commit comments

Comments
 (0)