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 staticcheck linter complains #6159

Merged
merged 3 commits into from
Aug 8, 2024
Merged

Fix staticcheck linter complains #6159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b697aea
Fix staticcheck linter complains
jjngx Aug 8, 2024
e8667dd
Fix staticcheck linter complains
jjngx Aug 8, 2024
34dd82f
Merge branch 'main' into fix/staticcheck-go-errors
jjngx Aug 8, 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
22 changes: 11 additions & 11 deletions internal/k8s/appprotect/app_protect_configuration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ const timeLayout = time.RFC3339

// reasons for invalidity
const (
failedValidationErrorMsg = "Validation Failed"
missingUserSigErrorMsg = "Policy has unsatisfied signature requirements"
duplicatedTagsErrorMsg = "Duplicate tag set"
invalidTimestampErrorMsg = "Invalid timestamp"
failedValidationErrorMsg = "validation failed"
missingUserSigErrorMsg = "policy has unsatisfied signature requirements"
duplicatedTagsErrorMsg = "duplicate tag set"
invalidTimestampErrorMsg = "invalid timestamp"
)

var (
Expand Down Expand Up @@ -399,25 +399,25 @@ func (ci *ConfigurationImpl) GetAppResource(kind, key string) (*unstructured.Uns
}
return nil, fmt.Errorf(obj.ErrorMsg)
}
return nil, fmt.Errorf("App Protect Policy %s not found", key)
return nil, fmt.Errorf("app protect Policy %s not found", key)
case LogConfGVK.Kind:
if obj, ok := ci.LogConfs[key]; ok {
if obj.IsValid {
return obj.Obj, nil
}
return nil, fmt.Errorf(obj.ErrorMsg)
}
return nil, fmt.Errorf("App Protect LogConf %s not found", key)
return nil, fmt.Errorf("app protect LogConf %s not found", key)
case UserSigGVK.Kind:
if obj, ok := ci.UserSigs[key]; ok {
if obj.IsValid {
return obj.Obj, nil
}
return nil, fmt.Errorf(obj.ErrorMsg)
}
return nil, fmt.Errorf("App Protect UserSig %s not found", key)
return nil, fmt.Errorf("app protect UserSig %s not found", key)
}
return nil, fmt.Errorf("Unknown App Protect resource kind %s", kind)
return nil, fmt.Errorf("unknown app protect resource kind %s", kind)
}

// DeletePolicy deletes an App Protect Policy from App Protect Configuration
Expand Down Expand Up @@ -599,14 +599,14 @@ func (fc *FakeConfiguration) GetAppResource(kind, key string) (*unstructured.Uns
if obj, ok := fc.Policies[key]; ok {
return obj.Obj, nil
}
return nil, fmt.Errorf("App Protect Policy %s not found", key)
return nil, fmt.Errorf("app protect Policy %s not found", key)
case LogConfGVK.Kind:
if obj, ok := fc.LogConfs[key]; ok {
return obj.Obj, nil
}
return nil, fmt.Errorf("App Protect LogConf %s not found", key)
return nil, fmt.Errorf("app protect LogConf %s not found", key)
}
return nil, fmt.Errorf("Unknown App Protect resource kind %s", kind)
return nil, fmt.Errorf("unknown app protect resource kind %s", kind)
}

// DeletePolicy deletes an App Protect Policy from App Protect Configuration
Expand Down
44 changes: 22 additions & 22 deletions internal/k8s/appprotect/app_protect_configuration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ func TestCreateAppProtectPolicyEx(t *testing.T) {
expectedPolicyEx: &PolicyEx{
SignatureReqs: nil,
IsValid: false,
ErrorMsg: "Invalid timestamp",
ErrorMsg: "invalid timestamp",
},
wantErr: true,
msg: "policy with invalid min timestamp",
Expand All @@ -131,7 +131,7 @@ func TestCreateAppProtectPolicyEx(t *testing.T) {
expectedPolicyEx: &PolicyEx{
SignatureReqs: nil,
IsValid: false,
ErrorMsg: "Invalid timestamp",
ErrorMsg: "invalid timestamp",
},
wantErr: true,
msg: "policy with invalid max timestamp",
Expand All @@ -145,7 +145,7 @@ func TestCreateAppProtectPolicyEx(t *testing.T) {
expectedPolicyEx: &PolicyEx{
SignatureReqs: nil,
IsValid: false,
ErrorMsg: "Validation Failed",
ErrorMsg: "validation failed",
},
wantErr: true,
msg: "policy empty spec",
Expand Down Expand Up @@ -563,7 +563,7 @@ func TestAddOrUpdatePolicy(t *testing.T) {
Resource: &PolicyEx{
Obj: invalidTestPolicy,
IsValid: false,
ErrorMsg: "Validation Failed",
ErrorMsg: "validation failed",
},
Op: Delete,
},
Expand All @@ -584,7 +584,7 @@ func TestAddOrUpdatePolicy(t *testing.T) {
Resource: &PolicyEx{
Obj: testPolicyUnsatisfied,
IsValid: false,
ErrorMsg: "Policy has unsatisfied signature requirements",
ErrorMsg: "policy has unsatisfied signature requirements",
SignatureReqs: []SignatureReq{
{
Tag: "test",
Expand All @@ -601,7 +601,7 @@ func TestAddOrUpdatePolicy(t *testing.T) {
{
Object: testPolicyUnsatisfied,
Reason: "Rejected",
Message: "Policy has unsatisfied signature requirements",
Message: "policy has unsatisfied signature requirements",
},
},
msg: "Missing sig reqs",
Expand Down Expand Up @@ -671,7 +671,7 @@ func TestAddOrUpdateLogConf(t *testing.T) {
Resource: &LogConfEx{
Obj: invalidLogConf,
IsValid: false,
ErrorMsg: "Validation Failed",
ErrorMsg: "validation failed",
},
Op: Delete,
},
Expand Down Expand Up @@ -802,7 +802,7 @@ func TestAddOrUpdateUserSig(t *testing.T) {
appProtectConfiguration.Policies["testing/testpolicy"] = &PolicyEx{
Obj: &unstructured.Unstructured{Object: map[string]interface{}{}},
IsValid: false,
ErrorMsg: "Policy has unsatisfied signature requirements",
ErrorMsg: "policy has unsatisfied signature requirements",
SignatureReqs: []SignatureReq{
{
Tag: "test3",
Expand Down Expand Up @@ -839,7 +839,7 @@ func TestAddOrUpdateUserSig(t *testing.T) {
{
Object: invalidTestUserSig2,
Reason: "Rejected",
Message: "Validation Failed",
Message: "validation failed",
},
},
msg: "validation failed",
Expand All @@ -854,7 +854,7 @@ func TestAddOrUpdateUserSig(t *testing.T) {
expectedProblems: []Problem{
{
Object: testUserSigDupTag,
Message: "Duplicate tag set",
Message: "duplicate tag set",
Reason: "Rejected",
},
},
Expand All @@ -870,7 +870,7 @@ func TestAddOrUpdateUserSig(t *testing.T) {
expectedProblems: []Problem{
{
Object: testUserSig1Invalid,
Message: "Validation Failed",
Message: "validation failed",
Reason: "Rejected",
},
},
Expand Down Expand Up @@ -1061,7 +1061,7 @@ func TestDeleteUserSig(t *testing.T) {
expectedProblems: []Problem{
{
Reason: "Rejected",
Message: "Policy has unsatisfied signature requirements",
Message: "policy has unsatisfied signature requirements",
Object: &unstructured.Unstructured{
Object: map[string]interface{}{},
},
Expand Down Expand Up @@ -1107,14 +1107,14 @@ func TestGetAppProtectResource(t *testing.T) {
kind: "APPolicy",
key: "testing/test2",
wantErr: true,
errMsg: "Validation Failed",
errMsg: "validation failed",
msg: "Policy, Negative, invalid object",
},
{
kind: "APPolicy",
key: "testing/test3",
wantErr: true,
errMsg: "App Protect Policy testing/test3 not found",
errMsg: "app protect Policy testing/test3 not found",
msg: "Policy, Negative, Object Does not exist",
},
{
Expand All @@ -1127,14 +1127,14 @@ func TestGetAppProtectResource(t *testing.T) {
kind: "APLogConf",
key: "testing/test2",
wantErr: true,
errMsg: "Validation Failed",
errMsg: "validation failed",
msg: "LogConf, Negative, invalid object",
},
{
kind: "APLogConf",
key: "testing/test3",
wantErr: true,
errMsg: "App Protect LogConf testing/test3 not found",
errMsg: "app protect LogConf testing/test3 not found",
msg: "LogConf, Negative, Object Does not exist",
},
{
Expand All @@ -1147,31 +1147,31 @@ func TestGetAppProtectResource(t *testing.T) {
kind: "APUserSig",
key: "testing/test2",
wantErr: true,
errMsg: "Validation Failed",
errMsg: "validation failed",
msg: "UserSig, Negative, invalid object",
},
{
kind: "APUserSig",
key: "testing/test3",
wantErr: true,
errMsg: "App Protect UserSig testing/test3 not found",
errMsg: "app protect UserSig testing/test3 not found",
msg: "UserSig, Negative, Object Does not exist",
},
{
kind: "Notreal",
key: "testing/test3",
wantErr: true,
errMsg: "Unknown App Protect resource kind Notreal",
errMsg: "unknown app protect resource kind Notreal",
msg: "Invalid kind, Negative",
},
}
appProtectConfiguration := newConfigurationImpl()
appProtectConfiguration.Policies["testing/test1"] = &PolicyEx{IsValid: true, Obj: &unstructured.Unstructured{}}
appProtectConfiguration.Policies["testing/test2"] = &PolicyEx{IsValid: false, Obj: &unstructured.Unstructured{}, ErrorMsg: "Validation Failed"}
appProtectConfiguration.Policies["testing/test2"] = &PolicyEx{IsValid: false, Obj: &unstructured.Unstructured{}, ErrorMsg: "validation failed"}
appProtectConfiguration.LogConfs["testing/test1"] = &LogConfEx{IsValid: true, Obj: &unstructured.Unstructured{}}
appProtectConfiguration.LogConfs["testing/test2"] = &LogConfEx{IsValid: false, Obj: &unstructured.Unstructured{}, ErrorMsg: "Validation Failed"}
appProtectConfiguration.LogConfs["testing/test2"] = &LogConfEx{IsValid: false, Obj: &unstructured.Unstructured{}, ErrorMsg: "validation failed"}
appProtectConfiguration.UserSigs["testing/test1"] = &UserSigEx{IsValid: true, Obj: &unstructured.Unstructured{}}
appProtectConfiguration.UserSigs["testing/test2"] = &UserSigEx{IsValid: false, Obj: &unstructured.Unstructured{}, ErrorMsg: "Validation Failed"}
appProtectConfiguration.UserSigs["testing/test2"] = &UserSigEx{IsValid: false, Obj: &unstructured.Unstructured{}, ErrorMsg: "validation failed"}

for _, test := range tests {
_, err := appProtectConfiguration.GetAppResource(test.kind, test.key)
Expand Down
Loading