Merge branch '7743-fix-gitaly-storage-deprecation-notice' into 'master'

Use new Gitaly configuration format to set default storages

Closes #7743

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/6808



Merged-by: Robert Marshall <rmarshall@gitlab.com>
Approved-by: Robert Marshall <rmarshall@gitlab.com>
Co-authored-by: Balasankar "Balu" C <balasankar@gitlab.com>

files/gitlab-cookbooks/gitaly/libraries/gitaly.rb

@@ -93,7 +93,8 @@ module Gitaly
           'path' => value['path']
         }
       end
-      Gitlab['gitaly']['storage'] = storages
+      Gitlab['gitaly']['configuration'] ||= {}
+      Gitlab['gitaly']['configuration']['storage'] = storages
     end
     # Compute the default gitconfig from the old Omnibus gitconfig setting.

spec/chef/cookbooks/gitaly/recipes/gitaly_spec.rb

@@ -912,13 +912,15 @@ RSpec.describe 'gitaly' do
       context 'using local gitaly' do
         before do
           stub_gitlab_rb(
-            {
-              gitaly: { storage: nil },
-              git_data_dirs:
-              {
-                'default' => { 'path' => '/tmp/default/git-data' },
-                'nfs1' => { 'path' => '/mnt/nfs1' }
+            gitaly: {
+              configuration: {
+                storage: nil
               }
+            },
+            git_data_dirs:
+            {
+              'default' => { 'path' => '/tmp/default/git-data' },
+              'nfs1' => { 'path' => '/mnt/nfs1' }
             }
           )
         end
@@ -936,12 +938,14 @@ RSpec.describe 'gitaly' do
       context 'using external gitaly' do
         before do
           stub_gitlab_rb(
-            {
-              gitaly: { storage: nil },
-              git_data_dirs:
-              {
-                'default' => { 'gitaly_address' => 'tcp://gitaly.internal:8075' },
+            gitaly: {
+              configuration: {
+                storage: nil
               }
+            },
+            git_data_dirs:
+            {
+              'default' => { 'gitaly_address' => 'tcp://gitaly.internal:8075' },
             }
           )
         end
@@ -953,6 +957,68 @@ RSpec.describe 'gitaly' do
             .with_content('gitaly_address: "tcp://gitaly.internal:8075"')
         end
       end
+
+      context "when gitaly storage is explicitly set" do
+        context "using gitaly['configuration']['storage'] key" do
+          before do
+            stub_gitlab_rb(
+              gitaly: {
+                configuration: {
+                  storage: [
+                    {
+                      'name' => 'nfs1',
+                      'path' => '/mnt/nfs1/repositories'
+                    },
+                    {
+                      'name' => 'default',
+                      'path' => '/tmp/default/git-data/repositories'
+                    }
+                  ]
+                }
+              },
+              git_data_dirs: {
+                'default' => { 'path' => '/tmp/gitaly-git-data' },
+              }
+            )
+          end
+
+          it 'populates gitaly config.toml with custom storages from gitaly configuration' do
+            expect(chef_run).to render_file(config_path)
+              .with_content(%r{\[\[storage\]\]\s+name = "default"\s+path = "/tmp/default/git-data/repositories"})
+            expect(chef_run).to render_file(config_path)
+              .with_content(%r{\[\[storage\]\]\s+name = "nfs1"\s+path = "/mnt/nfs1/repositories"})
+          end
+        end
+
+        context "using legacy gitaly['storage'] key" do
+          before do
+            stub_gitlab_rb(
+              gitaly: {
+                storage: [
+                  {
+                    'name' => 'nfs1',
+                    'path' => '/mnt/nfs1/repositories'
+                  },
+                  {
+                    'name' => 'default',
+                    'path' => '/tmp/default/git-data/repositories'
+                  }
+                ]
+              },
+              git_data_dirs: {
+                'default' => { 'path' => '/tmp/gitaly-git-data' },
+              }
+            )
+          end
+
+          it 'populates gitaly config.toml with custom storages from gitaly configuration' do
+            expect(chef_run).to render_file(config_path)
+              .with_content(%r{\[\[storage\]\]\s+name = "default"\s+path = "/tmp/default/git-data/repositories"})
+            expect(chef_run).to render_file(config_path)
+              .with_content(%r{\[\[storage\]\]\s+name = "nfs1"\s+path = "/mnt/nfs1/repositories"})
+          end
+        end
+      end
     end
   end