Merge pull request #59 from pjk25/add-actions-workflow

Add actions workflow

Author: michaelklishin

.github/workflows/test.yml

@@ -0,0 +1,55 @@
+name: Test
+on:
+  push:
+  #!   branches:
+  #!     - master
+  #! pull_request:
+  #!   branches:
+  #!     - master
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    services:
+      rabbitmq:
+        image: rabbitmq:3.9-management
+        ports:
+          - 5672:5672
+          - 15672:15672
+        options: >-
+          --name rabbitmq
+    env:
+      RUBY_RABBITMQ_HTTP_API_CLIENT_RABBITMQCTL: docker exec rabbitmq rabbitmqctl
+      RUBY_RABBITMQ_HTTP_API_CLIENT_RABBITMQ_PLUGINS: docker exec rabbitmq rabbitmq-plugins
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v2
+      - name: Wait for Broker to Finish Starting
+        run: |
+          set +e
+          tries=6;
+          while true; do
+            $RUBY_RABBITMQ_HTTP_API_CLIENT_RABBITMQCTL eval 'true = rabbit:is_running().'
+            if [[ $? -ne 0 ]]; then
+              ((tries--))
+              if [[ $tries -gt 0 ]]; then
+                echo "Rabbit is not yet running, will retry in 10s"
+                sleep 10
+              else
+                exit 1
+              fi
+            else
+              exit 0
+            fi
+          done
+      - name: Configure Broker for Test Suite
+        run: |
+          # Reduce retention policy for faster publishing of stats
+          $RUBY_RABBITMQ_HTTP_API_CLIENT_RABBITMQCTL eval 'supervisor2:terminate_child(rabbit_mgmt_sup_sup, rabbit_mgmt_sup), application:set_env(rabbitmq_management,       sample_retention_policies, [{global, [{605, 1}]}, {basic, [{605, 1}]}, {detailed, [{10, 1}]}]), rabbit_mgmt_sup_sup:start_child().' || true
+          $RUBY_RABBITMQ_HTTP_API_CLIENT_RABBITMQCTL eval  'supervisor2:terminate_child(rabbit_mgmt_agent_sup_sup, rabbit_mgmt_agent_sup), application:set_env(rabbitmq_management_agent, sample_retention_policies, [{global, [{605, 1}]}, {basic, [{605, 1}]}, {detailed, [{10, 1}]}]), rabbit_mgmt_agent_sup_sup:start_child().' || true
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.6 # Not needed with a .ruby-version file
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - name: Run Tests
+        run: |
+          bundle exec rspec -cfd spec

bin/ci/before_build.sh

@@ -20,4 +20,4 @@ $CTL set_permissions -p / guest ".*" ".*" ".*"
 
 # Reduce retention policy for faster publishing of stats
 $CTL eval 'supervisor2:terminate_child(rabbit_mgmt_sup_sup, rabbit_mgmt_sup), application:set_env(rabbitmq_management,       sample_retention_policies, [{global, [{605, 1}]}, {basic, [{605, 1}]}, {detailed, [{10, 1}]}]), rabbit_mgmt_sup_sup:start_child().' || true
-$CTL eval  'supervisor2:terminate_child(rabbit_mgmt_agent_sup_sup, rabbit_mgmt_agent_sup), application:set_env(rabbitmq_management_agent, sample_retention_policies, [{global, [{605, 1}]}, {basic, [{605, 1}]}, {detailed, [{10, 1}]}]), rabbit_mgmt_agent_sup_sup:start_child().' || true
+$CTL eval 'supervisor2:terminate_child(rabbit_mgmt_agent_sup_sup, rabbit_mgmt_agent_sup), application:set_env(rabbitmq_management_agent, sample_retention_policies, [{global, [{605, 1}]}, {basic, [{605, 1}]}, {detailed, [{10, 1}]}]), rabbit_mgmt_agent_sup_sup:start_child().' || true

lib/rabbitmq/http/client.rb

@@ -323,6 +323,10 @@ def update_topic_permissions_of(vhost, user, attributes)
         nil
       end
 
+      def delete_topic_permissions_of(vhost, user)
+        decode_resource(@connection.delete("topic-permissions/#{encode_uri_path_segment(vhost)}/#{encode_uri_path_segment(user)}"))
+      end
+
       def list_users(query = {})
         results = decode_resource_collection(@connection.get("users", query))
 

spec/integration/api_endpoints_spec.rb

@@ -197,7 +197,7 @@ def await_event_propagation
       xs = subject.list_connections
       f  = xs.first
 
-      expect(f.name).to match(/127.0.0.1/)
+      expect(f.name).to match(/(127\.0\.0\.1|172\.18\.0\.1)/)
       expect(f.client_properties.product).to eq("Bunny")
     end
   end
@@ -208,7 +208,7 @@ def await_event_propagation
       xs = subject.list_connections
       c  = subject.connection_info(xs.first.name)
 
-      expect(c.name).to match(/127.0.0.1/)
+      expect(c.name).to match(/(127\.0\.0\.1|172\.18\.0\.1)/)
       expect(c.client_properties.product).to eq("Bunny")
     end
   end
@@ -971,37 +971,49 @@ def await_event_propagation
   # Topic permissions 
   #
 
-  describe "GET /api/topic-permissions" do
-    it "returns a list of topic permissions" do
-      xs = subject.list_topic_permissions
-      expect(xs.first.read).to_not be_nil
+  describe "topic-permissions" do
+    before :each do
+      subject.update_topic_permissions_of(
+        "/",
+        "guest",
+        { exchange: "amq.topic", read: ".*", write: ".*" }
+      )
+    end
+    after :each do
+      subject.delete_topic_permissions_of("/", "guest")
     end
 
-  end
+    describe "GET /api/topic-permissions" do
+      it "returns a list of topic permissions" do
+        p, *r = subject.list_topic_permissions
+        expect(p.read).to_not be_nil
+      end
+    end
 
-  describe "GET /api/topic-permissions/:vhost/:user" do
-    it "returns a list of topic permissions of a user in a vhost" do
-      p = subject.list_topic_permissions_of("/", "guest").first
+    describe "GET /api/topic-permissions/:vhost/:user" do
+      it "returns a list of topic permissions of a user in a vhost" do
+        p, *r = subject.list_topic_permissions_of("/", "guest")
 
-      expect(p.exchange).to eq("amq.topic")
-      expect(p.read).to eq(".*")
-      expect(p.write).to eq(".*")
+        expect(p.exchange).to eq("amq.topic")
+        expect(p.read).to eq(".*")
+        expect(p.write).to eq(".*")
+      end
     end
-  end
 
-  describe "PUT /api/topic-permissions/:vhost/:user" do
-    it "updates the topic permissions of a user in a vhost" do
-      subject.update_topic_permissions_of(
-        "/",
-        "guest",
-        { exchange: "amq.topic", read: ".*", write: ".*" }
-      )
+    describe "PUT /api/topic-permissions/:vhost/:user" do
+      it "updates the topic permissions of a user in a vhost" do
+        subject.update_topic_permissions_of(
+          "/",
+          "guest",
+          { exchange: "amq.topic", read: ".*", write: ".foo" }
+        )
 
-      p = subject.list_topic_permissions_of("/", "guest").first
+        p = subject.list_topic_permissions_of("/", "guest").first
 
-      expect(p.exchange).to eq("amq.topic")
-      expect(p.read).to eq(".*")
-      expect(p.write).to eq(".*")
+        expect(p.exchange).to eq("amq.topic")
+        expect(p.read).to eq(".*")
+        expect(p.write).to eq(".foo")
+      end
     end
   end