Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

An output of task-definition of init command to stable. #601

Merged
merged 3 commits into from
Aug 4, 2023
Merged

An output of task-definition of init command to stable. #601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6780df9
add --sort option to init command
fujiwara Aug 4, 2023
50d328d
rename sortTaskDefinitionForDiff -> sortTaskDefinition
fujiwara Aug 4, 2023
e32fed9
fix tests
fujiwara Aug 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions diff.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ func diffServices(local, remote *Service, remoteArn string, localPath string, un
}

func diffTaskDefs(local, remote *TaskDefinitionInput, remoteArn string, localPath string, unified bool) (string, error) {
sortTaskDefinitionForDiff(local)
sortTaskDefinitionForDiff(remote)
sortTaskDefinition(local)
sortTaskDefinition(remote)

newTdBytes, err := MarshalJSONForAPI(local)
if err != nil {
Expand Down Expand Up @@ -235,7 +235,7 @@ func ServiceDefinitionForDiff(sv *Service) *ServiceForDiff {
}
}

func sortTaskDefinitionForDiff(td *TaskDefinitionInput) {
func sortTaskDefinition(td *TaskDefinitionInput) {
for i, cd := range td.ContainerDefinitions {
sort.SliceStable(cd.Environment, func(i, j int) bool {
return aws.ToString(cd.Environment[i].Name) < aws.ToString(cd.Environment[j].Name)
Expand Down Expand Up @@ -277,7 +277,7 @@ func sortTaskDefinitionForDiff(td *TaskDefinitionInput) {
})
// containerDefinitions are sorted by name
sort.SliceStable(td.ContainerDefinitions, func(i, j int) bool {
return aws.ToString(td.ContainerDefinitions[i].Name) > aws.ToString(td.ContainerDefinitions[j].Name)
return aws.ToString(td.ContainerDefinitions[i].Name) < aws.ToString(td.ContainerDefinitions[j].Name)
})

if td.Cpu != nil {
Expand Down
6 changes: 3 additions & 3 deletions diff_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,8 @@ var testTaskDefinition2 = &ecspresso.TaskDefinitionInput{
}

func TestTaskDefinitionDiffer(t *testing.T) {
ecspresso.SortTaskDefinitionForDiff(testTaskDefinition1)
ecspresso.SortTaskDefinitionForDiff(testTaskDefinition2)
ecspresso.SortTaskDefinition(testTaskDefinition1)
ecspresso.SortTaskDefinition(testTaskDefinition2)
td1, _ := ecspresso.MarshalJSONForAPI(testTaskDefinition1)
td2, _ := ecspresso.MarshalJSONForAPI(testTaskDefinition2)
if diff := cmp.Diff(td1, td2); diff != "" {
Expand Down Expand Up @@ -228,7 +228,7 @@ var testServiceDefinitionHasDesiredCount = &ecspresso.Service{
}

func TestDiffServices(t *testing.T) {
t.Run("when local.DesiredCount is nil, ignore diff of DesiredCount", func (t *testing.T) {
t.Run("when local.DesiredCount is nil, ignore diff of DesiredCount", func(t *testing.T) {
diff, err := ecspresso.DiffServices(
testServiceDefinitionNoDesiredCount,
testServiceDefinitionHasDesiredCount,
Expand Down
34 changes: 17 additions & 17 deletions export_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,23 @@ import (
)

var (
SortTaskDefinitionForDiff = sortTaskDefinitionForDiff
ToNumberCPU = toNumberCPU
ToNumberMemory = toNumberMemory
CalcDesiredCount = calcDesiredCount
ParseTags = parseTags
ExtractRoleName = extractRoleName
IsLongArnFormat = isLongArnFormat
ECRImageURLRegex = ecrImageURLRegex
NewLogger = newLogger
NewLogFilter = newLogFilter
NewConfigLoader = newConfigLoader
NewVerifier = newVerifier
ArnToName = arnToName
InitVerifyState = initVerifyState
VerifyResource = verifyResource
Map2str = map2str
DiffServices = diffServices
SortTaskDefinition = sortTaskDefinition
ToNumberCPU = toNumberCPU
ToNumberMemory = toNumberMemory
CalcDesiredCount = calcDesiredCount
ParseTags = parseTags
ExtractRoleName = extractRoleName
IsLongArnFormat = isLongArnFormat
ECRImageURLRegex = ecrImageURLRegex
NewLogger = newLogger
NewLogFilter = newLogFilter
NewConfigLoader = newConfigLoader
NewVerifier = newVerifier
ArnToName = arnToName
InitVerifyState = initVerifyState
VerifyResource = verifyResource
Map2str = map2str
DiffServices = diffServices
)

type ModifyAutoScalingParams = modifyAutoScalingParams
Expand Down
4 changes: 4 additions & 0 deletions init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ type InitOption struct {
TaskDefinition string `help:"ECS task definition name:revision" required:"" xor:"FROM"`
TaskDefinitionPath string `help:"path to output task definition file" default:"ecs-task-def.json"`
ServiceDefinitionPath string `help:"path to output service definition file" default:"ecs-service-def.json"`
Sort bool `help:"sort elements in task definition" default:"false" negatable:""`
ConfigFilePath string
ForceOverwrite bool `help:"overwrite existing files" default:"false"`
Jsonnet bool `help:"output files as jsonnet format" default:"false"`
Expand Down Expand Up @@ -188,6 +189,9 @@ func (d *App) initTaskDefinition(ctx context.Context, opt InitOption, tdArn stri
if err != nil {
return nil, err
}
if opt.Sort {
sortTaskDefinition(td)
}
if b, err := MarshalJSONForAPI(td); err != nil {
return nil, fmt.Errorf("unable to marshal task definition to JSON: %w", err)
} else {
Expand Down