Merge branch '323418-verify-and-validate-your-terraform-modules-in-the-ui' into 'master'

Add Infrastructure Registry sidebar entry [RUN ALL RSPEC] [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!57338

app/assets/javascripts/pages/projects/packages/infrastructure_registry/index/index.js

+import initPackageList from '~/packages/list/packages_list_app_bundle';
+
+initPackageList();

app/controllers/projects/packages/infrastructure_registry_controller.rb

+# frozen_string_literal: true
+
+module Projects
+  module Packages
+    class InfrastructureRegistryController < Projects::ApplicationController
+      feature_category :infrastructure_as_code
+    end
+  end
+end

app/helpers/projects_helper.rb

@@ -410,6 +410,10 @@ module ProjectsHelper
       nav_tabs << :container_registry
     end
 
+    if Feature.enabled?(:infrastructure_registry_page)
+      nav_tabs << :infrastructure_registry
+    end
+
     # Pipelines feature is tied to presence of builds
     if can?(current_user, :read_build, project)
       nav_tabs << :pipelines

app/views/layouts/nav/sidebar/_project_packages_link.html.haml

 - packages_link = project_nav_tab?(:packages) ? project_packages_path(@project) : project_container_registry_index_path(@project)
 
 - if (project_nav_tab?(:packages) || project_nav_tab?(:container_registry))
-  = nav_link controller: [:packages, :repositories] do
+  = nav_link controller: [:packages, :repositories, :infrastructure_registry] do
     = link_to packages_link, data: { qa_selector: 'packages_link' } do
       .nav-icon-container
         = sprite_icon('package')
       %span.nav-item-name
         = _('Packages & Registries')
     %ul.sidebar-sub-level-items
-      = nav_link(controller: [:packages, :repositories], html_options: { class: "fly-out-top-item" } ) do
+      = nav_link(controller: [:packages, :repositories, :infrastructure_registry], html_options: { class: "fly-out-top-item" } ) do
         = link_to packages_link do
           %strong.fly-out-top-item-name
             = _('Packages & Registries')
@@ -21,3 +21,7 @@
         = nav_link controller: :repositories do
           = link_to project_container_registry_index_path(@project), class: 'shortcuts-container-registry', title: _('Container Registry') do
             %span= _('Container Registry')
+      - if project_nav_tab? :infrastructure_registry
+        = nav_link controller: :infrastructure_registry do
+          = link_to project_infrastructure_registry_index_path(@project), title: _('Infrastructure Registry') do
+            %span= _('Infrastructure Registry')

app/views/projects/packages/infrastructure_registry/index.html.haml

+- page_title _("Infrastructure Registry")
+- @content_class = "limit-container-width" unless fluid_layout
+
+.row
+  .col-12
+    #js-vue-packages-list{ data: { resource_id: @project.id,
+      page_type: 'project',
+      empty_list_help_url: help_page_path('user/packages/package_registry/index'),
+      empty_list_illustration: image_path('illustrations/no-packages.svg'),
+      package_help_url: help_page_path('user/packages/index') } }

config/feature_flags/development/infrastructure_registry_page.yml

+---
+name: infrastructure_registry_page
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57338
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/326460
+milestone: '13.11'
+type: development
+group: group::package
+default_enabled: false

config/routes/project.rb

@@ -50,6 +50,8 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
           end
         end
 
+        resources :infrastructure_registry, only: [:index], module: :packages
+
         resources :jobs, only: [:index, :show], constraints: { id: /\d+/ } do
           collection do
             resources :artifacts, only: [] do

ee/spec/features/projects/navbar_spec.rb

@@ -12,6 +12,8 @@ RSpec.describe 'Project navbar' do
 
   before do
     insert_package_nav(_('Operations'))
+    insert_infrastructure_registry_nav
+    stub_config(registry: { enabled: false })
 
     project.add_maintainer(user)
     sign_in(user)
@@ -67,11 +69,7 @@ RSpec.describe 'Project navbar' do
       before do
         stub_config(registry: { enabled: true })
 
-        insert_after_sub_nav_item(
-          _('Package Registry'),
-          within: _('Packages & Registries'),
-          new_sub_nav_item_name: _('Container Registry')
-        )
+        insert_container_nav
 
         visit project_path(project)
       end

locale/gitlab.pot

@@ -16572,6 +16572,9 @@ msgstr ""
 msgid "Information about additional Pages templates and how to install them can be found in our %{pages_getting_started_guide}."
 msgstr ""
 
+msgid "Infrastructure Registry"
+msgstr ""
+
 msgid "Inherited"
 msgstr ""
 

spec/features/groups/navbar_spec.rb

@@ -68,7 +68,7 @@ RSpec.describe 'Group navbar' do
     before do
       stub_config(registry: { enabled: true })
 
-      insert_container_nav(_('Kubernetes'))
+      insert_container_nav
 
       visit group_path(group)
     end
@@ -80,7 +80,7 @@ RSpec.describe 'Group navbar' do
     before do
       stub_config(dependency_proxy: { enabled: true })
 
-      insert_dependency_proxy_nav(_('Dependency Proxy'))
+      insert_dependency_proxy_nav
 
       visit group_path(group)
     end

spec/features/projects/navbar_spec.rb

@@ -13,6 +13,8 @@ RSpec.describe 'Project navbar' do
 
   before do
     insert_package_nav(_('Operations'))
+    insert_infrastructure_registry_nav
+    stub_config(registry: { enabled: false })
 
     project.add_maintainer(user)
     sign_in(user)
@@ -60,7 +62,7 @@ RSpec.describe 'Project navbar' do
     before do
       stub_config(registry: { enabled: true })
 
-      insert_container_nav(_('Operations'))
+      insert_container_nav
 
       visit project_path(project)
     end

spec/support/helpers/navbar_structure_helper.rb

@@ -29,7 +29,7 @@ module NavbarStructureHelper
     )
   end
 
-  def insert_container_nav(within)
+  def insert_container_nav
     insert_after_sub_nav_item(
       _('Package Registry'),
       within: _('Packages & Registries'),
@@ -37,11 +37,19 @@ module NavbarStructureHelper
     )
   end
 
-  def insert_dependency_proxy_nav(within)
+  def insert_dependency_proxy_nav
     insert_after_sub_nav_item(
       _('Package Registry'),
       within: _('Packages & Registries'),
       new_sub_nav_item_name: _('Dependency Proxy')
     )
   end
+
+  def insert_infrastructure_registry_nav
+    insert_after_sub_nav_item(
+      _('Package Registry'),
+      within: _('Packages & Registries'),
+      new_sub_nav_item_name: _('Infrastructure Registry')
+    )
+  end
 end