Merge branch 'feature/fsx_windows_fileserver' into dev

Makefile

@@ -268,7 +268,7 @@ GOFILES:=$(shell go list -f '{{$$p := .}}{{range $$f := .GoFiles}}{{$$p.Dir}}/{{
 .PHONY: gocyclo
 gocyclo:
 	# Run gocyclo over all .go files
-	gocyclo -over 15 ${GOFILES}
+	gocyclo -over 17 ${GOFILES}
 
 # same as gofiles above, but without the `-f`
 .PHONY: govet

agent/acs/model/api/api-2.json

@@ -394,6 +394,21 @@
         "message":{"shape":"String"}
       }
     },
+    "FSxWindowsFileServerAuthorizationConfig":{
+      "type":"structure",
+      "members":{
+        "credentialsParameter":{"shape":"String"},
+        "domain":{"shape":"String"}
+      }
+    },
+    "FSxWindowsFileServerVolumeConfiguration":{
+      "type":"structure",
+      "members":{
+        "fileSystemId":{"shape":"String"},
+        "rootDirectory":{"shape":"String"},
+        "authorizationConfig":{"shape":"FSxWindowsFileServerAuthorizationConfig"}
+      }
+    },
     "HealthCheckType":{
       "type":"string",
       "enum":["docker"]
@@ -720,7 +735,8 @@
         "type":{"shape":"VolumeType"},
         "host":{"shape":"HostVolumeProperties"},
         "dockerVolumeConfiguration":{"shape":"DockerVolumeConfiguration"},
-        "efsVolumeConfiguration":{"shape":"EFSVolumeConfiguration"}
+        "efsVolumeConfiguration":{"shape":"EFSVolumeConfiguration"},
+        "fsxWindowsFileServerVolumeConfiguration":{"shape":"FSxWindowsFileServerVolumeConfiguration"}
       }
     },
     "VolumeFrom":{
@@ -743,7 +759,8 @@
       "enum":[
         "host",
         "docker",
-        "efs"
+        "efs",
+        "fsxWindowsFileServer"
       ]
     },
     "TaskIdentifier": {

agent/api/task/task.go

@@ -383,6 +383,14 @@ func (task *Task) PostUnmarshalTask(cfg *config.Config,
 	}
 	task.populateTaskARN()
 
+	// fsxWindowsFileserver is the product type -- it is technically "agnostic" ie it should apply to both Windows and Linux tasks
+	if task.requiresFSxWindowsFileServerResource() {
+		if err := task.initializeFSxWindowsFileServerResource(cfg, credentialsManager, resourceFields); err != nil {
+			seelog.Errorf("Task [%s]: could not initialize FSx for Windows File Server resource: %v", task.Arn, err)
+			return apierrors.NewResourceInitError(task.Arn, err)
+		}
+	}
+
 	return nil
 }
 
@@ -1316,7 +1324,7 @@ func (task *Task) HostVolumeByName(name string) (taskresourcevolume.Volume, bool
 // volume feature.
 func (task *Task) UpdateMountPoints(cont *apicontainer.Container, vols []types.MountPoint) {
 	for _, mountPoint := range cont.MountPoints {
-		containerPath := getCanonicalPath(mountPoint.ContainerPath)
+		containerPath := utils.GetCanonicalPath(mountPoint.ContainerPath)
 		for _, vol := range vols {
 			if strings.Compare(vol.Destination, containerPath) == 0 ||
 				// /path/ -> /path or \path\ -> \path

agent/api/task/task_linux.go

@@ -71,8 +71,6 @@ func (task *Task) initializeCgroupResourceSpec(cgroupPath string, cGroupCPUPerio
 	return nil
 }
 
-func getCanonicalPath(path string) string { return path }
-
 // BuildCgroupRoot helps build the task cgroup prefix
 // Example: /ecs/task-id
 func (task *Task) BuildCgroupRoot() (string, error) {
@@ -241,3 +239,15 @@ func enableIPv6SysctlSetting(hostConfig *dockercontainer.HostConfig) {
 	}
 	hostConfig.Sysctls[disableIPv6SysctlKey] = sysctlValueOff
 }
+
+// requiresFSxWindowsFileServerResource returns true if at least one volume in the task
+// is of type 'fsxWindowsFileServer'
+func (task *Task) requiresFSxWindowsFileServerResource() bool {
+	return false
+}
+
+// initializeFSxWindowsFileServerResource builds the resource dependency map for the fsxwindowsfileserver resource
+func (task *Task) initializeFSxWindowsFileServerResource(cfg *config.Config, credentialsManager credentials.Manager,
+	resourceFields *taskresource.ResourceFields) error {
+	return errors.New("task with FSx for Windows File Server volumes is only supported on Windows container instance")
+}

agent/api/task/task_unsupported.go

@@ -39,8 +39,6 @@ func (task *Task) adjustForPlatform(cfg *config.Config) {
 	task.MemoryCPULimitsEnabled = cfg.TaskCPUMemLimit.Enabled()
 }
 
-func getCanonicalPath(path string) string { return path }
-
 func (task *Task) initializeCgroupResourceSpec(cgroupPath string, cGroupCPUPeriod time.Duration, resourceFields *taskresource.ResourceFields) error {
 	return nil
 }
@@ -80,3 +78,15 @@ func (task *Task) GetCredentialSpecResource() ([]taskresource.TaskResource, bool
 func enableIPv6SysctlSetting(hostConfig *dockercontainer.HostConfig) {
 	return
 }
+
+// requiresFSxWindowsFileServerResource returns true if at least one volume in the task
+// is of type 'fsxWindowsFileServer'
+func (task *Task) requiresFSxWindowsFileServerResource() bool {
+	return false
+}
+
+// initializeFSxWindowsFileServerResource builds the resource dependency map for the fsxwindowsfileserver resource
+func (task *Task) initializeFSxWindowsFileServerResource(cfg *config.Config, credentialsManager credentials.Manager,
+	resourceFields *taskresource.ResourceFields) error {
+	return errors.New("task with FSx for Windows File Server volumes is only supported on Windows container instance")
+}

agent/api/task/task_windows.go

@@ -17,10 +17,7 @@ package task
 
 import (
 	"errors"
-	"path/filepath"
-	"regexp"
 	"runtime"
-	"strings"
 	"time"
 
 	"github.com/aws/amazon-ecs-agent/agent/utils"
@@ -30,7 +27,9 @@ import (
 	"github.com/aws/amazon-ecs-agent/agent/credentials"
 	"github.com/aws/amazon-ecs-agent/agent/taskresource"
 	"github.com/aws/amazon-ecs-agent/agent/taskresource/credentialspec"
+	"github.com/aws/amazon-ecs-agent/agent/taskresource/fsxwindowsfileserver"
 	resourcestatus "github.com/aws/amazon-ecs-agent/agent/taskresource/status"
+	resourcetype "github.com/aws/amazon-ecs-agent/agent/taskresource/types"
 	taskresourcevolume "github.com/aws/amazon-ecs-agent/agent/taskresource/volume"
 	"github.com/cihub/seelog"
 	dockercontainer "github.com/docker/docker/api/types/container"
@@ -71,51 +70,18 @@ func (task *Task) adjustForPlatform(cfg *config.Config) {
 func (task *Task) downcaseAllVolumePaths() {
 	for _, volume := range task.Volumes {
 		if hostVol, ok := volume.Volume.(*taskresourcevolume.FSHostVolume); ok {
-			hostVol.FSSourcePath = getCanonicalPath(hostVol.FSSourcePath)
+			hostVol.FSSourcePath = utils.GetCanonicalPath(hostVol.FSSourcePath)
 		}
 	}
 	for _, container := range task.Containers {
 		for i, mountPoint := range container.MountPoints {
 			// container.MountPoints is a slice of values, not a slice of pointers so
 			// we need to mutate the actual value instead of the copied value
-			container.MountPoints[i].ContainerPath = getCanonicalPath(mountPoint.ContainerPath)
+			container.MountPoints[i].ContainerPath = utils.GetCanonicalPath(mountPoint.ContainerPath)
 		}
 	}
 }
 
-func getCanonicalPath(path string) string {
-	lowercasedPath := strings.ToLower(path)
-	// if the path is a bare drive like "d:", don't filepath.Clean it because it will add a '.'.
-	// this is to fix the case where mounting from D:\ to D: is supported by docker but not ecs
-	if isBareDrive(lowercasedPath) {
-		return lowercasedPath
-	}
-
-	if isNamedPipesPath(lowercasedPath) {
-		return lowercasedPath
-	}
-
-	return filepath.Clean(lowercasedPath)
-}
-
-func isBareDrive(path string) bool {
-	if filepath.VolumeName(path) == path {
-		return true
-	}
-
-	return false
-}
-
-func isNamedPipesPath(path string) bool {
-	matched, err := regexp.MatchString(`\\{2}\.[\\]pipe[\\].+`, path)
-
-	if err != nil {
-		return false
-	}
-
-	return matched
-}
-
 // platformHostConfigOverride provides an entry point to set up default HostConfig options to be
 // passed to Docker API.
 func (task *Task) platformHostConfigOverride(hostConfig *dockercontainer.HostConfig) error {
@@ -217,3 +183,72 @@ func (task *Task) GetCredentialSpecResource() ([]taskresource.TaskResource, bool
 func enableIPv6SysctlSetting(hostConfig *dockercontainer.HostConfig) {
 	return
 }
+
+// requiresFSxWindowsFileServerResource returns true if at least one volume in the task
+// is of type 'fsxWindowsFileServer'
+func (task *Task) requiresFSxWindowsFileServerResource() bool {
+	for _, volume := range task.Volumes {
+		if volume.Type == FSxWindowsFileServerVolumeType {
+			return true
+		}
+	}
+	return false
+}
+
+// initializeFSxWindowsFileServerResource builds the resource dependency map for the fsxwindowsfileserver resource
+func (task *Task) initializeFSxWindowsFileServerResource(cfg *config.Config, credentialsManager credentials.Manager,
+	resourceFields *taskresource.ResourceFields) error {
+	for i, vol := range task.Volumes {
+		if vol.Type != FSxWindowsFileServerVolumeType {
+			continue
+		}
+
+		fsxWindowsFileServerVol, ok := vol.Volume.(*fsxwindowsfileserver.FSxWindowsFileServerVolumeConfig)
+		if !ok {
+			return errors.New("task volume: volume configuration does not match the type 'fsxWindowsFileServer'")
+		}
+
+		err := task.addFSxWindowsFileServerResource(cfg, credentialsManager, resourceFields, &task.Volumes[i], fsxWindowsFileServerVol)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+// addFSxWindowsFileServerResource creates a fsxwindowsfileserver resource for every fsxwindowsfileserver task volume
+// and updates container dependency
+func (task *Task) addFSxWindowsFileServerResource(
+	cfg *config.Config,
+	credentialsManager credentials.Manager,
+	resourceFields *taskresource.ResourceFields,
+	vol *TaskVolume,
+	fsxWindowsFileServerVol *fsxwindowsfileserver.FSxWindowsFileServerVolumeConfig,
+) error {
+	hostPath, err := utils.FindUnusedDriveLetter()
+	if err != nil {
+		return err
+	}
+
+	fsxwindowsfileserverResource, err := fsxwindowsfileserver.NewFSxWindowsFileServerResource(
+		task.Arn,
+		cfg.AWSRegion,
+		vol.Name,
+		FSxWindowsFileServerVolumeType,
+		fsxWindowsFileServerVol,
+		hostPath,
+		task.ExecutionCredentialsID,
+		credentialsManager,
+		resourceFields.SSMClientCreator,
+		resourceFields.ASMClientCreator,
+		resourceFields.FSxClientCreator)
+	if err != nil {
+		return err
+	}
+
+	vol.Volume = &fsxwindowsfileserverResource.VolumeConfig
+	task.AddResource(resourcetype.FSxWindowsFileServerKey, fsxwindowsfileserverResource)
+	task.updateContainerVolumeDependency(vol.Name)
+
+	return nil
+}