Make sure the deposit backend uses a writable storage for metadata
ClosedPublic
Actions

Authored by olasd on Mar 19 2021, 10:40 AM.

Details

Reviewers

ardumont
vlorentz

Commits

rSPSITEd6752957d023: Make moma use a read-only account for its local storage backend
rSPSITEe37668115aa6: Make sure the deposit backend uses a writable storage for metadata

Summary

Two commits:

use writable storage for deposit backend
use guest credentials for the local storage on moma

Test Plan

octocatalog-diff on moma:

diff origin/production/moma.softwareheritage.org current/moma.softwareheritage.org
*******************************************
  File[/etc/softwareheritage/deposit/server.yml] =>
   parameters =>
     content =>
      @@ -4,12 +4,12 @@
         cls: remote
         url: http://saatchi.internal.softwareheritage.org:5008/
      -storage:
      +storage_metadata:
         cls: remote
         args:
      -    url: http://localhost:5002/
      -storage_metadata:
      +    url: http://saam.internal.softwareheritage.org:5002/
      +storage:
         cls: remote
         args:
      -    url: http://localhost:5002/
      +    url: http://saam.internal.softwareheritage.org:5002/
       private:
         secret_key: swh::deploy::deposit::runtime_secret_key
*******************************************
  File[/etc/softwareheritage/storage/storage.yml] =>
   parameters =>
     content =>
      @@ -3,6 +3,6 @@
         cls: local
         args:
      -    db: host=somerset.internal.softwareheritage.org port=5432 user=swhstorage dbname=softwareheritage
      -      password=swh-deploy-storage-db-password
      +    db: host=somerset.internal.softwareheritage.org port=5432 user=guest dbname=softwareheritage
      +      password=guest
           objstorage:
             cls: multiplexer
*******************************************

octocatalog-diff on staging deposit:

*******************************************
  File[/etc/softwareheritage/deposit/server.yml] =>
   parameters =>
     content =>
      @@ -5,9 +5,9 @@
         args:
           url: http://scheduler0.internal.staging.swh.network:5008/
      -storage:
      +storage_metadata:
         cls: remote
         args:
           url: http://storage1.internal.staging.swh.network:5002/
      -storage_metadata:
      +storage:
         cls: remote
         args:
*******************************************

(there was apparently a duplicate setting for the storage backend...)

Diff Detail

Repository

rSPSITE puppet-swh-site

Branch

feature/deposit-writable

Lint

No Linters Available

Unit

No Unit Test Coverage

Build Status

Buildable 20008
Build 31056: arc lint + arc unit

Event Timeline

olasd requested review of this revision.Mar 19 2021, 10:40 AM

olasd created this revision.

Harbormaster completed remote builds in B20008: Diff 18927.Mar 19 2021, 10:40 AM

Thanks.

This revision is now accepted and ready to land.Mar 19 2021, 11:10 AM

Closed by commit rSPSITEe37668115aa6: Make sure the deposit backend uses a writable storage for metadata (authored by olasd). · Explain WhyMar 19 2021, 11:12 AM

This revision was automatically updated to reflect the committed changes.

olasd added a commit: rSPSITEe37668115aa6: Make sure the deposit backend uses a writable storage for metadata.

olasd added a commit: rSPSITEd6752957d023: Make moma use a read-only account for its local storage backend.

Revision Contents
Changeset List

Path

Size

data/

common/

common.yaml

7 lines

hostname/

moma.softwareheritage.org.yaml

2 lines

Diff 18927

View Options

data/common/common.yaml

Show All 12 Lines	cy.visit(url, {
onBeforeLoad: (win) => {		onBeforeLoad: (win) => {
win.localStorage.clear();		win.localStorage.clear();
}		}
});		});
});		});

it('should toggle sidebar when swh-push-menu is clicked', function() {		it('should toggle sidebar when swh-push-menu is clicked', function() {
cy.get('.swh-push-menu')		cy.get('.swh-push-menu')
.click()		.click();
.then(() => {
cy.get('body')		cy.get('body')
.should('have.class', 'sidebar-collapse')		.should('have.class', 'sidebar-collapse')
.get('.nav-link > p')		.get('.nav-link > p')
.should('have.css', 'opacity', '0');		.should('not.be.visible');
})
.get('.swh-push-menu')		cy.get('.swh-push-menu')
.click()		.click();
.then(() => {
cy.get('body')		cy.get('body')
.should('have.class', 'sidebar-open')		.should('have.class', 'sidebar-open')
.get('.nav-link > p')		.get('.nav-link > p')
.should('not.have.css', 'opacity', '0');		.should('be.visible');
});
});		});

it('should have less width when collapsed compared to open', function() {		it('should have less width when collapsed compared to open', function() {
let collapsedWidth, expandedWidth;		let collapseWidth;
cy.get('.swh-push-menu')		cy.get('.swh-push-menu')
.click()		.click()
.wait(250)
.get('.swh-sidebar')		.get('.swh-sidebar')
.should('have.css', 'width')		.wait(250)
		.invoke('width')
.then((width) => {		.then((width) => {
collapsedWidth = parseInt(width);		collapseWidth = width;
})		})
.get('.swh-push-menu')		.get('.swh-push-menu')
.click()		.click()
.wait(250)
.get('.swh-sidebar')		.get('.swh-sidebar')
.should('have.css', 'width')		.wait(250)
.then((width) => {		.invoke('width')
expandedWidth = parseInt(width);		.then(openWidth => {
})		assert.isBelow(collapseWidth, openWidth);
.then(() => {
assert.isBelow(collapsedWidth, expandedWidth);
});		});
});		});
});		});

describe('Sidebar Tests on small screens', function() {		describe('Sidebar Tests on small screens', function() {
beforeEach(function() {		beforeEach(function() {
cy.viewport('iphone-6');		cy.viewport('iphone-6');
cy.visit(url);		cy.visit(url);
});		});

it('should be collapsed by default', function() {		it('should be collapsed by default', function() {
cy.get('.swh-sidebar')		cy.get('.swh-sidebar')
.should('not.be.visible');		.should('not.be.visible');
});		});

it('should toggle sidebar when swh-push-menu is clicked', function() {		it('should toggle sidebar when swh-push-menu is clicked', function() {
cy.get('.swh-push-menu')		cy.get('.swh-push-menu')
.click()		.click()
.wait(250)
.get('.swh-sidebar')		.get('.swh-sidebar')
.should('be.visible')		.should('be.visible')
.get('#sidebar-overlay')		.get('#sidebar-overlay')
.click({force: true})		.click({force: true})
.wait(250)
.get('.swh-sidebar')		.get('.swh-sidebar')
.should('not.be.visible');		.should('not.be.visible');
});		});
});		});