Skip to content

Commit cea86b1

Browse files
cx-atish-jadhavcx-atish-jadhav
authored
Ignore and Revive changes for devassist (AST-109636) (#340)
* ignore revive changes for devassist * Vulnerability fixes * Fixed Ignore related bug and redme link
1 parent b85d15d commit cea86b1

123 files changed

Lines changed: 5571 additions & 395 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ Developer Assist is an agentic AI tool that delivers real-time context-aware pre
158158

159159
### Usage
160160
**GIF - AI Remediation with Developer Assist**
161-
![AI Remediation with Developer Assist](https://raw.githubusercontent.com/Checkmarx/ci-cd-integrations/main/.images/vscode_running_scan.gif "Running a Scan from the IDE")
161+
![AI Remediation with Developer Assist](https://raw.githubusercontent.com/Checkmarx/ci-cd-integrations/main/.images/Visual_Studio_AI_Remediation_with_Developer_Assist.gif "Running a Scan from the IDE")
162162
* Learn about using Checkmarx Developer Assist [here](https://docs.checkmarx.com/en/34965-405960-checkmarx-developer-assist.html)
163163

164164

‎ast-visual-studio-extension-tests/ast-visual-studio-extension-tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<ItemGroup>
1212
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
1313
<PackageReference Include="Microsoft.VisualStudio.Debugger.Interop.10.0" Version="17.0.32112.339" />
14-
<PackageReference Include="MessagePack" Version="2.5.187" />
14+
<PackageReference Include="MessagePack" Version="2.5.301" />
1515
<PackageReference Include="Moq" Version="4.20.72" />
1616
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
1717
<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />

‎ast-visual-studio-extension-tests/cx-integration-tests/Services/AscaServiceTests.cs‎

Lines changed: 15 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
using ast_visual_studio_extension.CxCLI;
21
using ast_visual_studio_extension.CxExtension.CxAssist.Realtime.Asca;
3-
using ast_visual_studio_extension.CxWrapper.Models;
4-
using Moq;
5-
using System;
62
using Xunit;
73

84
namespace ast_visual_studio_extension_tests.cx_integration_tests.Services
@@ -15,34 +11,19 @@ namespace ast_visual_studio_extension_tests.cx_integration_tests.Services
1511
[Trait("Category", "Integration")]
1612
public class AscaServiceTests
1713
{
18-
private readonly CxWrapper _wrapperInstance;
19-
20-
public AscaServiceTests()
21-
{
22-
// Create a real CxConfig for testing (doesn't make actual HTTP calls in unit tests)
23-
var config = new CxConfig
24-
{
25-
ApiKey = "test-api-key"
26-
};
27-
28-
// Create a real CxWrapper instance - it won't make actual calls unless explicitly invoked
29-
_wrapperInstance = new CxWrapper(config, typeof(AscaServiceTests));
30-
}
31-
3214
[Fact]
3315
public void AscaService_GetInstance_ReturnsServiceInstance()
3416
{
35-
// Get first instance
36-
var service1 = AscaService.GetInstance(_wrapperInstance);
17+
var service = AscaService.GetInstance(null);
3718

38-
Assert.NotNull(service1);
19+
Assert.NotNull(service);
3920
}
4021

4122
[Fact]
4223
public void AscaService_GetInstance_ReturnsSingletonInstance()
4324
{
44-
var service1 = AscaService.GetInstance(_wrapperInstance);
45-
var service2 = AscaService.GetInstance(_wrapperInstance);
25+
var service1 = AscaService.GetInstance(null);
26+
var service2 = AscaService.GetInstance(null);
4627

4728
Assert.Same(service1, service2);
4829
}
@@ -56,7 +37,7 @@ public void AscaService_GetInstance_ReturnsSingletonInstance()
5637
[InlineData("test.jsx")]
5738
public void AscaService_ShouldScanFile_WithValidExtension_ReturnsTrue(string filePath)
5839
{
59-
var service = AscaService.GetInstance(_wrapperInstance);
40+
var service = AscaService.GetInstance(null);
6041

6142
Assert.True(service.ShouldScanFile(filePath));
6243
}
@@ -68,7 +49,7 @@ public void AscaService_ShouldScanFile_WithValidExtension_ReturnsTrue(string fil
6849
[InlineData("test.yml")]
6950
public void AscaService_ShouldScanFile_WithInvalidExtension_ReturnsFalse(string filePath)
7051
{
71-
var service = AscaService.GetInstance(_wrapperInstance);
52+
var service = AscaService.GetInstance(null);
7253

7354
Assert.False(service.ShouldScanFile(filePath));
7455
}
@@ -79,52 +60,45 @@ public void AscaService_ShouldScanFile_WithInvalidExtension_ReturnsFalse(string
7960
[InlineData("C:\\dist\\bundle.js")]
8061
public void AscaService_ShouldScanFile_InExcludedPath_ReturnsFalse(string filePath)
8162
{
82-
var service = AscaService.GetInstance(_wrapperInstance);
63+
var service = AscaService.GetInstance(null);
8364

8465
Assert.False(service.ShouldScanFile(filePath));
8566
}
8667

8768
[Fact]
8869
public void AscaService_ShouldScanFile_WithNull_ReturnsFalse()
8970
{
90-
var service = AscaService.GetInstance(_wrapperInstance);
71+
var service = AscaService.GetInstance(null);
9172

9273
Assert.False(service.ShouldScanFile(null));
9374
}
9475

9576
[Fact]
9677
public void AscaService_ShouldScanFile_WithEmpty_ReturnsFalse()
9778
{
98-
var service = AscaService.GetInstance(_wrapperInstance);
79+
var service = AscaService.GetInstance(null);
9980

10081
Assert.False(service.ShouldScanFile(string.Empty));
10182
}
10283

10384
[Fact]
10485
public async System.Threading.Tasks.Task AscaService_UnregisterAsync_AllowsReinitializationAsync()
10586
{
106-
var service1 = AscaService.GetInstance(_wrapperInstance);
87+
var service1 = AscaService.GetInstance(null);
10788
await service1.UnregisterAsync();
10889

109-
// After unregister, next GetInstance should create new instance
110-
var service2 = AscaService.GetInstance(_wrapperInstance);
90+
var service2 = AscaService.GetInstance(null);
11191

112-
// Should be different instances after unregister
11392
Assert.NotSame(service1, service2);
11493
}
11594

11695
[Fact]
117-
public void AscaService_MultipleGetInstance_WithDifferentWrappers_StillReturnsSingleton()
96+
public void AscaService_MultipleGetInstance_WithDifferentPackages_StillReturnsSingleton()
11897
{
119-
var config1 = new CxConfig { ApiKey = "test1" };
120-
var config2 = new CxConfig { ApiKey = "test2" };
121-
var wrapper1 = new Mock<ast_visual_studio_extension.CxCLI.CxWrapper>(config1, typeof(AscaServiceTests));
122-
var wrapper2 = new Mock<ast_visual_studio_extension.CxCLI.CxWrapper>(config2, typeof(AscaServiceTests));
123-
124-
var service1 = AscaService.GetInstance(wrapper1.Object);
125-
var service2 = AscaService.GetInstance(wrapper2.Object);
98+
var service1 = AscaService.GetInstance(null);
99+
var service2 = AscaService.GetInstance(null);
126100

127-
// Singleton pattern returns same instance regardless of wrapper
101+
// Singleton pattern returns same instance regardless of package
128102
Assert.Same(service1, service2);
129103
}
130104
}

‎ast-visual-studio-extension-tests/cx-integration-tests/Services/ContainersServiceTests.cs‎

Lines changed: 9 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
using ast_visual_studio_extension.CxCLI;
21
using ast_visual_studio_extension.CxExtension.CxAssist.Realtime.Containers;
3-
using ast_visual_studio_extension.CxWrapper.Models;
4-
using System;
52
using Xunit;
63

74
namespace ast_visual_studio_extension_tests.cx_integration_tests.Services
@@ -14,31 +11,19 @@ namespace ast_visual_studio_extension_tests.cx_integration_tests.Services
1411
[Trait("Category", "Integration")]
1512
public class ContainersServiceTests
1613
{
17-
private readonly CxWrapper _wrapperInstance;
18-
19-
public ContainersServiceTests()
20-
{
21-
var config = new CxConfig
22-
{
23-
ApiKey = "test-api-key"
24-
};
25-
26-
_wrapperInstance = new CxWrapper(config, typeof(ContainersServiceTests));
27-
}
28-
2914
[Fact]
3015
public void ContainersService_GetInstance_ReturnsServiceInstance()
3116
{
32-
var service = ContainersService.GetInstance(_wrapperInstance, "docker");
17+
var service = ContainersService.GetInstance(null, "docker");
3318

3419
Assert.NotNull(service);
3520
}
3621

3722
[Fact]
3823
public void ContainersService_GetInstance_ReturnsSingletonInstance()
3924
{
40-
var service1 = ContainersService.GetInstance(_wrapperInstance, "docker");
41-
var service2 = ContainersService.GetInstance(_wrapperInstance, "podman");
25+
var service1 = ContainersService.GetInstance(null, "docker");
26+
var service2 = ContainersService.GetInstance(null, "podman");
4227

4328
// Singleton pattern returns same instance regardless of container engine
4429
Assert.Same(service1, service2);
@@ -50,7 +35,7 @@ public void ContainersService_GetInstance_ReturnsSingletonInstance()
5035
[InlineData("C:\\helm\\values.yaml")]
5136
public void ContainersService_ShouldScanFile_WithValidType_ReturnsTrue(string filePath)
5237
{
53-
var service = ContainersService.GetInstance(_wrapperInstance, "docker");
38+
var service = ContainersService.GetInstance(null, "docker");
5439

5540
Assert.True(service.ShouldScanFile(filePath));
5641
}
@@ -61,26 +46,26 @@ public void ContainersService_ShouldScanFile_WithValidType_ReturnsTrue(string fi
6146
[InlineData("package.json")]
6247
public void ContainersService_ShouldScanFile_WithInvalidType_ReturnsFalse(string filePath)
6348
{
64-
var service = ContainersService.GetInstance(_wrapperInstance, "docker");
49+
var service = ContainersService.GetInstance(null, "docker");
6550

6651
Assert.False(service.ShouldScanFile(filePath));
6752
}
6853

6954
[Fact]
7055
public void ContainersService_ShouldScanFile_WithNull_ReturnsFalse()
7156
{
72-
var service = ContainersService.GetInstance(_wrapperInstance, "docker");
57+
var service = ContainersService.GetInstance(null, "docker");
7358

7459
Assert.False(service.ShouldScanFile(null));
7560
}
7661

7762
[Fact]
7863
public async System.Threading.Tasks.Task ContainersService_UnregisterAsync_AllowsReinitializationAsync()
7964
{
80-
var service1 = ContainersService.GetInstance(_wrapperInstance, "docker");
65+
var service1 = ContainersService.GetInstance(null, "docker");
8166
await service1.UnregisterAsync();
8267

83-
var service2 = ContainersService.GetInstance(_wrapperInstance, "docker");
68+
var service2 = ContainersService.GetInstance(null, "docker");
8469

8570
Assert.NotSame(service1, service2);
8671
}
@@ -90,7 +75,7 @@ public async System.Threading.Tasks.Task ContainersService_UnregisterAsync_Allow
9075
[InlineData("podman")]
9176
public void ContainersService_GetInstance_AcceptsContainerEngine(string engine)
9277
{
93-
var service = ContainersService.GetInstance(_wrapperInstance, engine);
78+
var service = ContainersService.GetInstance(null, engine);
9479

9580
Assert.NotNull(service);
9681
}

‎ast-visual-studio-extension-tests/cx-integration-tests/Services/IacServiceTests.cs‎

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
using ast_visual_studio_extension.CxCLI;
21
using ast_visual_studio_extension.CxExtension.CxAssist.Realtime.Iac;
3-
using ast_visual_studio_extension.CxWrapper.Models;
4-
using System;
52
using Xunit;
63

74
namespace ast_visual_studio_extension_tests.cx_integration_tests.Services
@@ -14,31 +11,19 @@ namespace ast_visual_studio_extension_tests.cx_integration_tests.Services
1411
[Trait("Category", "Integration")]
1512
public class IacServiceTests
1613
{
17-
private readonly CxWrapper _wrapperInstance;
18-
19-
public IacServiceTests()
20-
{
21-
var config = new CxConfig
22-
{
23-
ApiKey = "test-api-key"
24-
};
25-
26-
_wrapperInstance = new CxWrapper(config, typeof(IacServiceTests));
27-
}
28-
2914
[Fact]
3015
public void IacService_GetInstance_ReturnsServiceInstance()
3116
{
32-
var service = IacService.GetInstance(_wrapperInstance);
17+
var service = IacService.GetInstance(null);
3318

3419
Assert.NotNull(service);
3520
}
3621

3722
[Fact]
3823
public void IacService_GetInstance_ReturnsSingletonInstance()
3924
{
40-
var service1 = IacService.GetInstance(_wrapperInstance);
41-
var service2 = IacService.GetInstance(_wrapperInstance);
25+
var service1 = IacService.GetInstance(null);
26+
var service2 = IacService.GetInstance(null);
4227

4328
Assert.Same(service1, service2);
4429
}
@@ -50,7 +35,7 @@ public void IacService_GetInstance_ReturnsSingletonInstance()
5035
[InlineData("dockerfile")]
5136
public void IacService_ShouldScanFile_WithValidType_ReturnsTrue(string filePath)
5237
{
53-
var service = IacService.GetInstance(_wrapperInstance);
38+
var service = IacService.GetInstance(null);
5439

5540
Assert.True(service.ShouldScanFile(filePath));
5641
}
@@ -61,26 +46,26 @@ public void IacService_ShouldScanFile_WithValidType_ReturnsTrue(string filePath)
6146
[InlineData("script.sh")]
6247
public void IacService_ShouldScanFile_WithInvalidType_ReturnsFalse(string filePath)
6348
{
64-
var service = IacService.GetInstance(_wrapperInstance);
49+
var service = IacService.GetInstance(null);
6550

6651
Assert.False(service.ShouldScanFile(filePath));
6752
}
6853

6954
[Fact]
7055
public void IacService_ShouldScanFile_WithNull_ReturnsFalse()
7156
{
72-
var service = IacService.GetInstance(_wrapperInstance);
57+
var service = IacService.GetInstance(null);
7358

7459
Assert.False(service.ShouldScanFile(null));
7560
}
7661

7762
[Fact]
7863
public async System.Threading.Tasks.Task IacService_UnregisterAsync_AllowsReinitializationAsync()
7964
{
80-
var service1 = IacService.GetInstance(_wrapperInstance);
65+
var service1 = IacService.GetInstance(null);
8166
await service1.UnregisterAsync();
8267

83-
var service2 = IacService.GetInstance(_wrapperInstance);
68+
var service2 = IacService.GetInstance(null);
8469

8570
Assert.NotSame(service1, service2);
8671
}

0 commit comments

Comments
 (0)