ZKUI-370: disable versioning on bucket that create on azure blob location #618

ChengYanJin · 2023-07-06T14:41:02Z

replace Toggle by Checkbox in the create bucket screen.

Disable the versioning in Bucket Overview Tab.

…Cloud Storage

bert-e · 2023-07-06T14:41:05Z

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 · 2023-07-06T14:41:10Z

Incorrect fix version

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

None

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

1.6.16
2.0.11
2.1.0

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

codecov-commenter · 2023-07-06T14:49:35Z

Codecov Report

Merging #618 (d101909) into development/1.6 (4d15af0) will increase coverage by 0.40%.
The diff coverage is 96.66%.

@@                 Coverage Diff                 @@
##           development/1.6     #618      +/-   ##
===================================================
+ Coverage            54.11%   54.52%   +0.40%     
===================================================
  Files                  218      218              
  Lines                10440    10445       +5     
  Branches              2922     2934      +12     
===================================================
+ Hits                  5650     5695      +45     
+ Misses                4770     4730      -40     
  Partials                20       20

Impacted Files	Coverage Δ
src/react/databrowser/buckets/BucketCreate.tsx	`77.86% <95.65%> (+7.95%)`	⬆️
...atabrowser/buckets/ObjectLockRetentionSettings.tsx	`96.42% <100.00%> (-0.45%)`	⬇️

... and 7 files with indirect coverage changes

JBWatenbergScality · 2023-07-13T07:49:07Z

src/react/databrowser/buckets/details/Overview.tsx

+                        isBucketHostedOnAzureOrGCP ? (
+                          <>
+                            Enabling versioning is not possible due to the
+                            bucket being hosted on Azure or Google Cloud.


Nit: We can probably say on azure for azure hosted buckets and on Google Cloud for the google hosted ones

bert-e · 2023-07-13T09:03:08Z

Conflict

A conflict has been raised during the creation of
integration branch w/2.1/bugfix/ZKUI-370-disable-versioning-on-bucket-that-create-on-azure-blob-location with contents from w/2.0/bugfix/ZKUI-370-disable-versioning-on-bucket-that-create-on-azure-blob-location
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-370-disable-versioning-on-bucket-that-create-on-azure-blob-location origin/development/2.1
 $ git merge origin/w/2.0/bugfix/ZKUI-370-disable-versioning-on-bucket-that-create-on-azure-blob-location
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/2.1/bugfix/ZKUI-370-disable-versioning-on-bucket-that-create-on-azure-blob-location

bert-e · 2023-07-13T09:06:56Z

History mismatch

Merge commit #46c5e3f7baa4401a1bb68fb7ba7ba1258df94489 on the integration branch
w/2.0/bugfix/ZKUI-370-disable-versioning-on-bucket-that-create-on-azure-blob-location is merging a branch which is neither the current
branch bugfix/ZKUI-370-disable-versioning-on-bucket-that-create-on-azure-blob-location nor the development branch
development/2.0.

It is likely due to a rebase of the branch bugfix/ZKUI-370-disable-versioning-on-bucket-that-create-on-azure-blob-location and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

ChengYanJin · 2023-07-13T09:07:19Z

/reset

bert-e · 2023-07-13T09:07:26Z

Reset complete

I have successfully deleted this pull request's integration branches.

bert-e · 2023-07-13T09:07:36Z

Conflict

A conflict has been raised during the creation of
integration branch w/2.1/bugfix/ZKUI-370-disable-versioning-on-bucket-that-create-on-azure-blob-location with contents from w/2.0/bugfix/ZKUI-370-disable-versioning-on-bucket-that-create-on-azure-blob-location
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-370-disable-versioning-on-bucket-that-create-on-azure-blob-location origin/development/2.1
 $ git merge origin/w/2.0/bugfix/ZKUI-370-disable-versioning-on-bucket-that-create-on-azure-blob-location
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/2.1/bugfix/ZKUI-370-disable-versioning-on-bucket-that-create-on-azure-blob-location

…ure or GCP

bert-e · 2023-07-13T09:39:07Z

History mismatch

Merge commit #0f78d6f78e6d2129da088d8a85b8581c676848f8 on the integration branch
w/2.0/bugfix/ZKUI-370-disable-versioning-on-bucket-that-create-on-azure-blob-location is merging a branch which is neither the current
branch bugfix/ZKUI-370-disable-versioning-on-bucket-that-create-on-azure-blob-location nor the development branch
development/2.0.

It is likely due to a rebase of the branch bugfix/ZKUI-370-disable-versioning-on-bucket-that-create-on-azure-blob-location and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

JBWatenbergScality · 2023-07-13T09:43:39Z

/reset

bert-e · 2023-07-13T09:43:46Z

Reset complete

I have successfully deleted this pull request's integration branches.

bert-e · 2023-07-13T09:43:56Z

Conflict

A conflict has been raised during the creation of
integration branch w/2.1/bugfix/ZKUI-370-disable-versioning-on-bucket-that-create-on-azure-blob-location with contents from w/2.0/bugfix/ZKUI-370-disable-versioning-on-bucket-that-create-on-azure-blob-location
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-370-disable-versioning-on-bucket-that-create-on-azure-blob-location origin/development/2.1
 $ git merge origin/w/2.0/bugfix/ZKUI-370-disable-versioning-on-bucket-that-create-on-azure-blob-location
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/2.1/bugfix/ZKUI-370-disable-versioning-on-bucket-that-create-on-azure-blob-location

ChengYanJin · 2023-07-13T09:51:25Z

/status

bert-e · 2023-07-13T09:51:29Z

Status

Status report is not available.

bert-e · 2023-07-13T09:51:40Z

Waiting for approval

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

the author
one peer

Peer approvals must include at least 1 approval from the following list:

ChengYanJin · 2023-07-13T09:51:59Z

/approve

JBWatenbergScality

LGTM !!

bert-e · 2023-07-13T09:53:10Z

Build failed

The build for commit did not succeed in branch w/2.0/bugfix/ZKUI-370-disable-versioning-on-bucket-that-create-on-azure-blob-location.

The following options are set: approve

bert-e · 2023-07-13T10:02:45Z

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 · 2023-07-13T10:02:57Z

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

Goodbye chengyanjin.

ZKUI-370: Disable the versioning for Microsoft Azure Blob and Google …

e6e7360

…Cloud Storage

ChengYanJin force-pushed the bugfix/ZKUI-370-disable-versioning-on-bucket-that-create-on-azure-blob-location branch 3 times, most recently from c264e7e to 9b3b200 Compare July 7, 2023 09:10

ZKUI-370: Fix the object-lock can not toggle off after toggling on

7d03caa

ChengYanJin force-pushed the bugfix/ZKUI-370-disable-versioning-on-bucket-that-create-on-azure-blob-location branch 2 times, most recently from ef9bcf1 to a027370 Compare July 11, 2023 13:29

ChengYanJin added 2 commits July 11, 2023 15:32

ZKUI-370: Replace Toggle by Checkbox and refactor the testing

a83a4c7

ZKUI-370: update core-ui to 0.89.0

e89956b

ChengYanJin force-pushed the bugfix/ZKUI-370-disable-versioning-on-bucket-that-create-on-azure-blob-location branch 2 times, most recently from e6b80b6 to 1a81865 Compare July 12, 2023 14:59

ZKUI-370: Refactor the test for objectlock retention setting

d101909

ChengYanJin force-pushed the bugfix/ZKUI-370-disable-versioning-on-bucket-that-create-on-azure-blob-location branch from 1a81865 to d101909 Compare July 12, 2023 15:30

ChengYanJin requested a review from JBWatenbergScality July 12, 2023 15:43

JBWatenbergScality reviewed Jul 13, 2023

View reviewed changes

ChengYanJin force-pushed the bugfix/ZKUI-370-disable-versioning-on-bucket-that-create-on-azure-blob-location branch 2 times, most recently from 4e75df1 to 46c5e3f Compare July 13, 2023 08:54

ChengYanJin force-pushed the bugfix/ZKUI-370-disable-versioning-on-bucket-that-create-on-azure-blob-location branch from 46c5e3f to 0f78d6f Compare July 13, 2023 09:06

ZKUI-370: Unable to enable the versioning for the bucket hosted on Az…

000b959

…ure or GCP

ChengYanJin force-pushed the bugfix/ZKUI-370-disable-versioning-on-bucket-that-create-on-azure-blob-location branch from 0f78d6f to 000b959 Compare July 13, 2023 09:39

scality deleted a comment from bert-e Jul 13, 2023

JBWatenbergScality approved these changes Jul 13, 2023

View reviewed changes

bert-e merged commit 000b959 into development/1.6 Jul 13, 2023

bert-e deleted the bugfix/ZKUI-370-disable-versioning-on-bucket-that-create-on-azure-blob-location branch July 13, 2023 10:03

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ZKUI-370: disable versioning on bucket that create on azure blob location #618

ZKUI-370: disable versioning on bucket that create on azure blob location #618

ChengYanJin commented Jul 6, 2023 •

edited

Loading

bert-e commented Jul 6, 2023

bert-e commented Jul 6, 2023

codecov-commenter commented Jul 6, 2023 •

edited

Loading

JBWatenbergScality Jul 13, 2023

bert-e commented Jul 13, 2023

bert-e commented Jul 13, 2023

ChengYanJin commented Jul 13, 2023

bert-e commented Jul 13, 2023

bert-e commented Jul 13, 2023

bert-e commented Jul 13, 2023

JBWatenbergScality commented Jul 13, 2023

bert-e commented Jul 13, 2023

bert-e commented Jul 13, 2023

ChengYanJin commented Jul 13, 2023

bert-e commented Jul 13, 2023

bert-e commented Jul 13, 2023

ChengYanJin commented Jul 13, 2023

JBWatenbergScality left a comment

bert-e commented Jul 13, 2023

bert-e commented Jul 13, 2023

bert-e commented Jul 13, 2023

ZKUI-370: disable versioning on bucket that create on azure blob location #618

ZKUI-370: disable versioning on bucket that create on azure blob location #618

Conversation

ChengYanJin commented Jul 6, 2023 • edited Loading

bert-e commented Jul 6, 2023

Hello chengyanjin,

bert-e commented Jul 6, 2023

Incorrect fix version

codecov-commenter commented Jul 6, 2023 • edited Loading

Codecov Report

JBWatenbergScality Jul 13, 2023

Choose a reason for hiding this comment

bert-e commented Jul 13, 2023

Conflict

bert-e commented Jul 13, 2023

History mismatch

ChengYanJin commented Jul 13, 2023

bert-e commented Jul 13, 2023

Reset complete

bert-e commented Jul 13, 2023

Conflict

bert-e commented Jul 13, 2023

History mismatch

JBWatenbergScality commented Jul 13, 2023

bert-e commented Jul 13, 2023

Reset complete

bert-e commented Jul 13, 2023

Conflict

ChengYanJin commented Jul 13, 2023

bert-e commented Jul 13, 2023

Status

bert-e commented Jul 13, 2023

Waiting for approval

ChengYanJin commented Jul 13, 2023

JBWatenbergScality left a comment

Choose a reason for hiding this comment

bert-e commented Jul 13, 2023

Build failed

bert-e commented Jul 13, 2023

In the queue

bert-e commented Jul 13, 2023

ChengYanJin commented Jul 6, 2023 •

edited

Loading

codecov-commenter commented Jul 6, 2023 •

edited

Loading