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.

Sign up for GitHub

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

Jump to bottom

Fixing AWS integration routes when path prefix is present. 6.1 #20992

Merged
merged 1 commit into from
Nov 20, 2024
Merged

Fixing AWS integration routes when path prefix is present. 6.1 #20992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions changelog/unreleased/pr-20969.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
type = "fixed"
message = "Fixing route for AWS integration when path prefix is present."

pulls = ["20969"]
2 changes: 1 addition & 1 deletion graylog2-web-interface/src/integrations/aws/AWSInputConfiguration.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import { useEffect } from 'react';
import PropTypes from 'prop-types';
import { useNavigate } from 'react-router-dom';

import Routes from 'integrations/aws/common/Routes.js';
import Routes from 'integrations/aws/common/Routes';

const AWSInputConfiguration = ({ url }) => {
const navigate = useNavigate();
Expand Down
9 changes: 7 additions & 2 deletions ...ace/src/integrations/aws/common/Routes.js → ...ace/src/integrations/aws/common/Routes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
* along with this program. If not, see
* <http://www.mongodb.com/licensing/server-side-public-license>.
*/
const Routes = {
import { qualifyUrls } from 'routing/Routes';

const AwsRoutes = {
INTEGRATIONS: {
AWS: {
CLOUDWATCH: {
Expand Down Expand Up @@ -54,6 +56,9 @@ const DocsRoutes = {
},
};

export default Routes;
export default {
...qualifyUrls(AwsRoutes),
unqualified: AwsRoutes,
};

export { ApiRoutes, DocsRoutes };
2 changes: 1 addition & 1 deletion graylog2-web-interface/src/integrations/bindings.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import TeamsNotificationV2Details from './event-notifications/event-notification

const bindings = {
routes: [
{ path: Routes.INTEGRATIONS.AWS.CLOUDWATCH.index, component: AWSCloudWatchApp },
{ path: Routes.unqualified.INTEGRATIONS.AWS.CLOUDWATCH.index, component: AWSCloudWatchApp },
],
inputConfiguration: [
{
Expand Down
Loading