diff --git a/solution/deps.yaml b/solution/deps.yaml index 55f89175eb..3cbfd90c3e 100644 --- a/solution/deps.yaml +++ b/solution/deps.yaml @@ -13,10 +13,10 @@ busybox: tag: 1.36.1 envsubst: BUSYBOX_TAG cloudserver: - sourceRegistry: ghcr.io/scality + sourceRegistry: ghcr.io/scality/playground/wlardier dashboard: cloudserver/cloudserver-dashboards image: cloudserver - tag: 8.8.36 + tag: 8.8.1061 envsubst: CLOUDSERVER_TAG drctl: sourceRegistry: ghcr.io/scality @@ -103,10 +103,10 @@ s3utils: tag: 1.14.14 envsubst: S3UTILS_TAG scuba: - sourceRegistry: ghcr.io/scality + sourceRegistry: ghcr.io/scality/playground/wlardier dashboard: scuba/scuba-dashboards image: scuba - tag: 1.0.8 + tag: 1.0.54 envsubst: SCUBA_TAG sorbet: sourceRegistry: ghcr.io/scality diff --git a/tests/ctst/features/quotas/Quotas.feature b/tests/ctst/features/quotas/Quotas.feature index e9de9ba341..8fca68a8c0 100644 --- a/tests/ctst/features/quotas/Quotas.feature +++ b/tests/ctst/features/quotas/Quotas.feature @@ -96,3 +96,43 @@ Feature: Quota Management for APIs | 100 | 200 | 0 | IAM_USER | | 100 | 0 | 200 | IAM_USER | | 100 | 200 | 200 | IAM_USER | + + @2.6.0 + @PreMerge + @Quotas + @CronJob + @DataDeletion + @NonVersioned + Scenario Outline: Quotas are affected by deletion operations between count items runs + Given an action "DeleteObject" + And a permission to perform the "PutObject" action + And a STORAGE_MANAGER type + And a bucket quota set to 10000 B + And an account quota set to 10000 B + And an upload size of 1000 B for the object "obj-1" + And a bucket quota set to B + And an account quota set to B + And a type + And an environment setup for the API + And an "existing" IAM Policy that "applies" with "ALLOW" effect for the current API + When I wait 3 seconds + And I PUT an object with size + Then the API should "fail" with "QuotaExceeded" + When the "count-items" cronjobs completes without error + When I wait 3 seconds + # At this point if negative inflights are not supported, write should + # not be possible, as the previous inflights are now part of the current + # metrics. + And i delete object "obj-1" + And I wait 3 seconds + And I PUT an object with size + Then the API should "succeed" with "" + + Examples: + | uploadSize | bucketQuota | accountQuota | userType | + | 100 | 200 | 0 | ACCOUNT | + | 100 | 0 | 200 | ACCOUNT | + | 100 | 200 | 200 | ACCOUNT | + | 100 | 200 | 0 | IAM_USER | + | 100 | 0 | 200 | IAM_USER | + | 100 | 200 | 200 | IAM_USER |