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 merge conflicts and breaking changes in PR 221 #264

Merged
merged 6 commits into from
Apr 27, 2023

Conversation

cirvine-MSFT
Copy link
Contributor

Manually merging and updating code to accomodate breaking changes introduced in #221

Created UTs for new helper functions
Updated .gitignore for JetBrains tools

How Tested:

Ran UTs
make test

Ran quickstart guide on an AKS Cluster

az login
az account set -s <SubId>
az aks get-credentials -g <RGName> -n <ClusterName>
kubelogin convert-kubeconfig -l azurecli
kubectl get nodes

dependabot bot and others added 6 commits March 8, 2023 00:05
Bumps [github.com/Azure/azure-sdk-for-go/sdk/azidentity](https://github.com/Azure/azure-sdk-for-go) from 1.1.0 to 1.2.2.
- [Release notes](https://github.com/Azure/azure-sdk-for-go/releases)
- [Changelog](https://github.com/Azure/azure-sdk-for-go/blob/sdk/azidentity/v1.2.2/CHANGELOG.md)
- [Commits](Azure/azure-sdk-for-go@v1.1...sdk/azidentity/v1.2.2)

---
updated-dependencies:
- dependency-name: github.com/Azure/azure-sdk-for-go/sdk/azidentity
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
confidential.WithAuthority has been deleted in breaking change.
Making the recommended code changes to pass the authority url as a param.
Created inline callback function that reads token from file
Updated test that is outdated with the change
Moved file read out of callback.
Added smaller functions so I could test edge cases.
Need to add more UTs and comments for new functions.
Copy link
Contributor Author

@cirvine-MSFT cirvine-MSFT left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM @weinong

@codecov-commenter
Copy link

Codecov Report

Merging #264 (8af3c68) into master (b710de8) will increase coverage by 0.04%.
The diff coverage is 29.16%.

@@            Coverage Diff             @@
##           master     #264      +/-   ##
==========================================
+ Coverage   50.13%   50.18%   +0.04%     
==========================================
  Files          15       15              
  Lines        1105     1100       -5     
==========================================
- Hits          554      552       -2     
+ Misses        520      517       -3     
  Partials       31       31              
Impacted Files Coverage Δ
pkg/token/federatedIdentity.go 43.83% <29.16%> (-2.07%) ⬇️

... and 4 files with indirect coverage changes

Copy link
Contributor

@weinong weinong left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@weinong weinong merged commit 401550a into Azure:master Apr 27, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants