access keys ui details improvement and edit (#3116)

models/service_account.go

@@ -0,0 +1,85 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+// This file is part of MinIO Console Server
+// Copyright (c) 2023 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 models
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"context"
+
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
+)
+
+// ServiceAccount service account
+//
+// swagger:model serviceAccount
+type ServiceAccount struct {
+
+	// account status
+	AccountStatus string `json:"accountStatus,omitempty"`
+
+	// description
+	Description string `json:"description,omitempty"`
+
+	// expiration
+	Expiration string `json:"expiration,omitempty"`
+
+	// implied policy
+	ImpliedPolicy bool `json:"impliedPolicy,omitempty"`
+
+	// name
+	Name string `json:"name,omitempty"`
+
+	// parent user
+	ParentUser string `json:"parentUser,omitempty"`
+
+	// policy
+	Policy string `json:"policy,omitempty"`
+}
+
+// Validate validates this service account
+func (m *ServiceAccount) Validate(formats strfmt.Registry) error {
+	return nil
+}
+
+// ContextValidate validates this service account based on context it is used
+func (m *ServiceAccount) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+	return nil
+}
+
+// MarshalBinary interface implementation
+func (m *ServiceAccount) MarshalBinary() ([]byte, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return swag.WriteJSON(m)
+}
+
+// UnmarshalBinary interface implementation
+func (m *ServiceAccount) UnmarshalBinary(b []byte) error {
+	var res ServiceAccount
+	if err := swag.ReadJSON(b, &res); err != nil {
+		return err
+	}
+	*m = res
+	return nil
+}

models/service_account_request.go

@@ -34,6 +34,18 @@ import (
 // swagger:model serviceAccountRequest
 type ServiceAccountRequest struct {
 
+	// comment
+	Comment string `json:"comment,omitempty"`
+
+	// description
+	Description string `json:"description,omitempty"`
+
+	// expiry
+	Expiry string `json:"expiry,omitempty"`
+
+	// name
+	Name string `json:"name,omitempty"`
+
 	// policy to be applied to the Service Account if any
 	Policy string `json:"policy,omitempty"`
 }

models/service_account_request_creds.go

@@ -37,6 +37,18 @@ type ServiceAccountRequestCreds struct {
 	// access key
 	AccessKey string `json:"accessKey,omitempty"`
 
+	// comment
+	Comment string `json:"comment,omitempty"`
+
+	// description
+	Description string `json:"description,omitempty"`
+
+	// expiry
+	Expiry string `json:"expiry,omitempty"`
+
+	// name
+	Name string `json:"name,omitempty"`
+
 	// policy to be applied to the Service Account if any
 	Policy string `json:"policy,omitempty"`
 

models/update_service_account_request.go

@@ -31,18 +31,33 @@ import (
 	"github.com/go-openapi/validate"
 )
 
-// AddServiceAccountPolicyRequest add service account policy request
+// UpdateServiceAccountRequest update service account request
 //
-// swagger:model addServiceAccountPolicyRequest
-type AddServiceAccountPolicyRequest struct {
+// swagger:model updateServiceAccountRequest
+type UpdateServiceAccountRequest struct {
+
+	// description
+	Description string `json:"description,omitempty"`
+
+	// expiry
+	Expiry string `json:"expiry,omitempty"`
+
+	// name
+	Name string `json:"name,omitempty"`
 
 	// policy
 	// Required: true
 	Policy *string `json:"policy"`
+
+	// secret key
+	SecretKey string `json:"secretKey,omitempty"`
+
+	// status
+	Status string `json:"status,omitempty"`
 }
 
-// Validate validates this add service account policy request
-func (m *AddServiceAccountPolicyRequest) Validate(formats strfmt.Registry) error {
+// Validate validates this update service account request
+func (m *UpdateServiceAccountRequest) Validate(formats strfmt.Registry) error {
 	var res []error
 
 	if err := m.validatePolicy(formats); err != nil {
@@ -55,7 +70,7 @@ func (m *AddServiceAccountPolicyRequest) Validate(formats strfmt.Registry) error
 	return nil
 }
 
-func (m *AddServiceAccountPolicyRequest) validatePolicy(formats strfmt.Registry) error {
+func (m *UpdateServiceAccountRequest) validatePolicy(formats strfmt.Registry) error {
 
 	if err := validate.Required("policy", "body", m.Policy); err != nil {
 		return err
@@ -64,13 +79,13 @@ func (m *AddServiceAccountPolicyRequest) validatePolicy(formats strfmt.Registry)
 	return nil
 }
 
-// ContextValidate validates this add service account policy request based on context it is used
-func (m *AddServiceAccountPolicyRequest) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+// ContextValidate validates this update service account request based on context it is used
+func (m *UpdateServiceAccountRequest) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
 	return nil
 }
 
 // MarshalBinary interface implementation
-func (m *AddServiceAccountPolicyRequest) MarshalBinary() ([]byte, error) {
+func (m *UpdateServiceAccountRequest) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
@@ -78,8 +93,8 @@ func (m *AddServiceAccountPolicyRequest) MarshalBinary() ([]byte, error) {
 }
 
 // UnmarshalBinary interface implementation
-func (m *AddServiceAccountPolicyRequest) UnmarshalBinary(b []byte) error {
-	var res AddServiceAccountPolicyRequest
+func (m *UpdateServiceAccountRequest) UnmarshalBinary(b []byte) error {
+	var res UpdateServiceAccountRequest
 	if err := swag.ReadJSON(b, &res); err != nil {
 		return err
 	}