Merge branch 'add-environment-scope-to-variable-type' into 'master'

Add `environment_scope` to `VariableType`

See merge request !91913

app/graphql/types/ci/variable_type.rb

@@ -26,6 +26,15 @@ class VariableType < BaseObject
 
       field :raw, GraphQL::Types::Boolean, null: true,
         description: 'Indicates whether the variable is raw.'
+
+      field :environment_scope, GraphQL::Types::String, null: true,
+        description: 'Scope defining the environments in which the variable can be used.'
+
+      def environment_scope
+        if object.respond_to?(:environment_scope)
+          object.environment_scope
+        end
+      end
     end
   end
 end

doc/api/graphql/reference/index.md

@@ -10097,6 +10097,7 @@ GitLab CI/CD configuration template.
 | Name | Type | Description |
 | ---- | ---- | ----------- |
+| <a id="civariableenvironmentscope"></a>`environmentScope` | [`String`](#string) | Scope defining the environments in which the variable can be used. |
 | <a id="civariableid"></a>`id` | [`ID!`](#id) | ID of the variable. |
 | <a id="civariablekey"></a>`key` | [`String`](#string) | Name of the variable. |
 | <a id="civariablemasked"></a>`masked` | [`Boolean`](#boolean) | Indicates whether the variable is masked. |

spec/graphql/types/ci/variables_type_spec.rb → spec/graphql/types/ci/variable_type_spec.rb

@@ -5,7 +5,7 @@
 RSpec.describe GitlabSchema.types['CiVariable'] do
   it 'contains attributes related to CI variables' do
     expect(described_class).to have_graphql_fields(
-      :id, :key, :value, :variable_type, :protected, :masked, :raw
+      :id, :key, :value, :variable_type, :protected, :masked, :raw, :environment_scope
     )
   end
 end

spec/requests/api/graphql/ci/group_variables_spec.rb

@@ -21,6 +21,7 @@
               protected
               masked
               raw
+              environmentScope
             }
           }
         }
@@ -35,7 +36,7 @@
 
     it "returns the group's CI variables" do
       variable = create(:ci_group_variable, group: group, key: 'TEST_VAR', value: 'test',
-                        masked: false, protected: true, raw: true)
+                        masked: false, protected: true, raw: true, environment_scope: 'staging')
 
       post_graphql(query, current_user: user)
 
@@ -46,7 +47,8 @@
         'variableType' => 'ENV_VAR',
         'masked' => false,
         'protected' => true,
-        'raw' => true
+        'raw' => true,
+        'environmentScope' => 'staging'
       })
     end
   end

spec/requests/api/graphql/ci/instance_variables_spec.rb

@@ -17,6 +17,7 @@
             protected
             masked
             raw
+            environmentScope
           }
         }
       }
@@ -39,7 +40,8 @@
         'variableType' => 'ENV_VAR',
         'masked' => false,
         'protected' => true,
-        'raw' => true
+        'raw' => true,
+        'environmentScope' => nil
       })
     end
   end

spec/requests/api/graphql/ci/project_variables_spec.rb

@@ -21,6 +21,7 @@
               protected
               masked
               raw
+              environmentScope
             }
           }
         }
@@ -35,7 +36,7 @@
 
     it "returns the project's CI variables" do
       variable = create(:ci_variable, project: project, key: 'TEST_VAR', value: 'test',
-                        masked: false, protected: true, raw: true)
+                        masked: false, protected: true, raw: true, environment_scope: 'production')
 
       post_graphql(query, current_user: user)
 
@@ -46,7 +47,8 @@
         'variableType' => 'ENV_VAR',
         'masked' => false,
         'protected' => true,
-        'raw' => true
+        'raw' => true,
+        'environmentScope' => 'production'
       })
     end
   end