Skip to content

Commit b1012ad

Browse files
Balijepalli Vamshi KrishnaBalijepalli Vamshi Krishna
authored andcommitted
add name changes to variables
1 parent 59f33da commit b1012ad

File tree

4 files changed

+10
-9
lines changed

4 files changed

+10
-9
lines changed

remediation/workflow/secureworkflow.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ func SecureWorkflow(queryStringParams map[string]string, inputYaml string, svc d
2121
pinActions, addHardenRunner, addPermissions, addProjectComment, replaceMaintainedActions := true, true, true, true, false
2222
pinnedActions, addedHardenRunner, addedPermissions, replacedMaintainedActions := false, false, false, false
2323
ignoreMissingKBs := false
24-
enableLogging := false
25-
exemptedActions, pinToImmutable, customerMaintainedActions := []string{}, false, map[string]string{}
24+
enableLogging := false
25+
exemptedActions, pinToImmutable, maintainedActionsMap := []string{}, false, map[string]string{}
2626

2727
if len(params) > 0 {
2828
if v, ok := params[0].([]string); ok {
@@ -36,7 +36,7 @@ func SecureWorkflow(queryStringParams map[string]string, inputYaml string, svc d
3636
}
3737
if len(params) > 2 {
3838
if v, ok := params[2].(map[string]string); ok {
39-
customerMaintainedActions = v
39+
maintainedActionsMap = v
4040
}
4141
}
4242

@@ -60,9 +60,10 @@ func SecureWorkflow(queryStringParams map[string]string, inputYaml string, svc d
6060
addProjectComment = false
6161
}
6262

63-
if len(customerMaintainedActions) > 0 {
63+
if len(maintainedActionsMap) > 0 {
6464
replaceMaintainedActions = true
65-
65+
}
66+
6667
if queryStringParams["enableLogging"] == "true" {
6768
enableLogging = true
6869
}
@@ -120,7 +121,7 @@ func SecureWorkflow(queryStringParams map[string]string, inputYaml string, svc d
120121
}
121122

122123
if replaceMaintainedActions {
123-
secureWorkflowReponse.FinalOutput, replacedMaintainedActions, err = maintainedactions.ReplaceActions(secureWorkflowReponse.FinalOutput, customerMaintainedActions)
124+
secureWorkflowReponse.FinalOutput, replacedMaintainedActions, err = maintainedactions.ReplaceActions(secureWorkflowReponse.FinalOutput, maintainedActionsMap)
124125
if err != nil {
125126
secureWorkflowReponse.HasErrors = true
126127
}

remediation/workflow/secureworkflow_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ func TestSecureWorkflow(t *testing.T) {
193193
wantAddedPermissions bool
194194
wantAddedMaintainedActions bool
195195
}{
196-
{fileName: "oneJob.yml", wantPinnedActions: true, wantAddedHardenRunner: true, wantAddedPermissions: false, wantAddedMaintainedActions: true},
196+
{fileName: "replaceactions.yml", wantPinnedActions: true, wantAddedHardenRunner: true, wantAddedPermissions: false, wantAddedMaintainedActions: true},
197197
{fileName: "allscenarios.yml", wantPinnedActions: true, wantAddedHardenRunner: true, wantAddedPermissions: true},
198198
{fileName: "missingaction.yml", wantPinnedActions: true, wantAddedHardenRunner: true, wantAddedPermissions: false},
199199
{fileName: "nohardenrunner.yml", wantPinnedActions: true, wantAddedHardenRunner: false, wantAddedPermissions: true},
@@ -228,7 +228,7 @@ func TestSecureWorkflow(t *testing.T) {
228228
case "multiplejobperms.yml":
229229
queryParams["addHardenRunner"] = "false"
230230
queryParams["pinActions"] = "false"
231-
case "oneJob.yml":
231+
case "replaceactions.yml":
232232
queryParams["addMaintainedActions"] = "true"
233233
queryParams["addHardenRunner"] = "true"
234234
queryParams["pinActions"] = "true"
@@ -238,7 +238,7 @@ func TestSecureWorkflow(t *testing.T) {
238238

239239
var output *permissions.SecureWorkflowReponse
240240
var actionMap map[string]string
241-
if test.fileName == "oneJob.yml" {
241+
if test.fileName == "replaceactions.yml" {
242242
actionMap, err = maintainedactions.LoadMaintainedActions("maintainedactions/maintainedActions.json")
243243
if err != nil {
244244
t.Errorf("unable to load the file %s", err)

0 commit comments

Comments
 (0)