Skip to content

[dmt] deprecate disable.message in module.yaml in favor of disable.messages #411

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

Open
Fkuloff wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[dmt] deprecate disable.message in module.yaml in favor of disable.messages #411

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 16 additions & 0 deletions pkg/linters/module/rules/module_yaml.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,25 @@ type DeckhouseModule struct {
Requirements *ModuleRequirements `json:"requirements,omitempty"`
Accessibility *ModuleAccessibility `json:"accessibility,omitempty"`
Update *ModuleUpdate `json:"update,omitempty"`
Disable *ModuleDisable `json:"disable,omitempty"`
}

type ModuleDescriptions struct {
English string `json:"en,omitempty"`
Russian string `json:"ru,omitempty"`
}

type ModuleDisable struct {
Confirmation bool `json:"confirmation,omitempty"`
Message string `json:"message,omitempty"`
Messages ModuleDisableMessages `json:"messages,omitempty"`
}

type ModuleDisableMessages struct {
English string `json:"en,omitempty"`
Russian string `json:"ru,omitempty"`
}

type ModuleRequirements struct {
ModulePlatformRequirements `json:",inline"`
ParentModules map[string]string `json:"modules,omitempty"`
Expand Down Expand Up @@ -283,6 +295,10 @@ func (r *DefinitionFileRule) CheckDefinitionFile(modulePath string, errorList *e
errorList.WithMaxLevel(maxLevel).Error("Field 'description' is deprecated, use 'descriptions.en' instead")
}

if yml.Disable != nil && yml.Disable.Message != "" {
errorList.WithMaxLevel(maxLevel).Error("Field 'disable.message' is deprecated, use 'disable.messages' (with 'ru'/'en') instead")
}
Comment on lines +298 to +300

if yml.Critical && yml.Weight == 0 {
errorList.Error("Field 'weight' must not be zero for critical modules")
}
Expand Down
Loading