fixup

Author: samtkaplan

src/AzStorage.jl

@@ -534,17 +534,43 @@ Serialize and write data to `io::AzObject`.  See serialize(conainer, blobname, d
 Serialization.serialize(o::AzObject, data) = serialize(o.container, o.name, data)
 
 """
-    touch(container, "blobname")
+    touch(c, b)
 
-Create a zero-byte object with name `blobname` in `container::AzContainer`.
+Update the metadata of a blob `b::AbstractString` in container `c::AzContainer`, changing
+the datset's 'LAST MODIFIED' date.  If the blob does not exist, then a zero-byte blob is
+created.
 
 # Example
 ```
 container = AzContainer("mycontainer";storageaccount="mystorageaccount")
 touch(container, "foo")
 ```
 """
-Base.touch(c::AzContainer, o::AbstractString) = write(c, o, "\0")
+function Base.touch(c::AzContainer, o::AbstractString)
+    if !isfile(c, o)
+        write(c, o, "\0")
+    else
+        @retry c.nretry HTTP.request(
+            "PUT",
+            "https://$(c.storageaccount).blob.core.windows.net/$(c.containername)/$(addprefix(c,o))?comp=metadata",
+            [
+                "Authorization" => "Bearer $(token(c.session))",
+                "x-ms-version" => API_VERSION,
+                "x-ms-meta-touched" => string(Dates.now(UTC))
+            ];
+            retry = false,
+            verbose = c.verbose,
+            connect_timeout = c.connect_timeout,
+            readtimeout = c.read_timeout)
+    end
+end
+
+"""
+    touch(o)
+
+Update the metadata of a blob `o::AzObject`, changing the dataset's 'LAST MODIFIED' date.
+"""
+Base.touch(o::AzObject) = touch(o.container, o.name)
 
 """
     touch(io::AzObject)
@@ -1416,34 +1442,6 @@ Note that the information stored is global, and not specfic to any one given IO
 """
 getperf_counters() = @ccall libAzStorage.getperf_counters()::PerfCounters
 
-"""
-    touch!(c, b)
-
-Update the metadata of a blob `b::AbstractString` in container `c::AzContainer`, changing
-the datset's 'LAST MODIFIED' date.
-"""
-function Base.touch(c::AzContainer, o::AbstractString)
-    @retry c.nretry HTTP.request(
-        "PUT",
-        "https://$(c.storageaccount).blob.core.windows.net/$(c.containername)/$(addprefix(c,o))?comp=metadata",
-        [
-            "Authorization" => "Bearer $(token(c.session))",
-            "x-ms-version" => API_VERSION,
-            "x-ms-meta-touched" => string(Dates.now(UTC))
-        ];
-        retry = false,
-        verbose = c.verbose,
-        connect_timeout = c.connect_timeout,
-        readtimeout = c.read_timeout)
-end
-
-"""
-    touch(o)
-
-Update the metadata of a blob `o::AzObject`, changing the dataset's 'LAST MODIFIED' date.
-"""
-Base.touch(o::AzObject) = touch(o.container, o.name)
-
 """
     tier!(c, b[; tier="Hot"])
 

test/runtests.jl

@@ -302,6 +302,34 @@ end
     rm(c)
 end
 
+@testset "Containers and Objects, touch" begin
+    r = uuid4()
+    c = AzContainer("foo-$r"; storageaccount, session)
+    mkpath(c)
+    write(c, "test.txt", "Hello")
+    
+    r1 = HTTP.request("HEAD", "https://$(c.storageaccount).blob.core.windows.net/$(c.containername)/test.txt", ["Authorization" => "Bearer $(token(c.session))", "x-ms-version" => AzStorage.API_VERSION])
+    t1 = HTTP.header(r1, "Last-Modified")
+
+    sleep(5)
+
+    touch(c, "test.txt")
+    r2 = HTTP.request("HEAD", "https://$(c.storageaccount).blob.core.windows.net/$(c.containername)/test.txt", ["Authorization" => "Bearer $(token(c.session))", "x-ms-version" => AzStorage.API_VERSION])
+    t2 = HTTP.header(r2, "Last-Modified")
+
+    @test t1 != t2
+
+    sleep(5)
+
+    touch(joinpath(c, "test.txt"))
+    r3 = HTTP.request("HEAD", "https://$(c.storageaccount).blob.core.windows.net/$(c.containername)/test.txt", ["Authorization" => "Bearer $(token(c.session))", "x-ms-version" => AzStorage.API_VERSION])
+    t3 = HTTP.header(r3, "Last-Modified")
+
+    @test t3 != t2
+
+    rm(c)
+end
+
 @testset "isdir, edge case" begin
     c = AzContainer(""; storageaccount="", session=session)
     @test isdir(c) == false
@@ -727,34 +755,6 @@ end
     rm(c)
 end
 
-@testset "touch" begin
-    r = uuid4()
-    c = AzContainer("foo-$r"; storageaccount, session)
-    mkpath(c)
-    write(c, "test.txt", "Hello")
-    
-    r1 = HTTP.request("HEAD", "https://$(c.storageaccount).blob.core.windows.net/$(c.containername)/test.txt", ["Authorization" => "Bearer $(token(c.session))", "x-ms-version" => AzStorage.API_VERSION])
-    t1 = HTTP.header(r1, "Last-Modified")
-
-    sleep(5)
-
-    touch(c, "test.txt")
-    r2 = HTTP.request("HEAD", "https://$(c.storageaccount).blob.core.windows.net/$(c.containername)/test.txt", ["Authorization" => "Bearer $(token(c.session))", "x-ms-version" => AzStorage.API_VERSION])
-    t2 = HTTP.header(r2, "Last-Modified")
-
-    @test t1 != t2
-
-    sleep(5)
-
-    touch(joinpath(c, "test.txt"))
-    r3 = HTTP.request("HEAD", "https://$(c.storageaccount).blob.core.windows.net/$(c.containername)/test.txt", ["Authorization" => "Bearer $(token(c.session))", "x-ms-version" => AzStorage.API_VERSION])
-    t3 = HTTP.header(r3, "Last-Modified")
-
-    @test t3 != t2
-
-    rm(c)
-end
-
 # TODO: CI is showing a seg-fault on Apple, but I do not have an Apple machine to help debug.
 if !Sys.iswindows() && !Sys.isapple()
     @testset "C token refresh, write" begin