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.

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 panic exit when containers ff could not be fetched (AST-86767) #1069

Merged
merged 13 commits into from
Mar 23, 2025
Prev Previous commit
Next Next commit
Fix tests
greensd4 committed Mar 23, 2025
commit c86df91b9e2754132b3902b09d7b0cc736224677
1 change: 1 addition & 0 deletions internal/commands/root_test.go
Original file line number Diff line number Diff line change
@@ -204,6 +204,7 @@ func assertError(t *testing.T, err error, expectedMessage string) {
func clearFlags() {
mock.Flags = wrappers.FeatureFlagsResponseModel{}
mock.Flag = wrappers.FeatureFlagResponseModel{}
mock.FFErr = nil
wrappers.ClearCache()
}

24 changes: 11 additions & 13 deletions internal/commands/scan_test.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build !integration

package commands

import (
@@ -1947,20 +1945,20 @@ func TestValidateScanTypes(t *testing.T) {
}

func TestIsContainersEngineEnabled_FlagEnabled(t *testing.T) {
mockWrapper := mock.FeatureFlagsMockWrapper{
FlagResponse: wrappers.FeatureFlagResponseModel{Status: true},
Err: nil,
}
clearFlags()
mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.ContainerEngineCLIEnabled, Status: true}
mock.FFErr = nil

result := isContainersEngineEnabled(mockWrapper)
assert.True(t, result, "Expected isContainersEngineEnabled to return true when the flag is enabled")
result := isContainersEngineEnabled(mock.FeatureFlagsMockWrapper{})
assert.Assert(t, result, "expected result to be true")
}

func TestIsContainersEngineEnabled_FlagRetrievalFails(t *testing.T) {
mockWrapper := mock.FeatureFlagsMockWrapper{
Err: errors.New("network error"),
}
clearFlags()
mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.ContainerEngineCLIEnabled, Status: false}
mock.FFErr = errors.New("something went wrong while fetching ff")

result := isContainersEngineEnabled(mock.FeatureFlagsMockWrapper{})

result := isContainersEngineEnabled(mockWrapper)
assert.False(t, result, "Expected isContainersEngineEnabled to return false when flag retrieval fails")
assert.Assert(t, !result, "expected result to be false")
}
4 changes: 4 additions & 0 deletions internal/wrappers/mock/feature-flags-mock.go
Original file line number Diff line number Diff line change
@@ -8,6 +8,7 @@ import (

var Flags wrappers.FeatureFlagsResponseModel
var Flag wrappers.FeatureFlagResponseModel
var FFErr error

type FeatureFlagsMockWrapper struct {
}
@@ -22,5 +23,8 @@ func (f FeatureFlagsMockWrapper) GetAll() (*wrappers.FeatureFlagsResponseModel,

func (f FeatureFlagsMockWrapper) GetSpecificFlag(specificFlag string) (*wrappers.FeatureFlagResponseModel, error) {
fmt.Println("Called GetSpecificFlag in FeatureFlagsMockWrapper with flag:", specificFlag)
if FFErr != nil {
return nil, FFErr
}
return &Flag, nil
}