Merge pull request #83 from ChevronETC/slashes

more aggressive removal of preceding and trailing '/'s from container…

Author: samtkaplan

Project.toml

@@ -1,6 +1,6 @@
 name = "AzStorage"
 uuid = "c6697862-1611-5eae-9ef8-48803c85c8d6"
-version = "2.7.0"
+version = "2.7.1"
 
 [deps]
 AbstractStorage = "14dbef02-f468-5f15-853e-5ec8dee7b899"

src/AzStorage.jl

@@ -138,22 +138,23 @@ The storage account must already exist.
 * `verbose=0` verbosity flag passed to libcurl.
 
 # Notes
-The container name can container "/"'s.  If this is the case, then the string preceding the first "/" will
+The container name can contain "/"'s.  If this is the case, then the string preceding the first "/" will
 be the container name, and the string that remains will be pre-pended to the blob names.  This allows Azure
-to present blobs in a pseudo-directory structure.
+to present blobs in a pseudo-directory structure.  Note that trailing and leading `/`'s are ignored.
 """
 function AzContainer(containername::AbstractString; storageaccount, session=AzSession(;lazy=false, scope=__OAUTH_SCOPE), nthreads=Sys.CPU_THREADS, connect_timeout=10, read_timeout=30, nretry=10, verbose=0, prefix="")
-    name = split(containername, '/')
+    name = split(strip(containername, '/'), '/')
     _containername = name[1]
-    prefix *= lstrip('/'*join(name[2:end], '/'), '/')
+    prefix = strip(strip(prefix, '/')*'/'*join(name[2:end], '/'), '/')
+
     AzContainer(String(storageaccount), String(_containername), String(prefix), session, windows_one_thread(nthreads), connect_timeout, read_timeout, nretry, verbose)
 end
 
 function AbstractStorage.Container(::Type{<:AzContainer}, d::Dict, session=AzSession(;lazy=false, scope=__OAUTH_SCOPE); nthreads=Sys.CPU_THREADS, connect_timeout=10, read_timeout=30, nretry=10, verbose=0)
     AzContainer(
         d["storageaccount"],
-        d["containername"],
-        d["prefix"],
+        String(strip(d["containername"], '/')),
+        String(strip(d["prefix"], '/')),
         session,
         windows_one_thread(get(d, "nthreads", nthreads)),
         connect_timeout,

test/runtests.jl

@@ -737,7 +737,24 @@ if !Sys.iswindows() && !Sys.isapple()
         @test data ≈ _data
     end
 
-    @testset "performance counters" begin
+    @testset "remove leading/training slashes" begin
+        r = uuid4()
+        c = AzContainer("foo-$r-o", storageaccount=storageaccount, session=session)
+        @test c.prefix == ""
+        @test c.containername == "foo-$r-o"
+        c = AzContainer("foo-$r-o/bar/", storageaccount=storageaccount, session=session)
+        @test c.prefix == "bar"
+        @test c.containername == "foo-$r-o"
+        c = AzContainer("foo-$r-o/bar/baz/", storageaccount=storageaccount, session=session)
+        @test c.prefix == "bar/baz"
+        @test c.containername == "foo-$r-o"
+        c = AzContainer("foo-$r-o/bar/baz/", storageaccount=storageaccount, session=session, prefix="/one/two/")
+        @test c.prefix == "one/two/bar/baz"
+        @test c.containername == "foo-$r-o"
+    end
+
+
+    @test_skip @testset "performance counters" begin
         perfcounters = AzStorage.getperf_counters()
         @info "Throttled events = $(perfcounters.count_throttled), Throttled ms wait: = $(perfcounters.ms_wait_throttled)"
 
@@ -753,5 +770,4 @@ if !Sys.iswindows() && !Sys.isapple()
         @test_skip @test perfcounters.count_throttled == 0
         @test_skip @test perfcounters.count_timeouts == 0
     end
-
 end