-
Notifications
You must be signed in to change notification settings - Fork 22
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
#7744: Fix integration config sanitization #7745
Merged
Merged
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
9851ddb
Fix integration config sanitization
johnnymetz bc6ee33
Update integration version in test. Use value.
johnnymetz 09d732c
Add new file to stricts null checks
johnnymetz 844307a
Fix test
johnnymetz 62295f6
Improve tests
johnnymetz 264091b
Merge branch 'main' into bugfix/7744-fix-sanitize-integration-config
johnnymetz 28f144e
Fix lint errors
johnnymetz File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
/* | ||
* Copyright (C) 2024 PixieBrix, Inc. | ||
* | ||
* This program is free software: you can redistribute it and/or modify | ||
* it under the terms of the GNU Affero General Public License as published by | ||
* the Free Software Foundation, either version 3 of the License, or | ||
* (at your option) any later version. | ||
* | ||
* This program is distributed in the hope that it will be useful, | ||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
* GNU Affero General Public License for more details. | ||
* | ||
* You should have received a copy of the GNU Affero General Public License | ||
* along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
*/ | ||
|
||
import { sanitizeIntegrationConfig } from "@/integrations/sanitizeIntegrationConfig"; | ||
import automationAnywhere from "@contrib/integrations/automation-anywhere.yaml"; | ||
import { fromJS } from "@/integrations/UserDefinedIntegration"; | ||
import type { IntegrationDefinition } from "@/integrations/integrationTypes"; | ||
|
||
const aaIntegration = fromJS( | ||
automationAnywhere as unknown as IntegrationDefinition, | ||
); | ||
|
||
describe("sanitizeIntegrationConfig", () => { | ||
it("sanitizes config with secret", () => { | ||
const config = { | ||
controlRoomUrl: "https://controlroom.example.com", | ||
username: "user", | ||
password: "pass", | ||
}; | ||
const sanitizedConfig = sanitizeIntegrationConfig(aaIntegration, config); | ||
expect(sanitizedConfig).toEqual({ | ||
controlRoomUrl: config.controlRoomUrl, | ||
username: config.username, | ||
}); | ||
}); | ||
|
||
it("sanitizes config with optional field", () => { | ||
johnnymetz marked this conversation as resolved.
Show resolved
Hide resolved
|
||
const config = { | ||
controlRoomUrl: "https://controlroom.example.com", | ||
username: "user", | ||
apiKey: "pass", | ||
folderId: "12345", | ||
}; | ||
const sanitizedConfig = sanitizeIntegrationConfig(aaIntegration, config); | ||
expect(sanitizedConfig).toEqual({ | ||
controlRoomUrl: config.controlRoomUrl, | ||
username: config.username, | ||
folderId: config.folderId, | ||
}); | ||
}); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
FYI - typo in the description here now, missing the word "Control"