Skip to content

Ensure no duplicate storage alert on usage quota page

What does this MR do?

Related to #247846

No changelog since this is behind the additional_repo_storage_by_namespace feature flag.

We've got a storage alert that fires on group&project pages. We've also got an inline alert on the Usage Quota page; for example http://localhost:3000/groups/over-purchased-limit/-/usage_quotas#storage-quota-tab

There's a lot of repeated information, and if a project reaches the 10GB limit, there's a lot of red danger on the page.

We opt for not showing the group&project alert on the Usage Quota page to reduce this overflow.

Screenshots (strongly suggested)

Before After
Screenshot_2020-10-21_at_12.08.07 Screenshot_2020-10-21_at_12.07.34

Testing this locally

Requires EE edition

Paste the following in your Rails console.

# Match the 10GB limit on GitLab.com, enable application setting
ApplicationSettings::UpdateService.new(Gitlab::CurrentSettings.current_application_settings, nil, { repository_size_limit: 10240, automatic_purchased_storage_allocation: true }).execute

ACCESS_LEVEL_OWNER = 50
PACKAGE_SIZE_IN_MIB = 10240

def create_group_with_usage_and_additional_storage(owner, group_name, nr_of_packs_purchased, usage)
  group = Group.create(name: group_name, path: group_name, type: 'Group')
  GroupMember.add_user(group, owner, ACCESS_LEVEL_OWNER)
  project = ::Projects::CreateService.new(owner, { namespace_id: group.id, name: 'project-' + group_name, path: 'project-' + group_name }).execute

  group.additional_purchased_storage_size = nr_of_packs_purchased * PACKAGE_SIZE_IN_MIB
  group.save!

  project.statistics&.destroy!

  project_statistics = ProjectStatistics.new(
    project_id: project.id,
    namespace_id: group.id,
    commit_count: 12,
    repository_size: usage * 3 / 5,
    lfs_objects_size: usage * 2 / 5
  )

  project_statistics.save!
end

root_user = User.where(username: 'root').first

create_group_with_usage_and_additional_storage(root_user, 'over-free-limit', 0, 20.gigabytes)
create_group_with_usage_and_additional_storage(root_user, 'under-free-limit-no-purchase', 0, 8.gigabytes)
create_group_with_usage_and_additional_storage(root_user, 'over-purchased-limit', 1, 30.gigabytes)
create_group_with_usage_and_additional_storage(root_user, 'warning-with-purchase', 1, 17.gigabytes)
create_group_with_usage_and_additional_storage(root_user, 'under-free-limit-with-purchase', 1, 5.gigabytes)

Navigate to http://localhost:3000/groups/over-purchased-limit/-/usage_quotas#storage-quota-tab

Does this MR meet the acceptance criteria?

Conformity

Availability and Testing

Security

If this MR contains changes to processing or storing of credentials or tokens, authorization and authentication methods and other items described in the security review guidelines:

  • Label as security and @ mention @gitlab-com/gl-security/appsec
  • The MR includes necessary changes to maintain consistency between UI, API, email, or other methods
  • Security reports checked/validated by a reviewer from the AppSec team
Edited by Mark Chao

Merge request reports