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

Fix / clarify capabilities API #2952

Merged
merged 23 commits into from
Jun 29, 2023
Merged

Fix / clarify capabilities API #2952

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
2433b82
starting cleanup
faec Jun 27, 2023
5bff963
update some tests
faec Jun 27, 2023
2cb3637
more test cleanup
faec Jun 27, 2023
a8ed9ae
more test cleanup
faec Jun 27, 2023
84e02f5
remove commented code
faec Jun 27, 2023
d6428b7
the tests pass again
faec Jun 27, 2023
a5528dd
merge identical input/output caps logic into a single string matcher …
faec Jun 27, 2023
2d092bb
add tests for empty upgrade conditions
faec Jun 27, 2023
06d014c
remove comments and unused test data
faec Jun 27, 2023
29e130f
fix error check, remove commented code
faec Jun 27, 2023
080f2a6
remove unintentional test data
faec Jun 27, 2023
b61de0c
Fix upgrade semantics bug, update tests
faec Jun 27, 2023
296aff8
update printComponents to support capabilities
faec Jun 28, 2023
0c7ca9f
remove unused parameter
faec Jun 28, 2023
6fc7bc8
typo
faec Jun 28, 2023
fe259e8
Actually include blocked components
faec Jun 28, 2023
f261717
make InputType and OutputType top-level Component fields
faec Jun 28, 2023
d0c816d
Merge branch 'main' of github.com:elastic/elastic-agent into capabili…
faec Jun 29, 2023
4eff50d
update tests
faec Jun 29, 2023
f3bb6bc
Update component tests to make sure Input/OutputType are initialized …
faec Jun 29, 2023
6f1fa76
only filter input types for non-shipper components
faec Jun 29, 2023
10c30bf
add requested metrics unit test
faec Jun 29, 2023
c3d7bd4
add upgrade version test
faec Jun 29, 2023
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
Prev Previous commit
Next Next commit
Fix upgrade semantics bug, update tests
  • Loading branch information
@faec
faec committed Jun 27, 2023
commit b61de0ce40258b1fd815f4af2ef73c7b7cead5d2
12 changes: 4 additions & 8 deletions internal/pkg/capabilities/upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,11 @@ func allowUpgrade(
result, err := cap.condition.Eval(varStore, true)
if err != nil {
log.Errorf("failed evaluating eql formula %q, skipping: %v", cap.conditionStr, err)
return true
continue
}
if result && cap.rule == ruleTypeDeny {
// This rule blocks the attempted upgrade
return false
}
if !result && cap.rule == ruleTypeAllow {
// An "allow" rule failed its check, this also blocks the upgrade.
return false
if result {
// The check passed, either accept or deny as configured.
return cap.rule == ruleTypeAllow
}
}
// If nothing blocked the upgrade, allow it.
Expand Down
41 changes: 16 additions & 25 deletions internal/pkg/capabilities/upgrade_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,47 +53,37 @@ func TestUpgrade(t *testing.T) {

t.Run("valid action - version mismmatch", func(t *testing.T) {
log := logger.NewWithoutConfig("testing")
// allow version 7.12.0, reject anything else
caps := []*upgradeCapability{
mustNewUpgradeCapability(
"${version} == '7.12.0'",
ruleTypeAllow,
),
mustNewUpgradeCapability("${version} == '7.12.0'", ruleTypeAllow),
mustNewUpgradeCapability("", ruleTypeDeny),
}
assert.True(t, allowUpgrade(log, "7.12.0", "", caps))
assert.False(t, allowUpgrade(log, "7.12.1", "", caps))
assert.False(t, allowUpgrade(log, "8.0.0", "", caps))
})

t.Run("valid action - version bug allowed minor mismatch", func(t *testing.T) {
t.Run("version bug allowed minor mismatch", func(t *testing.T) {
log := logger.NewWithoutConfig("testing")
caps := []*upgradeCapability{
mustNewUpgradeCapability(
"match(${version}, '8.0.*')",
ruleTypeAllow,
),
mustNewUpgradeCapability("match(${version}, '8.0.*')", ruleTypeAllow),
mustNewUpgradeCapability("", ruleTypeDeny),
}
assert.True(t, allowUpgrade(log, "8.0.0", "", caps))
assert.True(t, allowUpgrade(log, "8.0.1", "", caps))
assert.False(t, allowUpgrade(log, "8.1.0", "", caps))
})

t.Run("valid action - version minor allowed major mismatch", func(t *testing.T) {
t.Run("version minor allowed major mismatch", func(t *testing.T) {
log := logger.NewWithoutConfig("testing")
caps := []*upgradeCapability{
mustNewUpgradeCapability(
"match(${version}, '8.*.*')",
ruleTypeAllow,
),
}
assert.False(t, allowUpgrade(log, "7.157.0", "", caps))
})

t.Run("valid action - version minor allowed minor upgrade", func(t *testing.T) {
log := logger.NewWithoutConfig("testing")
caps := []*upgradeCapability{
mustNewUpgradeCapability(
"match(${version}, '8.*.*')",
ruleTypeAllow,
),
mustNewUpgradeCapability("match(${version}, '8.*.*')", ruleTypeAllow),
mustNewUpgradeCapability("", ruleTypeDeny),
}
assert.True(t, allowUpgrade(log, "8.157.0", "", caps))
assert.True(t, allowUpgrade(log, "8.0.123", "", caps))
assert.True(t, allowUpgrade(log, "8.2.0", "", caps))
assert.False(t, allowUpgrade(log, "7.157.0", "", caps))
})

t.Run("require trusted url", func(t *testing.T) {
Expand All @@ -103,6 +93,7 @@ func TestUpgrade(t *testing.T) {
"startsWith(${sourceURI}, 'https')",
ruleTypeAllow,
),
mustNewUpgradeCapability("", ruleTypeDeny),
}
assert.True(t, allowUpgrade(log, "9.0.0", "https://artifacts.elastic.co", caps))
assert.False(t, allowUpgrade(log, "9.0.0", "http://artifacts.elastic.co", caps))
Expand Down