Skip to content

Conversation

@aws-toolkit-automation
Copy link
Collaborator

Automatic merge failed

  • Resolve conflicts and push to this PR branch.
  • Do not squash-merge this PR. Use the "Create a merge commit" option to do a regular merge.

Command line hint

To perform the merge from the command line, you could do something like the following (where "origin" is the name of the remote in your local git repo):

git stash
git fetch --all
git checkout origin/feature/cwltail
git merge origin/master
git commit
git push origin HEAD:refs/heads/autoMerge/feature/cwltail

…ogin option for pro tier users (#5858)

## Problem
AmazonQ
- IAM users didn't have access to Q Chat (Free Tier)
- Sagemaker IAM users weren't automatically logged in using their
Sagemaker studio credentials.
- For Sagemaker users, login screen was disabled & users didn't have
access to chat or code completion.
- Sagemaker Pro Tier users code completion was broken & didn't generate
any recommendations even after successful login.
- Q Icon hides from Activity Bar when Toolkit extension is installed

## Solution
- Add new Q Developer Client to enable Free tier chat.
- Terminate all the conditions that used to force chat to get disabled
for IAM users
- Terminate the conditions that used to hide login screen for Sagemaker
users
- Login Sagemaker IAM users automatically using their environment
credentials (Free tier)
- Allow Sagemaker SSO pro tier users to login using the login screen.

---

<!--- REMINDER: Ensure that your PR meets the guidelines in
CONTRIBUTING.md -->

License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.
@github-actions
Copy link

This pull request modifies code in src/ but no tests were added/updated. Confirm whether tests should be added or ensure the PR description explains why tests are not required.

@aws-toolkit-automation aws-toolkit-automation merged commit ffae386 into feature/cwltail Oct 29, 2024
28 of 36 checks passed
@aws-toolkit-automation aws-toolkit-automation deleted the autoMerge/feature/cwltail branch October 29, 2024 12:27
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.

2 participants