Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
d39a46a8
Commit
d39a46a8
authored
Sep 14, 2020
by
Krasimir Angelov
Committed by
Shinya Maeda
Sep 14, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove ci_secrets_syntax feature flag
Related to
https://gitlab.com/gitlab-org/gitlab/-/issues/243431
parent
b1b0ac0a
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
16 additions
and
48 deletions
+16
-48
ee/app/models/ee/ci/build.rb
ee/app/models/ee/ci/build.rb
+1
-1
ee/changelogs/unreleased/ci-secrets-remove-feature-flags.yml
ee/changelogs/unreleased/ci-secrets-remove-feature-flags.yml
+5
-0
ee/config/feature_flags/licensed/ci_secrets_management.yml
ee/config/feature_flags/licensed/ci_secrets_management.yml
+7
-0
ee/lib/ee/gitlab/ci/config/entry/job.rb
ee/lib/ee/gitlab/ci/config/entry/job.rb
+0
-8
ee/lib/ee/gitlab/ci/features.rb
ee/lib/ee/gitlab/ci/features.rb
+0
-17
ee/spec/lib/gitlab/ci/config/entry/job_spec.rb
ee/spec/lib/gitlab/ci/config/entry/job_spec.rb
+3
-20
lib/gitlab/ci/features.rb
lib/gitlab/ci/features.rb
+0
-2
No files found.
ee/app/models/ee/ci/build.rb
View file @
d39a46a8
...
...
@@ -136,7 +136,7 @@ module EE
end
def
ci_secrets_management_available?
project
.
beta_
feature_available?
(
:ci_secrets_management
)
project
.
feature_available?
(
:ci_secrets_management
)
end
override
:runner_required_feature_names
...
...
ee/changelogs/unreleased/ci-secrets-remove-feature-flags.yml
0 → 100644
View file @
d39a46a8
---
title
:
Add support for reading Vault secrets from CI jobs
merge_request
:
42055
author
:
type
:
added
ee/config/feature_flags/licensed/ci_secrets_management.yml
0 → 100644
View file @
d39a46a8
---
name
:
ci_secrets_management
introduced_by_url
:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/42055
rollout_issue_url
:
group
:
group::release management
type
:
licensed
default_enabled
:
true
ee/lib/ee/gitlab/ci/config/entry/job.rb
View file @
d39a46a8
...
...
@@ -12,10 +12,6 @@ module EE
prepended
do
attributes
:secrets
validations
do
validates
:secrets
,
absence:
{
message:
'feature is disabled'
},
unless: :secrets_enabled?
end
entry
:secrets
,
::
Gitlab
::
Ci
::
Config
::
Entry
::
Secrets
,
description:
'Configured secrets for this job'
,
inherit:
false
...
...
@@ -25,10 +21,6 @@ module EE
def
value
super
.
merge
({
secrets:
secrets_value
}.
compact
)
end
def
secrets_enabled?
::
Gitlab
::
Ci
::
Features
.
secrets_syntax_enabled?
end
end
end
end
...
...
ee/lib/ee/gitlab/ci/features.rb
deleted
100644 → 0
View file @
b1b0ac0a
# frozen_string_literal: true
module
EE
module
Gitlab
module
Ci
module
Features
extend
ActiveSupport
::
Concern
prepended
do
def
self
.
secrets_syntax_enabled?
::
Feature
.
enabled?
(
:ci_secrets_syntax
)
end
end
end
end
end
end
ee/spec/lib/gitlab/ci/config/entry/job_spec.rb
View file @
d39a46a8
...
...
@@ -10,28 +10,11 @@ RSpec.describe Gitlab::Ci::Config::Entry::Job do
context
'when has secrets'
do
let
(
:config
)
{
{
script:
'echo'
,
secrets:
{
DATABASE_PASSWORD
:
{
vault:
'production/db/password'
}
}
}
}
context
'when ci_secrets_syntax feature flag is enabled'
do
before
do
stub_feature_flags
(
ci_secrets_syntax:
true
)
entry
.
compose!
end
it
{
expect
(
entry
).
to
be_valid
}
before
do
entry
.
compose!
end
context
'when ci_secrets_syntax feature flag is disabled'
do
before
do
stub_feature_flags
(
ci_secrets_syntax:
false
)
entry
.
compose!
end
it
'returns an error'
do
aggregate_failures
do
expect
(
entry
).
not_to
be_valid
expect
(
entry
.
errors
).
to
include
'job secrets feature is disabled'
end
end
end
it
{
expect
(
entry
).
to
be_valid
}
end
end
...
...
lib/gitlab/ci/features.rb
View file @
d39a46a8
...
...
@@ -77,5 +77,3 @@ module Gitlab
end
end
end
::
Gitlab
::
Ci
::
Features
.
prepend_if_ee
(
'::EE::Gitlab::Ci::Features'
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment