memberships (#1375)

* Add default artifact manager config

* expose membership /build_permission

* specs

---------

Co-authored-by: AndriiMysko <[email protected]>
Co-authored-by: GbArc <[email protected]>

Author: 3 people

lib/travis/api/v3/renderer/membership.rb

@@ -0,0 +1,6 @@
+module Travis::API::V3
+  class Renderer::Membership < ModelRenderer
+    representation(:minimal, :organization_id, :build_permission)
+    representation(:standard, :user_id, :organization_id, :role, :build_permission)
+  end
+end

lib/travis/api/v3/renderer/user.rb

@@ -2,7 +2,7 @@
 
 module Travis::API::V3
   class Renderer::User < Renderer::Owner
-    representation(:standard, :email, :is_syncing, :synced_at, :recently_signed_up, :secure_user_hash, :ro_mode, :confirmed_at, :custom_keys, :internal, :last_activity_at)
+    representation(:standard, :email, :is_syncing, :synced_at, :recently_signed_up, :secure_user_hash, :ro_mode, :confirmed_at, :custom_keys, :internal, :last_activity_at, :memberships)
     representation(:additional, :emails, :collaborator)
 
     def email

lib/travis/api/v3/services/custom_images/delete.rb

@@ -9,7 +9,7 @@ def run!
       raise NotFound unless owner
 
       if owner.is_a?(Travis::API::V3::Models::User)
-        access_control.permissions(owner).write!
+        access_control.permissions(owner).sync!
       else
         access_control.permissions(owner).admin!
       end

spec/v3/artifact_manager_client_spec.rb

@@ -11,19 +11,17 @@
 
   describe '#delete_images' do
     let(:image_ids) { [1, 2, 3] }
-    subject { client.delete_images(image_ids) }
+    subject { client.delete_images('user', user_id, image_ids) }
 
     it 'sends a DELETE request to the artifact manager' do
-      stub_request(:delete, "#{url}/images")
-        .with(body: { image_ids: image_ids }.to_json, headers: { 'X-Travis-User-Id' => user_id.to_s })
-        .to_return(status: 200, body: { images: [] }.to_json, headers: { 'Content-Type' => 'application/json' })
+      stub_request(:delete, %r{#{url}/image/user/#{user_id}/\d+})
+        .to_return(status: 200, headers: { 'Content-Type' => 'application/json' })
 
       subject
     end
 
     it 'raises an error if the request fails' do
-      stub_request(:delete, "#{url}/images")
-        .with(body: { image_ids: image_ids }.to_json, headers: { 'X-Travis-User-Id' => user_id.to_s })
+      stub_request(:delete, %r{#{url}/image/user/#{user_id}/\d+})
         .to_return(status: 400, body: { error: 'Bad Request' }.to_json, headers: { 'Content-Type' => 'application/json' })
 
       expect { subject }.to raise_error(Travis::API::V3::ClientError, 'Bad Request')

spec/v3/services/custom_images/delete_spec.rb

@@ -15,11 +15,7 @@
   context 'authenticated' do
     describe "deleting custom images by id list" do
       before do
-        stub_request(:delete, "#{Travis.config.artifact_manager.url}/images")
-          .with(
-            body: { image_ids: ['1', '2', '3'] }.to_json,
-            headers: { 'X-Travis-User-Id' => user.id.to_s }
-          )
+        stub_request(:delete, %r{#{Travis.config.artifact_manager.url}/image/user/#{user.id}/\d+})
           .to_return(status: 204, headers: { 'Content-Type' => 'application/json' })
       end
 

spec/v3/services/custom_images/for_owner_spec.rb

@@ -36,7 +36,7 @@
       let(:authorization) { { 'permissions' => [ 'repository_state_update' ] } }
 
       it 'returns an empty list' do
-        get("/v3/owner/#{other_user.login}/custom_images", {}, json_headers.merge('HTTP_AUTHORIZATION' => "token #{other_user_token}"))
+        get("/v3/owner/#{user.login}/custom_images", {}, json_headers.merge('HTTP_AUTHORIZATION' => "token #{other_user_token}"))
 
         expect(JSON.parse(last_response.body)).to include(
           'error_type' => 'insufficient_access'

spec/v3/services/installation/find_spec.rb

@@ -61,6 +61,7 @@
         "vcs_type" => user.vcs_type,
         "avatar_url" => "https://0.gravatar.com/avatar/07fb84848e68b96b69022d333ca8a3e2",
         "is_syncing" => nil,
+        "memberships" => [],
         "synced_at" => nil,
         "education" => nil,
         "allowance"   => {

spec/v3/services/owner/find_spec.rb

@@ -442,6 +442,7 @@
         "vcs_type"       => user.vcs_type,
         "avatar_url"     => nil,
         "is_syncing"     => nil,
+        "memberships"    => [],
         "synced_at"      => nil,
         "education"      => nil,
         "allow_migration"=> false,
@@ -480,6 +481,7 @@
         "avatar_url"     => nil,
         "education"      => nil,
         "is_syncing"     => nil,
+        "memberships"    => [],
         "synced_at"      => nil,
         "allow_migration"=> false,
         "allowance"      => {
@@ -517,6 +519,7 @@
         "avatar_url"       => nil,
         "education"        => nil,
         "is_syncing"       => nil,
+        "memberships"      => [],
         "synced_at"        => nil,
         "allow_migration"  => false,
         "allowance"        => {
@@ -561,6 +564,7 @@
         "avatar_url"       => nil,
         "education"        => nil,
         "is_syncing"       => nil,
+        "memberships"      => [],
         "synced_at"        => nil,
         "allow_migration"  => false,
         "allowance"        => {

spec/v3/services/v2_subscription/executions_spec.rb

@@ -211,6 +211,7 @@
               "account_env_vars" => [],
               "email"=>"[email protected]",
               "is_syncing"=>nil,
+              "memberships"=>[],
               "synced_at"=>nil,
               "recently_signed_up"=>false,
               "secure_user_hash"=>nil,
@@ -271,6 +272,7 @@
                 "account_env_vars" => [],
                 "email"=>"[email protected]",
                 "is_syncing"=>nil,
+                "memberships"=>[],
                 "synced_at"=>nil,
                 "recently_signed_up"=>false,
                 "secure_user_hash"=>nil,
@@ -310,6 +312,7 @@
                 "account_env_vars" => [],
                 "email"=>"[email protected]",
                 "is_syncing"=>nil,
+                "memberships"=>[],
                 "synced_at"=>nil,
                 "recently_signed_up"=>false,
                 "secure_user_hash"=>nil,