wip2

agent/api/task/task_linux.go

@@ -33,7 +33,6 @@ import (
 )
 
 const (
-	defaultCPUPeriod = 100 * time.Millisecond // 100ms
 	// With a 100ms CPU period, we can express 0.01 vCPU to 10 vCPUs
 	maxTaskVCPULimit = 10
 	// Reference: http://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_ContainerDefinition.html
@@ -231,11 +230,6 @@ func (task *Task) initializeCredentialSpecResource(config *config.Config, creden
 	return errors.New("task credentialspec is only supported on windows")
 }
 
-// getAllCredentialSpecRequirements is used to build all the credential spec requirements for the task
-func (task *Task) getAllCredentialSpecRequirements() []string {
-	return nil
-}
-
 // GetCredentialSpecResource retrieves credentialspec resource from resource map
 func (task *Task) GetCredentialSpecResource() ([]taskresource.TaskResource, bool) {
 	return []taskresource.TaskResource{}, false

agent/api/task/task_linux_test.go

@@ -61,6 +61,8 @@ const (
 	testTaskDefVersion         = "1"
 	testRegion                 = "testRegion"
 	testExecutionCredentialsID = "testExecutionCredentialsID"
+
+	defaultCPUPeriod = 100 * time.Millisecond // 100ms
 )
 
 func TestAddNetworkResourceProvisioningDependencyNop(t *testing.T) {

agent/engine/dependencygraph/graph.go

@@ -201,15 +201,6 @@ func verifyContainerDependenciesResolvedForResource(target taskresource.TaskReso
 	return true
 }
 
-func linksToContainerNames(links []string) []string {
-	names := make([]string, 0, len(links))
-	for _, link := range links {
-		name := strings.Split(link, ":")[0]
-		names = append(names, name)
-	}
-	return names
-}
-
 func executionCredentialsResolved(target *apicontainer.Container, id string, manager credentials.Manager) bool {
 	if target.GetKnownStatus() >= apicontainerstatus.ContainerPulled ||
 		!target.ShouldPullWithExecutionRole() ||

agent/engine/task_manager.go

@@ -41,7 +41,6 @@ import (
 	"github.com/aws/amazon-ecs-agent/agent/utils/ttime"
 
 	"github.com/cihub/seelog"
-	"github.com/pkg/errors"
 )
 
 const (
@@ -58,15 +57,10 @@ const (
 )
 
 var (
-	_stoppedSentWaitInterval       = stoppedSentWaitInterval
-	_maxStoppedWaitTimes           = int(maxStoppedWaitTimes)
-	taskNotWaitForSteadyStateError = errors.New("managed task: steady state check context is nil")
+	_stoppedSentWaitInterval = stoppedSentWaitInterval
+	_maxStoppedWaitTimes     = int(maxStoppedWaitTimes)
 )
 
-type acsTaskUpdate struct {
-	apitaskstatus.TaskStatus
-}
-
 type dockerContainerChange struct {
 	container *apicontainer.Container
 	event     dockerapi.DockerContainerChangeEvent

agent/eventhandler/task_handler.go

@@ -390,15 +390,6 @@ func (taskEvents *taskSendableEvents) toStringUnsafe() string {
 		taskEvents.taskARN, taskEvents.sending, taskEvents.createdAt.String())
 }
 
-// getTasksToEventsLen returns the length of the tasksToEvents map. It is
-// used only in the test code to ascertain that map has been cleaned up
-func (handler *TaskHandler) getTasksToEventsLen() int {
-	handler.lock.RLock()
-	defer handler.lock.RUnlock()
-
-	return len(handler.tasksToEvents)
-}
-
 // handleInvalidParamException removes the event from event queue when its parameters are
 // invalid to reduce redundant API call
 func handleInvalidParamException(err error, events *list.List, eventToSubmit *list.Element) {

agent/eventhandler/task_handler_test.go

@@ -335,13 +335,22 @@ func TestCleanupTaskEventAfterSubmit(t *testing.T) {
 
 	// Wait for task events to be removed from the tasksToEvents map
 	for {
-		if handler.getTasksToEventsLen() == 0 {
+		if getTasksToEventsLen(handler) == 0 {
 			break
 		}
 		time.Sleep(time.Millisecond)
 	}
 }
 
+// getTasksToEventsLen returns the length of the tasksToEvents map. It is
+// used only in the test code to ascertain that map has been cleaned up
+func getTasksToEventsLen(handler *TaskHandler) int {
+	handler.lock.RLock()
+	defer handler.lock.RUnlock()
+
+	return len(handler.tasksToEvents)
+}
+
 func containerEvent(arn string) statechange.Event {
 	return api.ContainerStateChange{TaskArn: arn, ContainerName: "containerName", Status: apicontainerstatus.ContainerRunning, Container: &apicontainer.Container{}}
 }

agent/eventhandler/task_handler_types.go

@@ -40,14 +40,6 @@ type sendableEvent struct {
 	lock sync.RWMutex
 }
 
-func newSendableContainerEvent(event api.ContainerStateChange) *sendableEvent {
-	return &sendableEvent{
-		isContainerEvent: true,
-		containerSent:    false,
-		containerChange:  event,
-	}
-}
-
 func newSendableTaskEvent(event api.TaskStateChange) *sendableEvent {
 	return &sendableEvent{
 		isContainerEvent: false,

agent/eventhandler/task_handler_types_test.go

@@ -29,6 +29,14 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
+func newSendableContainerEvent(event api.ContainerStateChange) *sendableEvent {
+	return &sendableEvent{
+		isContainerEvent: true,
+		containerSent:    false,
+		containerChange:  event,
+	}
+}
+
 func TestShouldContainerEventBeSent(t *testing.T) {
 	event := newSendableContainerEvent(api.ContainerStateChange{
 		Status: apicontainerstatus.ContainerStopped,

agent/httpclient/httpclient.go

@@ -27,8 +27,6 @@ import (
 	"github.com/aws/amazon-ecs-agent/agent/version"
 )
 
-const defaultTimeout = 10 * time.Minute
-
 // Taken from the default http.Client behavior
 const defaultDialTimeout = 30 * time.Second
 const defaultDialKeepalive = 30 * time.Second

agent/metrics/generic_metrics_client.go

@@ -115,12 +115,6 @@ func (gm *GenericMetrics) FireCallEnd(callHash, callName string, timestamp time.
 	}
 }
 
-// Simple Timeout function
-func startTimeout(timeout chan bool) {
-	time.Sleep(callTimeout)
-	timeout <- true
-}
-
 // This function increments the call count for a specific API call
 // This is invoked at the API call's start, whereas the duration metrics
 // are updated at the API call's end.

agent/metrics/metrics_engine.go

@@ -14,7 +14,6 @@
 package metrics
 
 import (
-	"context"
 	"fmt"
 	"net/http"
 	"time"
@@ -29,7 +28,6 @@ type APIType int32
 type MetricsEngine struct {
 	collection     bool
 	cfg            *config.Config
-	ctx            context.Context
 	Registry       *prometheus.Registry
 	managedMetrics map[APIType]MetricsClient
 }

agent/stats/utils.go

@@ -20,10 +20,6 @@ import (
 	"github.com/docker/docker/api/types"
 )
 
-// networkStatsErrorPattern defines the pattern that is used to evaluate
-// if there's an error reading network stats.
-const networkStatsErrorPattern = "open /sys/class/net/veth.*: no such file or directory"
-
 var numCores = uint64(runtime.NumCPU())
 
 // nan32 returns a 32bit NaN.

agent/taskresource/credentialspec/credentialspec_windows.go

@@ -41,6 +41,18 @@ import (
 	"github.com/pkg/errors"
 )
 
+const (
+	tempFileName = "temp_file"
+	// filePerm is the permission for the credentialspec file.
+	filePerm = 0644
+
+	s3DownloadTimeout = 30 * time.Second
+
+	// Environment variables to setup resource location
+	envProgramData              = "ProgramData"
+	dockerCredentialSpecDataDir = "docker/credentialspecs"
+)
+
 // CredentialSpecResource is the abstraction for credentialspec resources
 type CredentialSpecResource struct {
 	taskARN                string

agent/taskresource/credentialspec/types.go

@@ -13,20 +13,7 @@
 
 package credentialspec
 
-import "time"
-
 const (
 	// ResourceName is the name of the credentialspec resource
 	ResourceName = "credentialspec"
-
-	tempFileName = "temp_file"
-
-	// filePerm is the permission for the credentialspec file.
-	filePerm = 0644
-
-	s3DownloadTimeout = 30 * time.Second
-
-	// Environment variables to setup resource location
-	envProgramData              = "ProgramData"
-	dockerCredentialSpecDataDir = "docker/credentialspecs"
 )