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 the page fully reload upon token renewal and assume role after account creation #644

Merged

Conversation

ChengYanJin
Copy link
Contributor

@ChengYanJin ChengYanJin commented Sep 20, 2023

This PR fixed two issues explained below:

  1. Zenko UI gets fully reload upon token renewal is caused by the wrongly added token within queryKey when fetching WebIdentityRoles. However it is totally unnecessary.

  2. After account creation, we switch to the new account so we should assume role again which is missing before, cause the issue that we still load the IAM User/ policy of previous account.

@bert-e
Copy link
Contributor

bert-e commented Sep 20, 2023

Hello chengyanjin,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Sep 20, 2023

Incorrect fix version

The Fix Version/s in issue ZKUI-378 contains:

  • None

Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:

  • 1.6.17

  • 2.0.12

  • 2.1.0

Please check the Fix Version/s of ZKUI-378, or the target
branch of this pull request.

@codecov-commenter
Copy link

Codecov Report

Merging #644 (b6570e0) into development/1.6 (000b959) will increase coverage by 0.18%.
The diff coverage is 70.58%.

@@                 Coverage Diff                 @@
##           development/1.6     #644      +/-   ##
===================================================
+ Coverage            55.45%   55.63%   +0.18%     
===================================================
  Files                  218      218              
  Lines                10454    10457       +3     
  Branches              2942     2939       -3     
===================================================
+ Hits                  5797     5818      +21     
+ Misses                4636     4618      -18     
  Partials                21       21              
Files Changed Coverage Δ
src/react/DataServiceRoleProvider.tsx 36.20% <0.00%> (+1.78%) ⬆️
src/react/utils/hooks.ts 86.29% <ø> (ø)
src/react/account/AccountCreate.tsx 85.29% <100.00%> (+0.44%) ⬆️
src/react/actions/account.ts 46.06% <100.00%> (+16.30%) ⬆️

... and 6 files with indirect coverage changes

Copy link
Contributor

@JBWatenbergScality JBWatenbergScality left a comment

Choose a reason for hiding this comment

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

LGTM !

@bert-e
Copy link
Contributor

bert-e commented Sep 20, 2023

Conflict

A conflict has been raised during the creation of
integration branch w/2.0/bugfix/ZKUI-378-fix-the-bug-of-post-account-create with contents from bugfix/ZKUI-378-fix-the-bug-of-post-account-create
and development/2.0.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/2.0/bugfix/ZKUI-378-fix-the-bug-of-post-account-create origin/development/2.0
 $ git merge origin/bugfix/ZKUI-378-fix-the-bug-of-post-account-create
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/2.0/bugfix/ZKUI-378-fix-the-bug-of-post-account-create

@ChengYanJin
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Sep 20, 2023

Conflict

A conflict has been raised during the creation of
integration branch w/2.1/bugfix/ZKUI-378-fix-the-bug-of-post-account-create with contents from w/2.0/bugfix/ZKUI-378-fix-the-bug-of-post-account-create
and development/2.1.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/2.1/bugfix/ZKUI-378-fix-the-bug-of-post-account-create origin/development/2.1
 $ git merge origin/w/2.0/bugfix/ZKUI-378-fix-the-bug-of-post-account-create
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/2.1/bugfix/ZKUI-378-fix-the-bug-of-post-account-create

The following options are set: approve

@ChengYanJin
Copy link
Contributor Author

/status

@bert-e
Copy link
Contributor

bert-e commented Sep 20, 2023

Status

Status report is not available.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Sep 20, 2023

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

  • ✔️ development/1.6

  • ✔️ development/2.0

  • ✔️ development/2.1

The following branches will NOT be impacted:

  • development/1.4
  • development/1.5

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

  • Any commit you add on the source branch will trigger a new cycle after the
    current queue is merged.
  • Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Sep 20, 2023

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/1.6

  • ✔️ development/2.0

  • ✔️ development/2.1

The following branches have NOT changed:

  • development/1.4
  • development/1.5

Please check the status of the associated issue ZKUI-378.

Goodbye chengyanjin.

@bert-e bert-e merged commit b6570e0 into development/1.6 Sep 20, 2023
@bert-e bert-e deleted the bugfix/ZKUI-378-fix-the-bug-of-post-account-create branch September 20, 2023 14:07
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.

4 participants