Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
apollo
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
apollo
Commits
0cae4838
Commit
0cae4838
authored
Oct 01, 2019
by
Zhuohao Li
Committed by
Jason Song
Oct 01, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add OpenAPI to rollback config. (#2351) (#2581)
parent
fe281135
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
25 additions
and
5 deletions
+25
-5
apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi/v1/controller/ReleaseController.java
...ework/apollo/openapi/v1/controller/ReleaseController.java
+25
-5
No files found.
apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi/v1/controller/ReleaseController.java
View file @
0cae4838
...
@@ -6,6 +6,7 @@ import com.ctrip.framework.apollo.common.utils.BeanUtils;
...
@@ -6,6 +6,7 @@ import com.ctrip.framework.apollo.common.utils.BeanUtils;
import
com.ctrip.framework.apollo.common.utils.RequestPrecondition
;
import
com.ctrip.framework.apollo.common.utils.RequestPrecondition
;
import
com.ctrip.framework.apollo.core.enums.Env
;
import
com.ctrip.framework.apollo.core.enums.Env
;
import
com.ctrip.framework.apollo.core.utils.StringUtils
;
import
com.ctrip.framework.apollo.core.utils.StringUtils
;
import
com.ctrip.framework.apollo.openapi.auth.ConsumerPermissionValidator
;
import
com.ctrip.framework.apollo.openapi.dto.NamespaceGrayDelReleaseDTO
;
import
com.ctrip.framework.apollo.openapi.dto.NamespaceGrayDelReleaseDTO
;
import
com.ctrip.framework.apollo.openapi.dto.NamespaceReleaseDTO
;
import
com.ctrip.framework.apollo.openapi.dto.NamespaceReleaseDTO
;
import
com.ctrip.framework.apollo.openapi.dto.OpenReleaseDTO
;
import
com.ctrip.framework.apollo.openapi.dto.OpenReleaseDTO
;
...
@@ -15,19 +16,18 @@ import com.ctrip.framework.apollo.portal.entity.model.NamespaceReleaseModel;
...
@@ -15,19 +16,18 @@ import com.ctrip.framework.apollo.portal.entity.model.NamespaceReleaseModel;
import
com.ctrip.framework.apollo.portal.service.NamespaceBranchService
;
import
com.ctrip.framework.apollo.portal.service.NamespaceBranchService
;
import
com.ctrip.framework.apollo.portal.service.ReleaseService
;
import
com.ctrip.framework.apollo.portal.service.ReleaseService
;
import
com.ctrip.framework.apollo.portal.spi.UserService
;
import
com.ctrip.framework.apollo.portal.spi.UserService
;
import
javax.servlet.http.HttpServletRequest
;
import
org.springframework.security.access.AccessDeniedException
;
import
org.springframework.security.access.prepost.PreAuthorize
;
import
org.springframework.security.access.prepost.PreAuthorize
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.PathVariable
;
import
org.springframework.web.bind.annotation.PathVariable
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.PutMapping
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.RestController
;
import
javax.servlet.http.HttpServletRequest
;
import
static
com
.
ctrip
.
framework
.
apollo
.
common
.
utils
.
RequestPrecondition
.
checkModel
;
@RestController
(
"openapiReleaseController"
)
@RestController
(
"openapiReleaseController"
)
@RequestMapping
(
"/openapi/v1/envs/{env}"
)
@RequestMapping
(
"/openapi/v1/envs/{env}"
)
public
class
ReleaseController
{
public
class
ReleaseController
{
...
@@ -35,14 +35,17 @@ public class ReleaseController {
...
@@ -35,14 +35,17 @@ public class ReleaseController {
private
final
ReleaseService
releaseService
;
private
final
ReleaseService
releaseService
;
private
final
UserService
userService
;
private
final
UserService
userService
;
private
final
NamespaceBranchService
namespaceBranchService
;
private
final
NamespaceBranchService
namespaceBranchService
;
private
final
ConsumerPermissionValidator
consumerPermissionValidator
;
public
ReleaseController
(
public
ReleaseController
(
final
ReleaseService
releaseService
,
final
ReleaseService
releaseService
,
final
UserService
userService
,
final
UserService
userService
,
final
NamespaceBranchService
namespaceBranchService
)
{
final
NamespaceBranchService
namespaceBranchService
,
final
ConsumerPermissionValidator
consumerPermissionValidator
)
{
this
.
releaseService
=
releaseService
;
this
.
releaseService
=
releaseService
;
this
.
userService
=
userService
;
this
.
userService
=
userService
;
this
.
namespaceBranchService
=
namespaceBranchService
;
this
.
namespaceBranchService
=
namespaceBranchService
;
this
.
consumerPermissionValidator
=
consumerPermissionValidator
;
}
}
@PreAuthorize
(
value
=
"@consumerPermissionValidator.hasReleaseNamespacePermission(#request, #appId, #namespaceName, #env)"
)
@PreAuthorize
(
value
=
"@consumerPermissionValidator.hasReleaseNamespacePermission(#request, #appId, #namespaceName, #env)"
)
...
@@ -155,4 +158,21 @@ public class ReleaseController {
...
@@ -155,4 +158,21 @@ public class ReleaseController {
return
OpenApiBeanUtils
.
transformFromReleaseDTO
(
releaseService
.
publish
(
releaseModel
,
releaseModel
.
getReleasedBy
()));
return
OpenApiBeanUtils
.
transformFromReleaseDTO
(
releaseService
.
publish
(
releaseModel
,
releaseModel
.
getReleasedBy
()));
}
}
@PutMapping
(
path
=
"/releases/{releaseId}/rollback"
)
public
void
rollback
(
@PathVariable
String
env
,
@PathVariable
long
releaseId
,
HttpServletRequest
request
)
{
ReleaseDTO
release
=
releaseService
.
findReleaseById
(
Env
.
valueOf
(
env
),
releaseId
);
if
(
release
==
null
)
{
throw
new
BadRequestException
(
"release not found"
);
}
if
(!
consumerPermissionValidator
.
hasReleaseNamespacePermission
(
request
,
release
.
getAppId
(),
release
.
getNamespaceName
(),
env
))
{
throw
new
AccessDeniedException
(
"Forbidden operation. you don't have release permission"
);
}
releaseService
.
rollback
(
Env
.
valueOf
(
env
),
releaseId
);
}
}
}
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