Fix to use 'GetEnv' (#230)

Author: Noah Hanjun Lee

internal/server/api/v1/repos/deployment.go

@@ -85,7 +85,7 @@ func (r *Repo) CreateDeployment(c *gin.Context) {
 	vr, _ := c.Get(KeyRepo)
 	re := vr.(*ent.Repo)
 
-	cf, err := r.i.GetConfig(ctx, u, re)
+	env, err := r.i.GetEnv(ctx, u, re, p.Env)
 	if e.HasErrorCode(err, e.ErrorCodeEntityNotFound) {
 		r.log.Check(gb.GetZapLogLevel(err), "The configuration file is not found.").Write(zap.Error(err))
 		// To override the HTTP status 422.
@@ -97,24 +97,13 @@ func (r *Repo) CreateDeployment(c *gin.Context) {
 		return
 	}
 
-	var env *vo.Env
-	if env = cf.GetEnv(p.Env); env == nil {
-		r.log.Warn("The environment is not defined in the configuration.")
-		gb.ResponseWithError(
-			c,
-			e.NewErrorWithMessage(e.ErrorCodeConfigParseError, "The environment is not defiend in the configuration.", nil),
-		)
-		return
-	}
-
 	d, err := r.i.Deploy(ctx, u, re,
 		&ent.Deployment{
 			Type: deployment.Type(p.Type),
 			Env:  p.Env,
 			Ref:  p.Ref,
 		},
-		cf.GetEnv(p.Env),
-	)
+		env)
 	if err != nil {
 		r.log.Check(gb.GetZapLogLevel(err), "Failed to deploy.").Write(zap.Error(err))
 		gb.ResponseWithError(c, err)
@@ -160,7 +149,7 @@ func (r *Repo) UpdateDeployment(c *gin.Context) {
 		return
 	}
 
-	cf, err := r.i.GetConfig(ctx, u, re)
+	env, err := r.i.GetEnv(ctx, u, re, d.Env)
 	if e.HasErrorCode(err, e.ErrorCodeEntityNotFound) {
 		r.log.Check(gb.GetZapLogLevel(err), "The configuration file is not found.").Write(zap.Error(err))
 		// To override the HTTP status 422.
@@ -172,16 +161,6 @@ func (r *Repo) UpdateDeployment(c *gin.Context) {
 		return
 	}
 
-	var env *vo.Env
-	if env = cf.GetEnv(d.Env); env == nil {
-		r.log.Warn("The environment is not defined in the configuration.")
-		gb.ResponseWithError(
-			c,
-			e.NewErrorWithMessage(e.ErrorCodeConfigParseError, "The environment is not defiend in the configuration.", nil),
-		)
-		return
-	}
-
 	if d, err = r.i.DeployToRemote(ctx, u, re, d, env); err != nil {
 		r.log.Check(gb.GetZapLogLevel(err), "It has failed to deploy to the remote.").Write(zap.Error(err))
 		gb.ResponseWithError(c, err)
@@ -224,7 +203,7 @@ func (r *Repo) RollbackDeployment(c *gin.Context) {
 		return
 	}
 
-	cf, err := r.i.GetConfig(ctx, u, re)
+	env, err := r.i.GetEnv(ctx, u, re, d.Env)
 	if e.HasErrorCode(err, e.ErrorCodeEntityNotFound) {
 		r.log.Check(gb.GetZapLogLevel(err), "The configuration file is not found.").Write(zap.Error(err))
 		// To override the HTTP status 422.
@@ -236,25 +215,14 @@ func (r *Repo) RollbackDeployment(c *gin.Context) {
 		return
 	}
 
-	var env *vo.Env
-	if env = cf.GetEnv(d.Env); env == nil {
-		r.log.Warn("The environment is not defined in the configuration.")
-		gb.ResponseWithError(
-			c,
-			e.NewErrorWithMessage(e.ErrorCodeConfigParseError, "The environment is not defiend in the configuration.", nil),
-		)
-		return
-	}
-
 	d, err = r.i.Deploy(ctx, u, re,
 		&ent.Deployment{
 			Type:       d.Type,
 			Env:        d.Env,
 			Ref:        d.Ref,
 			IsRollback: true,
 		},
-		cf.GetEnv(d.Env),
-	)
+		env)
 	if err != nil {
 		r.log.Check(gb.GetZapLogLevel(err), "Failed to deploy.").Write(zap.Error(err))
 		gb.ResponseWithError(c, err)

internal/server/api/v1/repos/deployment_test.go

@@ -123,11 +123,9 @@ func TestRepo_CreateDeployment(t *testing.T) {
 		t.Log("Read the config file.")
 		m.
 			EXPECT().
-			GetConfig(gomock.Any(), gomock.AssignableToTypeOf(&ent.User{}), gomock.AssignableToTypeOf(&ent.Repo{})).
-			Return(&vo.Config{
-				Envs: []*vo.Env{
-					{Name: "prod"},
-				},
+			GetEnv(gomock.Any(), gomock.AssignableToTypeOf(&ent.User{}), gomock.AssignableToTypeOf(&ent.Repo{}), gomock.Any()).
+			Return(&vo.Env{
+				Name: "prod",
 			}, nil)
 
 		t.Log("Deploy with the payload successfully.")