diff --git a/.github/workflows/create.yml b/.github/workflows/create.yml
index 9e6dece..ccf9f24 100644
--- a/.github/workflows/create.yml
+++ b/.github/workflows/create.yml
@@ -21,7 +21,7 @@ jobs:
- name: Install dependencies and build
run: |
- npm install unplugin-icons @iconify-json/clarity @iconify-json/devicon @slidev/cli @slidev/theme-default slidev-theme-neversink playwright-chromium
+ npm install unplugin-icons @iconify-json/clarity @iconify-json/devicon @iconify-json/devicon-plain @slidev/cli @slidev/theme-default slidev-theme-neversink playwright-chromium
npm list
npm run build -- --base /${{ github.event.repository.name }}/
diff --git a/public/images/legacy_after_Adaptor.png b/public/images/legacy_after_Adaptor.png
index 9cff939..729b3ac 100644
Binary files a/public/images/legacy_after_Adaptor.png and b/public/images/legacy_after_Adaptor.png differ
diff --git a/slides.md b/slides.md
index 0c406ab..44a2a66 100644
--- a/slides.md
+++ b/slides.md
@@ -13,7 +13,7 @@ neversink_string: "DiracX CHEP"
**Federico Stagni**
-October 25th 2024
+October 23rd 2024
__ CHEP 2024
@@ -363,32 +363,27 @@ align: lm
# DiracX Web API
-
What is on the right is the certification Web API, loaded live. Use with caution!
+DIRAC Web APIs with
-
- DIRAC Web APIs with
-
-
- -
- Nicely documented in
-
+ Nicely documented by
+
- - --> this is what you see on the right
+ - --> this is what you see on the right
-
- Authorization with "standard" Authorization Code Flow redirecting to IdP
+ Follows the specification, with the (python) client generated by AutoREST.
-
---
layout: top-title
color: gray-light
@@ -507,7 +502,7 @@ title: tokens
:: content ::
-- **VO membership**: "in transition"
+- **Identity (community membership)**: "in transition"
- **Submitting pilots**: The computing elements right now prefer the tokens (DIRAC v8 does that already)
- **Data access**: at least in WLCG, proxies. One day, will be token
- **Verifying a user's identity** (internally to Dirac):
@@ -520,7 +515,7 @@ layout: top-title-two-cols
color: gray-light
align: c-lm-rm
title: proxies+tokens
-columns: is-3
+columns: is-2
---
:: title ::
@@ -529,10 +524,11 @@ columns: is-3
:: left ::
-```mermaid {theme: 'forest', scale: 0.4}
+DiracX: Authorization with "standard" Authorization Code Flow redirecting to IdP
+
+```mermaid {theme: 'forest', scale: 0.45}
%%{init: { 'theme': 'forest' }}%%
sequenceDiagram
- title DiracX: tokens with standard OAuth2 flow
create actor U as User
create participant DiracX
U->>DiracX: Login
@@ -551,10 +547,11 @@ DiracX delivers its own tokens, they are not the same tokens used for the Grid e
:: right ::
-```mermaid {theme: 'forest', scale: 0.4}
+DIRAC+DiracX: working with proxies and tokens
+
+```mermaid {theme: 'forest', scale: 0.40}
%%{init: { 'theme': 'forest' }}%%
sequenceDiagram
- title DIRAC+DiracX: Working with proxies and tokens
create actor U as User
create participant dirac-proxy-init
U->>dirac-proxy-init:
@@ -562,13 +559,16 @@ sequenceDiagram
dirac-proxy-init->>VOMS:
destroy VOMS
VOMS->>dirac-proxy-init: VOMS proxy
- dirac-proxy-init->>DiracX: exchange proxy for token
- DiracX->>dirac-proxy-init: DiracX token
+ create participant DIRAC
+ dirac-proxy-init->>DIRAC: exchange proxy for token
+ destroy DIRAC
+ DIRAC->>dirac-proxy-init: DiracX token
dirac-proxy-init->>U: proxy+token bundle
U->>DIRAC_service: proxy
U->>DiracX: token
```
+
---
@@ -580,24 +580,37 @@ title: Migration
:: title ::
-- Business continuity for DIRAC communities is our top priority:
- - DIRAC and DiracX share the databases (MySQL and OpenSearch)
- - the legacy adaptor will move traffic from DIRAC to DiracX services
- - DIRAC v9 and DiracX will need to live together for some time
+### Business continuity for DIRAC communities is our top priority
+Services of DIRAC v9 and DiracX will need to live together for some time
:: content ::
+
+
+
+
+
+
+DIRAC and DiracX share the databases
+
+
+
+A legacy adaptor moves traffic from DIRAC to DiracX services
+
+
+
+DIRAC services can be removed
+
+
---
@@ -613,8 +626,15 @@ title: Extensions
:: content ::
+
+ It is sometimes necessary to extend all Dirac(X) components (including Web and Pilot).
+
+ DiracX aims to provide an easy way to do so.
+
+
+
+Examples:
-Dirac has to support different communities with different workflows and requirements. Examples:
- LHCb stores the metadata and provenance of every produced file in a LHCb-specific database (with an Oracle backend)
@@ -641,11 +661,9 @@ Dirac has to support different communities with different workflows and requirem
- EGI uses DIRAC as WMS, and EGI-CheckIn as an identity provider. Hosts (among others) WeNMR (structural biology and life science)
-
- It is sometimes necessary to extend all Dirac(X) components (including Web and Pilot).
-
- DiracX aims to provide an easy way to do so.
-
+
+Extension "Gubbins" provided for reference
+
---
@@ -703,10 +721,10 @@ titlewidth: is-3
-
- tests: (as you could see we have a somewhat open test deployment infrastructure). Try something out, and let us know!
+ [code (github.com/DIRACGrid)](https://github.com/DIRACGrid/diracx)
-
- code: https://github.com/DIRACGrid/diracx
+ tests: (as you could see we have a somewhat open test deployment infrastructure). Try something out, and let us know!
@@ -731,6 +749,10 @@ diracx-charts/run_demo.sh # do not do it now!
+
+
---
layout: top-title-two-cols
@@ -862,7 +884,7 @@ Q/A
:: content ::
-- I am using Rucio. I could use DiracX as WMS but do not want to fiddle with DIRAC
+- I am using {Rucio|AnotherTool}. I could use DiracX as WMS but do not want to fiddle with DIRAC
--> It will probably be possible, but we do not know when.