Page MenuHomeSoftware Heritage

deposit: Configure deposit to use keycloak in staging
ClosedPublic

Authored by ardumont on Mar 19 2021, 10:48 AM.

Details

Summary

And keep the basic authentication mechanism for the production instance.

Related to T2858

Test Plan

bin/octocatalog:

bin/octocatalog-diff --octocatalog-diff-args --no-truncate-details --to staging deposit.internal.staging.swh.network
Found host deposit.internal.staging.swh.network
*** Running octocatalog-diff on host deposit.internal.staging.swh.network
I, [2021-03-19T10:46:39.590029 #24158]  INFO -- : Catalogs compiled for deposit.internal.staging.swh.network
I, [2021-03-19T10:46:41.388585 #24158]  INFO -- : Diffs computed for deposit.internal.staging.swh.network
diff origin/production/deposit.internal.staging.swh.network current/deposit.internal.staging.swh.network
*******************************************
  File[/etc/softwareheritage/deposit/server.yml] =>
   parameters =>
     content =>
      @@ -24,4 +24,8 @@
       extraction_dir: "/tmp/swh-deposit/archive/"
       swh_authority_url: https://deposit.staging.swh.network/
      +authentication_provider: keycloak
      +keycloak:
      +  server_url: https://auth.softwareheritage.org/auth/
      +  realm_name: SoftwareHeritageStaging
       allowed_hosts:
       - deposit.staging.swh.network
*******************************************
*** End octocatalog-diff on deposit.internal.staging.swh.network
$ bin/octocatalog-diff --octocatalog-diff-args --no-truncate-details --to staging moma
Found host moma.softwareheritage.org
*** Running octocatalog-diff on host moma.softwareheritage.org
I, [2021-03-19T10:47:05.969085 #30451]  INFO -- : Catalogs compiled for moma.softwareheritage.org
I, [2021-03-19T10:47:08.697311 #30451]  INFO -- : Diffs computed for moma.softwareheritage.org
diff origin/production/moma.softwareheritage.org current/moma.softwareheritage.org
*******************************************
  File[/etc/softwareheritage/deposit/server.yml] =>
   parameters =>
     content =>
      @@ -23,4 +23,5 @@
       extraction_dir: "/tmp/swh-deposit/archive/"
       swh_authority_url: https://deposit.softwareheritage.org/
      +authentication_provider: basic
       allowed_hosts:
       - deposit.softwareheritage.org
*******************************************
*** End octocatalog-diff on moma.softwareheritage.org

Diff Detail

Repository
rSPSITE puppet-swh-site
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

ardumont created this revision.
anlambert added a subscriber: anlambert.

Looks good to me.

This revision is now accepted and ready to land.Mar 19 2021, 10:59 AM
data/deployments/staging/common.yaml
321

I'll take this out of the equation for now.
That will need some role reworking logic
on the current deposit profile/role.

It's not blocking to deploy it without it though.

Drop the cache_uri settings for now