Skip to content

Commit

Permalink
Merge pull request #75 from stormcat24/feature/fixed_search_bg_cluster
Browse files Browse the repository at this point in the history
Fixed search blue green cluster problems
  • Loading branch information
stormcat24 committed Apr 11, 2016
2 parents baae960 + 55d71a5 commit 25cc87c
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 15 deletions.
33 changes: 19 additions & 14 deletions bluegreen/bluegreen.go
Expand Up @@ -27,29 +27,34 @@ type BlueGreenController struct {

func NewBlueGreenController(manager *aws.AwsManager, projectDir string, targetResource string, params map[string]string) (*BlueGreenController, error) {

con := &BlueGreenController{
manager: manager,
targetResource: targetResource,
params: params,
}

defs, errs := con.searchBlueGreen(projectDir)
if errs != nil {
return nil, errs
}

bgdef, ok := defs[targetResource]
if !ok {
return nil, fmt.Errorf("BlueGreen '%v' is not defined.", targetResource)
}

targetResources := make([]string, 0)
if targetResource != "" {
targetResources = append(targetResources, fmt.Sprintf("%s-blue", targetResource))
targetResources = append(targetResources, fmt.Sprintf("%s-green", targetResource))
targetResources = append(targetResources, bgdef.Blue.Cluster)
targetResources = append(targetResources, bgdef.Green.Cluster)
}

ccon, err := service.NewServiceController(manager, projectDir, targetResources, params)
if err != nil {
return nil, err
}

con := &BlueGreenController{
manager: manager,
ClusterController: ccon,
targetResource: targetResource,
params: params,
}

defs, errs := con.searchBlueGreen(projectDir)
if errs != nil {
return nil, errs
}

con.ClusterController = ccon
con.blueGreenMap = defs
return con, nil
}
Expand Down
2 changes: 1 addition & 1 deletion operation/version.go
@@ -1,3 +1,3 @@
package operation

const Version string = "0.2.0-RC4"
const Version string = "0.2.0-RC5"

0 comments on commit 25cc87c

Please sign in to comment.