Add ulimits to parseV3

allisaurus · allisaurus · commit 7411b59577ef · 2018-06-04T10:56:17.000-07:00
diff --git a/ecs-cli/modules/cli/compose/project/project_parseV3.go b/ecs-cli/modules/cli/compose/project/project_parseV3.go
@@ -154,7 +154,11 @@ func convertToContainerConfig(serviceConfig types.ServiceConfig, serviceVols *ad
 		}
 		c.Tmpfs = ecsTmpfs
 	}
-	// TODO: reconcile with top-level Volumes key
+
+	if len(serviceConfig.Ulimits) > 0 {
+		c.Ulimits = convertToECSUlimits(serviceConfig.Ulimits)
+	}
+
 	if len(serviceConfig.Volumes) > 0 {
 		mountPoints := []*ecs.MountPoint{}
 
@@ -207,6 +211,25 @@ func convertPortConfigToECSMapping(portConfig types.ServicePortConfig) *ecs.Port
 	return &ecsMapping
 }
 
+func convertToECSUlimits(ulimits map[string]*types.UlimitsConfig) []*ecs.Ulimit {
+	ecsUlimits := []*ecs.Ulimit{}
+
+	for name, ulimit := range ulimits {
+		ecsULimit := ecs.Ulimit{}
+		ecsULimit.SetName(name)
+
+		if ulimit.Single > 0 {
+			ecsULimit.SetSoftLimit(int64(ulimit.Single))
+			ecsULimit.SetHardLimit(int64(ulimit.Single))
+		} else {
+			ecsULimit.SetSoftLimit(int64(ulimit.Soft))
+			ecsULimit.SetHardLimit(int64(ulimit.Hard))
+		}
+		ecsUlimits = append(ecsUlimits, &ecsULimit)
+	}
+	return ecsUlimits
+}
+
 func logWarningForDeployFields(d types.DeployConfig, serviceName string) {
 	if d.Resources.Limits != nil || d.Resources.Reservations != nil {
 		log.WithFields(log.Fields{
diff --git a/ecs-cli/modules/cli/compose/project/project_parseV3_test.go b/ecs-cli/modules/cli/compose/project/project_parseV3_test.go
@@ -49,6 +49,14 @@ services:
     tmpfs:
       - "/run:rw,size=1gb"
     read_only: true
+    ulimits:
+      rss: 65535
+      nofile:
+        soft: 2000
+        hard: 4000
+      nice:
+        soft: 300
+        hard: 500
   mysql:
     image: mysql
     labels:
@@ -418,6 +426,19 @@ func verifyConvertToContainerConfigOutput(t *testing.T, expected types.ServiceCo
 		assert.Empty(t, actual.PortMappings)
 	}
 
+	if len(expected.Ulimits) > 0 {
+		assert.Equal(t, len(expected.Ulimits), len(actual.Ulimits), "Expected number of Ulimits to match")
+
+		for _, lim := range actual.Ulimits {
+			matchingServUlimit := expected.Ulimits[*lim.Name]
+
+			assert.NotNil(t, matchingServUlimit, "Expected ContainerConfig ulimit to have corresponding serviceConfig ulimit")
+			verifyUlimit(t, *matchingServUlimit, *lim)
+		}
+	} else {
+		assert.Empty(t, actual.Ulimits)
+	}
+
 	if len(expected.Volumes) > 0 {
 		for i, vol := range expected.Volumes {
 			if vol.Type == "volume" {
@@ -437,6 +458,20 @@ func verifyConvertToContainerConfigOutput(t *testing.T, expected types.ServiceCo
 	}
 }
 
+func verifyUlimit(t *testing.T, servUlimit types.UlimitsConfig, containerUlimit ecs.Ulimit) {
+	var soft int64
+	var hard int64
+	if servUlimit.Single > 0 {
+		soft = int64(servUlimit.Single)
+		hard = int64(servUlimit.Single)
+	} else {
+		soft = int64(servUlimit.Soft)
+		hard = int64(servUlimit.Hard)
+	}
+	assert.Equal(t, soft, *containerUlimit.SoftLimit, "Expected soft limit to match")
+	assert.Equal(t, hard, *containerUlimit.HardLimit, "Expected hard limit to match")
+}
+
 func verifyMountPoint(t *testing.T, servVolume types.ServiceVolumeConfig, mountPoint ecs.MountPoint) {
 	if servVolume.Source == "" {
 		assert.True(t, strings.HasPrefix(*mountPoint.SourceVolume, "volume-"), "Expected volume Source to being with 'volume-'")
