Skip to content
This repository has been archived by the owner on Apr 17, 2023. It is now read-only.

Commit

Permalink
Merge pull request #714 from mssola/fix-registry-23-target
Browse files Browse the repository at this point in the history
Fixed the `relevant?` method for Registry v2.3
  • Loading branch information
mssola committed Feb 5, 2016
2 parents 1dcdf27 + 575d51b commit b7f9091
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 1 deletion.
2 changes: 1 addition & 1 deletion lib/portus/registry_notification.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def self.process!(data, handler)
def self.relevant?(event)
return false unless event["action"] == "push"
return false unless event["target"].is_a?(Hash)
event["target"]["mediaType"] == "application/vnd.docker.distribution.manifest.v1+json"
event["target"]["mediaType"].start_with? "application/vnd.docker.distribution.manifest"
end
end
end
35 changes: 35 additions & 0 deletions spec/lib/portus/registry_notification_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,44 @@
}
end

# This is a real even notification as given by docker distribution v2.3
# rubocop:disable Metrics/LineLength
let(:version23) do
{
"id" => "7dc1c55c-dfe2-4699-ab0b-8f32e89882ce",
"timestamp" => "2016-02-05T11:16:14.917994087+01:00",
"action" => "push",
"target" => {
"mediaType" => "application/vnd.docker.distribution.manifest.v1+prettyjws",
"size" => 2739,
"digest" => "sha256:b9c8a3839b2754e0fc4309e0f994f617d43814996805388e2f9d977db3fa7967",
"length" => 2739,
"repository" => "mssola/lala",
"url" => "https://registry.mssola.cat:5000/v2/mssola/lala/manifests/sha256:b9c8a3839b2754e0fc4309e0f994f617d43814996805388e2f9d977db3fa7967"
},
"request" => {
"id" => "e30471d8-39c3-41c0-abc2-775ed43e81c9",
"addr" => "127.0.0.1:54032",
"host" => "registry.mssola.cat:5000",
"method" => "PUT",
"useragent" => "docker/1.9.1 go/go1.5.2 git-commit/a34a1d5 kernel/4.4.0-1-default os/linux arch/amd64"
},
"actor" => {
"name" => "mssola"
},
"source" => {
"addr" => "g67:5000",
"instanceID" => "18771ece-0887-40f8-ad53-ee46451b4d8b"
}
}
end
# rubocop:enable Metrics/LineLength

it "processes all the relevant events" do
body["events"] << relevant
body["events"] << version23
expect(Repository).to receive(:handle_push_event).with(relevant)
expect(Repository).to receive(:handle_push_event).with(version23)
Portus::RegistryNotification.process!(body, Repository)
end
end

0 comments on commit b7f9091

Please sign in to comment.