Merge branch 'main' into groups-capabilities

addons/api/mirage/factories/credential-library.js

@@ -1,5 +1,6 @@
 import factory from '../generated/factories/credential-library';
 import { random, system } from 'faker';
+import permissions from '../helpers/permissions';
 
 const types = ['vault'];
 
@@ -7,6 +8,14 @@ export default factory.extend({
   id: (i) => `credential-library-id-${i}`,
   type: (i) => types[i % types.length],
 
+  authorized_actions: () =>
+    permissions.authorizedActionsFor('credential-library') || [
+      'no-op',
+      'read',
+      'update',
+      'delete',
+    ],
+
   attributes() {
     switch (this.type) {
       case 'vault':

package.json

@@ -76,7 +76,7 @@
     "minimist": "^1.2.3",
     "normalize-url": "^4.5.1",
     "glob-parent": "^5.1.2",
-    "tar": "^3.2.3 - ^4.4.15 - ^5.0.7 - ^6.1.2",
+    "tar": "^6.1.2",
     "xmldom": "github:xmldom/xmldom#0.7.0"
   },
   "config": {

ui/admin/app/components/form/credential-library/index.hbs

@@ -118,10 +118,13 @@
     </form.textarea>
   {{/if}}
 
-  <form.actions
-    @disabled={{if @model.cannotSave @model.cannotSave}}
-    @enableEditText={{t 'actions.edit-form'}}
-    @submitText={{t 'actions.save'}}
-    @cancelText={{t 'actions.cancel'}}
-  />
+  {{#if (can 'save model' @model)}}
+    <form.actions
+      @disabled={{if @model.cannotSave @model.cannotSave}}
+      @enableEditText={{t 'actions.edit-form'}}
+      @submitText={{t 'actions.save'}}
+      @cancelText={{t 'actions.cancel'}}
+    />
+  {{/if}}
+
 </Rose::Form>

ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/credential-library/-actions.hbs

@@ -1,13 +1,15 @@
-<Rose::Dropdown
-  @text={{t 'actions.manage'}}
-  @dropdownRight={{true}}
-  as |dropdown|
->
-  <dropdown.button
-    @style='danger'
-    @disabled={{@model.canSave}}
-    {{on 'click' (route-action 'delete' @model)}}
+{{#if (can 'delete model' @model)}}
+  <Rose::Dropdown
+    @text={{t 'actions.manage'}}
+    @dropdownRight={{true}}
+    as |dropdown|
   >
-    {{t 'resources.credential-library.actions.delete'}}
-  </dropdown.button>
-</Rose::Dropdown>
+    <dropdown.button
+      @style='danger'
+      @disabled={{@model.canSave}}
+      {{on 'click' (route-action 'delete' @model)}}
+    >
+      {{t 'resources.credential-library.actions.delete'}}
+    </dropdown.button>
+  </Rose::Dropdown>
+{{/if}}

ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/index.hbs

@@ -12,12 +12,16 @@
       {{#each @model as |credentialLibrary|}}
         <body.row as |row|>
           <row.headerCell>
-            <LinkTo
-              @route='scopes.scope.credential-stores.credential-store.credential-libraries.credential-library'
-              @model={{credentialLibrary.id}}
-            >
+            {{#if (can 'read model' credentialLibrary)}}
+              <LinkTo
+                @route='scopes.scope.credential-stores.credential-store.credential-libraries.credential-library'
+                @model={{credentialLibrary.id}}
+              >
+                {{credentialLibrary.displayName}}
+              </LinkTo>
+            {{else}}
               {{credentialLibrary.displayName}}
-            </LinkTo>
+            {{/if}}
             <p>{{credentialLibrary.description}}</p>
           </row.headerCell>
           <row.cell>

ui/admin/tests/acceptance/accounts/update-test.js

@@ -59,7 +59,7 @@ module('Acceptance | accounts | update', function (hooks) {
     }
   });
 
-  test('can update an account and save changes', async function (assert) {
+  test('can update resource and save changes', async function (assert) {
     assert.expect(1);
     await visit(urls.account);
     await click('form [type="button"]', 'Activate edit mode');
@@ -68,6 +68,14 @@ module('Acceptance | accounts | update', function (hooks) {
     assert.equal(this.server.db.accounts[0].name, 'update name');
   });
 
+  test('cannot update resource without proper authorization', async function (assert) {
+    assert.expect(1);
+    instances.account.authorized_actions =
+      instances.account.authorized_actions.filter((item) => item !== 'update');
+    await visit(urls.account);
+    assert.notOk(find('form [type="button"]'));
+  });
+
   test('can update an account and cancel changes', async function (assert) {
     assert.expect(1);
     await visit(urls.account);

ui/admin/tests/acceptance/credential-libraries-test.js

@@ -0,0 +1,138 @@
+import { module, test } from 'qunit';
+import { visit, click, fillIn, currentURL, find } from '@ember/test-helpers';
+import { setupApplicationTest } from 'ember-qunit';
+import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import a11yAudit from 'ember-a11y-testing/test-support/audit';
+import { authenticateSession } from 'ember-simple-auth/test-support';
+import { Response } from 'miragejs';
+
+module('Acceptance | credential-libraries', function (hooks) {
+  setupApplicationTest(hooks);
+  setupMirage(hooks);
+
+  let getCredentialLibraryCount;
+
+  const instances = {
+    scopes: {
+      global: null,
+      org: null,
+      project: null,
+    },
+  };
+
+  const urls = {
+    globalScope: null,
+    orgScope: null,
+    projectScope: null,
+    credentialStores: null,
+    credentialStore: null,
+    credentialLibrary: null,
+    credentialLibraries: null,
+    newCredentialLibrary: null,
+    unknownCredentialLibrary: null,
+  };
+
+  hooks.beforeEach(function () {
+    // Generate resources
+    instances.scopes.global = this.server.create('scope', { id: 'global' });
+    instances.scopes.org = this.server.create('scope', {
+      type: 'org',
+      scope: { id: 'global', type: 'global' },
+    });
+    instances.scopes.project = this.server.create('scope', {
+      type: 'project',
+      scope: { id: instances.scopes.org.id, type: 'org' },
+    });
+    instances.credentialStore = this.server.create('credential-store', {
+      scope: instances.scopes.project,
+    });
+    instances.credentialLibrary = this.server.create('credential-library', {
+      scope: instances.scopes.project,
+      credentialStore: instances.credentialStore,
+    });
+    // Generate route URLs for resources
+    urls.globalScope = `/scopes/global/scopes`;
+    urls.orgScope = `/scopes/${instances.scopes.org.id}/scopes`;
+    urls.projectScope = `/scopes/${instances.scopes.project.id}`;
+    urls.credentialStores = `${urls.projectScope}/credential-stores`;
+    urls.credentialStore = `${urls.credentialStores}/${instances.credentialStore.id}`;
+    urls.credentialLibraries = `${urls.credentialStore}/credential-libraries`;
+    urls.credentialLibrary = `${urls.credentialLibraries}/${instances.credentialLibrary.id}`;
+    urls.newCredentialLibrary = `${urls.credentialLibraries}/new`;
+    urls.unknownCredentialLibrary = `${urls.credentialLibraries}/foo`;
+    // Generate resource counter
+    getCredentialLibraryCount = () =>
+      this.server.schema.credentialLibraries.all().models.length;
+    authenticateSession({});
+  });
+
+  test('visiting credential libraries', async function (assert) {
+    assert.expect(2);
+    await visit(urls.credentialLibraries);
+    await a11yAudit();
+    assert.equal(currentURL(), urls.credentialLibraries);
+    await visit(urls.credentialLibrary);
+    await a11yAudit();
+    assert.equal(currentURL(), urls.credentialLibrary);
+  });
+
+  test('visiting an unknown credential library displays 404 message', async function (assert) {
+    assert.expect(1);
+    await visit(urls.unknownCredentialLibrary);
+    await a11yAudit();
+    console.debug(find('.rose-message-subtitle'));
+    assert.ok(find('.rose-message-subtitle').textContent.trim(), 'Error 404');
+  });
+
+  test('can create a credential library', async function (assert) {
+    assert.expect(1);
+    const count = getCredentialLibraryCount();
+    await visit(urls.newCredentialLibrary);
+    await fillIn('[name="name"]', 'random string');
+    await click('[type="submit"]');
+    assert.equal(getCredentialLibraryCount(), count + 1);
+  });
+
+  test('can cancel create a new credential library', async function (assert) {
+    assert.expect(2);
+    const count = getCredentialLibraryCount();
+    await visit(urls.newCredentialLibrary);
+    await fillIn('[name="name"]', 'random string');
+    await click('.rose-form-actions [type="button"]');
+    assert.equal(currentURL(), urls.credentialLibraries);
+    assert.equal(getCredentialLibraryCount(), count);
+  });
+
+  test('saving a new credential library with invalid fields displays error messasges', async function (assert) {
+    assert.expect(2);
+    this.server.post('/credential-libraries', () => {
+      return new Response(
+        400,
+        {},
+        {
+          status: 400,
+          code: 'invalid_argument',
+          message: 'The request was invalid',
+          details: {
+            request_fields: [
+              {
+                name: 'name',
+                description: 'Name is required.',
+              },
+            ],
+          },
+        }
+      );
+    });
+    await visit(urls.newCredentialLibrary);
+    await click('[type="submit"]');
+    assert.ok(
+      find('[role="alert"]').textContent.trim(),
+      'The request was invalid.'
+    );
+    assert.ok(
+      find('.rose-form-error-message').textContent.trim(),
+      'Name is required.'
+    );
+  });
+});

ui/admin/tests/acceptance/credential-library/delete-test.js

@@ -0,0 +1,131 @@
+import { module, test } from 'qunit';
+import { visit, click, find } from '@ember/test-helpers';
+import { setupApplicationTest } from 'ember-qunit';
+import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { authenticateSession } from 'ember-simple-auth/test-support';
+import { Response } from 'miragejs';
+import { resolve, reject } from 'rsvp';
+import sinon from 'sinon';
+
+module('Acceptance | credential-libraries | delete', function (hooks) {
+  setupApplicationTest(hooks);
+  setupMirage(hooks);
+
+  let getCredentialLibraryCount;
+
+  const instances = {
+    scopes: {
+      global: null,
+      org: null,
+      project: null,
+    },
+  };
+
+  const urls = {
+    globalScope: null,
+    orgScope: null,
+    projectScope: null,
+    credentialStores: null,
+    credentialStore: null,
+    credentialLibrary: null,
+    credentialLibraries: null,
+    newCredentialLibrary: null,
+    unknownCredentialLibrary: null,
+  };
+
+  hooks.beforeEach(function () {
+    // Generate resources
+    instances.scopes.global = this.server.create('scope', { id: 'global' });
+    instances.scopes.org = this.server.create('scope', {
+      type: 'org',
+      scope: { id: 'global', type: 'global' },
+    });
+    instances.scopes.project = this.server.create('scope', {
+      type: 'project',
+      scope: { id: instances.scopes.org.id, type: 'org' },
+    });
+    instances.credentialStore = this.server.create('credential-store', {
+      scope: instances.scopes.project,
+    });
+    instances.credentialLibrary = this.server.create('credential-library', {
+      scope: instances.scopes.project,
+      credentialStore: instances.credentialStore,
+    });
+    // Generate route URLs for resources
+    urls.globalScope = `/scopes/global/scopes`;
+    urls.orgScope = `/scopes/${instances.scopes.org.id}/scopes`;
+    urls.projectScope = `/scopes/${instances.scopes.project.id}`;
+    urls.credentialStores = `${urls.projectScope}/credential-stores`;
+    urls.credentialStore = `${urls.credentialStores}/${instances.credentialStore.id}`;
+    urls.credentialLibraries = `${urls.credentialStore}/credential-libraries`;
+    urls.credentialLibrary = `${urls.credentialLibraries}/${instances.credentialLibrary.id}`;
+    urls.newCredentialLibrary = `${urls.credentialLibraries}/new`;
+    urls.unknownCredentialLibrary = `${urls.credentialLibraries}/foo`;
+    // Generate resource counter
+    getCredentialLibraryCount = () =>
+      this.server.schema.credentialLibraries.all().models.length;
+    authenticateSession({});
+  });
+
+  test('can delete resource', async function (assert) {
+    assert.expect(1);
+    const count = getCredentialLibraryCount();
+    await visit(urls.credentialLibrary);
+    await click('.rose-layout-page-actions .rose-dropdown-button-danger');
+    assert.equal(getCredentialLibraryCount(), count - 1);
+  });
+
+  test('cannot delete resource without proper authorization', async function (assert) {
+    assert.expect(1);
+    instances.credentialLibrary.authorized_actions =
+      instances.credentialLibrary.authorized_actions.filter(
+        (item) => item !== 'delete'
+      );
+    await visit(urls.credentialLibrary);
+    assert.notOk(
+      find('.rose-layout-page-actions .rose-dropdown-button-danger')
+    );
+  });
+
+  test('can accept delete credential library via dialog', async function (assert) {
+    assert.expect(2);
+    const confirmService = this.owner.lookup('service:confirm');
+    confirmService.enabled = true;
+    confirmService.confirm = sinon.fake.returns(resolve());
+    const count = getCredentialLibraryCount();
+    await visit(urls.credentialLibrary);
+    await click('.rose-layout-page-actions .rose-dropdown-button-danger');
+    assert.equal(getCredentialLibraryCount(), count - 1);
+    assert.ok(confirmService.confirm.calledOnce);
+  });
+
+  test('cannot cancel delete credential library via dialog', async function (assert) {
+    assert.expect(2);
+    const confirmService = this.owner.lookup('service:confirm');
+    confirmService.enabled = true;
+    confirmService.confirm = sinon.fake.returns(reject());
+    const count = getCredentialLibraryCount();
+    await visit(urls.credentialLibrary);
+    await click('.rose-layout-page-actions .rose-dropdown-button-danger');
+    assert.equal(getCredentialLibraryCount(), count);
+    assert.ok(confirmService.confirm.calledOnce);
+  });
+
+  test('deleting a credential library which errors displays error messages', async function (assert) {
+    assert.expect(1);
+    this.server.del('/credential-libraries/:id', () => {
+      return new Response(
+        490,
+        {},
+        {
+          status: 490,
+          code: 'error',
+          message: 'Oops.',
+        }
+      );
+    });
+    await visit(urls.credentialLibrary);
+    await click('.rose-layout-page-actions .rose-dropdown-button-danger');
+    assert.ok(find('[role="alert"]').textContent.trim(), 'Oops.');
+  });
+});

ui/admin/tests/acceptance/credential-library/read-test.js

@@ -0,0 +1,80 @@
+import { module, test } from 'qunit';
+import { visit, click, currentURL, find } from '@ember/test-helpers';
+import { setupApplicationTest } from 'ember-qunit';
+import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import a11yAudit from 'ember-a11y-testing/test-support/audit';
+import { authenticateSession } from 'ember-simple-auth/test-support';
+
+module('Acceptance | credential-libraries | read', function (hooks) {
+  setupApplicationTest(hooks);
+  setupMirage(hooks);
+
+  const instances = {
+    scopes: {
+      global: null,
+      org: null,
+      project: null,
+    },
+  };
+
+  const urls = {
+    globalScope: null,
+    orgScope: null,
+    projectScope: null,
+    credentialStores: null,
+    credentialStore: null,
+    credentialLibrary: null,
+    credentialLibraries: null,
+    newCredentialLibrary: null,
+    unknownCredentialLibrary: null,
+  };
+
+  hooks.beforeEach(function () {
+    // Generate resources
+    instances.scopes.global = this.server.create('scope', { id: 'global' });
+    instances.scopes.org = this.server.create('scope', {
+      type: 'org',
+      scope: { id: 'global', type: 'global' },
+    });
+    instances.scopes.project = this.server.create('scope', {
+      type: 'project',
+      scope: { id: instances.scopes.org.id, type: 'org' },
+    });
+    instances.credentialStore = this.server.create('credential-store', {
+      scope: instances.scopes.project,
+    });
+    instances.credentialLibrary = this.server.create('credential-library', {
+      scope: instances.scopes.project,
+      credentialStore: instances.credentialStore,
+    });
+    // Generate route URLs for resources
+    urls.globalScope = `/scopes/global/scopes`;
+    urls.orgScope = `/scopes/${instances.scopes.org.id}/scopes`;
+    urls.projectScope = `/scopes/${instances.scopes.project.id}`;
+    urls.credentialStores = `${urls.projectScope}/credential-stores`;
+    urls.credentialStore = `${urls.credentialStores}/${instances.credentialStore.id}`;
+    urls.credentialLibraries = `${urls.credentialStore}/credential-libraries`;
+    urls.credentialLibrary = `${urls.credentialLibraries}/${instances.credentialLibrary.id}`;
+    urls.newCredentialLibrary = `${urls.credentialLibraries}/new`;
+    urls.unknownCredentialLibrary = `${urls.credentialLibraries}/foo`;
+    authenticateSession({});
+  });
+
+  test('can navigate to resource', async function (assert) {
+    assert.expect(1);
+    await visit(urls.credentialLibraries);
+    await click('main tbody .rose-table-header-cell a');
+    await a11yAudit();
+    assert.equal(currentURL(), urls.credentialLibrary);
+  });
+
+  test('cannot navigate to resource without proper authorization', async function (assert) {
+    assert.expect(1);
+    instances.credentialLibrary.authorized_actions =
+      instances.credentialLibrary.authorized_actions.filter(
+        (item) => item !== 'read'
+      );
+    await visit(urls.credentialLibraries);
+    assert.notOk(find('main tbody .rose-table-header-cell a'));
+  });
+});

ui/admin/tests/acceptance/credential-library/update-test.js

@@ -2,18 +2,13 @@ import { module, test } from 'qunit';
 import { visit, click, fillIn, currentURL, find } from '@ember/test-helpers';
 import { setupApplicationTest } from 'ember-qunit';
 import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
-import a11yAudit from 'ember-a11y-testing/test-support/audit';
 import { authenticateSession } from 'ember-simple-auth/test-support';
 import { Response } from 'miragejs';
-import { resolve, reject } from 'rsvp';
-import sinon from 'sinon';
 
-module('Acceptance | credential-library', function (hooks) {
+module('Acceptance | credential-libraries | update', function (hooks) {
   setupApplicationTest(hooks);
   setupMirage(hooks);
 
-  let getCredentialLibraryCount;
-
   const instances = {
     scopes: {
       global: null,
@@ -50,6 +45,7 @@ module('Acceptance | credential-library', function (hooks) {
     });
     instances.credentialLibrary = this.server.create('credential-library', {
       scope: instances.scopes.project,
+      credentialStore: instances.credentialStore,
     });
     // Generate route URLs for resources
     urls.globalScope = `/scopes/global/scopes`;
@@ -61,83 +57,10 @@ module('Acceptance | credential-library', function (hooks) {
     urls.credentialLibrary = `${urls.credentialLibraries}/${instances.credentialLibrary.id}`;
     urls.newCredentialLibrary = `${urls.credentialLibraries}/new`;
     urls.unknownCredentialLibrary = `${urls.credentialLibraries}/foo`;
-    // Generate resource counter
-    getCredentialLibraryCount = () =>
-      this.server.schema.credentialLibraries.all().models.length;
     authenticateSession({});
   });
 
-  test('visiting credential libraries', async function (assert) {
-    assert.expect(2);
-    await visit(urls.credentialLibraries);
-    await a11yAudit();
-    assert.equal(currentURL(), urls.credentialLibraries);
-    await visit(urls.credentialLibrary);
-    await a11yAudit();
-    assert.equal(currentURL(), urls.credentialLibrary);
-  });
-
-  test('visiting an unknown credential library displays 404 message', async function (assert) {
-    assert.expect(1);
-    await visit(urls.unknownCredentialLibrary);
-    await a11yAudit();
-    console.debug(find('.rose-message-subtitle'));
-    assert.ok(find('.rose-message-subtitle').textContent.trim(), 'Error 404');
-  });
-
-  test('can create a credential library', async function (assert) {
-    assert.expect(1);
-    const count = getCredentialLibraryCount();
-    await visit(urls.newCredentialLibrary);
-    await fillIn('[name="name"]', 'random string');
-    await click('[type="submit"]');
-    assert.equal(getCredentialLibraryCount(), count + 1);
-  });
-
-  test('can cancel create a new credential library', async function (assert) {
-    assert.expect(2);
-    const count = getCredentialLibraryCount();
-    await visit(urls.newCredentialLibrary);
-    await fillIn('[name="name"]', 'random string');
-    await click('.rose-form-actions [type="button"]');
-    assert.equal(currentURL(), urls.credentialLibraries);
-    assert.equal(getCredentialLibraryCount(), count);
-  });
-
-  test('saving a new credential library with invalid fields displays error messasges', async function (assert) {
-    assert.expect(2);
-    this.server.post('/credential-libraries', () => {
-      return new Response(
-        400,
-        {},
-        {
-          status: 400,
-          code: 'invalid_argument',
-          message: 'The request was invalid',
-          details: {
-            request_fields: [
-              {
-                name: 'name',
-                description: 'Name is required.',
-              },
-            ],
-          },
-        }
-      );
-    });
-    await visit(urls.newCredentialLibrary);
-    await click('[type="submit"]');
-    assert.ok(
-      find('[role="alert"]').textContent.trim(),
-      'The request was invalid.'
-    );
-    assert.ok(
-      find('.rose-form-error-message').textContent.trim(),
-      'Name is required.'
-    );
-  });
-
-  test('can save changes to existing credential library', async function (assert) {
+  test('can update resource and save changes', async function (assert) {
     assert.expect(3);
     assert.notEqual(instances.credentialLibrary.name, 'random string');
     await visit(urls.credentialLibrary);
@@ -151,7 +74,17 @@ module('Acceptance | credential-library', function (hooks) {
     );
   });
 
-  test('can cancel changes to existing credential library', async function (assert) {
+  test('cannot update resource without proper authorization', async function (assert) {
+    assert.expect(1);
+    instances.credentialLibrary.authorized_actions =
+      instances.credentialLibrary.authorized_actions.filter(
+        (item) => item !== 'update'
+      );
+    await visit(urls.credentialLibrary);
+    assert.notOk(find('form [type="button"]'));
+  });
+
+  test('can update a credential library and cancel changes', async function (assert) {
     assert.expect(2);
     await visit(urls.credentialLibrary);
     await click('form [type="button"]', 'Activate edit mode');
@@ -245,54 +178,4 @@ module('Acceptance | credential-library', function (hooks) {
       );
     }
   });
-
-  test('can delete credential library', async function (assert) {
-    assert.expect(1);
-    const count = getCredentialLibraryCount();
-    await visit(urls.credentialLibrary);
-    await click('.rose-layout-page-actions .rose-dropdown-button-danger');
-    assert.equal(getCredentialLibraryCount(), count - 1);
-  });
-
-  test('can accept delete credential library via dialog', async function (assert) {
-    assert.expect(2);
-    const confirmService = this.owner.lookup('service:confirm');
-    confirmService.enabled = true;
-    confirmService.confirm = sinon.fake.returns(resolve());
-    const count = getCredentialLibraryCount();
-    await visit(urls.credentialLibrary);
-    await click('.rose-layout-page-actions .rose-dropdown-button-danger');
-    assert.equal(getCredentialLibraryCount(), count - 1);
-    assert.ok(confirmService.confirm.calledOnce);
-  });
-
-  test('cannot cancel delete credential library via dialog', async function (assert) {
-    assert.expect(2);
-    const confirmService = this.owner.lookup('service:confirm');
-    confirmService.enabled = true;
-    confirmService.confirm = sinon.fake.returns(reject());
-    const count = getCredentialLibraryCount();
-    await visit(urls.credentialLibrary);
-    await click('.rose-layout-page-actions .rose-dropdown-button-danger');
-    assert.equal(getCredentialLibraryCount(), count);
-    assert.ok(confirmService.confirm.calledOnce);
-  });
-
-  test('deleting a credential library which errors displays error messages', async function (assert) {
-    assert.expect(1);
-    this.server.del('/credential-libraries/:id', () => {
-      return new Response(
-        490,
-        {},
-        {
-          status: 490,
-          code: 'error',
-          message: 'Oops.',
-        }
-      );
-    });
-    await visit(urls.credentialLibrary);
-    await click('.rose-layout-page-actions .rose-dropdown-button-danger');
-    assert.ok(find('[role="alert"]').textContent.trim(), 'Oops.');
-  });
 });

yarn.lock

@@ -11026,14 +11026,7 @@ fs-merger@^3.0.1, fs-merger@^3.2.1:
     fs-tree-diff "^2.0.1"
     walk-sync "^2.2.0"
 
-fs-minipass@^1.2.7:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
-  integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==
-  dependencies:
-    minipass "^2.6.0"
-
-fs-minipass@^2.0.0, fs-minipass@^2.1.0:
+fs-minipass@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
   integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==
@@ -15139,7 +15132,7 @@ minipass-sized@^1.0.3:
   dependencies:
     minipass "^3.0.0"
 
-minipass@^2.2.0, minipass@^2.3.5, minipass@^2.6.0, minipass@^2.9.0:
+minipass@^2.2.0, minipass@^2.3.5:
   version "2.9.0"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
   integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==
@@ -15154,14 +15147,7 @@ minipass@^3.0.0, minipass@^3.0.1, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.
   dependencies:
     yallist "^4.0.0"
 
-minizlib@^1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
-  integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==
-  dependencies:
-    minipass "^2.9.0"
-
-minizlib@^2.0.0, minizlib@^2.1.1, minizlib@^2.1.2:
+minizlib@^2.0.0, minizlib@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
   integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
@@ -18674,7 +18660,7 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
-safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@^5.2.1, safe-buffer@~5.2.0:
+safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
@@ -20029,35 +20015,10 @@ tapable@^1.0.0, tapable@^1.1.3:
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
   integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
 
-tar@^4, tar@^4.4.10, tar@^4.4.12, tar@^4.4.15:
-  version "4.4.16"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.16.tgz#4a48b3c025e77d9d0c788f038a09b91c594d326d"
-  integrity sha512-gOVUT/KWPkGFZQmCRDVFNUWBl7niIo/PRR7lzrIqtZpit+st54lGROuVjc6zEQM9FhH+dJfQIl+9F0k8GNXg5g==
-  dependencies:
-    chownr "^1.1.4"
-    fs-minipass "^1.2.7"
-    minipass "^2.9.0"
-    minizlib "^1.3.3"
-    mkdirp "^0.5.5"
-    safe-buffer "^5.2.1"
-    yallist "^3.1.1"
-
-tar@^5.0.5:
-  version "5.0.8"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-5.0.8.tgz#8cbddead599d7335aa2be551bfb18521dea488a2"
-  integrity sha512-v71KDHvYI+EJ8+o6W44fzuiTDcfHrlVjtvn4ITF1ClH5GbU6H9InNX1XNG07YwZSkloNQQxAJabkjEdHyqjn1g==
-  dependencies:
-    chownr "^1.1.4"
-    fs-minipass "^2.1.0"
-    minipass "^3.1.3"
-    minizlib "^2.1.2"
-    mkdirp "^0.5.5"
-    yallist "^4.0.0"
-
-tar@^6.0.2, tar@^6.0.5, tar@^6.1.0:
-  version "6.1.7"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.7.tgz#c566d1107d38b09e92983a68db5534fc7f6cab42"
-  integrity sha512-PBoRkOJU0X3lejJ8GaRCsobjXTgFofRDSPdSUhRSdlwJfifRlQBwGXitDItdGFu0/h0XDMCkig0RN1iT7DBxhA==
+tar@^4, tar@^4.4.10, tar@^4.4.12, tar@^4.4.15, tar@^5.0.5, tar@^6.0.2, tar@^6.0.5, tar@^6.1.0, tar@^6.1.2:
+  version "6.1.8"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.8.tgz#4fc50cfe56511c538ce15b71e05eebe66530cbd4"
+  integrity sha512-sb9b0cp855NbkMJcskdSYA7b11Q8JsX4qe4pyUAfHp+Y6jBjJeek2ZVlwEfWayshEIwlIzXx0Fain3QG9JPm2A==
   dependencies:
     chownr "^2.0.0"
     fs-minipass "^2.0.0"
@@ -21776,7 +21737,7 @@ yallist@^2.1.2:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
   integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
 
-yallist@^3.0.0, yallist@^3.0.2, yallist@^3.1.1:
+yallist@^3.0.0, yallist@^3.0.2:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
   integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==