Merge branch '218630-update-example-terraform-state-bucket' into 'master'

Use valid bucket name in Terraform state examples

See merge request gitlab-org/gitlab!36513

config/gitlab.yml.example

@@ -360,7 +360,7 @@ production: &base
     # storage_path: shared/terraform_state
     object_store:
       enabled: false
-      remote_directory: terraform_state # The bucket name
+      remote_directory: terraform # The bucket name
       connection:
         provider: AWS
         aws_access_key_id: AWS_ACCESS_KEY_ID
@@ -1253,7 +1253,7 @@ test:
     storage_path: tmp/tests/terraform_state
     object_store:
       enabled: false
-      remote_directory: terraform_state
+      remote_directory: terraform
       connection:
         provider: AWS # Only AWS supported at the moment
         aws_access_key_id: AWS_ACCESS_KEY_ID

doc/administration/terraform_state.md

@@ -78,7 +78,7 @@ See [the available connection settings for different providers](object_storage.m
    ```ruby
    gitlab_rails['terraform_state_enabled'] = true
    gitlab_rails['terraform_state_object_store_enabled'] = true
-   gitlab_rails['terraform_state_object_store_remote_directory'] = "terraform_state"
+   gitlab_rails['terraform_state_object_store_remote_directory'] = "terraform"
    gitlab_rails['terraform_state_object_store_connection'] = {
      'provider' => 'AWS',
      'region' => 'eu-central-1',
@@ -110,7 +110,7 @@ See [the available connection settings for different providers](object_storage.m
      enabled: true
      object_store:
        enabled: true
-       remote_directory: "terraform_state" # The bucket name
+       remote_directory: "terraform" # The bucket name
        connection:
          provider: AWS # Only AWS supported at the moment
          aws_access_key_id: AWS_ACESS_KEY_ID

spec/support/helpers/stub_object_storage.rb

@@ -92,7 +92,7 @@ module StubObjectStorage
   def stub_terraform_state_object_storage(uploader = described_class, **params)
     stub_object_storage_uploader(config: Gitlab.config.terraform_state.object_store,
                                  uploader: uploader,
-                                 remote_directory: 'terraform_state',
+                                 remote_directory: 'terraform',
                                  **params)
   end