Merge pull request #128 from jippi/patch-1

EFS no longer support {AZ}.fs-{ID}.efs.{REGION}.amazonaws.com

Author: gondor

netshare/drivers/efs.go

@@ -10,19 +10,18 @@ import (
 )
 
 const (
-	EfsTemplateURI = "%s.%s.efs.%s.amazonaws.com"
+	EfsTemplateURI = "%s.efs.%s.amazonaws.com"
 )
 
 type efsDriver struct {
 	volumeDriver
-	availzone string
 	resolve   bool
 	region    string
 	resolver  *Resolver
 	dnscache  map[string]string
 }
 
-func NewEFSDriver(root, az, nameserver string, resolve bool) efsDriver {
+func NewEFSDriver(root, nameserver string, resolve bool) efsDriver {
 
 	d := efsDriver{
 		volumeDriver: newVolumeDriver(root),
@@ -39,9 +38,6 @@ func NewEFSDriver(root, az, nameserver string, resolve bool) efsDriver {
 		os.Exit(1)
 	}
 	d.region = md.Region
-	if az == "" {
-		d.availzone = md.AvailZone
-	}
 	return d
 }
 
@@ -110,7 +106,7 @@ func (e efsDriver) fixSource(name, id string) string {
 	uri := reg.FindString(v[0])
 
 	if e.resolve {
-		uri = fmt.Sprintf(EfsTemplateURI, e.availzone, v[0], e.region)
+		uri = fmt.Sprintf(EfsTemplateURI, v[0], e.region)
 		if i, ok := e.dnscache[uri]; ok {
 			uri = i
 		}

netshare/netshare.go

@@ -184,11 +184,10 @@ func execNFS(cmd *cobra.Command, args []string) {
 }
 
 func execEFS(cmd *cobra.Command, args []string) {
-	az, _ := cmd.Flags().GetString(AvailZoneFlag)
 	resolve, _ := cmd.Flags().GetBool(NoResolveFlag)
 	ns, _ := cmd.Flags().GetString(NameServerFlag)
-	d := drivers.NewEFSDriver(rootForType(drivers.EFS), az, ns, !resolve)
-	startOutput(fmt.Sprintf("EFS :: availability-zone: %s, resolve: %v, ns: %s", az, resolve, ns))
+	d := drivers.NewEFSDriver(rootForType(drivers.EFS), ns, !resolve)
+	startOutput(fmt.Sprintf("EFS :: resolve: %v, ns: %s", resolve, ns))
 	start(drivers.EFS, d)
 }