Skip to content

Commit 83b02ca

Browse files
yetoneyetone
committed
Revert "feat(event): deployment types (#208)"
This reverts commit 0621665.
1 parent 0a8bad4 commit 83b02ca

File tree

2 files changed

+9
-158
lines changed

2 files changed

+9
-158
lines changed

‎api-server/controllers/controllersv1/cluster.go

+3-50
Original file line numberDiff line numberDiff line change
@@ -89,35 +89,15 @@ func (c *clusterController) Create(ctx *gin.Context, schema *CreateClusterSchema
8989
return nil, err
9090
}
9191

92-
cluster, createError := services.ClusterService.Create(ctx, services.CreateClusterOption{
92+
cluster, err := services.ClusterService.Create(ctx, services.CreateClusterOption{
9393
CreatorId: user.ID,
9494
OrganizationId: org.ID,
9595
Name: schema.Name,
9696
Description: schema.Description,
9797
KubeConfig: schema.KubeConfig,
9898
Config: schema.Config,
9999
})
100-
101-
apiTokenName := ""
102-
if user.ApiToken != nil {
103-
apiTokenName = user.ApiToken.Name
104-
}
105-
createEventOpt := services.CreateEventOption{
106-
CreatorId: user.ID,
107-
ApiTokenName: apiTokenName,
108-
OrganizationId: &org.ID,
109-
ResourceType: modelschemas.ResourceTypeCluster,
110-
ResourceId: cluster.ID,
111-
Status: modelschemas.EventStatusSuccess,
112-
OperationName: "created",
113-
}
114-
if createError != nil {
115-
createEventOpt.Status = modelschemas.EventStatusFailed
116-
}
117-
if _, eventError := services.EventService.Create(ctx, createEventOpt); eventError != nil {
118-
return nil, errors.Wrap(eventError, "create event")
119-
}
120-
if createError != nil {
100+
if err != nil {
121101
return nil, errors.Wrap(err, "create cluster")
122102
}
123103
return transformersv1.ToClusterFullSchema(ctx, cluster)
@@ -136,39 +116,12 @@ func (c *clusterController) Update(ctx *gin.Context, schema *UpdateClusterSchema
136116
if err = c.canUpdate(ctx, cluster); err != nil {
137117
return nil, err
138118
}
139-
cluster, updateError := services.ClusterService.Update(ctx, cluster, services.UpdateClusterOption{
119+
cluster, err = services.ClusterService.Update(ctx, cluster, services.UpdateClusterOption{
140120
Description: schema.Description,
141121
Config: schema.Config,
142122
KubeConfig: schema.KubeConfig,
143123
})
144-
user, err := services.GetCurrentUser(ctx)
145124
if err != nil {
146-
return nil, err
147-
}
148-
org, err := schema.GetOrganization(ctx)
149-
if err != nil {
150-
return nil, err
151-
}
152-
apiTokenName := ""
153-
if user.ApiToken != nil {
154-
apiTokenName = user.ApiToken.Name
155-
}
156-
createEventOpt := services.CreateEventOption{
157-
CreatorId: user.ID,
158-
ApiTokenName: apiTokenName,
159-
OrganizationId: &org.ID,
160-
ResourceType: modelschemas.ResourceTypeCluster,
161-
ResourceId: cluster.ID,
162-
Status: modelschemas.EventStatusSuccess,
163-
OperationName: "updated",
164-
}
165-
if updateError != nil {
166-
createEventOpt.Status = modelschemas.EventStatusFailed
167-
}
168-
if _, eventError := services.EventService.Create(ctx, createEventOpt); eventError != nil {
169-
return nil, errors.Wrap(eventError, "create event")
170-
}
171-
if updateError != nil {
172125
return nil, errors.Wrap(err, "update cluster")
173126
}
174127
return transformersv1.ToClusterFullSchema(ctx, cluster)

‎api-server/controllers/controllersv1/deployment.go

+6-108
Original file line numberDiff line numberDiff line change
@@ -133,29 +133,8 @@ func (c *deploymentController) Create(ctx *gin.Context, schema *CreateDeployment
133133
return nil, errors.Wrap(err, "create deployment")
134134
}
135135

136-
deploymentSchema, updateError := c.doUpdate(ctx_, schema.UpdateDeploymentSchema, org, deployment)
137-
138-
apiTokenName := ""
139-
if user.ApiToken != nil {
140-
apiTokenName = user.ApiToken.Name
141-
}
142-
createEventOpt := services.CreateEventOption{
143-
CreatorId: user.ID,
144-
ApiTokenName: apiTokenName,
145-
OrganizationId: &org.ID,
146-
ResourceType: modelschemas.ResourceTypeDeployment,
147-
ResourceId: deployment.ID,
148-
Status: modelschemas.EventStatusSuccess,
149-
OperationName: "created",
150-
}
151-
if updateError != nil {
152-
createEventOpt.Status = modelschemas.EventStatusFailed
153-
}
154-
if _, eventErr := services.EventService.Create(ctx_, createEventOpt); eventErr != nil {
155-
return nil, errors.Wrap(eventErr, "create event")
156-
}
157-
158-
return deploymentSchema, updateError
136+
deploymentSchema, err := c.doUpdate(ctx_, schema.UpdateDeploymentSchema, org, deployment)
137+
return deploymentSchema, err
159138
}
160139

161140
type UpdateDeploymentSchema struct {
@@ -210,34 +189,8 @@ func (c *deploymentController) Update(ctx *gin.Context, schema *UpdateDeployment
210189
return nil, err
211190
}
212191

213-
deploymentSchema, updateError := c.doUpdate(ctx_, schema.UpdateDeploymentSchema, org, deployment)
214-
215-
user, err := services.GetCurrentUser(ctx)
216-
if err != nil {
217-
return nil, err
218-
}
219-
220-
apiTokenName := ""
221-
if user.ApiToken != nil {
222-
apiTokenName = user.ApiToken.Name
223-
}
224-
225-
createEventOpt := services.CreateEventOption{
226-
CreatorId: user.ID,
227-
ApiTokenName: apiTokenName,
228-
OrganizationId: &org.ID,
229-
ResourceType: modelschemas.ResourceTypeDeployment,
230-
ResourceId: deployment.ID,
231-
Status: modelschemas.EventStatusSuccess,
232-
OperationName: "updated",
233-
}
234-
if updateError != nil {
235-
createEventOpt.Status = modelschemas.EventStatusFailed
236-
}
237-
if _, eventErr := services.EventService.Create(ctx_, createEventOpt); eventErr != nil {
238-
return nil, errors.Wrap(eventErr, "create event")
239-
}
240-
return deploymentSchema, updateError
192+
deploymentSchema, err := c.doUpdate(ctx_, schema.UpdateDeploymentSchema, org, deployment)
193+
return deploymentSchema, err
241194
}
242195

243196
func (c *deploymentController) doUpdate(ctx context.Context, schema schemasv1.UpdateDeploymentSchema, org *models.Organization, deployment *models.Deployment) (*schemasv1.DeploymentSchema, error) {
@@ -424,37 +377,10 @@ func (c *deploymentController) Terminate(ctx *gin.Context, schema *GetDeployment
424377
if err = c.canOperate(ctx, deployment); err != nil {
425378
return nil, err
426379
}
427-
deployment, terminateError := services.DeploymentService.Terminate(ctx, deployment)
428-
user, err := services.GetCurrentUser(ctx)
429-
if err != nil {
430-
return nil, err
431-
}
432-
org, err := schema.GetOrganization(ctx)
380+
deployment, err = services.DeploymentService.Terminate(ctx, deployment)
433381
if err != nil {
434382
return nil, err
435383
}
436-
apiTokenName := ""
437-
if user.ApiToken != nil {
438-
apiTokenName = user.ApiToken.Name
439-
}
440-
createEventOpt := services.CreateEventOption{
441-
CreatorId: user.ID,
442-
ApiTokenName: apiTokenName,
443-
OrganizationId: &org.ID,
444-
ResourceType: modelschemas.ResourceTypeDeployment,
445-
ResourceId: deployment.ID,
446-
Status: modelschemas.EventStatusSuccess,
447-
OperationName: "terminated",
448-
}
449-
if terminateError != nil {
450-
createEventOpt.Status = modelschemas.EventStatusFailed
451-
}
452-
if _, eventErr := services.EventService.Create(ctx, createEventOpt); eventErr != nil {
453-
return nil, errors.Wrap(eventErr, "create event")
454-
}
455-
if terminateError != nil {
456-
return nil, terminateError
457-
}
458384
return transformersv1.ToDeploymentSchema(ctx, deployment)
459385
}
460386

@@ -466,38 +392,10 @@ func (c *deploymentController) Delete(ctx *gin.Context, schema *GetDeploymentSch
466392
if err = c.canOperate(ctx, deployment); err != nil {
467393
return nil, err
468394
}
469-
deployment, deleteError := services.DeploymentService.Delete(ctx, deployment)
470-
org, err := schema.GetOrganization(ctx)
395+
deployment, err = services.DeploymentService.Delete(ctx, deployment)
471396
if err != nil {
472397
return nil, err
473398
}
474-
user, err := services.GetCurrentUser(ctx)
475-
if err != nil {
476-
return nil, err
477-
}
478-
apiTokenName := ""
479-
if user.ApiToken != nil {
480-
apiTokenName = user.ApiToken.Name
481-
}
482-
createEventOpt := services.CreateEventOption{
483-
CreatorId: user.ID,
484-
ApiTokenName: apiTokenName,
485-
OrganizationId: &org.ID,
486-
ResourceType: modelschemas.ResourceTypeDeployment,
487-
ResourceId: deployment.ID,
488-
Status: modelschemas.EventStatusSuccess,
489-
OperationName: "deleted",
490-
}
491-
if deleteError != nil {
492-
createEventOpt.Status = modelschemas.EventStatusFailed
493-
}
494-
if _, eventErr := services.EventService.Create(ctx, createEventOpt); eventErr != nil {
495-
return nil, errors.Wrap(eventErr, "create event")
496-
}
497-
498-
if deleteError != nil {
499-
return nil, deleteError
500-
}
501399
return transformersv1.ToDeploymentSchema(ctx, deployment)
502400
}
503401

0 commit comments

Comments
 (0)