Skip to content

Commit e5fa28c

Browse files
committed
fix
Signed-off-by: Sinelnikov Michail <mikhail.sinelnikov@flant.com>
1 parent b99f869 commit e5fa28c

File tree

2 files changed

+1
-32
lines changed

2 files changed

+1
-32
lines changed

pkg/linters/module/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,6 @@ This rule automatically detects feature usage and ensures proper version constra
360360
| **Stage Field** | ≥ 1.68.0 | `stage` field present in `module.yaml` |
361361
| **Go Hooks** | ≥ 1.68.0 | `go.mod` with `module-sdk` + `app.Run()` calls |
362362
| **Module-SDK ≥ 0.3** | ≥ 1.71.0 | `module-sdk ≥ 0.3.0` in `go.mod` |
363-
| **Readiness Probes** | ≥ 1.71.0 | `module-sdk ≥ 0.3` + `app.WithReadiness()` calls |
364363
| **Optional Modules** | ≥ 1.73.0 | `!optional` flag in module requirements |
365364

366365
**Validation:**

pkg/linters/module/rules/requirements.go

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -43,21 +43,17 @@ const (
4343
// MinimalDeckhouseVersionForOptionalModules defines the minimum required Deckhouse version for optional modules usage
4444
MinimalDeckhouseVersionForOptionalModules = "1.73.0"
4545

46-
// MinimalModuleSDKVersionForReadiness defines the minimum module-sdk version for readiness probes
47-
MinimalModuleSDKVersionForReadiness = "0.3"
4846
// MinimalModuleSDKVersionRequiresDeckhouse171 defines the minimum module-sdk version that requires Deckhouse >= 1.71
4947
MinimalModuleSDKVersionRequiresDeckhouse171 = "0.3.0"
5048
// MinimalDeckhouseVersionForModuleSDK03 defines the minimum Deckhouse version required for Module-SDK >= 0.3
5149
MinimalDeckhouseVersionForModuleSDK03 = "1.71.0"
5250

5351
// Common patterns used in Go files
54-
ReadinessProbePattern = `(\w+)\.WithReadiness`
55-
AppRunPattern = `\w+\.Run\(`
52+
AppRunPattern = `\w+\.Run\(`
5653
)
5754

5855
// Precompiled regex patterns for better performance
5956
var (
60-
readinessProbeRegex = regexp.MustCompile(ReadinessProbePattern)
6157
appRunRegex = regexp.MustCompile(AppRunPattern)
6258
versionConstraintRegex = regexp.MustCompile(`([><=]=?|!=)\s*v?(\d+(?:\.\d+){0,2})`)
6359
)
@@ -142,22 +138,6 @@ func NewRequirementsRegistry() *RequirementsRegistry {
142138
},
143139
})
144140

145-
// Readiness probes check - checks for app.WithReadiness with module-sdk >= 0.3
146-
registry.RegisterCheck(RequirementCheck{
147-
Name: "readiness_probes",
148-
Requirements: []ComponentRequirement{
149-
{
150-
ComponentType: ComponentDeckhouse,
151-
MinVersion: MinimalDeckhouseVersionForReadinessProbes,
152-
Description: "Readiness probes usage requires minimum Deckhouse version",
153-
},
154-
},
155-
Description: "Readiness probes usage requires minimum Deckhouse version",
156-
Detector: func(modulePath string, _ *DeckhouseModule) bool {
157-
return hasReadinessProbes(modulePath)
158-
},
159-
})
160-
161141
// Optional modules check - checks for !optional flag usage
162142
registry.RegisterCheck(RequirementCheck{
163143
Name: "optional_modules",
@@ -348,16 +328,6 @@ func findPatternInGoFiles(dirs []string, pattern *regexp.Regexp) bool {
348328
return false
349329
}
350330

351-
// hasReadinessProbes determines if readiness probes (app.WithReadiness) and module-sdk >= 0.3 are used
352-
func hasReadinessProbes(modulePath string) bool {
353-
validGoModDirs := findGoModFilesWithModuleSDK(modulePath, MinimalModuleSDKVersionForReadiness)
354-
if len(validGoModDirs) == 0 {
355-
return false
356-
}
357-
358-
return findPatternInGoFiles(validGoModDirs, readinessProbeRegex)
359-
}
360-
361331
// hasGoHooks determines if there are go hooks with module-sdk dependency and app.Run calls
362332
func hasGoHooks(modulePath string) bool {
363333
// Check that there's module-sdk dependency in go.mod files (any version)

0 commit comments

Comments
 (0)