Added multidelete function for Service Accounts (#1501)
Added multidelete function for Service Accounts
This commit is contained in:
@@ -23,8 +23,8 @@ import Grid from "@mui/material/Grid";
|
|||||||
import api from "../../../common/api";
|
import api from "../../../common/api";
|
||||||
import { Box } from "@mui/material";
|
import { Box } from "@mui/material";
|
||||||
import { NewServiceAccount } from "../Common/CredentialsPrompt/types";
|
import { NewServiceAccount } from "../Common/CredentialsPrompt/types";
|
||||||
import { setErrorSnackMessage } from "../../../actions";
|
import { setErrorSnackMessage, setSnackBarMessage } from "../../../actions";
|
||||||
import { AccountIcon, AddIcon, PasswordKeyIcon } from "../../../icons";
|
import { AccountIcon, AddIcon, PasswordKeyIcon, DeleteIcon } from "../../../icons";
|
||||||
import TableWrapper from "../Common/TableWrapper/TableWrapper";
|
import TableWrapper from "../Common/TableWrapper/TableWrapper";
|
||||||
import { stringSort } from "../../../utils/sortFunctions";
|
import { stringSort } from "../../../utils/sortFunctions";
|
||||||
import PageHeader from "../Common/PageHeader/PageHeader";
|
import PageHeader from "../Common/PageHeader/PageHeader";
|
||||||
@@ -46,6 +46,8 @@ import {
|
|||||||
} from "../../../common/SecureComponent/permissions";
|
} from "../../../common/SecureComponent/permissions";
|
||||||
import SecureComponent from "../../../common/SecureComponent/SecureComponent";
|
import SecureComponent from "../../../common/SecureComponent/SecureComponent";
|
||||||
import RBIconButton from "../Buckets/BucketDetails/SummaryItems/RBIconButton";
|
import RBIconButton from "../Buckets/BucketDetails/SummaryItems/RBIconButton";
|
||||||
|
import {selectSAs} from "../../Console/Configurations/utils"
|
||||||
|
import DeleteMultipleServiceAccounts from "../Users/DeleteMultipleServiceAccounts"
|
||||||
|
|
||||||
const AddServiceAccount = withSuspense(
|
const AddServiceAccount = withSuspense(
|
||||||
React.lazy(() => import("./AddServiceAccount"))
|
React.lazy(() => import("./AddServiceAccount"))
|
||||||
@@ -89,6 +91,8 @@ const Account = ({ classes, displayErrorMessage }: IServiceAccountsProps) => {
|
|||||||
useState<NewServiceAccount | null>(null);
|
useState<NewServiceAccount | null>(null);
|
||||||
const [changePasswordModalOpen, setChangePasswordModalOpen] =
|
const [changePasswordModalOpen, setChangePasswordModalOpen] =
|
||||||
useState<boolean>(false);
|
useState<boolean>(false);
|
||||||
|
const [selectedSAs, setSelectedSAs] = useState<string[]>([]);
|
||||||
|
const [deleteMultipleOpen, setDeleteMultipleOpen] = useState<boolean>(false);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
fetchRecords();
|
fetchRecords();
|
||||||
@@ -139,6 +143,24 @@ const Account = ({ classes, displayErrorMessage }: IServiceAccountsProps) => {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const closeDeleteMultipleModalAndRefresh = (refresh: boolean) => {
|
||||||
|
setDeleteMultipleOpen(false);
|
||||||
|
if (refresh) {
|
||||||
|
setSnackBarMessage(`Service accounts deleted successfully.`);
|
||||||
|
setSelectedSAs([]);
|
||||||
|
setLoading(true);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
const selectAllItems = () => {
|
||||||
|
if (selectedSAs.length === records.length) {
|
||||||
|
setSelectedSAs([]);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
setSelectedSAs(records);
|
||||||
|
};
|
||||||
|
|
||||||
const closeCredentialsModal = () => {
|
const closeCredentialsModal = () => {
|
||||||
setShowNewCredentials(false);
|
setShowNewCredentials(false);
|
||||||
setNewServiceAccount(null);
|
setNewServiceAccount(null);
|
||||||
@@ -176,6 +198,13 @@ const Account = ({ classes, displayErrorMessage }: IServiceAccountsProps) => {
|
|||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
{deleteMultipleOpen && (
|
||||||
|
<DeleteMultipleServiceAccounts
|
||||||
|
deleteOpen={deleteMultipleOpen}
|
||||||
|
selectedSAs={selectedSAs}
|
||||||
|
closeDeleteModalAndRefresh={closeDeleteMultipleModalAndRefresh}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
{showNewCredentials && (
|
{showNewCredentials && (
|
||||||
<CredentialsPrompt
|
<CredentialsPrompt
|
||||||
newServiceAccount={newServiceAccount}
|
newServiceAccount={newServiceAccount}
|
||||||
@@ -204,7 +233,15 @@ const Account = ({ classes, displayErrorMessage }: IServiceAccountsProps) => {
|
|||||||
sx={{
|
sx={{
|
||||||
display: "flex",
|
display: "flex",
|
||||||
}}
|
}}
|
||||||
>
|
> <RBIconButton
|
||||||
|
tooltip={"Delete Selected"}
|
||||||
|
onClick={() => {setDeleteMultipleOpen(true);}}
|
||||||
|
text={"Delete Selected"}
|
||||||
|
icon={<DeleteIcon />}
|
||||||
|
color="secondary"
|
||||||
|
disabled={selectedSAs.length === 0}
|
||||||
|
variant={"outlined"}
|
||||||
|
/>
|
||||||
<SecureComponent
|
<SecureComponent
|
||||||
scopes={[IAM_SCOPES.ADMIN_CREATE_USER]}
|
scopes={[IAM_SCOPES.ADMIN_CREATE_USER]}
|
||||||
resource={CONSOLE_UI_RESOURCE}
|
resource={CONSOLE_UI_RESOURCE}
|
||||||
@@ -220,6 +257,7 @@ const Account = ({ classes, displayErrorMessage }: IServiceAccountsProps) => {
|
|||||||
/>
|
/>
|
||||||
</SecureComponent>
|
</SecureComponent>
|
||||||
|
|
||||||
|
|
||||||
<RBIconButton
|
<RBIconButton
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
setAddScreenOpen(true);
|
setAddScreenOpen(true);
|
||||||
@@ -241,6 +279,9 @@ const Account = ({ classes, displayErrorMessage }: IServiceAccountsProps) => {
|
|||||||
idField={""}
|
idField={""}
|
||||||
columns={[{ label: "Service Account", elementKey: "" }]}
|
columns={[{ label: "Service Account", elementKey: "" }]}
|
||||||
itemActions={tableActions}
|
itemActions={tableActions}
|
||||||
|
selectedItems={selectedSAs}
|
||||||
|
onSelect={e => selectSAs(e, setSelectedSAs, selectedSAs)}
|
||||||
|
onSelectAll={selectAllItems}
|
||||||
/>
|
/>
|
||||||
</Grid>
|
</Grid>
|
||||||
<Grid item xs={12} marginTop={"15px"}>
|
<Grid item xs={12} marginTop={"15px"}>
|
||||||
|
|||||||
@@ -522,3 +522,20 @@ export const removeEmptyFields = (formFields: IElementValue[]) => {
|
|||||||
|
|
||||||
return nonEmptyFields;
|
return nonEmptyFields;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const selectSAs = (e: React.ChangeEvent<HTMLInputElement>, setSelectedSAs : Function, selectedSAs : string[]) => {
|
||||||
|
const targetD = e.target;
|
||||||
|
const value = targetD.value;
|
||||||
|
const checked = targetD.checked;
|
||||||
|
|
||||||
|
let elements: string[] = [...selectedSAs]; // We clone the selectedSAs array
|
||||||
|
if (checked) {
|
||||||
|
// If the user has checked this field we need to push this to selectedSAs
|
||||||
|
elements.push(value);
|
||||||
|
} else {
|
||||||
|
// User has unchecked this field, we need to remove it from the list
|
||||||
|
elements = elements.filter((element) => element !== value);
|
||||||
|
}
|
||||||
|
setSelectedSAs(elements);
|
||||||
|
return elements;
|
||||||
|
};
|
||||||
|
|||||||
@@ -0,0 +1,73 @@
|
|||||||
|
// This file is part of MinIO Console Server
|
||||||
|
// Copyright (c) 2022 MinIO, 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 React from "react";
|
||||||
|
import { connect } from "react-redux";
|
||||||
|
import { DialogContentText } from "@mui/material";
|
||||||
|
import { setErrorSnackMessage } from "../../../actions";
|
||||||
|
import { ErrorResponseHandler } from "../../../common/types"
|
||||||
|
import useApi from "../../../screens/Console/Common/Hooks/useApi";
|
||||||
|
import ConfirmDialog from "../../../screens/Console/Common/ModalWrapper/ConfirmDialog";
|
||||||
|
import { ConfirmDeleteIcon } from "../../../icons";
|
||||||
|
interface IDeleteMultiSAsProps {
|
||||||
|
closeDeleteModalAndRefresh: (refresh: boolean) => void;
|
||||||
|
deleteOpen: boolean;
|
||||||
|
selectedSAs: string[];
|
||||||
|
setErrorSnackMessage: typeof setErrorSnackMessage;
|
||||||
|
}
|
||||||
|
const DeleteMultipleSAs = ({
|
||||||
|
closeDeleteModalAndRefresh,
|
||||||
|
deleteOpen,
|
||||||
|
selectedSAs,
|
||||||
|
setErrorSnackMessage,
|
||||||
|
}: IDeleteMultiSAsProps) => {
|
||||||
|
const onDelSuccess = () => closeDeleteModalAndRefresh(true);
|
||||||
|
const onDelError = (err: ErrorResponseHandler) => setErrorSnackMessage(err);
|
||||||
|
const onClose = () => closeDeleteModalAndRefresh(false);
|
||||||
|
const [deleteLoading, invokeDeleteApi] = useApi(onDelSuccess, onDelError);
|
||||||
|
if (!selectedSAs) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
const onConfirmDelete = () => {
|
||||||
|
invokeDeleteApi(
|
||||||
|
"POST",
|
||||||
|
`/api/v1/service-accounts/delete-multi`,
|
||||||
|
selectedSAs
|
||||||
|
);
|
||||||
|
};
|
||||||
|
return (
|
||||||
|
<ConfirmDialog
|
||||||
|
title={`Delete Service Accounts`}
|
||||||
|
confirmText={"Delete"}
|
||||||
|
isOpen={deleteOpen}
|
||||||
|
titleIcon={<ConfirmDeleteIcon />}
|
||||||
|
isLoading={deleteLoading}
|
||||||
|
onConfirm={onConfirmDelete}
|
||||||
|
onClose={onClose}
|
||||||
|
confirmationContent={
|
||||||
|
<DialogContentText>
|
||||||
|
Are you sure you want to delete the selected {selectedSAs.length}{" "}
|
||||||
|
service accounts?{" "}
|
||||||
|
</DialogContentText>
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
const mapDispatchToProps = {
|
||||||
|
setErrorSnackMessage,
|
||||||
|
};
|
||||||
|
const connector = connect(null, mapDispatchToProps);
|
||||||
|
|
||||||
|
export default connector(DeleteMultipleSAs);
|
||||||
@@ -17,6 +17,7 @@
|
|||||||
import React, { useEffect, useState } from "react";
|
import React, { useEffect, useState } from "react";
|
||||||
import { connect } from "react-redux";
|
import { connect } from "react-redux";
|
||||||
import { Theme } from "@mui/material/styles";
|
import { Theme } from "@mui/material/styles";
|
||||||
|
import { Box } from "@mui/material";
|
||||||
import createStyles from "@mui/styles/createStyles";
|
import createStyles from "@mui/styles/createStyles";
|
||||||
import withStyles from "@mui/styles/withStyles";
|
import withStyles from "@mui/styles/withStyles";
|
||||||
import {
|
import {
|
||||||
@@ -27,16 +28,18 @@ import {
|
|||||||
import api from "../../../common/api";
|
import api from "../../../common/api";
|
||||||
import TableWrapper from "../Common/TableWrapper/TableWrapper";
|
import TableWrapper from "../Common/TableWrapper/TableWrapper";
|
||||||
import { AppState } from "../../../store";
|
import { AppState } from "../../../store";
|
||||||
import { setErrorSnackMessage } from "../../../actions";
|
import { setErrorSnackMessage, setSnackBarMessage } from "../../../actions";
|
||||||
import { NewServiceAccount } from "../Common/CredentialsPrompt/types";
|
import { NewServiceAccount } from "../Common/CredentialsPrompt/types";
|
||||||
import { stringSort } from "../../../utils/sortFunctions";
|
import { stringSort } from "../../../utils/sortFunctions";
|
||||||
import { ErrorResponseHandler } from "../../../common/types";
|
import { ErrorResponseHandler } from "../../../common/types";
|
||||||
import AddUserServiceAccount from "./AddUserServiceAccount";
|
import AddUserServiceAccount from "./AddUserServiceAccount";
|
||||||
import DeleteServiceAccount from "../Account/DeleteServiceAccount";
|
import DeleteServiceAccount from "../Account/DeleteServiceAccount";
|
||||||
import CredentialsPrompt from "../Common/CredentialsPrompt/CredentialsPrompt";
|
import CredentialsPrompt from "../Common/CredentialsPrompt/CredentialsPrompt";
|
||||||
import { AddIcon } from "../../../icons";
|
import { AddIcon, DeleteIcon } from "../../../icons";
|
||||||
import PanelTitle from "../Common/PanelTitle/PanelTitle";
|
import PanelTitle from "../Common/PanelTitle/PanelTitle";
|
||||||
import RBIconButton from "../Buckets/BucketDetails/SummaryItems/RBIconButton";
|
import RBIconButton from "../Buckets/BucketDetails/SummaryItems/RBIconButton";
|
||||||
|
import DeleteMultipleServiceAccounts from "./DeleteMultipleServiceAccounts"
|
||||||
|
import {selectSAs} from "../../Console/Configurations/utils"
|
||||||
|
|
||||||
interface IUserServiceAccountsProps {
|
interface IUserServiceAccountsProps {
|
||||||
classes: any;
|
classes: any;
|
||||||
@@ -71,6 +74,8 @@ const UserServiceAccountsPanel = ({
|
|||||||
const [showNewCredentials, setShowNewCredentials] = useState<boolean>(false);
|
const [showNewCredentials, setShowNewCredentials] = useState<boolean>(false);
|
||||||
const [newServiceAccount, setNewServiceAccount] =
|
const [newServiceAccount, setNewServiceAccount] =
|
||||||
useState<NewServiceAccount | null>(null);
|
useState<NewServiceAccount | null>(null);
|
||||||
|
const [selectedSAs, setSelectedSAs] = useState<string[]>([]);
|
||||||
|
const [deleteMultipleOpen, setDeleteMultipleOpen] = useState<boolean>(false);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
fetchRecords();
|
fetchRecords();
|
||||||
@@ -120,6 +125,24 @@ const UserServiceAccountsPanel = ({
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const closeDeleteMultipleModalAndRefresh = (refresh: boolean) => {
|
||||||
|
setDeleteMultipleOpen(false);
|
||||||
|
if (refresh) {
|
||||||
|
setSnackBarMessage(`Service accounts deleted successfully.`);
|
||||||
|
setSelectedSAs([]);
|
||||||
|
setLoading(true);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
const selectAllItems = () => {
|
||||||
|
if (selectedSAs.length === records.length) {
|
||||||
|
setSelectedSAs([]);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
setSelectedSAs(records);
|
||||||
|
};
|
||||||
|
|
||||||
const closeCredentialsModal = () => {
|
const closeCredentialsModal = () => {
|
||||||
setShowNewCredentials(false);
|
setShowNewCredentials(false);
|
||||||
setNewServiceAccount(null);
|
setNewServiceAccount(null);
|
||||||
@@ -154,6 +177,13 @@ const UserServiceAccountsPanel = ({
|
|||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
{deleteMultipleOpen && (
|
||||||
|
<DeleteMultipleServiceAccounts
|
||||||
|
deleteOpen={deleteMultipleOpen}
|
||||||
|
selectedSAs={selectedSAs}
|
||||||
|
closeDeleteModalAndRefresh={closeDeleteMultipleModalAndRefresh}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
{showNewCredentials && (
|
{showNewCredentials && (
|
||||||
<CredentialsPrompt
|
<CredentialsPrompt
|
||||||
newServiceAccount={newServiceAccount}
|
newServiceAccount={newServiceAccount}
|
||||||
@@ -166,7 +196,16 @@ const UserServiceAccountsPanel = ({
|
|||||||
)}
|
)}
|
||||||
<div className={classes.actionsTray}>
|
<div className={classes.actionsTray}>
|
||||||
<PanelTitle>Service Accounts</PanelTitle>
|
<PanelTitle>Service Accounts</PanelTitle>
|
||||||
|
<Box >
|
||||||
|
<RBIconButton
|
||||||
|
tooltip={"Delete Selected"}
|
||||||
|
onClick={() => {setDeleteMultipleOpen(true);}}
|
||||||
|
text={"Delete Selected"}
|
||||||
|
icon={<DeleteIcon />}
|
||||||
|
color="secondary"
|
||||||
|
disabled={selectedSAs.length === 0}
|
||||||
|
variant={"outlined"}
|
||||||
|
/>
|
||||||
<RBIconButton
|
<RBIconButton
|
||||||
tooltip={"Create service account"}
|
tooltip={"Create service account"}
|
||||||
text={"Create service account"}
|
text={"Create service account"}
|
||||||
@@ -180,6 +219,7 @@ const UserServiceAccountsPanel = ({
|
|||||||
}}
|
}}
|
||||||
disabled={!hasPolicy}
|
disabled={!hasPolicy}
|
||||||
/>
|
/>
|
||||||
|
</Box>
|
||||||
</div>
|
</div>
|
||||||
<div className={classes.tableBlock}>
|
<div className={classes.tableBlock}>
|
||||||
<TableWrapper
|
<TableWrapper
|
||||||
@@ -189,6 +229,9 @@ const UserServiceAccountsPanel = ({
|
|||||||
idField={""}
|
idField={""}
|
||||||
columns={[{ label: "Service Account", elementKey: "" }]}
|
columns={[{ label: "Service Account", elementKey: "" }]}
|
||||||
itemActions={tableActions}
|
itemActions={tableActions}
|
||||||
|
selectedItems={selectedSAs}
|
||||||
|
onSelect={e => selectSAs(e, setSelectedSAs, selectedSAs)}
|
||||||
|
onSelectAll={selectAllItems}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</React.Fragment>
|
</React.Fragment>
|
||||||
|
|||||||
@@ -3062,6 +3062,39 @@ func init() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"/service-accounts/delete-multi": {
|
||||||
|
"post": {
|
||||||
|
"tags": [
|
||||||
|
"UserAPI"
|
||||||
|
],
|
||||||
|
"summary": "Delete Multiple Service Accounts",
|
||||||
|
"operationId": "DeleteMultipleServiceAccounts",
|
||||||
|
"parameters": [
|
||||||
|
{
|
||||||
|
"name": "selectedSA",
|
||||||
|
"in": "body",
|
||||||
|
"required": true,
|
||||||
|
"schema": {
|
||||||
|
"type": "array",
|
||||||
|
"items": {
|
||||||
|
"type": "string"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"responses": {
|
||||||
|
"200": {
|
||||||
|
"description": "A successful response."
|
||||||
|
},
|
||||||
|
"default": {
|
||||||
|
"description": "Generic error response.",
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/definitions/error"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
"/service-accounts/{access_key}": {
|
"/service-accounts/{access_key}": {
|
||||||
"delete": {
|
"delete": {
|
||||||
"tags": [
|
"tags": [
|
||||||
@@ -9147,6 +9180,39 @@ func init() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"/service-accounts/delete-multi": {
|
||||||
|
"post": {
|
||||||
|
"tags": [
|
||||||
|
"UserAPI"
|
||||||
|
],
|
||||||
|
"summary": "Delete Multiple Service Accounts",
|
||||||
|
"operationId": "DeleteMultipleServiceAccounts",
|
||||||
|
"parameters": [
|
||||||
|
{
|
||||||
|
"name": "selectedSA",
|
||||||
|
"in": "body",
|
||||||
|
"required": true,
|
||||||
|
"schema": {
|
||||||
|
"type": "array",
|
||||||
|
"items": {
|
||||||
|
"type": "string"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"responses": {
|
||||||
|
"200": {
|
||||||
|
"description": "A successful response."
|
||||||
|
},
|
||||||
|
"default": {
|
||||||
|
"description": "Generic error response.",
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/definitions/error"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
"/service-accounts/{access_key}": {
|
"/service-accounts/{access_key}": {
|
||||||
"delete": {
|
"delete": {
|
||||||
"tags": [
|
"tags": [
|
||||||
|
|||||||
@@ -143,6 +143,9 @@ func NewConsoleAPI(spec *loads.Document) *ConsoleAPI {
|
|||||||
UserAPIDeleteMultipleObjectsHandler: user_api.DeleteMultipleObjectsHandlerFunc(func(params user_api.DeleteMultipleObjectsParams, principal *models.Principal) middleware.Responder {
|
UserAPIDeleteMultipleObjectsHandler: user_api.DeleteMultipleObjectsHandlerFunc(func(params user_api.DeleteMultipleObjectsParams, principal *models.Principal) middleware.Responder {
|
||||||
return middleware.NotImplemented("operation user_api.DeleteMultipleObjects has not yet been implemented")
|
return middleware.NotImplemented("operation user_api.DeleteMultipleObjects has not yet been implemented")
|
||||||
}),
|
}),
|
||||||
|
UserAPIDeleteMultipleServiceAccountsHandler: user_api.DeleteMultipleServiceAccountsHandlerFunc(func(params user_api.DeleteMultipleServiceAccountsParams, principal *models.Principal) middleware.Responder {
|
||||||
|
return middleware.NotImplemented("operation user_api.DeleteMultipleServiceAccounts has not yet been implemented")
|
||||||
|
}),
|
||||||
UserAPIDeleteObjectHandler: user_api.DeleteObjectHandlerFunc(func(params user_api.DeleteObjectParams, principal *models.Principal) middleware.Responder {
|
UserAPIDeleteObjectHandler: user_api.DeleteObjectHandlerFunc(func(params user_api.DeleteObjectParams, principal *models.Principal) middleware.Responder {
|
||||||
return middleware.NotImplemented("operation user_api.DeleteObject has not yet been implemented")
|
return middleware.NotImplemented("operation user_api.DeleteObject has not yet been implemented")
|
||||||
}),
|
}),
|
||||||
@@ -493,6 +496,8 @@ type ConsoleAPI struct {
|
|||||||
UserAPIDeleteBucketReplicationRuleHandler user_api.DeleteBucketReplicationRuleHandler
|
UserAPIDeleteBucketReplicationRuleHandler user_api.DeleteBucketReplicationRuleHandler
|
||||||
// UserAPIDeleteMultipleObjectsHandler sets the operation handler for the delete multiple objects operation
|
// UserAPIDeleteMultipleObjectsHandler sets the operation handler for the delete multiple objects operation
|
||||||
UserAPIDeleteMultipleObjectsHandler user_api.DeleteMultipleObjectsHandler
|
UserAPIDeleteMultipleObjectsHandler user_api.DeleteMultipleObjectsHandler
|
||||||
|
// UserAPIDeleteMultipleServiceAccountsHandler sets the operation handler for the delete multiple service accounts operation
|
||||||
|
UserAPIDeleteMultipleServiceAccountsHandler user_api.DeleteMultipleServiceAccountsHandler
|
||||||
// UserAPIDeleteObjectHandler sets the operation handler for the delete object operation
|
// UserAPIDeleteObjectHandler sets the operation handler for the delete object operation
|
||||||
UserAPIDeleteObjectHandler user_api.DeleteObjectHandler
|
UserAPIDeleteObjectHandler user_api.DeleteObjectHandler
|
||||||
// UserAPIDeleteObjectRetentionHandler sets the operation handler for the delete object retention operation
|
// UserAPIDeleteObjectRetentionHandler sets the operation handler for the delete object retention operation
|
||||||
@@ -820,6 +825,9 @@ func (o *ConsoleAPI) Validate() error {
|
|||||||
if o.UserAPIDeleteMultipleObjectsHandler == nil {
|
if o.UserAPIDeleteMultipleObjectsHandler == nil {
|
||||||
unregistered = append(unregistered, "user_api.DeleteMultipleObjectsHandler")
|
unregistered = append(unregistered, "user_api.DeleteMultipleObjectsHandler")
|
||||||
}
|
}
|
||||||
|
if o.UserAPIDeleteMultipleServiceAccountsHandler == nil {
|
||||||
|
unregistered = append(unregistered, "user_api.DeleteMultipleServiceAccountsHandler")
|
||||||
|
}
|
||||||
if o.UserAPIDeleteObjectHandler == nil {
|
if o.UserAPIDeleteObjectHandler == nil {
|
||||||
unregistered = append(unregistered, "user_api.DeleteObjectHandler")
|
unregistered = append(unregistered, "user_api.DeleteObjectHandler")
|
||||||
}
|
}
|
||||||
@@ -1269,6 +1277,10 @@ func (o *ConsoleAPI) initHandlerCache() {
|
|||||||
o.handlers["POST"] = make(map[string]http.Handler)
|
o.handlers["POST"] = make(map[string]http.Handler)
|
||||||
}
|
}
|
||||||
o.handlers["POST"]["/buckets/{bucket_name}/delete-objects"] = user_api.NewDeleteMultipleObjects(o.context, o.UserAPIDeleteMultipleObjectsHandler)
|
o.handlers["POST"]["/buckets/{bucket_name}/delete-objects"] = user_api.NewDeleteMultipleObjects(o.context, o.UserAPIDeleteMultipleObjectsHandler)
|
||||||
|
if o.handlers["POST"] == nil {
|
||||||
|
o.handlers["POST"] = make(map[string]http.Handler)
|
||||||
|
}
|
||||||
|
o.handlers["POST"]["/service-accounts/delete-multi"] = user_api.NewDeleteMultipleServiceAccounts(o.context, o.UserAPIDeleteMultipleServiceAccountsHandler)
|
||||||
if o.handlers["DELETE"] == nil {
|
if o.handlers["DELETE"] == nil {
|
||||||
o.handlers["DELETE"] = make(map[string]http.Handler)
|
o.handlers["DELETE"] = make(map[string]http.Handler)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,88 @@
|
|||||||
|
// Code generated by go-swagger; DO NOT EDIT.
|
||||||
|
|
||||||
|
// This file is part of MinIO Console Server
|
||||||
|
// Copyright (c) 2021 MinIO, 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/>.
|
||||||
|
//
|
||||||
|
|
||||||
|
package user_api
|
||||||
|
|
||||||
|
// This file was generated by the swagger tool.
|
||||||
|
// Editing this file might prove futile when you re-run the generate command
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net/http"
|
||||||
|
|
||||||
|
"github.com/go-openapi/runtime/middleware"
|
||||||
|
|
||||||
|
"github.com/minio/console/models"
|
||||||
|
)
|
||||||
|
|
||||||
|
// DeleteMultipleServiceAccountsHandlerFunc turns a function with the right signature into a delete multiple service accounts handler
|
||||||
|
type DeleteMultipleServiceAccountsHandlerFunc func(DeleteMultipleServiceAccountsParams, *models.Principal) middleware.Responder
|
||||||
|
|
||||||
|
// Handle executing the request and returning a response
|
||||||
|
func (fn DeleteMultipleServiceAccountsHandlerFunc) Handle(params DeleteMultipleServiceAccountsParams, principal *models.Principal) middleware.Responder {
|
||||||
|
return fn(params, principal)
|
||||||
|
}
|
||||||
|
|
||||||
|
// DeleteMultipleServiceAccountsHandler interface for that can handle valid delete multiple service accounts params
|
||||||
|
type DeleteMultipleServiceAccountsHandler interface {
|
||||||
|
Handle(DeleteMultipleServiceAccountsParams, *models.Principal) middleware.Responder
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewDeleteMultipleServiceAccounts creates a new http.Handler for the delete multiple service accounts operation
|
||||||
|
func NewDeleteMultipleServiceAccounts(ctx *middleware.Context, handler DeleteMultipleServiceAccountsHandler) *DeleteMultipleServiceAccounts {
|
||||||
|
return &DeleteMultipleServiceAccounts{Context: ctx, Handler: handler}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* DeleteMultipleServiceAccounts swagger:route POST /service-accounts/delete-multi UserAPI deleteMultipleServiceAccounts
|
||||||
|
|
||||||
|
Delete Multiple Service Accounts
|
||||||
|
|
||||||
|
*/
|
||||||
|
type DeleteMultipleServiceAccounts struct {
|
||||||
|
Context *middleware.Context
|
||||||
|
Handler DeleteMultipleServiceAccountsHandler
|
||||||
|
}
|
||||||
|
|
||||||
|
func (o *DeleteMultipleServiceAccounts) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
|
||||||
|
route, rCtx, _ := o.Context.RouteInfo(r)
|
||||||
|
if rCtx != nil {
|
||||||
|
*r = *rCtx
|
||||||
|
}
|
||||||
|
var Params = NewDeleteMultipleServiceAccountsParams()
|
||||||
|
uprinc, aCtx, err := o.Context.Authorize(r, route)
|
||||||
|
if err != nil {
|
||||||
|
o.Context.Respond(rw, r, route.Produces, route, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if aCtx != nil {
|
||||||
|
*r = *aCtx
|
||||||
|
}
|
||||||
|
var principal *models.Principal
|
||||||
|
if uprinc != nil {
|
||||||
|
principal = uprinc.(*models.Principal) // this is really a models.Principal, I promise
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := o.Context.BindValidRequest(r, route, &Params); err != nil { // bind params
|
||||||
|
o.Context.Respond(rw, r, route.Produces, route, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
res := o.Handler.Handle(Params, principal) // actually handle the request
|
||||||
|
o.Context.Respond(rw, r, route.Produces, route, res)
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,87 @@
|
|||||||
|
// Code generated by go-swagger; DO NOT EDIT.
|
||||||
|
|
||||||
|
// This file is part of MinIO Console Server
|
||||||
|
// Copyright (c) 2021 MinIO, 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/>.
|
||||||
|
//
|
||||||
|
|
||||||
|
package user_api
|
||||||
|
|
||||||
|
// This file was generated by the swagger tool.
|
||||||
|
// Editing this file might prove futile when you re-run the swagger generate command
|
||||||
|
|
||||||
|
import (
|
||||||
|
"io"
|
||||||
|
"net/http"
|
||||||
|
|
||||||
|
"github.com/go-openapi/errors"
|
||||||
|
"github.com/go-openapi/runtime"
|
||||||
|
"github.com/go-openapi/runtime/middleware"
|
||||||
|
)
|
||||||
|
|
||||||
|
// NewDeleteMultipleServiceAccountsParams creates a new DeleteMultipleServiceAccountsParams object
|
||||||
|
//
|
||||||
|
// There are no default values defined in the spec.
|
||||||
|
func NewDeleteMultipleServiceAccountsParams() DeleteMultipleServiceAccountsParams {
|
||||||
|
|
||||||
|
return DeleteMultipleServiceAccountsParams{}
|
||||||
|
}
|
||||||
|
|
||||||
|
// DeleteMultipleServiceAccountsParams contains all the bound params for the delete multiple service accounts operation
|
||||||
|
// typically these are obtained from a http.Request
|
||||||
|
//
|
||||||
|
// swagger:parameters DeleteMultipleServiceAccounts
|
||||||
|
type DeleteMultipleServiceAccountsParams struct {
|
||||||
|
|
||||||
|
// HTTP Request Object
|
||||||
|
HTTPRequest *http.Request `json:"-"`
|
||||||
|
|
||||||
|
/*
|
||||||
|
Required: true
|
||||||
|
In: body
|
||||||
|
*/
|
||||||
|
SelectedSA []string
|
||||||
|
}
|
||||||
|
|
||||||
|
// BindRequest both binds and validates a request, it assumes that complex things implement a Validatable(strfmt.Registry) error interface
|
||||||
|
// for simple values it will use straight method calls.
|
||||||
|
//
|
||||||
|
// To ensure default values, the struct must have been initialized with NewDeleteMultipleServiceAccountsParams() beforehand.
|
||||||
|
func (o *DeleteMultipleServiceAccountsParams) BindRequest(r *http.Request, route *middleware.MatchedRoute) error {
|
||||||
|
var res []error
|
||||||
|
|
||||||
|
o.HTTPRequest = r
|
||||||
|
|
||||||
|
if runtime.HasBody(r) {
|
||||||
|
defer r.Body.Close()
|
||||||
|
var body []string
|
||||||
|
if err := route.Consumer.Consume(r.Body, &body); err != nil {
|
||||||
|
if err == io.EOF {
|
||||||
|
res = append(res, errors.Required("selectedSA", "body", ""))
|
||||||
|
} else {
|
||||||
|
res = append(res, errors.NewParseError("selectedSA", "body", "", err))
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// no validation required on inline body
|
||||||
|
o.SelectedSA = body
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
res = append(res, errors.Required("selectedSA", "body", ""))
|
||||||
|
}
|
||||||
|
if len(res) > 0 {
|
||||||
|
return errors.CompositeValidationError(res...)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,113 @@
|
|||||||
|
// Code generated by go-swagger; DO NOT EDIT.
|
||||||
|
|
||||||
|
// This file is part of MinIO Console Server
|
||||||
|
// Copyright (c) 2021 MinIO, 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/>.
|
||||||
|
//
|
||||||
|
|
||||||
|
package user_api
|
||||||
|
|
||||||
|
// This file was generated by the swagger tool.
|
||||||
|
// Editing this file might prove futile when you re-run the swagger generate command
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net/http"
|
||||||
|
|
||||||
|
"github.com/go-openapi/runtime"
|
||||||
|
|
||||||
|
"github.com/minio/console/models"
|
||||||
|
)
|
||||||
|
|
||||||
|
// DeleteMultipleServiceAccountsOKCode is the HTTP code returned for type DeleteMultipleServiceAccountsOK
|
||||||
|
const DeleteMultipleServiceAccountsOKCode int = 200
|
||||||
|
|
||||||
|
/*DeleteMultipleServiceAccountsOK A successful response.
|
||||||
|
|
||||||
|
swagger:response deleteMultipleServiceAccountsOK
|
||||||
|
*/
|
||||||
|
type DeleteMultipleServiceAccountsOK struct {
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewDeleteMultipleServiceAccountsOK creates DeleteMultipleServiceAccountsOK with default headers values
|
||||||
|
func NewDeleteMultipleServiceAccountsOK() *DeleteMultipleServiceAccountsOK {
|
||||||
|
|
||||||
|
return &DeleteMultipleServiceAccountsOK{}
|
||||||
|
}
|
||||||
|
|
||||||
|
// WriteResponse to the client
|
||||||
|
func (o *DeleteMultipleServiceAccountsOK) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) {
|
||||||
|
|
||||||
|
rw.Header().Del(runtime.HeaderContentType) //Remove Content-Type on empty responses
|
||||||
|
|
||||||
|
rw.WriteHeader(200)
|
||||||
|
}
|
||||||
|
|
||||||
|
/*DeleteMultipleServiceAccountsDefault Generic error response.
|
||||||
|
|
||||||
|
swagger:response deleteMultipleServiceAccountsDefault
|
||||||
|
*/
|
||||||
|
type DeleteMultipleServiceAccountsDefault struct {
|
||||||
|
_statusCode int
|
||||||
|
|
||||||
|
/*
|
||||||
|
In: Body
|
||||||
|
*/
|
||||||
|
Payload *models.Error `json:"body,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewDeleteMultipleServiceAccountsDefault creates DeleteMultipleServiceAccountsDefault with default headers values
|
||||||
|
func NewDeleteMultipleServiceAccountsDefault(code int) *DeleteMultipleServiceAccountsDefault {
|
||||||
|
if code <= 0 {
|
||||||
|
code = 500
|
||||||
|
}
|
||||||
|
|
||||||
|
return &DeleteMultipleServiceAccountsDefault{
|
||||||
|
_statusCode: code,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// WithStatusCode adds the status to the delete multiple service accounts default response
|
||||||
|
func (o *DeleteMultipleServiceAccountsDefault) WithStatusCode(code int) *DeleteMultipleServiceAccountsDefault {
|
||||||
|
o._statusCode = code
|
||||||
|
return o
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetStatusCode sets the status to the delete multiple service accounts default response
|
||||||
|
func (o *DeleteMultipleServiceAccountsDefault) SetStatusCode(code int) {
|
||||||
|
o._statusCode = code
|
||||||
|
}
|
||||||
|
|
||||||
|
// WithPayload adds the payload to the delete multiple service accounts default response
|
||||||
|
func (o *DeleteMultipleServiceAccountsDefault) WithPayload(payload *models.Error) *DeleteMultipleServiceAccountsDefault {
|
||||||
|
o.Payload = payload
|
||||||
|
return o
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetPayload sets the payload to the delete multiple service accounts default response
|
||||||
|
func (o *DeleteMultipleServiceAccountsDefault) SetPayload(payload *models.Error) {
|
||||||
|
o.Payload = payload
|
||||||
|
}
|
||||||
|
|
||||||
|
// WriteResponse to the client
|
||||||
|
func (o *DeleteMultipleServiceAccountsDefault) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) {
|
||||||
|
|
||||||
|
rw.WriteHeader(o._statusCode)
|
||||||
|
if o.Payload != nil {
|
||||||
|
payload := o.Payload
|
||||||
|
if err := producer.Produce(rw, payload); err != nil {
|
||||||
|
panic(err) // let the recovery middleware deal with this
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,104 @@
|
|||||||
|
// Code generated by go-swagger; DO NOT EDIT.
|
||||||
|
|
||||||
|
// This file is part of MinIO Console Server
|
||||||
|
// Copyright (c) 2021 MinIO, 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/>.
|
||||||
|
//
|
||||||
|
|
||||||
|
package user_api
|
||||||
|
|
||||||
|
// This file was generated by the swagger tool.
|
||||||
|
// Editing this file might prove futile when you re-run the generate command
|
||||||
|
|
||||||
|
import (
|
||||||
|
"errors"
|
||||||
|
"net/url"
|
||||||
|
golangswaggerpaths "path"
|
||||||
|
)
|
||||||
|
|
||||||
|
// DeleteMultipleServiceAccountsURL generates an URL for the delete multiple service accounts operation
|
||||||
|
type DeleteMultipleServiceAccountsURL struct {
|
||||||
|
_basePath string
|
||||||
|
}
|
||||||
|
|
||||||
|
// WithBasePath sets the base path for this url builder, only required when it's different from the
|
||||||
|
// base path specified in the swagger spec.
|
||||||
|
// When the value of the base path is an empty string
|
||||||
|
func (o *DeleteMultipleServiceAccountsURL) WithBasePath(bp string) *DeleteMultipleServiceAccountsURL {
|
||||||
|
o.SetBasePath(bp)
|
||||||
|
return o
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetBasePath sets the base path for this url builder, only required when it's different from the
|
||||||
|
// base path specified in the swagger spec.
|
||||||
|
// When the value of the base path is an empty string
|
||||||
|
func (o *DeleteMultipleServiceAccountsURL) SetBasePath(bp string) {
|
||||||
|
o._basePath = bp
|
||||||
|
}
|
||||||
|
|
||||||
|
// Build a url path and query string
|
||||||
|
func (o *DeleteMultipleServiceAccountsURL) Build() (*url.URL, error) {
|
||||||
|
var _result url.URL
|
||||||
|
|
||||||
|
var _path = "/service-accounts/delete-multi"
|
||||||
|
|
||||||
|
_basePath := o._basePath
|
||||||
|
if _basePath == "" {
|
||||||
|
_basePath = "/api/v1"
|
||||||
|
}
|
||||||
|
_result.Path = golangswaggerpaths.Join(_basePath, _path)
|
||||||
|
|
||||||
|
return &_result, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Must is a helper function to panic when the url builder returns an error
|
||||||
|
func (o *DeleteMultipleServiceAccountsURL) Must(u *url.URL, err error) *url.URL {
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
if u == nil {
|
||||||
|
panic("url can't be nil")
|
||||||
|
}
|
||||||
|
return u
|
||||||
|
}
|
||||||
|
|
||||||
|
// String returns the string representation of the path with query string
|
||||||
|
func (o *DeleteMultipleServiceAccountsURL) String() string {
|
||||||
|
return o.Must(o.Build()).String()
|
||||||
|
}
|
||||||
|
|
||||||
|
// BuildFull builds a full url with scheme, host, path and query string
|
||||||
|
func (o *DeleteMultipleServiceAccountsURL) BuildFull(scheme, host string) (*url.URL, error) {
|
||||||
|
if scheme == "" {
|
||||||
|
return nil, errors.New("scheme is required for a full url on DeleteMultipleServiceAccountsURL")
|
||||||
|
}
|
||||||
|
if host == "" {
|
||||||
|
return nil, errors.New("host is required for a full url on DeleteMultipleServiceAccountsURL")
|
||||||
|
}
|
||||||
|
|
||||||
|
base, err := o.Build()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
base.Scheme = scheme
|
||||||
|
base.Host = host
|
||||||
|
return base, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// StringFull returns the string representation of a complete url
|
||||||
|
func (o *DeleteMultipleServiceAccountsURL) StringFull(scheme, host string) string {
|
||||||
|
return o.Must(o.BuildFull(scheme, host)).String()
|
||||||
|
}
|
||||||
@@ -99,6 +99,13 @@ func registerServiceAccountsHandlers(api *operations.ConsoleAPI) {
|
|||||||
return user_api.NewGetServiceAccountPolicyOK().WithPayload(serviceAccounts)
|
return user_api.NewGetServiceAccountPolicyOK().WithPayload(serviceAccounts)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
// Delete multiple service accounts
|
||||||
|
api.UserAPIDeleteMultipleServiceAccountsHandler = user_api.DeleteMultipleServiceAccountsHandlerFunc(func(params user_api.DeleteMultipleServiceAccountsParams, session *models.Principal) middleware.Responder {
|
||||||
|
if err := getDeleteMultipleServiceAccountsResponse(session, params.SelectedSA); err != nil {
|
||||||
|
return user_api.NewDeleteMultipleServiceAccountsDefault(int(err.Code)).WithPayload(err)
|
||||||
|
}
|
||||||
|
return user_api.NewDeleteMultipleServiceAccountsOK()
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
// createServiceAccount adds a service account to the userClient and assigns a policy to him if defined.
|
// createServiceAccount adds a service account to the userClient and assigns a policy to him if defined.
|
||||||
@@ -382,3 +389,22 @@ func getServiceAccountPolicyResponse(session *models.Principal, accessKey string
|
|||||||
}
|
}
|
||||||
return serviceAccounts, nil
|
return serviceAccounts, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// getDeleteMultipleServiceAccountsResponse authenticates the user and calls deleteServiceAccount for each account listed in selectedSAs
|
||||||
|
func getDeleteMultipleServiceAccountsResponse(session *models.Principal, selectedSAs []string) *models.Error {
|
||||||
|
ctx, cancel := context.WithTimeout(context.Background(), time.Second*20)
|
||||||
|
defer cancel()
|
||||||
|
userAdmin, err := NewMinioAdminClient(session)
|
||||||
|
if err != nil {
|
||||||
|
return prepareError(err)
|
||||||
|
}
|
||||||
|
// create a MinIO user Admin Client interface implementation
|
||||||
|
// defining the client to be used
|
||||||
|
userAdminClient := AdminClient{Client: userAdmin}
|
||||||
|
for _, sa := range selectedSAs {
|
||||||
|
if err := deleteServiceAccount(ctx, userAdminClient, sa); err != nil {
|
||||||
|
return prepareError(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ securityDefinitions:
|
|||||||
tokenUrl: http://min.io
|
tokenUrl: http://min.io
|
||||||
# Apply the key security definition to all APIs
|
# Apply the key security definition to all APIs
|
||||||
security:
|
security:
|
||||||
- key: [ ]
|
- key: []
|
||||||
paths:
|
paths:
|
||||||
/login:
|
/login:
|
||||||
get:
|
get:
|
||||||
@@ -35,7 +35,7 @@ paths:
|
|||||||
schema:
|
schema:
|
||||||
$ref: "#/definitions/error"
|
$ref: "#/definitions/error"
|
||||||
# Exclude this API from the authentication requirement
|
# Exclude this API from the authentication requirement
|
||||||
security: [ ]
|
security: []
|
||||||
tags:
|
tags:
|
||||||
- UserAPI
|
- UserAPI
|
||||||
post:
|
post:
|
||||||
@@ -55,7 +55,7 @@ paths:
|
|||||||
schema:
|
schema:
|
||||||
$ref: "#/definitions/error"
|
$ref: "#/definitions/error"
|
||||||
# Exclude this API from the authentication requirement
|
# Exclude this API from the authentication requirement
|
||||||
security: [ ]
|
security: []
|
||||||
tags:
|
tags:
|
||||||
- UserAPI
|
- UserAPI
|
||||||
/login/oauth2/auth:
|
/login/oauth2/auth:
|
||||||
@@ -75,7 +75,7 @@ paths:
|
|||||||
description: Generic error response.
|
description: Generic error response.
|
||||||
schema:
|
schema:
|
||||||
$ref: "#/definitions/error"
|
$ref: "#/definitions/error"
|
||||||
security: [ ]
|
security: []
|
||||||
tags:
|
tags:
|
||||||
- UserAPI
|
- UserAPI
|
||||||
|
|
||||||
@@ -1260,6 +1260,28 @@ paths:
|
|||||||
tags:
|
tags:
|
||||||
- UserAPI
|
- UserAPI
|
||||||
|
|
||||||
|
/service-accounts/delete-multi:
|
||||||
|
post:
|
||||||
|
summary: Delete Multiple Service Accounts
|
||||||
|
operationId: DeleteMultipleServiceAccounts
|
||||||
|
parameters:
|
||||||
|
- name: selectedSA
|
||||||
|
in: body
|
||||||
|
required: true
|
||||||
|
schema:
|
||||||
|
type: array
|
||||||
|
items:
|
||||||
|
type: string
|
||||||
|
responses:
|
||||||
|
200:
|
||||||
|
description: A successful response.
|
||||||
|
default:
|
||||||
|
description: Generic error response.
|
||||||
|
schema:
|
||||||
|
$ref: "#/definitions/error"
|
||||||
|
tags:
|
||||||
|
- UserAPI
|
||||||
|
|
||||||
/service-accounts/{access_key}/policy:
|
/service-accounts/{access_key}/policy:
|
||||||
get:
|
get:
|
||||||
summary: Get Service Account Policy
|
summary: Get Service Account Policy
|
||||||
@@ -2471,7 +2493,7 @@ paths:
|
|||||||
- name: order
|
- name: order
|
||||||
in: query
|
in: query
|
||||||
type: string
|
type: string
|
||||||
enum: [ timeDesc, timeAsc ]
|
enum: [timeDesc, timeAsc]
|
||||||
default: timeDesc
|
default: timeDesc
|
||||||
- name: timeStart
|
- name: timeStart
|
||||||
in: query
|
in: query
|
||||||
@@ -3234,7 +3256,7 @@ definitions:
|
|||||||
properties:
|
properties:
|
||||||
loginStrategy:
|
loginStrategy:
|
||||||
type: string
|
type: string
|
||||||
enum: [ form, redirect, service-account ]
|
enum: [form, redirect, service-account]
|
||||||
redirect:
|
redirect:
|
||||||
type: string
|
type: string
|
||||||
loginOauth2AuthRequest:
|
loginOauth2AuthRequest:
|
||||||
@@ -3320,7 +3342,7 @@ definitions:
|
|||||||
type: string
|
type: string
|
||||||
status:
|
status:
|
||||||
type: string
|
type: string
|
||||||
enum: [ ok ]
|
enum: [ok]
|
||||||
operator:
|
operator:
|
||||||
type: boolean
|
type: boolean
|
||||||
distributedMode:
|
distributedMode:
|
||||||
@@ -3341,7 +3363,7 @@ definitions:
|
|||||||
type: string
|
type: string
|
||||||
values:
|
values:
|
||||||
type: array
|
type: array
|
||||||
items: { }
|
items: {}
|
||||||
resultTarget:
|
resultTarget:
|
||||||
type: object
|
type: object
|
||||||
properties:
|
properties:
|
||||||
@@ -3621,7 +3643,7 @@ definitions:
|
|||||||
type: string
|
type: string
|
||||||
service:
|
service:
|
||||||
type: string
|
type: string
|
||||||
enum: [ replication ]
|
enum: [replication]
|
||||||
syncMode:
|
syncMode:
|
||||||
type: string
|
type: string
|
||||||
bandwidth:
|
bandwidth:
|
||||||
|
|||||||
Reference in New Issue
Block a user