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

sort sso profiles by profile name #733

Merged
merged 4 commits into from
Sep 19, 2024
Merged

sort sso profiles by profile name #733

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b62538d
sort sso profiles by profile name
shwethaumashanker Aug 13, 2024
df2f477
Fix lint errors
JoshuaWilkes Sep 18, 2024
badf74a
Merge branch 'main' into sort-sso-profiles-by-profile-name
JoshuaWilkes Sep 18, 2024
684681a
Update pkg/granted/completion.go
JoshuaWilkes Sep 18, 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
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ require (
github.com/aws/aws-sdk-go-v2/service/iam v1.28.7
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.7 // indirect
github.com/aws/smithy-go v1.20.2
github.com/common-fate/awsconfigfile v0.9.0
github.com/common-fate/awsconfigfile v0.10.0
github.com/common-fate/useragent v0.1.0
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
github.com/danieljoos/wincred v1.1.2 // indirect
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@ github.com/common-fate/apikit v0.4.0 h1:d3ZYWg4CPBte6gIyiNM2MFuqn7Pg24RdYlB6Tz25
github.com/common-fate/apikit v0.4.0/go.mod h1:5WXBU3NBnQ6ZuqQyazwL5Ou6yT7UpC8c3yK8F9mGh9k=
github.com/common-fate/awsconfigfile v0.9.0 h1:eP5UGdX/kUqubnp1OM+78n/ssuuu2xMjztUZMwR7xPI=
github.com/common-fate/awsconfigfile v0.9.0/go.mod h1:4g8kxy1vcf2hn6N5Zmaz+nfc7xQ66uWSb5dsm2ZCa6s=
github.com/common-fate/awsconfigfile v0.10.0 h1:9W0JTeO0d3jNLw3Ps9U7IJwLYp4D9zcipq/sqNEWJOg=
github.com/common-fate/awsconfigfile v0.10.0/go.mod h1:znstvN26aO+KUwmdjwZ+WcmitZ7heEJb5iFdCPokAO8=
github.com/common-fate/cli v1.8.0 h1:T3I+NCMTyvIlZC8QK9qfmsZWj3eSDSZRPHQlM5KJ8Q4=
github.com/common-fate/cli v1.8.0/go.mod h1:fE4jNXj30AvqFvBMTHIDuoI/IahN1h8iRrjEE2n2Td0=
github.com/common-fate/clio v1.2.3 h1:hHwUYZjn66qGYDpgANl0EB/92hyi/Jsnd07qB09rvn4=
Expand Down
3 changes: 3 additions & 0 deletions pkg/granted/completion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,10 @@
// Try to create a file
err := os.WriteFile(executableDir, []byte(combinedOutput), 0600)
if err != nil {
<<<<<<< sort-sso-profiles-by-profile-name

Check failure on line 72 in pkg/granted/completion.go

View workflow job for this annotation

GitHub Actions / Unit Tests 

syntax error: unexpected <<, expected }

Check failure on line 72 in pkg/granted/completion.go

View workflow job for this annotation

GitHub Actions / Go Lint 

syntax error: unexpected <<, expected }

Check failure on line 72 in pkg/granted/completion.go

View workflow job for this annotation

GitHub Actions / Go Lint 

expected statement, found '<<' (typecheck)

Check failure on line 72 in pkg/granted/completion.go

View workflow job for this annotation

GitHub Actions / Go Lint 

syntax error: unexpected <<, expected }
=======

Check failure on line 73 in pkg/granted/completion.go

View workflow job for this annotation

GitHub Actions / Unit Tests 

syntax error: unexpected ==, expected }

Check failure on line 73 in pkg/granted/completion.go

View workflow job for this annotation

GitHub Actions / Go Lint 

syntax error: unexpected ==, expected } (typecheck)

Check failure on line 73 in pkg/granted/completion.go

View workflow job for this annotation

GitHub Actions / Go Lint 

syntax error: unexpected ==, expected }) (typecheck)

>>>>>>> main
return fmt.Errorf("something went wrong when saving fish autocompletions: %s", err.Error())
}
clio.Success("Fish autocompletions generated successfully")
Expand Down
Loading