Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated diagrams #935

Merged
merged 5 commits into from
Dec 9, 2024
Merged

Updated diagrams #935

merged 5 commits into from
Dec 9, 2024

Conversation

zvr
Copy link
Member

@zvr zvr commented Dec 6, 2024

I've updated and simplified all diagrams.

This PR adds:

  • the editable (draw.io) diagram (each diagram in a tab)
  • the exported diagrams (in PNG format)

Once merged, they should also be copied in the spec repo.

zvr added 2 commits December 6, 2024 01:18
Signed-off-by: Alexios Zavras (zvr) <zvr+git@zvr.gr>
Signed-off-by: Alexios Zavras (zvr) <zvr+git@zvr.gr>
@zvr zvr added this to the 3.0.1 milestone Dec 6, 2024
@zvr zvr requested review from bact and goneall December 6, 2024 00:25
Copy link
Collaborator

@bact bact left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please use all lowercase for filenames, as they were and also referred to in spdx-spec Markdown.

This will also allow GitHub to show diffs between old and new images.

@bact
Copy link
Collaborator

bact commented Dec 6, 2024

As we have xsd types for properties, I think we should also keep xsd types for Simple Data Types as well, also the constraints.

We should simplify the diagram by removing the enums which can be rather long.

But those xsd types and constraints of Simple Data Types are just short, and from what I see in the Core PNG, we have plenty of spaces around the Simple Data Types box.

We can cut them shorter to:

SemVer
xsd:string constrained to SemVer 2.0.0

MediaType
xsd:string constrained to RFC 2046

DateTime
xsd:string constrained to ISO-8601

I think that should fit the box.

@zvr
Copy link
Member Author

zvr commented Dec 6, 2024

Please use all lowercase for filenames, as they were and also referred to in spdx-spec Markdown.

The profile names are always with capital first letter, the tabs in the .drawio file are the same, I simply used the automatically generated name -- otherwise why even have "model-" ? Why introduce a new convention with lowercase here?

@bact
Copy link
Collaborator

bact commented Dec 6, 2024

Because with all uppercase or all lowercase it is less error prone when we type in the code, compared to mixed cases.

Signed-off-by: Alexios Zavras (zvr) <zvr+git@zvr.gr>
@bact
Copy link
Collaborator

bact commented Dec 6, 2024

I can see that the prefix "model-" is for file organizational purposes.

  • When looking at the filename, one can make a fair guess that it should be something about "license model" and maybe not "license logo".
  • When stored with other files in the same directory, prefix helps with grouping.
    • Not a great use case here, because in our images/ we only have one group of images.
    • But I guess in the case of OMG submission, we can see that in (resulting) images/ it could have some historical diagrams (spdx23) mixed with the diagrams here.
    • So if we like to change the prefix from "model-" to "spdx30-", I'm happy too.

--

On casing,
in the past five or six months, I have encountered a number of MkDocs issues that are related to wrong casing and make the build fail or result in deadlink. So if there's anything that will make that less likely repeated, I will do.

@bact
Copy link
Collaborator

bact commented Dec 6, 2024

In earlier versions of SPDX 3 spec website, these model images are not even displayed. Because we just use the generated filename which contains a space. And that breaks when it's inside the URL. Somehow the space doesn't get automatically converted to %20.

That's why we now use "-" instead of a space (thus "model-" and not "model ").

@zvr
Copy link
Member Author

zvr commented Dec 6, 2024

As I said, I use the standard filenames that drawio uses (which is filename-tabname).

I don't have time for this; feel free to change them afterwards. Given that every file we use has uppercase letters in the path, I'm pretty confident there will be no issues with using the correct profile names.

I'm producing the PDFs now.

@bact
Copy link
Collaborator

bact commented Dec 6, 2024

Please go ahead with the PDF.

@bact
Copy link
Collaborator

bact commented Dec 6, 2024

Currently there are two styles of referencing an element from a profile:

  • With prefix / : /Profile/element (see "File" box in Software diagram, for example)

  • Without prefix / : Profile/element (see "VulnAssessmentRelationship" box in Security diagram, for example)

Not sure which one we are more preferred.

This is minor and does not affect the meaning of the diagram. Can be fixed for consistency later.

@zvr
Copy link
Member Author

zvr commented Dec 6, 2024

Yeah, I did not change almost anything inside the text. There are too many changes to be made. For example, all properties in a class are in random order, while in the spec they are sorted. If there is time before the ISO version, I'll try to edit them all.

@bact
Copy link
Collaborator

bact commented Dec 6, 2024

Yes. They were before you made edits. No worries.

@goneall
Copy link
Member

goneall commented Dec 6, 2024

the VexAffectedVulnAssessmentRelationship actionStatement was updated to a min cardinality of 1 in the model - this is not reflected in the diagrams.

@goneall
Copy link
Member

goneall commented Dec 6, 2024

the VexAffectedVulnAssessmentRelationship actionStatementTime was updated to a max cardinality of 1 in the model - this is not reflected in the diagrams.

Copy link
Member

@goneall goneall left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Found two updates to the model that were missed in the diagram for the security profile detailed in the above 2 comments.

…nship

Signed-off-by: Alexios Zavras (zvr) <zvr+git@zvr.gr>
@zvr zvr requested a review from goneall December 6, 2024 17:28
Copy link
Member

@goneall goneall left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Collaborator

@bact bact left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will handle the entries ordering and etc later. This is good for now.

@bact bact merged commit 70da246 into spdx:main Dec 9, 2024
1 check passed
@bact bact added Profile:Core Core Profile and related matters Profile:Build Build Profile and related matters Profile:Licensing Licensing Profile and related matters Profile:AI Artificial Intelligence Profile and related matters labels Dec 9, 2024
@bact bact added Profile:Software Software Profile and related matters Profile:Dataset Dataset Profile and related matters Profile:Security Security Profile and related matters Profile:Extension Extension Profile and related matters labels Dec 9, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Profile:AI Artificial Intelligence Profile and related matters Profile:Build Build Profile and related matters Profile:Core Core Profile and related matters Profile:Dataset Dataset Profile and related matters Profile:Extension Extension Profile and related matters Profile:Licensing Licensing Profile and related matters Profile:Security Security Profile and related matters Profile:Software Software Profile and related matters
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants