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

Remove the power-user command and related catalogers #2306

Merged
merged 6 commits into from
Nov 20, 2023

Conversation

wagoodman
Copy link
Contributor

Closes #1419

This PR:

  • removes the power-user command
  • removes the secrets cataloger
  • removes vestiges of the classifier cataloger
  • adds a warning when an image being scanned called power-user to tell the user that that command has been removed
  • bumps the JSON schema (breaking change) to remove the secrets model from the SBOM

Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>
Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>
Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>
@github-actions github-actions bot added json-schema Changes the json schema breaking-change Change is not backwards compatible labels Nov 8, 2023
@wagoodman wagoodman marked this pull request as ready for review November 8, 2023 22:10
@wagoodman wagoodman requested a review from a team November 8, 2023 22:10
…mand

Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>
Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>
@wagoodman
Copy link
Contributor Author

JSON schema diff for reviewers:

# diff schema/json/schema-12.0.1.json schema/json/schema-13.0.0.json 
3c3
<   "$id": "anchore.io/schema/syft/json/12.0.1/document",
---
>   "$id": "anchore.io/schema/syft/json/13.0.0/document",
392,397d391
<           },
<           "type": "array"
<         },
<         "secrets": {
<           "items": {
<             "$ref": "#/$defs/Secrets"
2111,2140d2104
<       ]
<     },
<     "SearchResult": {
<       "properties": {
<         "classification": {
<           "type": "string"
<         },
<         "lineNumber": {
<           "type": "integer"
<         },
<         "lineOffset": {
<           "type": "integer"
<         },
<         "seekPosition": {
<           "type": "integer"
<         },
<         "length": {
<           "type": "integer"
<         },
<         "value": {
<           "type": "string"
<         }
<       },
<       "type": "object",
<       "required": [
<         "classification",
<         "lineNumber",
<         "lineOffset",
<         "seekPosition",
<         "length"
2143,2160d2106
<     "Secrets": {
<       "properties": {
<         "location": {
<           "$ref": "#/$defs/Coordinates"
<         },
<         "secrets": {
<           "items": {
<             "$ref": "#/$defs/SearchResult"
<           },
<           "type": "array"
<         }
<       },
<       "type": "object",
<       "required": [
<         "location",
<         "secrets"
<       ]
<     },

Copy link
Contributor

@spiffcs spiffcs left a comment

Choose a reason for hiding this comment

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

Nice refactor and pruning going into syft v1.0.0.

…mand

Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>
@wagoodman wagoodman enabled auto-merge (squash) November 20, 2023 15:38
@wagoodman wagoodman merged commit 5565bde into main Nov 20, 2023
10 checks passed
@wagoodman wagoodman deleted the remove-power-user-command branch November 20, 2023 15:44
GijsCalis pushed a commit to GijsCalis/syft that referenced this pull request Feb 19, 2024
* remove the power-user command

Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>

* remove secrets + classifier catalogers

Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>

* bump json schema

Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>

* regenerate json schema

Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>

---------

Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
breaking-change Change is not backwards compatible json-schema Changes the json schema
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Remove power-user command and related catalogers
2 participants