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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
236c9c17
Commit
236c9c17
authored
Mar 30, 2017
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Simplify how we create container registry resources
parent
003a51d1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
108 deletions
+0
-108
app/services/container_registry/create_repository_service.rb
app/services/container_registry/create_repository_service.rb
+0
-33
spec/services/container_registry/create_repository_service_spec.rb
...ices/container_registry/create_repository_service_spec.rb
+0
-75
No files found.
app/services/container_registry/create_repository_service.rb
deleted
100644 → 0
View file @
003a51d1
module
ContainerRegistry
##
# Service for creating a container repository.
#
# It is usually executed before registry authenticator returns
# a token for given request.
#
class
CreateRepositoryService
<
BaseService
def
execute
(
path
)
@path
=
path
return
if
path
.
has_repository?
unless
user_can_create?
||
legacy_trigger_can_create?
raise
Gitlab
::
Access
::
AccessDeniedError
end
ContainerRepository
.
create_from_path
(
path
)
end
private
def
user_can_create?
can?
(
@current_user
,
:create_container_image
,
@path
.
repository_project
)
end
## TODO, remove it after removing legacy triggers.
#
def
legacy_trigger_can_create?
@current_user
.
nil?
&&
@project
==
@path
.
repository_project
end
end
end
spec/services/container_registry/create_repository_service_spec.rb
deleted
100644 → 0
View file @
003a51d1
require
'spec_helper'
describe
ContainerRegistry
::
CreateRepositoryService
,
'#execute'
do
let
(
:project
)
{
create
(
:empty_project
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:path
)
do
ContainerRegistry
::
Path
.
new
(
"
#{
project
.
full_path
}
/my/image"
)
end
let
(
:service
)
{
described_class
.
new
(
project
,
user
)
}
before
do
stub_container_registry_config
(
enabled:
true
)
end
context
'when repository is created by an user'
do
context
'when user has no ability to create a repository'
do
it
'does not create a new container repository'
do
expect
{
service
.
execute
(
path
)
}
.
to
raise_error
(
Gitlab
::
Access
::
AccessDeniedError
)
.
and
change
{
ContainerRepository
.
count
}.
by
(
0
)
end
end
context
'when user has ability do create a repository'
do
before
do
project
.
add_developer
(
user
)
end
context
'when repository already exists'
do
before
do
create
(
:container_repository
,
project:
project
,
name:
'my/image'
)
end
it
'does not create container repository again'
do
expect
{
service
.
execute
(
path
)
}
.
to_not
change
{
ContainerRepository
.
count
}
end
end
context
'when repository does not exist yet'
do
it
'creates a new container repository'
do
expect
{
service
.
execute
(
path
)
}
.
to
change
{
project
.
container_repositories
.
count
}.
by
(
1
)
end
end
end
end
context
'when repository is created by a legacy pipeline trigger'
do
let
(
:user
)
{
nil
}
context
'when repository path matches authenticated project'
do
it
'creates a new container repository'
do
expect
{
service
.
execute
(
path
)
}
.
to
change
{
project
.
container_repositories
.
count
}.
by
(
1
)
end
end
context
'when repository path does not match authenticated project'
do
let
(
:private_project
)
{
create
(
:empty_project
,
:private
)
}
let
(
:path
)
do
ContainerRegistry
::
Path
.
new
(
"
#{
private_project
.
full_path
}
/my/image"
)
end
it
'does not create a new container repository'
do
expect
{
service
.
execute
(
path
)
}
.
to
raise_error
(
Gitlab
::
Access
::
AccessDeniedError
)
.
and
change
{
ContainerRepository
.
count
}.
by
(
0
)
end
end
end
end
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