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

Jump to bottom

Fix issue with Azure Pipelines PAT Auth #3160

Merged
merged 13 commits into from
Jun 29, 2022
Merged

Fix issue with Azure Pipelines PAT Auth #3160

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
7dcaff4
Fix issue with Azure Pipelines PAT Auth
raravena80 Jun 12, 2022
54d2a69
Move to TrimSuffix to metadata parsing section
raravena80 Jun 15, 2022
ea0b6a2
Update CHANGELOG.md with fixes for #3159
raravena80 Jun 15, 2022
b10d4c0
Minor fix to meta variable
raravena80 Jun 15, 2022
1606902
tab vs spaces.
raravena80 Jun 15, 2022
a5dd83b
Remove extra line for SetBasicAuth
raravena80 Jun 16, 2022
8e5a803
Add test with PAT having a newline
raravena80 Jun 16, 2022
e574919
Update azure_pipelines_scaler_test.go
raravena80 Jun 27, 2022
4654a35
Update azure_pipelines_scaler_test.go
raravena80 Jun 28, 2022
aeb85fa
Update azure_pipelines_scaler_test.go
raravena80 Jun 28, 2022
89cfbd0
Merge branch 'main' into patch-1
raravena80 Jun 28, 2022
6dc2793
Update azure_pipelines_scaler_test.go
raravena80 Jun 28, 2022
cad3d60
Update CHANGELOG.md
raravena80 Jun 29, 2022
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ To learn more about our roadmap, we recommend reading [this document](ROADMAP.md
- **General:** Refactor adapter startup to ensure proper log initilization. ([2316](https://github.com/kedacore/keda/issues/2316))
- **Azure Eventhub Scaler:** KEDA operator crashes on nil memory panic if the eventhub connectionstring for Azure Eventhub Scaler contains an invalid character ([#3082](https://github.com/kedacore/keda/issues/3082))
- **General:** Scaleobject ready condition 'False/Unknow' to 'True' requeue([#3096](https://github.com/kedacore/keda/issues/3096))
- **Azure Pipelines Scaler:** Fix issue with Azure Pipelines wrong PAT Auth. ([#3159](https://github.com/kedacore/keda/issues/3159))

### Deprecations

Expand Down
4 changes: 3 additions & 1 deletion pkg/scalers/azure_pipelines_scaler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,8 @@ func parseAzurePipelinesMetadata(ctx context.Context, config *ScalerConfig, http
}
}

// Trim any trailing new lines from the Azure Pipelines PAT
meta.personalAccessToken = strings.TrimSuffix(meta.personalAccessToken, "\n")
meta.scalerIndex = config.ScalerIndex

return &meta, nil
Expand Down Expand Up @@ -178,7 +180,7 @@ func getAzurePipelineRequest(ctx context.Context, url string, metadata *azurePip
return []byte{}, err
}

req.SetBasicAuth("PAT", metadata.personalAccessToken)
req.SetBasicAuth("", metadata.personalAccessToken)

r, err := httpClient.Do(req)
if err != nil {
Expand Down
2 changes: 2 additions & 0 deletions pkg/scalers/azure_pipelines_scaler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ var testAzurePipelinesMetadata = []parseAzurePipelinesMetadataTestData{
{"all properly formed", map[string]string{"organizationURLFromEnv": "AZP_URL", "personalAccessTokenFromEnv": "AZP_TOKEN", "poolID": "1", "targetPipelinesQueueLength": "1"}, false, testAzurePipelinesResolvedEnv, map[string]string{}},
// using triggerAuthentication
{"using triggerAuthentication", map[string]string{"poolID": "1", "targetPipelinesQueueLength": "1"}, false, testAzurePipelinesResolvedEnv, map[string]string{"organizationURL": "https://dev.azure.com/sample", "personalAccessToken": "sample"}},
// using triggerAuthentication with personalAccessToken terminating in newline
{"using triggerAuthentication with personalAccessToken terminating in newline", map[string]string{"poolID": "1", "targetPipelinesQueueLength": "1"}, false, testAzurePipelinesResolvedEnv, map[string]string{"organizationURL": "https://dev.azure.com/sample", "personalAccessToken": "sample\n"}},
JorTurFer marked this conversation as resolved.
Show resolved Hide resolved
// missing organizationURL
{"missing organizationURL", map[string]string{"organizationURLFromEnv": "", "personalAccessTokenFromEnv": "sample", "poolID": "1", "targetPipelinesQueueLength": "1"}, true, testAzurePipelinesResolvedEnv, map[string]string{}},
// missing personalAccessToken
Expand Down