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

Feature/osis 74 delete credential #98

Merged
merged 1 commit into from
Aug 18, 2022

Conversation

XinLi0207
Copy link
Contributor

@codecov
Copy link

codecov bot commented Aug 16, 2022

Codecov Report

Merging #98 (d269819) into development/1.1 (f10a754) will increase coverage by 0.17%.
The diff coverage is 83.58%.

❗ Current head d269819 differs from pull request most recent head dcf4ef1. Consider uploading reports for the commit dcf4ef1 to get more accurate results

@@                  Coverage Diff                  @@
##             development/1.1      #98      +/-   ##
=====================================================
+ Coverage              63.23%   63.40%   +0.17%     
- Complexity               398      399       +1     
=====================================================
  Files                     70       70              
  Lines                   2266     2282      +16     
  Branches                 156      157       +1     
=====================================================
+ Hits                    1433     1447      +14     
  Misses                   766      766              
- Partials                  67       69       +2     
Impacted Files Coverage Δ
...m/scality/osis/vaultadmin/impl/VaultAdminImpl.java 78.50% <0.00%> (ø)
...lity/osis/service/impl/ScalityOsisServiceImpl.java 88.15% <84.12%> (-0.02%) ⬇️
.../com/scality/osis/utils/ScalityModelConverter.java 96.75% <100.00%> (ø)

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@XinLi0207 XinLi0207 force-pushed the feature/OSIS-73-update-s3credentials branch from d0678ff to 7c67fc2 Compare August 16, 2022 12:11
@XinLi0207 XinLi0207 force-pushed the feature/OSIS-74-delete-credential branch from e215806 to 513d231 Compare August 16, 2022 12:30
@XinLi0207 XinLi0207 force-pushed the feature/OSIS-73-update-s3credentials branch from 7c67fc2 to 3515b5b Compare August 16, 2022 13:08
@XinLi0207 XinLi0207 force-pushed the feature/OSIS-74-delete-credential branch from 513d231 to d269819 Compare August 16, 2022 14:19
Copy link

@williamlardier williamlardier left a comment

Choose a reason for hiding this comment

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

LGTM

Comment on lines +522 to +525
try {
generateAdminPolicy(tenantId);
deleteS3Credential(tenantId, userId, accessKey);
} catch (Exception ex) {

Choose a reason for hiding this comment

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

Nit: the nested try/catch in the PRs could be avoided to simplify the code (but I agree, this is not the highest priority today 😄 ).

@XinLi0207 XinLi0207 force-pushed the feature/OSIS-73-update-s3credentials branch from 843abc3 to f10a754 Compare August 18, 2022 08:57
Base automatically changed from feature/OSIS-73-update-s3credentials to development/1.1 August 18, 2022 09:05
@bert-e
Copy link
Contributor

bert-e commented Aug 18, 2022

Hello xinliscality,

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 Aug 18, 2022

Conflict

There is a conflict between your branch feature/OSIS-74-delete-credential and the
destination branch development/1.1.

Please resolve the conflict on the feature branch (feature/OSIS-74-delete-credential).

git fetch && \
git checkout origin/feature/OSIS-74-delete-credential && \
git merge origin/development/1.1

Resolve merge conflicts and commit

git push origin HEAD:feature/OSIS-74-delete-credential

@XinLi0207 XinLi0207 force-pushed the feature/OSIS-74-delete-credential branch from d269819 to dcf4ef1 Compare August 18, 2022 09:23
@bert-e
Copy link
Contributor

bert-e commented Aug 18, 2022

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

@XinLi0207
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Aug 18, 2022

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.1

The following branches will NOT be impacted:

  • development/1.0

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 Aug 18, 2022

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

  • ✔️ development/1.1

The following branches have NOT changed:

  • development/1.0

Please check the status of the associated issue OSIS-74.

Goodbye xinliscality.

@bert-e bert-e merged commit dcf4ef1 into development/1.1 Aug 18, 2022
@bert-e bert-e deleted the feature/OSIS-74-delete-credential branch August 18, 2022 09:28
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