Skip to content

Commit 7dd1ec4

Browse files
committed
Fix naming
1 parent 913a07e commit 7dd1ec4

File tree

2 files changed

+15
-12
lines changed

2 files changed

+15
-12
lines changed

src/Cli/func/Actions/LocalActions/CreateFunctionAction.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ internal class CreateFunctionAction : BaseAction
3434
private IEnumerable<UserPrompt> _userPrompts;
3535
private WorkerRuntime _workerRuntime;
3636

37-
public CreateFunctionAction(ITemplatesManager templatesManager, ISecretsManager secretsManager, IContextHelpManager contextHelpManager, IEnumerable<IConfigurationProfile> configurationProfileProvider)
37+
public CreateFunctionAction(ITemplatesManager templatesManager, ISecretsManager secretsManager, IContextHelpManager contextHelpManager, IEnumerable<IConfigurationProfile> configurationProfiles)
3838
{
3939
_templatesManager = templatesManager;
4040
_secretsManager = secretsManager;
4141
_contextHelpManager = contextHelpManager;
4242

4343
// Construct InitAction with the provided providers so it can validate and apply the profile
44-
_initAction = new InitAction(_templatesManager, _secretsManager, configurationProfileProvider);
44+
_initAction = new InitAction(_templatesManager, _secretsManager, configurationProfiles);
4545
_userInputHandler = new UserInputHandler(_templatesManager);
4646
}
4747

src/Cli/func/Actions/LocalActions/InitAction.cs

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@ internal class InitAction : BaseAction
2626
private const string DefaultInProcTargetFramework = Common.TargetFramework.Net8;
2727
private readonly ITemplatesManager _templatesManager;
2828
private readonly ISecretsManager _secretsManager;
29-
private readonly IEnumerable<IConfigurationProfile> _configurationProfile;
29+
private readonly IEnumerable<IConfigurationProfile> _configurationProfiles;
3030
internal static readonly Dictionary<Lazy<string>, Task<string>> FileToContentMap = new Dictionary<Lazy<string>, Task<string>>
3131
{
3232
{ new Lazy<string>(() => ".gitignore"), StaticResources.GitIgnore }
3333
};
3434

35-
public InitAction(ITemplatesManager templatesManager, ISecretsManager secretsManager, IEnumerable<IConfigurationProfile> configurationProfile)
35+
public InitAction(ITemplatesManager templatesManager, ISecretsManager secretsManager, IEnumerable<IConfigurationProfile> configurationProfiles)
3636
{
3737
_templatesManager = templatesManager;
3838
_secretsManager = secretsManager;
39-
_configurationProfile = configurationProfile;
39+
_configurationProfiles = configurationProfiles;
4040
}
4141

4242
public SourceControl SourceControl { get; set; } = SourceControl.Git;
@@ -63,7 +63,7 @@ public InitAction(ITemplatesManager templatesManager, ISecretsManager secretsMan
6363

6464
public string TargetFramework { get; set; }
6565

66-
public string ConfigurationProfile { get; set; }
66+
public string ConfigurationProfileName { get; set; }
6767

6868
public bool? ManagedDependencies { get; set; }
6969

@@ -155,7 +155,7 @@ public override ICommandLineParserResult ParseArgs(string[] args)
155155
.SetDefault(null)
156156
.WithDescription(WarningColor("[preview]").ToString() + " Initialize a project with a host configuration profile. Currently supported: 'mcp-custom-handler'. "
157157
+ WarningColor("Using a configuration profile may skip all other initialization steps.").ToString())
158-
.Callback(cp => ConfigurationProfile = cp);
158+
.Callback(cp => ConfigurationProfileName = cp);
159159

160160
if (args.Any() && !args.First().StartsWith("-"))
161161
{
@@ -669,21 +669,24 @@ private async Task ShowEolMessage()
669669

670670
private async Task<bool> TryApplyConfigurationProfileIfProvided()
671671
{
672-
if (string.IsNullOrEmpty(ConfigurationProfile))
672+
if (string.IsNullOrEmpty(ConfigurationProfileName))
673673
{
674674
return false;
675675
}
676676

677-
IConfigurationProfile configurationProfile = _configurationProfile
678-
.FirstOrDefault(p => string.Equals(p.Name, ConfigurationProfile, StringComparison.OrdinalIgnoreCase));
677+
IConfigurationProfile configurationProfile = _configurationProfiles
678+
.FirstOrDefault(p => string.Equals(p.Name, ConfigurationProfileName, StringComparison.OrdinalIgnoreCase));
679679

680680
if (configurationProfile is null)
681681
{
682-
var supportedProfiles = _configurationProfile
682+
var supportedProfiles = _configurationProfiles
683683
.Select(p => p.Name)
684684
.ToList();
685685

686-
ColoredConsole.WriteLine(WarningColor($"Configuration profile '{ConfigurationProfile}' is not supported. Supported values: {string.Join(", ", supportedProfiles)}"));
686+
ColoredConsole.WriteLine(WarningColor($"Configuration profile '{ConfigurationProfileName}' is not supported. Supported values: {string.Join(", ", supportedProfiles)}"));
687+
688+
// Return true to avoid running the rest of the initialization steps, we are treating the use of `--configuration-profile`
689+
// as a stand alone command. So if the provided profile is invalid, we just warn and exit.
687690
return true;
688691
}
689692

0 commit comments

Comments
 (0)