bugfix for PR-3522: handle case when env-ECS_DYNAMIC_HOST_PORT_RANGE …

…is not set
aws · Jan 4, 2023 · d5232a9 · d5232a9
1 parent f96a061
commit d5232a9
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 18 deletions.
diff --git a/agent/config/config_test.go b/agent/config/config_test.go
@@ -513,6 +513,13 @@ func TestParseDynamicHostPortRange(t *testing.T) {
 			expectedErrorDynamicHostPortRange:   nil,
 			expectedErrorEphemeralHostPortRange: nil,
 		},
+		{
+			testName:                            "Parse DynamicHostPortRange for valid case when config option is not set or is empty",
+			testDynamicHostPortRangeVal:         "",
+			expectedPortRangeVal:                "300-400",
+			expectedErrorDynamicHostPortRange:   nil,
+			expectedErrorEphemeralHostPortRange: nil,
+		},
 		{
 			testName:                            "Parse DynamicHostPortRange for Invalid DynamicHostPortRange value",
 			testDynamicHostPortRangeVal:         "test1",
@@ -536,7 +543,7 @@ func TestParseDynamicHostPortRange(t *testing.T) {
 			defer setTestRegion()()
 			defer setTestEnv("ECS_DYNAMIC_HOST_PORT_RANGE", tc.testDynamicHostPortRangeVal)()
 
-			if tc.expectedErrorDynamicHostPortRange != nil {
+			if tc.testDynamicHostPortRangeVal == "" || tc.expectedErrorDynamicHostPortRange != nil {
 				getDynamicHostPortRange = func() (start int, end int, err error) {
 					return 300, 400, nil
 				}

diff --git a/agent/config/parse.go b/agent/config/parse.go
@@ -380,16 +380,24 @@ var getDynamicHostPortRange = utils.GetDynamicHostPortRange
 
 func parseDynamicHostPortRange(dynamicHostPortRangeEnv string) string {
 	dynamicHostPortRange := os.Getenv(dynamicHostPortRangeEnv)
-	_, _, err := nat.ParsePortRangeToInt(dynamicHostPortRange)
-	if err != nil {
-		seelog.Warnf("Unable to read the dynamicHostPortRange value: %s", dynamicHostPortRange)
-		startHostPortRange, endHostPortRange, err := getDynamicHostPortRange()
+	if dynamicHostPortRange != "" {
+		_, _, err := nat.ParsePortRangeToInt(dynamicHostPortRange)
 		if err != nil {
-			seelog.Warnf("Unable to read the ephemeral host port range, "+
-				"falling back to the default range: %v-%v", utils.DefaultPortRangeStart, utils.DefaultPortRangeEnd)
-			return fmt.Sprintf("%d-%d", utils.DefaultPortRangeStart, utils.DefaultPortRangeEnd)
+			seelog.Warnf("Invalid dynamicHostPortRange value from config: %s, err: %v", dynamicHostPortRange, err)
+			return getDefaultDynamicHostPortRange()
 		}
-		return fmt.Sprintf("%d-%d", startHostPortRange, endHostPortRange)
+	} else {
+		return getDefaultDynamicHostPortRange()
 	}
 	return dynamicHostPortRange
 }
+
+func getDefaultDynamicHostPortRange() string {
+	startHostPortRange, endHostPortRange, err := getDynamicHostPortRange()
+	if err != nil {
+		seelog.Warnf("Unable to read the ephemeral host port range, "+
+			"falling back to the default range: %v-%v", utils.DefaultPortRangeStart, utils.DefaultPortRangeEnd)
+		return fmt.Sprintf("%d-%d", utils.DefaultPortRangeStart, utils.DefaultPortRangeEnd)
+	}
+	return fmt.Sprintf("%d-%d", startHostPortRange, endHostPortRange)
+}
diff --git a/ecs-init/cache/dependencies_mocks.go b/ecs-init/cache/dependencies_mocks.go
diff --git a/ecs-init/docker/backoff_mocks.go b/ecs-init/docker/backoff_mocks.go
diff --git a/ecs-init/docker/dependencies_mocks.go b/ecs-init/docker/dependencies_mocks.go
diff --git a/ecs-init/engine/dependencies_mocks.go b/ecs-init/engine/dependencies_mocks.go
diff --git a/ecs-init/exec/iptables/cmd_mocks.go b/ecs-init/exec/iptables/cmd_mocks.go
diff --git a/ecs-init/exec/iptables/exec_mocks.go b/ecs-init/exec/iptables/exec_mocks.go
diff --git a/ecs-init/exec/sysctl/cmd_mocks.go b/ecs-init/exec/sysctl/cmd_mocks.go
diff --git a/ecs-init/exec/sysctl/exec_mocks.go b/ecs-init/exec/sysctl/exec_mocks.go
diff --git a/ecs-init/gpu/nvidia_gpu_manager_mocks.go b/ecs-init/gpu/nvidia_gpu_manager_mocks.go