Skip to content

Commit 06a388e

Browse files
committed
refactor: rename CliDownloadUrl to CliBaseDownloadURL
Rename property from CliDownloadUrl to CliBaseDownloadURL across entire codebase for consistency with UI labeling and configuration naming conventions. Updated files: - IPersistableOption.cs: Interface property definition - SnykOptions.cs: Implementation property - SnykSettings.cs: Persisted settings property - SnykOptionsManager.cs: Load/Save mappings - ConfigScriptingBridge.cs: HTML config bridge - HtmlResourceLoader.cs: Template replacement - LsSettings.cs: Language server initialization - SnykCliDownloader.cs: CLI download URL references - SnykCliOptionsUserControl.cs: UI control binding - SnykGeneralOptionsDialogPage.cs: Options dialog handler - SnykCliDownloaderTest.cs: Test mock setup - SnykUserStorageSettingsServiceTest.cs: Test assertions
1 parent f4bccef commit 06a388e

File tree

14 files changed

+18
-18
lines changed

14 files changed

+18
-18
lines changed

Snyk.VisualStudio.Extension.2022/Download/SnykCliDownloader.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ public LatestReleaseInfo GetLatestReleaseInfo()
5252
{
5353
Logger.Information("Get latest CLI release info");
5454

55-
var latestReleaseVersionUrl = string.Format(LatestReleaseVersionUrlScheme, SnykOptions.CliDownloadUrl, SnykOptions.CliReleaseChannel);
55+
var latestReleaseVersionUrl = string.Format(LatestReleaseVersionUrlScheme, SnykOptions.CliBaseDownloadURL, SnykOptions.CliReleaseChannel);
5656
var latestVersion = webClient.DownloadString(latestReleaseVersionUrl).Replace("\n", string.Empty);
5757

58-
var latestReleaseDownloadUrl = string.Format(LatestReleaseDownloadUrlScheme, SnykOptions.CliDownloadUrl, "v"+latestVersion);
58+
var latestReleaseDownloadUrl = string.Format(LatestReleaseDownloadUrlScheme, SnykOptions.CliBaseDownloadURL, "v"+latestVersion);
5959

6060
return new LatestReleaseInfo
6161
{

Snyk.VisualStudio.Extension.2022/Language/CustomInitializationOptions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public class SnykLsInitializationOptions
5050
public string OutputFormat { get; set; }
5151
public string EnableDeltaFindings { get; set; }
5252
public List<FolderConfig> FolderConfigs { get; set; }
53-
public string BaseUrl { get; set; }
53+
public string CliBaseDownloadUrl { get; set; }
5454
public int? RiskScoreThreshold { get; set; }
5555
}
5656

Snyk.VisualStudio.Extension.2022/Language/LsSettings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public SnykLsInitializationOptions GetInitializationOptions()
6363
DeviceId = options.DeviceId,
6464
EnableDeltaFindings = options.EnableDeltaFindings.ToString().ToLower(),
6565
FolderConfigs = options.FolderConfigs,
66-
BaseUrl = options.CliDownloadUrl,
66+
CliBaseDownloadUrl = options.CliBaseDownloadURL,
6767
AdditionalEnv = options.AdditionalEnv,
6868
RiskScoreThreshold = options.RiskScoreThreshold
6969
};

Snyk.VisualStudio.Extension.2022/Settings/IPersistableOption.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public interface IPersistableOptions
6666
/// </summary>
6767
string CliCustomPath { get; set; }
6868
string CliReleaseChannel { get; set; }
69-
string CliDownloadUrl { get; set; }
69+
string CliBaseDownloadURL { get; set; }
7070
ISet<string> TrustedFolders { get; set; }
7171

7272
bool EnableDeltaFindings { get; set; }

Snyk.VisualStudio.Extension.2022/Settings/SnykCliOptionsUserControl.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public SnykCliOptionsUserControl(ISnykServiceProvider serviceProvider) : base(se
2121
protected override void UpdateViewFromOptions()
2222
{
2323
this.manageBinariesAutomaticallyCheckbox.Checked = OptionsMemento.BinariesAutoUpdate;
24-
this.cliDownloadUrlTextBox.Text = OptionsMemento.CliDownloadUrl;
24+
this.cliDownloadUrlTextBox.Text = OptionsMemento.CliBaseDownloadURL;
2525

2626
var cliPath = string.IsNullOrEmpty(OptionsMemento.CliCustomPath)
2727
? SnykCli.GetSnykCliDefaultPath()

Snyk.VisualStudio.Extension.2022/Settings/SnykGeneralOptionsDialogPage.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ private bool HandleCliConfiguration()
211211
{
212212
var memento = this.serviceProvider.Package.SnykCliOptionsDialogPage.SnykCliOptionsUserControl.OptionsMemento;
213213

214-
this.SnykOptions.CliDownloadUrl = memento.CliDownloadUrl;
214+
this.SnykOptions.CliBaseDownloadURL = memento.CliBaseDownloadURL;
215215

216216
var binariesAutoUpdateChanged = this.SnykOptions.BinariesAutoUpdate != memento.BinariesAutoUpdate;
217217
var releaseChannelChanged = this.SnykOptions.CliReleaseChannel != memento.CliReleaseChannel;

Snyk.VisualStudio.Extension.2022/Settings/SnykOptions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public class SnykOptions : ISnykOptions
3333
public bool BinariesAutoUpdate { get; set; }
3434
public string CliCustomPath { get; set; }
3535
public string CliReleaseChannel { get; set; }
36-
public string CliDownloadUrl { get; set; }
36+
public string CliBaseDownloadURL { get; set; }
3737
public ISet<string> TrustedFolders { get; set; }
3838
public bool EnableDeltaFindings { get; set; }
3939
public List<FolderConfig> FolderConfigs { get; set; }

Snyk.VisualStudio.Extension.2022/Settings/SnykOptionsManager.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public ISnykOptions Load()
4848

4949
BinariesAutoUpdate = snykSettings.BinariesAutoUpdateEnabled,
5050
CliCustomPath = snykSettings.CustomCliPath,
51-
CliDownloadUrl = snykSettings.CliDownloadUrl,
51+
CliBaseDownloadURL = snykSettings.CliBaseDownloadURL,
5252
CliReleaseChannel = snykSettings.CliReleaseChannel,
5353
CurrentCliVersion = snykSettings.CurrentCliVersion,
5454

@@ -87,7 +87,7 @@ public void Save(IPersistableOptions options, bool triggerSettingsChangedEvent =
8787

8888
snykSettings.BinariesAutoUpdateEnabled = options.BinariesAutoUpdate;
8989
snykSettings.CustomCliPath = options.CliCustomPath;
90-
snykSettings.CliDownloadUrl = options.CliDownloadUrl;
90+
snykSettings.CliBaseDownloadURL = options.CliBaseDownloadURL;
9191
snykSettings.CliReleaseChannel = options.CliReleaseChannel;
9292
snykSettings.CurrentCliVersion = options.CurrentCliVersion;
9393

Snyk.VisualStudio.Extension.2022/Settings/SnykSettings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public SnykSettings()
6363
public string Token { get; set; } = string.Empty;
6464
public bool IacEnabled { get; set; } = true;
6565
public string CliReleaseChannel { get; set; } = SnykCliDownloader.DefaultReleaseChannel;
66-
public string CliDownloadUrl { get; set; } = SnykCliDownloader.DefaultBaseDownloadUrl;
66+
public string CliBaseDownloadURL { get; set; } = SnykCliDownloader.DefaultBaseDownloadUrl;
6767
public bool IgnoreUnknownCa { get; set; }
6868
public string Organization { get; set; }
6969
public string CustomEndpoint { get; set; }

Snyk.VisualStudio.Extension.2022/UI/Html/ConfigScriptingBridge.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -332,9 +332,9 @@ private void ApplyCliSettings(IdeConfigData config)
332332
options.BinariesAutoUpdate = config.ManageBinariesAutomatically.Value;
333333
}
334334

335-
if (config.BaseUrl != null)
335+
if (config.CliBaseDownloadURL != null)
336336
{
337-
options.CliDownloadUrl = config.BaseUrl;
337+
options.CliBaseDownloadURL = config.CliBaseDownloadURL;
338338
}
339339

340340
if (config.CliReleaseChannel != null)

0 commit comments

Comments
 (0)