Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: release 1.22 #845

Merged
merged 4 commits into from
Jul 16, 2024
Merged

chore: release 1.22 #845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
912bfa1
build: version bump to 1.22
aws-sdk-dotnet-automation Jul 3, 2024
7092453
feat: Remove disabled fields from showing on redeployment in server mode
philasmar Jul 1, 2024
8be3fcb
make more settings visible
philasmar Jul 11, 2024
db9ec45
fix integ test
philasmar Jul 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions src/AWS.Deploy.CLI/ServerMode/Controllers/DeploymentController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,15 +200,24 @@ private List<OptionSettingItemSummary> ListOptionSettingSummary(IOptionSettingHa

foreach (var setting in configurableOptionSettings)
{
var settingSummary = new OptionSettingItemSummary(setting.Id, setting.FullyQualifiedId, setting.Name, setting.Description, setting.Type.ToString())
var settingSummary = new OptionSettingItemSummary(
setting.Id,
setting.FullyQualifiedId,
setting.Name,
setting.Description,
setting.Type.ToString())
{
Category = setting.Category,
TypeHint = setting.TypeHint?.ToString(),
TypeHintData = setting.TypeHintData,
Value = optionSettingHandler.GetOptionSettingValue(recommendation, setting),
Advanced = setting.AdvancedSetting,
ReadOnly = recommendation.IsExistingCloudApplication && !setting.Updatable,
Visible = optionSettingHandler.IsOptionSettingDisplayable(recommendation, setting),
Visible =
optionSettingHandler.IsOptionSettingDisplayable(recommendation, setting) &&
// Updating visibility of settings in server-mode to be determined by 'VisibleOnRedeployment'
// when performing a redeployment and 'Updatable' is set to false.
!(recommendation.IsExistingCloudApplication && !setting.Updatable && !setting.VisibleOnRedeployment),
SummaryDisplayable = optionSettingHandler.IsSummaryDisplayable(recommendation, setting),
AllowedValues = setting.AllowedValues,
ValueMapping = setting.ValueMapping,
Expand Down
5 changes: 5 additions & 0 deletions src/AWS.Deploy.Common/Recipes/OptionSettingItem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,11 @@ public partial class OptionSettingItem : IOptionSettingItem
/// </summary>
public bool Updatable { get; set; }

/// <summary>
/// If the value is true, the setting will be displayed during a redeployment. This only applies to server-mode clients.
/// </summary>
public bool VisibleOnRedeployment { get; set; }

/// <summary>
/// List of all validators that should be run when configuring this OptionSettingItem.
/// </summary>
Expand Down
2 changes: 2 additions & 0 deletions src/AWS.Deploy.Recipes/RecipeDefinitions/ASP.NETAppAppRunner.recipe
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@
"TypeHint": "AppRunnerService",
"AdvancedSetting": false,
"Updatable": false,
"VisibleOnRedeployment": true,
"DefaultValue": "{StackName}-service",
"Validators": [
{
Expand Down Expand Up @@ -288,6 +289,7 @@
"Type": "String",
"AdvancedSetting": true,
"Updatable": false,
"VisibleOnRedeployment": true,
"Validators": [
{
"ValidatorType": "Regex",
Expand Down
10 changes: 9 additions & 1 deletion src/AWS.Deploy.Recipes/RecipeDefinitions/ASP.NETAppECSFargate.recipe
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@
"TypeHint": "ECSCluster",
"AdvancedSetting": false,
"Updatable": false,
"VisibleOnRedeployment": true,
"ChildOptionSettings": [
{
"Id": "CreateNew",
Expand All @@ -136,6 +137,7 @@
"TypeHint": "ExistingECSCluster",
"AdvancedSetting": false,
"Updatable": false,
"VisibleOnRedeployment": true,
"Validators": [
{
"ValidatorType": "Regex",
Expand All @@ -160,6 +162,7 @@
"DefaultValue": "{StackName}",
"AdvancedSetting": false,
"Updatable": false,
"VisibleOnRedeployment": true,
"Validators": [
{
"ValidatorType": "Regex",
Expand Down Expand Up @@ -195,6 +198,7 @@
"DefaultValue": "{StackName}-service",
"AdvancedSetting": false,
"Updatable": false,
"VisibleOnRedeployment": true,
"Validators": [
{
"ValidatorType": "Regex",
Expand Down Expand Up @@ -304,6 +308,7 @@
"TypeHint": "Vpc",
"AdvancedSetting": false,
"Updatable": false,
"VisibleOnRedeployment": true,
"ChildOptionSettings": [
{
"Id": "IsDefault",
Expand Down Expand Up @@ -360,6 +365,7 @@
"DefaultValue": "{DefaultVpcId}",
"AdvancedSetting": false,
"Updatable": false,
"VisibleOnRedeployment": true,
"Validators": [
{
"ValidatorType": "Regex",
Expand Down Expand Up @@ -533,6 +539,7 @@
"DefaultValue": null,
"AdvancedSetting": false,
"Updatable": false,
"VisibleOnRedeployment": true,
"Validators": [
{
"ValidatorType": "Regex",
Expand Down Expand Up @@ -738,7 +745,8 @@
"Type": "Bool",
"DefaultValue": true,
"AdvancedSetting": false,
"Updatable": false
"Updatable": false,
"VisibleOnRedeployment": true
}
]
},
Expand Down
11 changes: 11 additions & 0 deletions src/AWS.Deploy.Recipes/RecipeDefinitions/ASP.NETAppElasticBeanstalkLinux.recipe
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@
"TypeHint": "BeanstalkApplication",
"AdvancedSetting": false,
"Updatable": false,
"VisibleOnRedeployment": true,
"ChildOptionSettings": [
{
"Id": "CreateNew",
Expand All @@ -155,6 +156,7 @@
"DefaultValue": "{StackName}",
"AdvancedSetting": false,
"Updatable": false,
"VisibleOnRedeployment": true,
"DependsOn": [
{
"Id": "BeanstalkApplication.CreateNew",
Expand Down Expand Up @@ -187,6 +189,7 @@
"DefaultValue": "{StackName}",
"AdvancedSetting": false,
"Updatable": false,
"VisibleOnRedeployment": true,
"DependsOn": [
{
"Id": "BeanstalkApplication.CreateNew",
Expand Down Expand Up @@ -215,6 +218,7 @@
"Type": "Object",
"AdvancedSetting": false,
"Updatable": false,
"VisibleOnRedeployment": true,
"ChildOptionSettings": [
{
"Id": "EnvironmentName",
Expand All @@ -225,6 +229,7 @@
"DefaultValue": "{StackName}-dev",
"AdvancedSetting": false,
"Updatable": false,
"VisibleOnRedeployment": true,
"Validators": [
{
"ValidatorType": "Regex",
Expand Down Expand Up @@ -342,6 +347,7 @@
},
"AdvancedSetting": false,
"Updatable": false,
"VisibleOnRedeployment": true,
"ChildOptionSettings": [
{
"Id": "CreateNew",
Expand All @@ -363,6 +369,7 @@
},
"AdvancedSetting": false,
"Updatable": false,
"VisibleOnRedeployment": true,
"DependsOn": [
{
"Id": "ApplicationIAMRole.CreateNew",
Expand Down Expand Up @@ -393,6 +400,7 @@
},
"AdvancedSetting": false,
"Updatable": false,
"VisibleOnRedeployment": true,
"ChildOptionSettings": [
{
"Id": "CreateNew",
Expand All @@ -414,6 +422,7 @@
},
"AdvancedSetting": false,
"Updatable": false,
"VisibleOnRedeployment": true,
"DependsOn": [
{
"Id": "ServiceIAMRole.CreateNew",
Expand Down Expand Up @@ -442,6 +451,7 @@
"DefaultValue": "",
"AdvancedSetting": true,
"Updatable": false,
"VisibleOnRedeployment": true,
"Validators": [
{
"ValidatorType": "Regex",
Expand Down Expand Up @@ -821,6 +831,7 @@
"DefaultValue": "{DefaultVpcId}",
"AdvancedSetting": true,
"Updatable": false,
"VisibleOnRedeployment": true,
"Validators": [
{
"ValidatorType": "Regex",
Expand Down
10 changes: 10 additions & 0 deletions src/AWS.Deploy.Recipes/RecipeDefinitions/ASP.NETAppElasticBeanstalkWindows.recipe
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@
"TypeHint": "BeanstalkApplication",
"AdvancedSetting": false,
"Updatable": false,
"VisibleOnRedeployment": true,
"ChildOptionSettings": [
{
"Id": "CreateNew",
Expand All @@ -155,6 +156,7 @@
"DefaultValue": "{StackName}",
"AdvancedSetting": false,
"Updatable": false,
"VisibleOnRedeployment": true,
"DependsOn": [
{
"Id": "BeanstalkApplication.CreateNew",
Expand Down Expand Up @@ -187,6 +189,7 @@
"DefaultValue": "{StackName}",
"AdvancedSetting": false,
"Updatable": false,
"VisibleOnRedeployment": true,
"DependsOn": [
{
"Id": "BeanstalkApplication.CreateNew",
Expand Down Expand Up @@ -216,6 +219,7 @@
"DefaultValue": "{StackName}-dev",
"AdvancedSetting": false,
"Updatable": false,
"VisibleOnRedeployment": true,
"Validators": [
{
"ValidatorType": "Regex",
Expand Down Expand Up @@ -331,6 +335,7 @@
},
"AdvancedSetting": false,
"Updatable": false,
"VisibleOnRedeployment": true,
"ChildOptionSettings": [
{
"Id": "CreateNew",
Expand All @@ -352,6 +357,7 @@
},
"AdvancedSetting": false,
"Updatable": false,
"VisibleOnRedeployment": true,
"DependsOn": [
{
"Id": "ApplicationIAMRole.CreateNew",
Expand Down Expand Up @@ -382,6 +388,7 @@
},
"AdvancedSetting": false,
"Updatable": false,
"VisibleOnRedeployment": true,
"ChildOptionSettings": [
{
"Id": "CreateNew",
Expand All @@ -403,6 +410,7 @@
},
"AdvancedSetting": false,
"Updatable": false,
"VisibleOnRedeployment": true,
"DependsOn": [
{
"Id": "ServiceIAMRole.CreateNew",
Expand Down Expand Up @@ -431,6 +439,7 @@
"DefaultValue": "",
"AdvancedSetting": true,
"Updatable": false,
"VisibleOnRedeployment": true,
"Validators": [
{
"ValidatorType": "Regex",
Expand Down Expand Up @@ -816,6 +825,7 @@
"DefaultValue": "{DefaultVpcId}",
"AdvancedSetting": true,
"Updatable": false,
"VisibleOnRedeployment": true,
"Validators": [
{
"ValidatorType": "Regex",
Expand Down
4 changes: 4 additions & 0 deletions src/AWS.Deploy.Recipes/RecipeDefinitions/ConsoleAppECSFargateScheduleTask.recipe
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@
"TypeHint": "ECSCluster",
"AdvancedSetting": false,
"Updatable": false,
"VisibleOnRedeployment": true,
"ChildOptionSettings": [
{
"Id": "CreateNew",
Expand All @@ -154,6 +155,7 @@
"TypeHint": "ExistingECSCluster",
"AdvancedSetting": false,
"Updatable": false,
"VisibleOnRedeployment": true,
"Validators": [
{
"ValidatorType": "Regex",
Expand All @@ -178,6 +180,7 @@
"DefaultValue": "{StackName}",
"AdvancedSetting": false,
"Updatable": false,
"VisibleOnRedeployment": true,
"Validators": [
{
"ValidatorType": "Regex",
Expand Down Expand Up @@ -323,6 +326,7 @@
"DefaultValue": "{DefaultVpcId}",
"AdvancedSetting": false,
"Updatable": false,
"VisibleOnRedeployment": true,
"Validators": [
{
"ValidatorType": "Regex",
Expand Down
6 changes: 6 additions & 0 deletions src/AWS.Deploy.Recipes/RecipeDefinitions/ConsoleAppECSFargateService.recipe
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@
"TypeHint": "ECSCluster",
"AdvancedSetting": false,
"Updatable": false,
"VisibleOnRedeployment": true,
"ChildOptionSettings": [
{
"Id": "CreateNew",
Expand All @@ -194,6 +195,7 @@
"TypeHint": "ExistingECSCluster",
"AdvancedSetting": false,
"Updatable": false,
"VisibleOnRedeployment": true,
"Validators": [
{
"ValidatorType": "Regex",
Expand All @@ -218,6 +220,7 @@
"DefaultValue": "{StackName}",
"AdvancedSetting": false,
"Updatable": false,
"VisibleOnRedeployment": true,
"Validators": [
{
"ValidatorType": "Regex",
Expand Down Expand Up @@ -247,6 +250,7 @@
"DefaultValue": "{StackName}-service",
"AdvancedSetting": false,
"Updatable": false,
"VisibleOnRedeployment": true,
"Validators": [
{
"ValidatorType": "Regex",
Expand Down Expand Up @@ -336,6 +340,7 @@
"TypeHint": "Vpc",
"AdvancedSetting": false,
"Updatable": false,
"VisibleOnRedeployment": true,
"ChildOptionSettings": [
{
"Id": "IsDefault",
Expand Down Expand Up @@ -392,6 +397,7 @@
"DefaultValue": "{DefaultVpcId}",
"AdvancedSetting": false,
"Updatable": false,
"VisibleOnRedeployment": true,
"Validators": [
{
"ValidatorType": "Regex",
Expand Down
6 changes: 6 additions & 0 deletions src/AWS.Deploy.Recipes/RecipeDefinitions/aws-deploy-recipe-schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,6 +587,12 @@
"description": "If the setting is false the setting can not be changed during redeployment.",
"minLength": 1
},
"VisibleOnRedeployment": {
"type": "boolean",
"title": "VisibleOnRedeployment",
"description": "If the value is true, the setting will be displayed during a redeployment. This only applies to server-mode clients.",
"minLength": 1
},
"DependsOn": {
"type": "array",
"title": "",
Expand Down
Loading
Loading