restructure rcloud-base as a single base controller (#37)

* restructure rcloud-base as a single base controller
* updated master.rest
* moved sentry from internal to pkg as it is used by relay
* removing unused rpc and it's dependencies
* Fix usermgmt tests
* Don't redefine variables in rest file
Co-authored-by: Abin Simon <abin.simon@rafay.co>

Makefile

@@ -7,33 +7,23 @@ vendor:
 
 .PHONY: build-proto
 build-proto:
-	cd components; buf build
+	buf build
 
 .PHONY: gen-proto
 gen-proto:
-	cd components/common; buf generate
-	cd components/authz; buf generate
+	buf generate
 
 .PHONY: test
 test:
-	cd components/common; go test ./...
-	cd components/adminsrv; go test ./...
-	cd components/usermgmt; go test ./...
-	cd components/cluster-scheduler; go test ./...
-
+	go test ./...
+	
 .PHONY: check
 check:
-	cd components/common; go fmt ./...
-	cd components/adminsrv; go fmt ./...
-	cd components/usermgmt; go fmt ./...
-	cd components/cluster-scheduler; go fmt ./...
-
-	cd components/common; go vet ./...
-	cd components/adminsrv; go vet ./...
-	cd components/usermgmt; go vet ./...
-	cd components/cluster-scheduler; go vet ./...
-
+	go fmt ./...
+	
+	go vet ./...
+	
 .PHONY: clean
 clean:
-	rm -rf components/**/gen
+	rm -rf ./**/gen
 	find . -name "*.pb*" -type f -delete

README.md

@@ -67,4 +67,4 @@ export POSTGRESQL_URL='postgres://<user>:<pass>@<host>:<port>/admindb?sslmode=di
 migrate -path ./persistence/migrations/admindb -database "$POSTGRESQL_URL" up
 ```
 
-See [cli-usage](https://github.com/golang-migrate/migrate#cli-usage) for more info.
+See [cli-usage](https://github.com/golang-migrate/migrate#cli-usage) for more info.

_kratos/development/session_main.go

@@ -3,7 +3,7 @@ package main
 import (
 	"time"
 
-	"github.com/RafaySystems/rcloud-base/components/usermgmt/_kratos/development/pkg"
+	"github.com/RafaySystems/rcloud-base/_kratos/development/pkg"
 
 	ory "github.com/ory/kratos-client-go"
 )

_kratos/go.mod

@@ -1,4 +1,4 @@
-module github.com/RafaySystems/rcloud-base/components/usermgmt/_kratos
+module github.com/RafaySystems/rcloud-base/_kratos
 
 go 1.17
 

_kratos/kratos.yml

@@ -1,6 +1,6 @@
 version: v0.7.1-alpha.1
 
-dsn: memory
+dsn: postgres://admindbuser:admindbpassword@localhost:5432/admindb?sslmode=disable&max_conns=20&max_idle_conns=4
 
 serve:
   public:

api/def/clients/sentry/client/audit_information/audit_information_client.go

@@ -0,0 +1,117 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package audit_information
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"github.com/go-openapi/runtime"
+	"github.com/go-openapi/strfmt"
+)
+
+// New creates a new audit information API client.
+func New(transport runtime.ClientTransport, formats strfmt.Registry) ClientService {
+	return &Client{transport: transport, formats: formats}
+}
+
+/*
+Client for audit information API
+*/
+type Client struct {
+	transport runtime.ClientTransport
+	formats   strfmt.Registry
+}
+
+// ClientOption is the option for Client methods
+type ClientOption func(*runtime.ClientOperation)
+
+// ClientService is the interface for Client methods
+type ClientService interface {
+	AuditInformationLookupCluster(params *AuditInformationLookupClusterParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*AuditInformationLookupClusterOK, error)
+
+	AuditInformationLookupUser(params *AuditInformationLookupUserParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*AuditInformationLookupUserOK, error)
+
+	SetTransport(transport runtime.ClientTransport)
+}
+
+/*
+  AuditInformationLookupCluster audit information lookup cluster API
+*/
+func (a *Client) AuditInformationLookupCluster(params *AuditInformationLookupClusterParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*AuditInformationLookupClusterOK, error) {
+	// TODO: Validate the params before sending
+	if params == nil {
+		params = NewAuditInformationLookupClusterParams()
+	}
+	op := &runtime.ClientOperation{
+		ID:                 "AuditInformation_LookupCluster",
+		Method:             "GET",
+		PathPattern:        "/v2/sentry/auditInfo/cluster",
+		ProducesMediaTypes: []string{"application/json", "application/yaml"},
+		ConsumesMediaTypes: []string{"application/json", "application/yaml"},
+		Schemes:            []string{"https"},
+		Params:             params,
+		Reader:             &AuditInformationLookupClusterReader{formats: a.formats},
+		AuthInfo:           authInfo,
+		Context:            params.Context,
+		Client:             params.HTTPClient,
+	}
+	for _, opt := range opts {
+		opt(op)
+	}
+
+	result, err := a.transport.Submit(op)
+	if err != nil {
+		return nil, err
+	}
+	success, ok := result.(*AuditInformationLookupClusterOK)
+	if ok {
+		return success, nil
+	}
+	// unexpected success response
+	unexpectedSuccess := result.(*AuditInformationLookupClusterDefault)
+	return nil, runtime.NewAPIError("unexpected success response: content available as default response in error", unexpectedSuccess, unexpectedSuccess.Code())
+}
+
+/*
+  AuditInformationLookupUser audit information lookup user API
+*/
+func (a *Client) AuditInformationLookupUser(params *AuditInformationLookupUserParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*AuditInformationLookupUserOK, error) {
+	// TODO: Validate the params before sending
+	if params == nil {
+		params = NewAuditInformationLookupUserParams()
+	}
+	op := &runtime.ClientOperation{
+		ID:                 "AuditInformation_LookupUser",
+		Method:             "GET",
+		PathPattern:        "/v2/sentry/auditInfo/user",
+		ProducesMediaTypes: []string{"application/json", "application/yaml"},
+		ConsumesMediaTypes: []string{"application/json", "application/yaml"},
+		Schemes:            []string{"https"},
+		Params:             params,
+		Reader:             &AuditInformationLookupUserReader{formats: a.formats},
+		AuthInfo:           authInfo,
+		Context:            params.Context,
+		Client:             params.HTTPClient,
+	}
+	for _, opt := range opts {
+		opt(op)
+	}
+
+	result, err := a.transport.Submit(op)
+	if err != nil {
+		return nil, err
+	}
+	success, ok := result.(*AuditInformationLookupUserOK)
+	if ok {
+		return success, nil
+	}
+	// unexpected success response
+	unexpectedSuccess := result.(*AuditInformationLookupUserDefault)
+	return nil, runtime.NewAPIError("unexpected success response: content available as default response in error", unexpectedSuccess, unexpectedSuccess.Code())
+}
+
+// SetTransport changes the transport on the client
+func (a *Client) SetTransport(transport runtime.ClientTransport) {
+	a.transport = transport
+}

api/def/clients/sentry/client/audit_information/audit_information_lookup_cluster_parameters.go

@@ -0,0 +1,158 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package audit_information
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"context"
+	"net/http"
+	"time"
+
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime"
+	cr "github.com/go-openapi/runtime/client"
+	"github.com/go-openapi/strfmt"
+)
+
+// NewAuditInformationLookupClusterParams creates a new AuditInformationLookupClusterParams object,
+// with the default timeout for this client.
+//
+// Default values are not hydrated, since defaults are normally applied by the API server side.
+//
+// To enforce default values in parameter, use SetDefaults or WithDefaults.
+func NewAuditInformationLookupClusterParams() *AuditInformationLookupClusterParams {
+	return &AuditInformationLookupClusterParams{
+		timeout: cr.DefaultTimeout,
+	}
+}
+
+// NewAuditInformationLookupClusterParamsWithTimeout creates a new AuditInformationLookupClusterParams object
+// with the ability to set a timeout on a request.
+func NewAuditInformationLookupClusterParamsWithTimeout(timeout time.Duration) *AuditInformationLookupClusterParams {
+	return &AuditInformationLookupClusterParams{
+		timeout: timeout,
+	}
+}
+
+// NewAuditInformationLookupClusterParamsWithContext creates a new AuditInformationLookupClusterParams object
+// with the ability to set a context for a request.
+func NewAuditInformationLookupClusterParamsWithContext(ctx context.Context) *AuditInformationLookupClusterParams {
+	return &AuditInformationLookupClusterParams{
+		Context: ctx,
+	}
+}
+
+// NewAuditInformationLookupClusterParamsWithHTTPClient creates a new AuditInformationLookupClusterParams object
+// with the ability to set a custom HTTPClient for a request.
+func NewAuditInformationLookupClusterParamsWithHTTPClient(client *http.Client) *AuditInformationLookupClusterParams {
+	return &AuditInformationLookupClusterParams{
+		HTTPClient: client,
+	}
+}
+
+/* AuditInformationLookupClusterParams contains all the parameters to send to the API endpoint
+   for the audit information lookup cluster operation.
+
+   Typically these are written to a http.Request.
+*/
+type AuditInformationLookupClusterParams struct {
+
+	// ClusterSNI.
+	ClusterSNI *string
+
+	timeout    time.Duration
+	Context    context.Context
+	HTTPClient *http.Client
+}
+
+// WithDefaults hydrates default values in the audit information lookup cluster params (not the query body).
+//
+// All values with no default are reset to their zero value.
+func (o *AuditInformationLookupClusterParams) WithDefaults() *AuditInformationLookupClusterParams {
+	o.SetDefaults()
+	return o
+}
+
+// SetDefaults hydrates default values in the audit information lookup cluster params (not the query body).
+//
+// All values with no default are reset to their zero value.
+func (o *AuditInformationLookupClusterParams) SetDefaults() {
+	// no default values defined for this parameter
+}
+
+// WithTimeout adds the timeout to the audit information lookup cluster params
+func (o *AuditInformationLookupClusterParams) WithTimeout(timeout time.Duration) *AuditInformationLookupClusterParams {
+	o.SetTimeout(timeout)
+	return o
+}
+
+// SetTimeout adds the timeout to the audit information lookup cluster params
+func (o *AuditInformationLookupClusterParams) SetTimeout(timeout time.Duration) {
+	o.timeout = timeout
+}
+
+// WithContext adds the context to the audit information lookup cluster params
+func (o *AuditInformationLookupClusterParams) WithContext(ctx context.Context) *AuditInformationLookupClusterParams {
+	o.SetContext(ctx)
+	return o
+}
+
+// SetContext adds the context to the audit information lookup cluster params
+func (o *AuditInformationLookupClusterParams) SetContext(ctx context.Context) {
+	o.Context = ctx
+}
+
+// WithHTTPClient adds the HTTPClient to the audit information lookup cluster params
+func (o *AuditInformationLookupClusterParams) WithHTTPClient(client *http.Client) *AuditInformationLookupClusterParams {
+	o.SetHTTPClient(client)
+	return o
+}
+
+// SetHTTPClient adds the HTTPClient to the audit information lookup cluster params
+func (o *AuditInformationLookupClusterParams) SetHTTPClient(client *http.Client) {
+	o.HTTPClient = client
+}
+
+// WithClusterSNI adds the clusterSNI to the audit information lookup cluster params
+func (o *AuditInformationLookupClusterParams) WithClusterSNI(clusterSNI *string) *AuditInformationLookupClusterParams {
+	o.SetClusterSNI(clusterSNI)
+	return o
+}
+
+// SetClusterSNI adds the clusterSNI to the audit information lookup cluster params
+func (o *AuditInformationLookupClusterParams) SetClusterSNI(clusterSNI *string) {
+	o.ClusterSNI = clusterSNI
+}
+
+// WriteToRequest writes these params to a swagger request
+func (o *AuditInformationLookupClusterParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error {
+
+	if err := r.SetTimeout(o.timeout); err != nil {
+		return err
+	}
+	var res []error
+
+	if o.ClusterSNI != nil {
+
+		// query param clusterSNI
+		var qrClusterSNI string
+
+		if o.ClusterSNI != nil {
+			qrClusterSNI = *o.ClusterSNI
+		}
+		qClusterSNI := qrClusterSNI
+		if qClusterSNI != "" {
+
+			if err := r.SetQueryParam("clusterSNI", qClusterSNI); err != nil {
+				return err
+			}
+		}
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}

api/def/clients/sentry/client/audit_information/audit_information_lookup_cluster_responses.go

@@ -0,0 +1,187 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package audit_information
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"fmt"
+	"io"
+
+	"github.com/go-openapi/runtime"
+	"github.com/go-openapi/strfmt"
+
+	"github.com/RafaySystems/rcloud-base/api/def/clients/sentry/models"
+)
+
+// AuditInformationLookupClusterReader is a Reader for the AuditInformationLookupCluster structure.
+type AuditInformationLookupClusterReader struct {
+	formats strfmt.Registry
+}
+
+// ReadResponse reads a server response into the received o.
+func (o *AuditInformationLookupClusterReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (interface{}, error) {
+	switch response.Code() {
+	case 200:
+		result := NewAuditInformationLookupClusterOK()
+		if err := result.readResponse(response, consumer, o.formats); err != nil {
+			return nil, err
+		}
+		return result, nil
+	case 403:
+		result := NewAuditInformationLookupClusterForbidden()
+		if err := result.readResponse(response, consumer, o.formats); err != nil {
+			return nil, err
+		}
+		return nil, result
+	case 404:
+		result := NewAuditInformationLookupClusterNotFound()
+		if err := result.readResponse(response, consumer, o.formats); err != nil {
+			return nil, err
+		}
+		return nil, result
+	default:
+		result := NewAuditInformationLookupClusterDefault(response.Code())
+		if err := result.readResponse(response, consumer, o.formats); err != nil {
+			return nil, err
+		}
+		if response.Code()/100 == 2 {
+			return result, nil
+		}
+		return nil, result
+	}
+}
+
+// NewAuditInformationLookupClusterOK creates a AuditInformationLookupClusterOK with default headers values
+func NewAuditInformationLookupClusterOK() *AuditInformationLookupClusterOK {
+	return &AuditInformationLookupClusterOK{}
+}
+
+/* AuditInformationLookupClusterOK describes a response with status code 200, with default header values.
+
+A successful response.
+*/
+type AuditInformationLookupClusterOK struct {
+	Payload *models.RPCLookupClusterResponse
+}
+
+func (o *AuditInformationLookupClusterOK) Error() string {
+	return fmt.Sprintf("[GET /v2/sentry/auditInfo/cluster][%d] auditInformationLookupClusterOK  %+v", 200, o.Payload)
+}
+func (o *AuditInformationLookupClusterOK) GetPayload() *models.RPCLookupClusterResponse {
+	return o.Payload
+}
+
+func (o *AuditInformationLookupClusterOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error {
+
+	o.Payload = new(models.RPCLookupClusterResponse)
+
+	// response payload
+	if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF {
+		return err
+	}
+
+	return nil
+}
+
+// NewAuditInformationLookupClusterForbidden creates a AuditInformationLookupClusterForbidden with default headers values
+func NewAuditInformationLookupClusterForbidden() *AuditInformationLookupClusterForbidden {
+	return &AuditInformationLookupClusterForbidden{}
+}
+
+/* AuditInformationLookupClusterForbidden describes a response with status code 403, with default header values.
+
+Returned when the user does not have permission to access the resource.
+*/
+type AuditInformationLookupClusterForbidden struct {
+	Payload interface{}
+}
+
+func (o *AuditInformationLookupClusterForbidden) Error() string {
+	return fmt.Sprintf("[GET /v2/sentry/auditInfo/cluster][%d] auditInformationLookupClusterForbidden  %+v", 403, o.Payload)
+}
+func (o *AuditInformationLookupClusterForbidden) GetPayload() interface{} {
+	return o.Payload
+}
+
+func (o *AuditInformationLookupClusterForbidden) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error {
+
+	// response payload
+	if err := consumer.Consume(response.Body(), &o.Payload); err != nil && err != io.EOF {
+		return err
+	}
+
+	return nil
+}
+
+// NewAuditInformationLookupClusterNotFound creates a AuditInformationLookupClusterNotFound with default headers values
+func NewAuditInformationLookupClusterNotFound() *AuditInformationLookupClusterNotFound {
+	return &AuditInformationLookupClusterNotFound{}
+}
+
+/* AuditInformationLookupClusterNotFound describes a response with status code 404, with default header values.
+
+Returned when the resource does not exist.
+*/
+type AuditInformationLookupClusterNotFound struct {
+	Payload string
+}
+
+func (o *AuditInformationLookupClusterNotFound) Error() string {
+	return fmt.Sprintf("[GET /v2/sentry/auditInfo/cluster][%d] auditInformationLookupClusterNotFound  %+v", 404, o.Payload)
+}
+func (o *AuditInformationLookupClusterNotFound) GetPayload() string {
+	return o.Payload
+}
+
+func (o *AuditInformationLookupClusterNotFound) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error {
+
+	// response payload
+	if err := consumer.Consume(response.Body(), &o.Payload); err != nil && err != io.EOF {
+		return err
+	}
+
+	return nil
+}
+
+// NewAuditInformationLookupClusterDefault creates a AuditInformationLookupClusterDefault with default headers values
+func NewAuditInformationLookupClusterDefault(code int) *AuditInformationLookupClusterDefault {
+	return &AuditInformationLookupClusterDefault{
+		_statusCode: code,
+	}
+}
+
+/* AuditInformationLookupClusterDefault describes a response with status code -1, with default header values.
+
+An unexpected error response.
+*/
+type AuditInformationLookupClusterDefault struct {
+	_statusCode int
+
+	Payload *models.GooglerpcStatus
+}
+
+// Code gets the status code for the audit information lookup cluster default response
+func (o *AuditInformationLookupClusterDefault) Code() int {
+	return o._statusCode
+}
+
+func (o *AuditInformationLookupClusterDefault) Error() string {
+	return fmt.Sprintf("[GET /v2/sentry/auditInfo/cluster][%d] AuditInformation_LookupCluster default  %+v", o._statusCode, o.Payload)
+}
+func (o *AuditInformationLookupClusterDefault) GetPayload() *models.GooglerpcStatus {
+	return o.Payload
+}
+
+func (o *AuditInformationLookupClusterDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error {
+
+	o.Payload = new(models.GooglerpcStatus)
+
+	// response payload
+	if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF {
+		return err
+	}
+
+	return nil
+}

api/def/clients/sentry/client/audit_information/audit_information_lookup_user_parameters.go

@@ -0,0 +1,158 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package audit_information
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"context"
+	"net/http"
+	"time"
+
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime"
+	cr "github.com/go-openapi/runtime/client"
+	"github.com/go-openapi/strfmt"
+)
+
+// NewAuditInformationLookupUserParams creates a new AuditInformationLookupUserParams object,
+// with the default timeout for this client.
+//
+// Default values are not hydrated, since defaults are normally applied by the API server side.
+//
+// To enforce default values in parameter, use SetDefaults or WithDefaults.
+func NewAuditInformationLookupUserParams() *AuditInformationLookupUserParams {
+	return &AuditInformationLookupUserParams{
+		timeout: cr.DefaultTimeout,
+	}
+}
+
+// NewAuditInformationLookupUserParamsWithTimeout creates a new AuditInformationLookupUserParams object
+// with the ability to set a timeout on a request.
+func NewAuditInformationLookupUserParamsWithTimeout(timeout time.Duration) *AuditInformationLookupUserParams {
+	return &AuditInformationLookupUserParams{
+		timeout: timeout,
+	}
+}
+
+// NewAuditInformationLookupUserParamsWithContext creates a new AuditInformationLookupUserParams object
+// with the ability to set a context for a request.
+func NewAuditInformationLookupUserParamsWithContext(ctx context.Context) *AuditInformationLookupUserParams {
+	return &AuditInformationLookupUserParams{
+		Context: ctx,
+	}
+}
+
+// NewAuditInformationLookupUserParamsWithHTTPClient creates a new AuditInformationLookupUserParams object
+// with the ability to set a custom HTTPClient for a request.
+func NewAuditInformationLookupUserParamsWithHTTPClient(client *http.Client) *AuditInformationLookupUserParams {
+	return &AuditInformationLookupUserParams{
+		HTTPClient: client,
+	}
+}
+
+/* AuditInformationLookupUserParams contains all the parameters to send to the API endpoint
+   for the audit information lookup user operation.
+
+   Typically these are written to a http.Request.
+*/
+type AuditInformationLookupUserParams struct {
+
+	// UserCN.
+	UserCN *string
+
+	timeout    time.Duration
+	Context    context.Context
+	HTTPClient *http.Client
+}
+
+// WithDefaults hydrates default values in the audit information lookup user params (not the query body).
+//
+// All values with no default are reset to their zero value.
+func (o *AuditInformationLookupUserParams) WithDefaults() *AuditInformationLookupUserParams {
+	o.SetDefaults()
+	return o
+}
+
+// SetDefaults hydrates default values in the audit information lookup user params (not the query body).
+//
+// All values with no default are reset to their zero value.
+func (o *AuditInformationLookupUserParams) SetDefaults() {
+	// no default values defined for this parameter
+}
+
+// WithTimeout adds the timeout to the audit information lookup user params
+func (o *AuditInformationLookupUserParams) WithTimeout(timeout time.Duration) *AuditInformationLookupUserParams {
+	o.SetTimeout(timeout)
+	return o
+}
+
+// SetTimeout adds the timeout to the audit information lookup user params
+func (o *AuditInformationLookupUserParams) SetTimeout(timeout time.Duration) {
+	o.timeout = timeout
+}
+
+// WithContext adds the context to the audit information lookup user params
+func (o *AuditInformationLookupUserParams) WithContext(ctx context.Context) *AuditInformationLookupUserParams {
+	o.SetContext(ctx)
+	return o
+}
+
+// SetContext adds the context to the audit information lookup user params
+func (o *AuditInformationLookupUserParams) SetContext(ctx context.Context) {
+	o.Context = ctx
+}
+
+// WithHTTPClient adds the HTTPClient to the audit information lookup user params
+func (o *AuditInformationLookupUserParams) WithHTTPClient(client *http.Client) *AuditInformationLookupUserParams {
+	o.SetHTTPClient(client)
+	return o
+}
+
+// SetHTTPClient adds the HTTPClient to the audit information lookup user params
+func (o *AuditInformationLookupUserParams) SetHTTPClient(client *http.Client) {
+	o.HTTPClient = client
+}
+
+// WithUserCN adds the userCN to the audit information lookup user params
+func (o *AuditInformationLookupUserParams) WithUserCN(userCN *string) *AuditInformationLookupUserParams {
+	o.SetUserCN(userCN)
+	return o
+}
+
+// SetUserCN adds the userCN to the audit information lookup user params
+func (o *AuditInformationLookupUserParams) SetUserCN(userCN *string) {
+	o.UserCN = userCN
+}
+
+// WriteToRequest writes these params to a swagger request
+func (o *AuditInformationLookupUserParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error {
+
+	if err := r.SetTimeout(o.timeout); err != nil {
+		return err
+	}
+	var res []error
+
+	if o.UserCN != nil {
+
+		// query param userCN
+		var qrUserCN string
+
+		if o.UserCN != nil {
+			qrUserCN = *o.UserCN
+		}
+		qUserCN := qrUserCN
+		if qUserCN != "" {
+
+			if err := r.SetQueryParam("userCN", qUserCN); err != nil {
+				return err
+			}
+		}
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}

api/def/clients/sentry/client/audit_information/audit_information_lookup_user_responses.go

@@ -0,0 +1,187 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package audit_information
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"fmt"
+	"io"
+
+	"github.com/go-openapi/runtime"
+	"github.com/go-openapi/strfmt"
+
+	"github.com/RafaySystems/rcloud-base/api/def/clients/sentry/models"
+)
+
+// AuditInformationLookupUserReader is a Reader for the AuditInformationLookupUser structure.
+type AuditInformationLookupUserReader struct {
+	formats strfmt.Registry
+}
+
+// ReadResponse reads a server response into the received o.
+func (o *AuditInformationLookupUserReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (interface{}, error) {
+	switch response.Code() {
+	case 200:
+		result := NewAuditInformationLookupUserOK()
+		if err := result.readResponse(response, consumer, o.formats); err != nil {
+			return nil, err
+		}
+		return result, nil
+	case 403:
+		result := NewAuditInformationLookupUserForbidden()
+		if err := result.readResponse(response, consumer, o.formats); err != nil {
+			return nil, err
+		}
+		return nil, result
+	case 404:
+		result := NewAuditInformationLookupUserNotFound()
+		if err := result.readResponse(response, consumer, o.formats); err != nil {
+			return nil, err
+		}
+		return nil, result
+	default:
+		result := NewAuditInformationLookupUserDefault(response.Code())
+		if err := result.readResponse(response, consumer, o.formats); err != nil {
+			return nil, err
+		}
+		if response.Code()/100 == 2 {
+			return result, nil
+		}
+		return nil, result
+	}
+}
+
+// NewAuditInformationLookupUserOK creates a AuditInformationLookupUserOK with default headers values
+func NewAuditInformationLookupUserOK() *AuditInformationLookupUserOK {
+	return &AuditInformationLookupUserOK{}
+}
+
+/* AuditInformationLookupUserOK describes a response with status code 200, with default header values.
+
+A successful response.
+*/
+type AuditInformationLookupUserOK struct {
+	Payload *models.RPCLookupUserResponse
+}
+
+func (o *AuditInformationLookupUserOK) Error() string {
+	return fmt.Sprintf("[GET /v2/sentry/auditInfo/user][%d] auditInformationLookupUserOK  %+v", 200, o.Payload)
+}
+func (o *AuditInformationLookupUserOK) GetPayload() *models.RPCLookupUserResponse {
+	return o.Payload
+}
+
+func (o *AuditInformationLookupUserOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error {
+
+	o.Payload = new(models.RPCLookupUserResponse)
+
+	// response payload
+	if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF {
+		return err
+	}
+
+	return nil
+}
+
+// NewAuditInformationLookupUserForbidden creates a AuditInformationLookupUserForbidden with default headers values
+func NewAuditInformationLookupUserForbidden() *AuditInformationLookupUserForbidden {
+	return &AuditInformationLookupUserForbidden{}
+}
+
+/* AuditInformationLookupUserForbidden describes a response with status code 403, with default header values.
+
+Returned when the user does not have permission to access the resource.
+*/
+type AuditInformationLookupUserForbidden struct {
+	Payload interface{}
+}
+
+func (o *AuditInformationLookupUserForbidden) Error() string {
+	return fmt.Sprintf("[GET /v2/sentry/auditInfo/user][%d] auditInformationLookupUserForbidden  %+v", 403, o.Payload)
+}
+func (o *AuditInformationLookupUserForbidden) GetPayload() interface{} {
+	return o.Payload
+}
+
+func (o *AuditInformationLookupUserForbidden) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error {
+
+	// response payload
+	if err := consumer.Consume(response.Body(), &o.Payload); err != nil && err != io.EOF {
+		return err
+	}
+
+	return nil
+}
+
+// NewAuditInformationLookupUserNotFound creates a AuditInformationLookupUserNotFound with default headers values
+func NewAuditInformationLookupUserNotFound() *AuditInformationLookupUserNotFound {
+	return &AuditInformationLookupUserNotFound{}
+}
+
+/* AuditInformationLookupUserNotFound describes a response with status code 404, with default header values.
+
+Returned when the resource does not exist.
+*/
+type AuditInformationLookupUserNotFound struct {
+	Payload string
+}
+
+func (o *AuditInformationLookupUserNotFound) Error() string {
+	return fmt.Sprintf("[GET /v2/sentry/auditInfo/user][%d] auditInformationLookupUserNotFound  %+v", 404, o.Payload)
+}
+func (o *AuditInformationLookupUserNotFound) GetPayload() string {
+	return o.Payload
+}
+
+func (o *AuditInformationLookupUserNotFound) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error {
+
+	// response payload
+	if err := consumer.Consume(response.Body(), &o.Payload); err != nil && err != io.EOF {
+		return err
+	}
+
+	return nil
+}
+
+// NewAuditInformationLookupUserDefault creates a AuditInformationLookupUserDefault with default headers values
+func NewAuditInformationLookupUserDefault(code int) *AuditInformationLookupUserDefault {
+	return &AuditInformationLookupUserDefault{
+		_statusCode: code,
+	}
+}
+
+/* AuditInformationLookupUserDefault describes a response with status code -1, with default header values.
+
+An unexpected error response.
+*/
+type AuditInformationLookupUserDefault struct {
+	_statusCode int
+
+	Payload *models.GooglerpcStatus
+}
+
+// Code gets the status code for the audit information lookup user default response
+func (o *AuditInformationLookupUserDefault) Code() int {
+	return o._statusCode
+}
+
+func (o *AuditInformationLookupUserDefault) Error() string {
+	return fmt.Sprintf("[GET /v2/sentry/auditInfo/user][%d] AuditInformation_LookupUser default  %+v", o._statusCode, o.Payload)
+}
+func (o *AuditInformationLookupUserDefault) GetPayload() *models.GooglerpcStatus {
+	return o.Payload
+}
+
+func (o *AuditInformationLookupUserDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error {
+
+	o.Payload = new(models.GooglerpcStatus)
+
+	// response payload
+	if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF {
+		return err
+	}
+
+	return nil
+}

api/def/clients/sentry/client/bootstrap/bootstrap_client.go

@@ -30,16 +30,8 @@ type ClientOption func(*runtime.ClientOperation)
 type ClientService interface {
 	BootstrapCreateBootstrapAgent(params *BootstrapCreateBootstrapAgentParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*BootstrapCreateBootstrapAgentOK, error)
 
-	BootstrapCreateRelayNetwork(params *BootstrapCreateRelayNetworkParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*BootstrapCreateRelayNetworkOK, error)
-
 	BootstrapDeleteBootstrapAgent(params *BootstrapDeleteBootstrapAgentParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*BootstrapDeleteBootstrapAgentOK, error)
 
-	BootstrapDeleteRelayNetwork(params *BootstrapDeleteRelayNetworkParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*BootstrapDeleteRelayNetworkOK, error)
-
-	BootstrapDownloadRelayNetwork(params *BootstrapDownloadRelayNetworkParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*BootstrapDownloadRelayNetworkOK, error)
-
-	BootstrapDownloadRelayNetworkAgent(params *BootstrapDownloadRelayNetworkAgentParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*BootstrapDownloadRelayNetworkAgentOK, error)
-
 	BootstrapGetBootstrapAgent(params *BootstrapGetBootstrapAgentParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*BootstrapGetBootstrapAgentOK, error)
 
 	BootstrapGetBootstrapAgentConfig(params *BootstrapGetBootstrapAgentConfigParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*BootstrapGetBootstrapAgentConfigOK, error)
@@ -52,16 +44,10 @@ type ClientService interface {
 
 	BootstrapGetBootstrapInfra(params *BootstrapGetBootstrapInfraParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*BootstrapGetBootstrapInfraOK, error)
 
-	BootstrapGetRelayNetwork(params *BootstrapGetRelayNetworkParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*BootstrapGetRelayNetworkOK, error)
-
-	BootstrapGetRelayNetworks(params *BootstrapGetRelayNetworksParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*BootstrapGetRelayNetworksOK, error)
-
 	BootstrapPatchBootstrapAgentTemplate(params *BootstrapPatchBootstrapAgentTemplateParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*BootstrapPatchBootstrapAgentTemplateOK, error)
 
 	BootstrapPatchBootstrapInfra(params *BootstrapPatchBootstrapInfraParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*BootstrapPatchBootstrapInfraOK, error)
 
-	BootstrapPatchRelayNetwork(params *BootstrapPatchRelayNetworkParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*BootstrapPatchRelayNetworkOK, error)
-
 	BootstrapRegisterBootstrapAgent(params *BootstrapRegisterBootstrapAgentParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*BootstrapRegisterBootstrapAgentOK, error)
 
 	BootstrapUpdateBootstrapAgent(params *BootstrapUpdateBootstrapAgentParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*BootstrapUpdateBootstrapAgentOK, error)
@@ -107,44 +93,6 @@ func (a *Client) BootstrapCreateBootstrapAgent(params *BootstrapCreateBootstrapA
 	return nil, runtime.NewAPIError("unexpected success response: content available as default response in error", unexpectedSuccess, unexpectedSuccess.Code())
 }
 
-/*
-  BootstrapCreateRelayNetwork bootstrap create relay network API
-*/
-func (a *Client) BootstrapCreateRelayNetwork(params *BootstrapCreateRelayNetworkParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*BootstrapCreateRelayNetworkOK, error) {
-	// TODO: Validate the params before sending
-	if params == nil {
-		params = NewBootstrapCreateRelayNetworkParams()
-	}
-	op := &runtime.ClientOperation{
-		ID:                 "Bootstrap_CreateRelayNetwork",
-		Method:             "POST",
-		PathPattern:        "/v2/sentry/relaynetwork",
-		ProducesMediaTypes: []string{"application/json", "application/yaml"},
-		ConsumesMediaTypes: []string{"application/json", "application/yaml"},
-		Schemes:            []string{"https"},
-		Params:             params,
-		Reader:             &BootstrapCreateRelayNetworkReader{formats: a.formats},
-		AuthInfo:           authInfo,
-		Context:            params.Context,
-		Client:             params.HTTPClient,
-	}
-	for _, opt := range opts {
-		opt(op)
-	}
-
-	result, err := a.transport.Submit(op)
-	if err != nil {
-		return nil, err
-	}
-	success, ok := result.(*BootstrapCreateRelayNetworkOK)
-	if ok {
-		return success, nil
-	}
-	// unexpected success response
-	unexpectedSuccess := result.(*BootstrapCreateRelayNetworkDefault)
-	return nil, runtime.NewAPIError("unexpected success response: content available as default response in error", unexpectedSuccess, unexpectedSuccess.Code())
-}
-
 /*
   BootstrapDeleteBootstrapAgent bootstrap delete bootstrap agent API
 */
@@ -183,120 +131,6 @@ func (a *Client) BootstrapDeleteBootstrapAgent(params *BootstrapDeleteBootstrapA
 	return nil, runtime.NewAPIError("unexpected success response: content available as default response in error", unexpectedSuccess, unexpectedSuccess.Code())
 }
 
-/*
-  BootstrapDeleteRelayNetwork bootstrap delete relay network API
-*/
-func (a *Client) BootstrapDeleteRelayNetwork(params *BootstrapDeleteRelayNetworkParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*BootstrapDeleteRelayNetworkOK, error) {
-	// TODO: Validate the params before sending
-	if params == nil {
-		params = NewBootstrapDeleteRelayNetworkParams()
-	}
-	op := &runtime.ClientOperation{
-		ID:                 "Bootstrap_DeleteRelayNetwork",
-		Method:             "DELETE",
-		PathPattern:        "/v2/sentry/relaynetwork/{metadata.name}",
-		ProducesMediaTypes: []string{"application/json", "application/yaml"},
-		ConsumesMediaTypes: []string{"application/json", "application/yaml"},
-		Schemes:            []string{"https"},
-		Params:             params,
-		Reader:             &BootstrapDeleteRelayNetworkReader{formats: a.formats},
-		AuthInfo:           authInfo,
-		Context:            params.Context,
-		Client:             params.HTTPClient,
-	}
-	for _, opt := range opts {
-		opt(op)
-	}
-
-	result, err := a.transport.Submit(op)
-	if err != nil {
-		return nil, err
-	}
-	success, ok := result.(*BootstrapDeleteRelayNetworkOK)
-	if ok {
-		return success, nil
-	}
-	// unexpected success response
-	unexpectedSuccess := result.(*BootstrapDeleteRelayNetworkDefault)
-	return nil, runtime.NewAPIError("unexpected success response: content available as default response in error", unexpectedSuccess, unexpectedSuccess.Code())
-}
-
-/*
-  BootstrapDownloadRelayNetwork bootstrap download relay network API
-*/
-func (a *Client) BootstrapDownloadRelayNetwork(params *BootstrapDownloadRelayNetworkParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*BootstrapDownloadRelayNetworkOK, error) {
-	// TODO: Validate the params before sending
-	if params == nil {
-		params = NewBootstrapDownloadRelayNetworkParams()
-	}
-	op := &runtime.ClientOperation{
-		ID:                 "Bootstrap_DownloadRelayNetwork",
-		Method:             "GET",
-		PathPattern:        "/v2/sentry/relaynetwork/{metadata.name}/download",
-		ProducesMediaTypes: []string{"application/json", "application/yaml"},
-		ConsumesMediaTypes: []string{"application/json", "application/yaml"},
-		Schemes:            []string{"https"},
-		Params:             params,
-		Reader:             &BootstrapDownloadRelayNetworkReader{formats: a.formats},
-		AuthInfo:           authInfo,
-		Context:            params.Context,
-		Client:             params.HTTPClient,
-	}
-	for _, opt := range opts {
-		opt(op)
-	}
-
-	result, err := a.transport.Submit(op)
-	if err != nil {
-		return nil, err
-	}
-	success, ok := result.(*BootstrapDownloadRelayNetworkOK)
-	if ok {
-		return success, nil
-	}
-	// unexpected success response
-	unexpectedSuccess := result.(*BootstrapDownloadRelayNetworkDefault)
-	return nil, runtime.NewAPIError("unexpected success response: content available as default response in error", unexpectedSuccess, unexpectedSuccess.Code())
-}
-
-/*
-  BootstrapDownloadRelayNetworkAgent bootstrap download relay network agent API
-*/
-func (a *Client) BootstrapDownloadRelayNetworkAgent(params *BootstrapDownloadRelayNetworkAgentParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*BootstrapDownloadRelayNetworkAgentOK, error) {
-	// TODO: Validate the params before sending
-	if params == nil {
-		params = NewBootstrapDownloadRelayNetworkAgentParams()
-	}
-	op := &runtime.ClientOperation{
-		ID:                 "Bootstrap_DownloadRelayNetworkAgent",
-		Method:             "GET",
-		PathPattern:        "/v2/sentry/relaynetwork/{metadata.name}/{clusterScope}/agentdownload",
-		ProducesMediaTypes: []string{"application/json", "application/yaml"},
-		ConsumesMediaTypes: []string{"application/json", "application/yaml"},
-		Schemes:            []string{"https"},
-		Params:             params,
-		Reader:             &BootstrapDownloadRelayNetworkAgentReader{formats: a.formats},
-		AuthInfo:           authInfo,
-		Context:            params.Context,
-		Client:             params.HTTPClient,
-	}
-	for _, opt := range opts {
-		opt(op)
-	}
-
-	result, err := a.transport.Submit(op)
-	if err != nil {
-		return nil, err
-	}
-	success, ok := result.(*BootstrapDownloadRelayNetworkAgentOK)
-	if ok {
-		return success, nil
-	}
-	// unexpected success response
-	unexpectedSuccess := result.(*BootstrapDownloadRelayNetworkAgentDefault)
-	return nil, runtime.NewAPIError("unexpected success response: content available as default response in error", unexpectedSuccess, unexpectedSuccess.Code())
-}
-
 /*
   BootstrapGetBootstrapAgent bootstrap get bootstrap agent API
 */
@@ -525,82 +359,6 @@ func (a *Client) BootstrapGetBootstrapInfra(params *BootstrapGetBootstrapInfraPa
 	return nil, runtime.NewAPIError("unexpected success response: content available as default response in error", unexpectedSuccess, unexpectedSuccess.Code())
 }
 
-/*
-  BootstrapGetRelayNetwork bootstrap get relay network API
-*/
-func (a *Client) BootstrapGetRelayNetwork(params *BootstrapGetRelayNetworkParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*BootstrapGetRelayNetworkOK, error) {
-	// TODO: Validate the params before sending
-	if params == nil {
-		params = NewBootstrapGetRelayNetworkParams()
-	}
-	op := &runtime.ClientOperation{
-		ID:                 "Bootstrap_GetRelayNetwork",
-		Method:             "GET",
-		PathPattern:        "/v2/sentry/relaynetwork/{metadata.name}",
-		ProducesMediaTypes: []string{"application/json", "application/yaml"},
-		ConsumesMediaTypes: []string{"application/json", "application/yaml"},
-		Schemes:            []string{"https"},
-		Params:             params,
-		Reader:             &BootstrapGetRelayNetworkReader{formats: a.formats},
-		AuthInfo:           authInfo,
-		Context:            params.Context,
-		Client:             params.HTTPClient,
-	}
-	for _, opt := range opts {
-		opt(op)
-	}
-
-	result, err := a.transport.Submit(op)
-	if err != nil {
-		return nil, err
-	}
-	success, ok := result.(*BootstrapGetRelayNetworkOK)
-	if ok {
-		return success, nil
-	}
-	// unexpected success response
-	unexpectedSuccess := result.(*BootstrapGetRelayNetworkDefault)
-	return nil, runtime.NewAPIError("unexpected success response: content available as default response in error", unexpectedSuccess, unexpectedSuccess.Code())
-}
-
-/*
-  BootstrapGetRelayNetworks bootstrap get relay networks API
-*/
-func (a *Client) BootstrapGetRelayNetworks(params *BootstrapGetRelayNetworksParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*BootstrapGetRelayNetworksOK, error) {
-	// TODO: Validate the params before sending
-	if params == nil {
-		params = NewBootstrapGetRelayNetworksParams()
-	}
-	op := &runtime.ClientOperation{
-		ID:                 "Bootstrap_GetRelayNetworks",
-		Method:             "GET",
-		PathPattern:        "/v2/sentry/relaynetwork",
-		ProducesMediaTypes: []string{"application/json", "application/yaml"},
-		ConsumesMediaTypes: []string{"application/json", "application/yaml"},
-		Schemes:            []string{"https"},
-		Params:             params,
-		Reader:             &BootstrapGetRelayNetworksReader{formats: a.formats},
-		AuthInfo:           authInfo,
-		Context:            params.Context,
-		Client:             params.HTTPClient,
-	}
-	for _, opt := range opts {
-		opt(op)
-	}
-
-	result, err := a.transport.Submit(op)
-	if err != nil {
-		return nil, err
-	}
-	success, ok := result.(*BootstrapGetRelayNetworksOK)
-	if ok {
-		return success, nil
-	}
-	// unexpected success response
-	unexpectedSuccess := result.(*BootstrapGetRelayNetworksDefault)
-	return nil, runtime.NewAPIError("unexpected success response: content available as default response in error", unexpectedSuccess, unexpectedSuccess.Code())
-}
-
 /*
   BootstrapPatchBootstrapAgentTemplate bootstrap patch bootstrap agent template API
 */
@@ -677,44 +435,6 @@ func (a *Client) BootstrapPatchBootstrapInfra(params *BootstrapPatchBootstrapInf
 	return nil, runtime.NewAPIError("unexpected success response: content available as default response in error", unexpectedSuccess, unexpectedSuccess.Code())
 }
 
-/*
-  BootstrapPatchRelayNetwork bootstrap patch relay network API
-*/
-func (a *Client) BootstrapPatchRelayNetwork(params *BootstrapPatchRelayNetworkParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*BootstrapPatchRelayNetworkOK, error) {
-	// TODO: Validate the params before sending
-	if params == nil {
-		params = NewBootstrapPatchRelayNetworkParams()
-	}
-	op := &runtime.ClientOperation{
-		ID:                 "Bootstrap_PatchRelayNetwork",
-		Method:             "PUT",
-		PathPattern:        "/v2/sentry/relaynetwork/{metadata.name}",
-		ProducesMediaTypes: []string{"application/json", "application/yaml"},
-		ConsumesMediaTypes: []string{"application/json", "application/yaml"},
-		Schemes:            []string{"https"},
-		Params:             params,
-		Reader:             &BootstrapPatchRelayNetworkReader{formats: a.formats},
-		AuthInfo:           authInfo,
-		Context:            params.Context,
-		Client:             params.HTTPClient,
-	}
-	for _, opt := range opts {
-		opt(op)
-	}
-
-	result, err := a.transport.Submit(op)
-	if err != nil {
-		return nil, err
-	}
-	success, ok := result.(*BootstrapPatchRelayNetworkOK)
-	if ok {
-		return success, nil
-	}
-	// unexpected success response
-	unexpectedSuccess := result.(*BootstrapPatchRelayNetworkDefault)
-	return nil, runtime.NewAPIError("unexpected success response: content available as default response in error", unexpectedSuccess, unexpectedSuccess.Code())
-}
-
 /*
   BootstrapRegisterBootstrapAgent bootstrap register bootstrap agent API
 */

api/def/clients/sentry/client/bootstrap/bootstrap_create_bootstrap_agent_parameters.go

@@ -15,7 +15,7 @@ import (
 	cr "github.com/go-openapi/runtime/client"
 	"github.com/go-openapi/strfmt"
 
-	"github.com/RafaySystems/rcloud-base/components/common/api/def/clients/sentry/models"
+	"github.com/RafaySystems/rcloud-base/api/def/clients/sentry/models"
 )
 
 // NewBootstrapCreateBootstrapAgentParams creates a new BootstrapCreateBootstrapAgentParams object,

api/def/clients/sentry/client/bootstrap/bootstrap_create_bootstrap_agent_responses.go

@@ -12,7 +12,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/strfmt"
 
-	"github.com/RafaySystems/rcloud-base/components/common/api/def/clients/sentry/models"
+	"github.com/RafaySystems/rcloud-base/api/def/clients/sentry/models"
 )
 
 // BootstrapCreateBootstrapAgentReader is a Reader for the BootstrapCreateBootstrapAgent structure.

api/def/clients/sentry/client/bootstrap/bootstrap_delete_bootstrap_agent_parameters.go

@@ -81,6 +81,12 @@ type BootstrapDeleteBootstrapAgentParams struct {
 	*/
 	MetadataDescription *string
 
+	/* MetadataDisplayName.
+
+	   Display Name. display name of the resource
+	*/
+	MetadataDisplayName *string
+
 	// MetadataID.
 	MetadataID *string
 
@@ -246,6 +252,17 @@ func (o *BootstrapDeleteBootstrapAgentParams) SetMetadataDescription(metadataDes
 	o.MetadataDescription = metadataDescription
 }
 
+// WithMetadataDisplayName adds the metadataDisplayName to the bootstrap delete bootstrap agent params
+func (o *BootstrapDeleteBootstrapAgentParams) WithMetadataDisplayName(metadataDisplayName *string) *BootstrapDeleteBootstrapAgentParams {
+	o.SetMetadataDisplayName(metadataDisplayName)
+	return o
+}
+
+// SetMetadataDisplayName adds the metadataDisplayName to the bootstrap delete bootstrap agent params
+func (o *BootstrapDeleteBootstrapAgentParams) SetMetadataDisplayName(metadataDisplayName *string) {
+	o.MetadataDisplayName = metadataDisplayName
+}
+
 // WithMetadataID adds the metadataID to the bootstrap delete bootstrap agent params
 func (o *BootstrapDeleteBootstrapAgentParams) WithMetadataID(metadataID *string) *BootstrapDeleteBootstrapAgentParams {
 	o.SetMetadataID(metadataID)
@@ -448,6 +465,23 @@ func (o *BootstrapDeleteBootstrapAgentParams) WriteToRequest(r runtime.ClientReq
 		}
 	}
 
+	if o.MetadataDisplayName != nil {
+
+		// query param metadata.displayName
+		var qrMetadataDisplayName string
+
+		if o.MetadataDisplayName != nil {
+			qrMetadataDisplayName = *o.MetadataDisplayName
+		}
+		qMetadataDisplayName := qrMetadataDisplayName
+		if qMetadataDisplayName != "" {
+
+			if err := r.SetQueryParam("metadata.displayName", qMetadataDisplayName); err != nil {
+				return err
+			}
+		}
+	}
+
 	if o.MetadataID != nil {
 
 		// query param metadata.id

api/def/clients/sentry/client/bootstrap/bootstrap_delete_bootstrap_agent_responses.go

@@ -12,7 +12,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/strfmt"
 
-	"github.com/RafaySystems/rcloud-base/components/common/api/def/clients/sentry/models"
+	"github.com/RafaySystems/rcloud-base/api/def/clients/sentry/models"
 )
 
 // BootstrapDeleteBootstrapAgentReader is a Reader for the BootstrapDeleteBootstrapAgent structure.

api/def/clients/sentry/client/bootstrap/bootstrap_get_bootstrap_agent_config_parameters.go

@@ -81,6 +81,12 @@ type BootstrapGetBootstrapAgentConfigParams struct {
 	*/
 	MetadataDescription *string
 
+	/* MetadataDisplayName.
+
+	   Display Name. display name of the resource
+	*/
+	MetadataDisplayName *string
+
 	// MetadataID.
 	MetadataID *string
 
@@ -246,6 +252,17 @@ func (o *BootstrapGetBootstrapAgentConfigParams) SetMetadataDescription(metadata
 	o.MetadataDescription = metadataDescription
 }
 
+// WithMetadataDisplayName adds the metadataDisplayName to the bootstrap get bootstrap agent config params
+func (o *BootstrapGetBootstrapAgentConfigParams) WithMetadataDisplayName(metadataDisplayName *string) *BootstrapGetBootstrapAgentConfigParams {
+	o.SetMetadataDisplayName(metadataDisplayName)
+	return o
+}
+
+// SetMetadataDisplayName adds the metadataDisplayName to the bootstrap get bootstrap agent config params
+func (o *BootstrapGetBootstrapAgentConfigParams) SetMetadataDisplayName(metadataDisplayName *string) {
+	o.MetadataDisplayName = metadataDisplayName
+}
+
 // WithMetadataID adds the metadataID to the bootstrap get bootstrap agent config params
 func (o *BootstrapGetBootstrapAgentConfigParams) WithMetadataID(metadataID *string) *BootstrapGetBootstrapAgentConfigParams {
 	o.SetMetadataID(metadataID)
@@ -448,6 +465,23 @@ func (o *BootstrapGetBootstrapAgentConfigParams) WriteToRequest(r runtime.Client
 		}
 	}
 
+	if o.MetadataDisplayName != nil {
+
+		// query param metadata.displayName
+		var qrMetadataDisplayName string
+
+		if o.MetadataDisplayName != nil {
+			qrMetadataDisplayName = *o.MetadataDisplayName
+		}
+		qMetadataDisplayName := qrMetadataDisplayName
+		if qMetadataDisplayName != "" {
+
+			if err := r.SetQueryParam("metadata.displayName", qMetadataDisplayName); err != nil {
+				return err
+			}
+		}
+	}
+
 	if o.MetadataID != nil {
 
 		// query param metadata.id

api/def/clients/sentry/client/bootstrap/bootstrap_get_bootstrap_agent_config_responses.go

@@ -12,7 +12,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/strfmt"
 
-	"github.com/RafaySystems/rcloud-base/components/common/api/def/clients/sentry/models"
+	"github.com/RafaySystems/rcloud-base/api/def/clients/sentry/models"
 )
 
 // BootstrapGetBootstrapAgentConfigReader is a Reader for the BootstrapGetBootstrapAgentConfig structure.

api/def/clients/sentry/client/bootstrap/bootstrap_get_bootstrap_agent_parameters.go

@@ -81,6 +81,12 @@ type BootstrapGetBootstrapAgentParams struct {
 	*/
 	MetadataDescription *string
 
+	/* MetadataDisplayName.
+
+	   Display Name. display name of the resource
+	*/
+	MetadataDisplayName *string
+
 	// MetadataID.
 	MetadataID *string
 
@@ -246,6 +252,17 @@ func (o *BootstrapGetBootstrapAgentParams) SetMetadataDescription(metadataDescri
 	o.MetadataDescription = metadataDescription
 }
 
+// WithMetadataDisplayName adds the metadataDisplayName to the bootstrap get bootstrap agent params
+func (o *BootstrapGetBootstrapAgentParams) WithMetadataDisplayName(metadataDisplayName *string) *BootstrapGetBootstrapAgentParams {
+	o.SetMetadataDisplayName(metadataDisplayName)
+	return o
+}
+
+// SetMetadataDisplayName adds the metadataDisplayName to the bootstrap get bootstrap agent params
+func (o *BootstrapGetBootstrapAgentParams) SetMetadataDisplayName(metadataDisplayName *string) {
+	o.MetadataDisplayName = metadataDisplayName
+}
+
 // WithMetadataID adds the metadataID to the bootstrap get bootstrap agent params
 func (o *BootstrapGetBootstrapAgentParams) WithMetadataID(metadataID *string) *BootstrapGetBootstrapAgentParams {
 	o.SetMetadataID(metadataID)
@@ -448,6 +465,23 @@ func (o *BootstrapGetBootstrapAgentParams) WriteToRequest(r runtime.ClientReques
 		}
 	}
 
+	if o.MetadataDisplayName != nil {
+
+		// query param metadata.displayName
+		var qrMetadataDisplayName string
+
+		if o.MetadataDisplayName != nil {
+			qrMetadataDisplayName = *o.MetadataDisplayName
+		}
+		qMetadataDisplayName := qrMetadataDisplayName
+		if qMetadataDisplayName != "" {
+
+			if err := r.SetQueryParam("metadata.displayName", qMetadataDisplayName); err != nil {
+				return err
+			}
+		}
+	}
+
 	if o.MetadataID != nil {
 
 		// query param metadata.id

api/def/clients/sentry/client/bootstrap/bootstrap_get_bootstrap_agent_responses.go

@@ -12,7 +12,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/strfmt"
 
-	"github.com/RafaySystems/rcloud-base/components/common/api/def/clients/sentry/models"
+	"github.com/RafaySystems/rcloud-base/api/def/clients/sentry/models"
 )
 
 // BootstrapGetBootstrapAgentReader is a Reader for the BootstrapGetBootstrapAgent structure.

api/def/clients/sentry/client/bootstrap/bootstrap_get_bootstrap_agent_template_parameters.go

@@ -82,6 +82,12 @@ type BootstrapGetBootstrapAgentTemplateParams struct {
 	*/
 	MetadataDescription *string
 
+	/* MetadataDisplayName.
+
+	   Display Name. display name of the resource
+	*/
+	MetadataDisplayName *string
+
 	// MetadataID.
 	MetadataID *string
 
@@ -243,6 +249,17 @@ func (o *BootstrapGetBootstrapAgentTemplateParams) SetMetadataDescription(metada
 	o.MetadataDescription = metadataDescription
 }
 
+// WithMetadataDisplayName adds the metadataDisplayName to the bootstrap get bootstrap agent template params
+func (o *BootstrapGetBootstrapAgentTemplateParams) WithMetadataDisplayName(metadataDisplayName *string) *BootstrapGetBootstrapAgentTemplateParams {
+	o.SetMetadataDisplayName(metadataDisplayName)
+	return o
+}
+
+// SetMetadataDisplayName adds the metadataDisplayName to the bootstrap get bootstrap agent template params
+func (o *BootstrapGetBootstrapAgentTemplateParams) SetMetadataDisplayName(metadataDisplayName *string) {
+	o.MetadataDisplayName = metadataDisplayName
+}
+
 // WithMetadataID adds the metadataID to the bootstrap get bootstrap agent template params
 func (o *BootstrapGetBootstrapAgentTemplateParams) WithMetadataID(metadataID *string) *BootstrapGetBootstrapAgentTemplateParams {
 	o.SetMetadataID(metadataID)
@@ -456,6 +473,23 @@ func (o *BootstrapGetBootstrapAgentTemplateParams) WriteToRequest(r runtime.Clie
 		}
 	}
 
+	if o.MetadataDisplayName != nil {
+
+		// query param metadata.displayName
+		var qrMetadataDisplayName string
+
+		if o.MetadataDisplayName != nil {
+			qrMetadataDisplayName = *o.MetadataDisplayName
+		}
+		qMetadataDisplayName := qrMetadataDisplayName
+		if qMetadataDisplayName != "" {
+
+			if err := r.SetQueryParam("metadata.displayName", qMetadataDisplayName); err != nil {
+				return err
+			}
+		}
+	}
+
 	if o.MetadataID != nil {
 
 		// query param metadata.id

api/def/clients/sentry/client/bootstrap/bootstrap_get_bootstrap_agent_template_responses.go

@@ -12,7 +12,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/strfmt"
 
-	"github.com/RafaySystems/rcloud-base/components/common/api/def/clients/sentry/models"
+	"github.com/RafaySystems/rcloud-base/api/def/clients/sentry/models"
 )
 
 // BootstrapGetBootstrapAgentTemplateReader is a Reader for the BootstrapGetBootstrapAgentTemplate structure.

api/def/clients/sentry/client/bootstrap/bootstrap_get_bootstrap_agent_templates_parameters.go

@@ -63,6 +63,9 @@ type BootstrapGetBootstrapAgentTemplatesParams struct {
 	// ID.
 	ID *string
 
+	// Account.
+	Account *string
+
 	// BlueprintRef.
 	BlueprintRef *string
 
@@ -128,14 +131,14 @@ type BootstrapGetBootstrapAgentTemplatesParams struct {
 	// OrderBy.
 	OrderBy *string
 
-	// OrganizationID.
-	OrganizationID *string
+	// Organization.
+	Organization *string
 
-	// PartnerID.
-	PartnerID *string
+	// Partner.
+	Partner *string
 
-	// ProjectID.
-	ProjectID *string
+	// Project.
+	Project *string
 
 	// PublishedVersion.
 	PublishedVersion *string
@@ -219,6 +222,17 @@ func (o *BootstrapGetBootstrapAgentTemplatesParams) SetID(id *string) {
 	o.ID = id
 }
 
+// WithAccount adds the account to the bootstrap get bootstrap agent templates params
+func (o *BootstrapGetBootstrapAgentTemplatesParams) WithAccount(account *string) *BootstrapGetBootstrapAgentTemplatesParams {
+	o.SetAccount(account)
+	return o
+}
+
+// SetAccount adds the account to the bootstrap get bootstrap agent templates params
+func (o *BootstrapGetBootstrapAgentTemplatesParams) SetAccount(account *string) {
+	o.Account = account
+}
+
 // WithBlueprintRef adds the blueprintRef to the bootstrap get bootstrap agent templates params
 func (o *BootstrapGetBootstrapAgentTemplatesParams) WithBlueprintRef(blueprintRef *string) *BootstrapGetBootstrapAgentTemplatesParams {
 	o.SetBlueprintRef(blueprintRef)
@@ -384,37 +398,37 @@ func (o *BootstrapGetBootstrapAgentTemplatesParams) SetOrderBy(orderBy *string)
 	o.OrderBy = orderBy
 }
 
-// WithOrganizationID adds the organizationID to the bootstrap get bootstrap agent templates params
-func (o *BootstrapGetBootstrapAgentTemplatesParams) WithOrganizationID(organizationID *string) *BootstrapGetBootstrapAgentTemplatesParams {
-	o.SetOrganizationID(organizationID)
+// WithOrganization adds the organization to the bootstrap get bootstrap agent templates params
+func (o *BootstrapGetBootstrapAgentTemplatesParams) WithOrganization(organization *string) *BootstrapGetBootstrapAgentTemplatesParams {
+	o.SetOrganization(organization)
 	return o
 }
 
-// SetOrganizationID adds the organizationId to the bootstrap get bootstrap agent templates params
-func (o *BootstrapGetBootstrapAgentTemplatesParams) SetOrganizationID(organizationID *string) {
-	o.OrganizationID = organizationID
+// SetOrganization adds the organization to the bootstrap get bootstrap agent templates params
+func (o *BootstrapGetBootstrapAgentTemplatesParams) SetOrganization(organization *string) {
+	o.Organization = organization
 }
 
-// WithPartnerID adds the partnerID to the bootstrap get bootstrap agent templates params
-func (o *BootstrapGetBootstrapAgentTemplatesParams) WithPartnerID(partnerID *string) *BootstrapGetBootstrapAgentTemplatesParams {
-	o.SetPartnerID(partnerID)
+// WithPartner adds the partner to the bootstrap get bootstrap agent templates params
+func (o *BootstrapGetBootstrapAgentTemplatesParams) WithPartner(partner *string) *BootstrapGetBootstrapAgentTemplatesParams {
+	o.SetPartner(partner)
 	return o
 }
 
-// SetPartnerID adds the partnerId to the bootstrap get bootstrap agent templates params
-func (o *BootstrapGetBootstrapAgentTemplatesParams) SetPartnerID(partnerID *string) {
-	o.PartnerID = partnerID
+// SetPartner adds the partner to the bootstrap get bootstrap agent templates params
+func (o *BootstrapGetBootstrapAgentTemplatesParams) SetPartner(partner *string) {
+	o.Partner = partner
 }
 
-// WithProjectID adds the projectID to the bootstrap get bootstrap agent templates params
-func (o *BootstrapGetBootstrapAgentTemplatesParams) WithProjectID(projectID *string) *BootstrapGetBootstrapAgentTemplatesParams {
-	o.SetProjectID(projectID)
+// WithProject adds the project to the bootstrap get bootstrap agent templates params
+func (o *BootstrapGetBootstrapAgentTemplatesParams) WithProject(project *string) *BootstrapGetBootstrapAgentTemplatesParams {
+	o.SetProject(project)
 	return o
 }
 
-// SetProjectID adds the projectId to the bootstrap get bootstrap agent templates params
-func (o *BootstrapGetBootstrapAgentTemplatesParams) SetProjectID(projectID *string) {
-	o.ProjectID = projectID
+// SetProject adds the project to the bootstrap get bootstrap agent templates params
+func (o *BootstrapGetBootstrapAgentTemplatesParams) SetProject(project *string) {
+	o.Project = project
 }
 
 // WithPublishedVersion adds the publishedVersion to the bootstrap get bootstrap agent templates params
@@ -486,6 +500,23 @@ func (o *BootstrapGetBootstrapAgentTemplatesParams) WriteToRequest(r runtime.Cli
 		}
 	}
 
+	if o.Account != nil {
+
+		// query param account
+		var qrAccount string
+
+		if o.Account != nil {
+			qrAccount = *o.Account
+		}
+		qAccount := qrAccount
+		if qAccount != "" {
+
+			if err := r.SetQueryParam("account", qAccount); err != nil {
+				return err
+			}
+		}
+	}
+
 	if o.BlueprintRef != nil {
 
 		// query param blueprintRef
@@ -735,52 +766,52 @@ func (o *BootstrapGetBootstrapAgentTemplatesParams) WriteToRequest(r runtime.Cli
 		}
 	}
 
-	if o.OrganizationID != nil {
+	if o.Organization != nil {
 
-		// query param organizationID
-		var qrOrganizationID string
+		// query param organization
+		var qrOrganization string
 
-		if o.OrganizationID != nil {
-			qrOrganizationID = *o.OrganizationID
+		if o.Organization != nil {
+			qrOrganization = *o.Organization
 		}
-		qOrganizationID := qrOrganizationID
-		if qOrganizationID != "" {
+		qOrganization := qrOrganization
+		if qOrganization != "" {
 
-			if err := r.SetQueryParam("organizationID", qOrganizationID); err != nil {
+			if err := r.SetQueryParam("organization", qOrganization); err != nil {
 				return err
 			}
 		}
 	}
 
-	if o.PartnerID != nil {
+	if o.Partner != nil {
 
-		// query param partnerID
-		var qrPartnerID string
+		// query param partner
+		var qrPartner string
 
-		if o.PartnerID != nil {
-			qrPartnerID = *o.PartnerID
+		if o.Partner != nil {
+			qrPartner = *o.Partner
 		}
-		qPartnerID := qrPartnerID
-		if qPartnerID != "" {
+		qPartner := qrPartner
+		if qPartner != "" {
 
-			if err := r.SetQueryParam("partnerID", qPartnerID); err != nil {
+			if err := r.SetQueryParam("partner", qPartner); err != nil {
 				return err
 			}
 		}
 	}
 
-	if o.ProjectID != nil {
+	if o.Project != nil {
 
-		// query param projectID
-		var qrProjectID string
+		// query param project
+		var qrProject string
 
-		if o.ProjectID != nil {
-			qrProjectID = *o.ProjectID
+		if o.Project != nil {
+			qrProject = *o.Project
 		}
-		qProjectID := qrProjectID
-		if qProjectID != "" {
+		qProject := qrProject
+		if qProject != "" {
 
-			if err := r.SetQueryParam("projectID", qProjectID); err != nil {
+			if err := r.SetQueryParam("project", qProject); err != nil {
 				return err
 			}
 		}

api/def/clients/sentry/client/bootstrap/bootstrap_get_bootstrap_agent_templates_responses.go

@@ -12,7 +12,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/strfmt"
 
-	"github.com/RafaySystems/rcloud-base/components/common/api/def/clients/sentry/models"
+	"github.com/RafaySystems/rcloud-base/api/def/clients/sentry/models"
 )
 
 // BootstrapGetBootstrapAgentTemplatesReader is a Reader for the BootstrapGetBootstrapAgentTemplates structure.

api/def/clients/sentry/client/bootstrap/bootstrap_get_bootstrap_agents_parameters.go

@@ -63,6 +63,9 @@ type BootstrapGetBootstrapAgentsParams struct {
 	// OptsID.
 	OptsID *string
 
+	// OptsAccount.
+	OptsAccount *string
+
 	// OptsBlueprintRef.
 	OptsBlueprintRef *string
 
@@ -128,14 +131,14 @@ type BootstrapGetBootstrapAgentsParams struct {
 	// OptsOrderBy.
 	OptsOrderBy *string
 
-	// OptsOrganizationID.
-	OptsOrganizationID *string
+	// OptsOrganization.
+	OptsOrganization *string
 
-	// OptsPartnerID.
-	OptsPartnerID *string
+	// OptsPartner.
+	OptsPartner *string
 
-	// OptsProjectID.
-	OptsProjectID *string
+	// OptsProject.
+	OptsProject *string
 
 	// OptsPublishedVersion.
 	OptsPublishedVersion *string
@@ -222,6 +225,17 @@ func (o *BootstrapGetBootstrapAgentsParams) SetOptsID(optsID *string) {
 	o.OptsID = optsID
 }
 
+// WithOptsAccount adds the optsAccount to the bootstrap get bootstrap agents params
+func (o *BootstrapGetBootstrapAgentsParams) WithOptsAccount(optsAccount *string) *BootstrapGetBootstrapAgentsParams {
+	o.SetOptsAccount(optsAccount)
+	return o
+}
+
+// SetOptsAccount adds the optsAccount to the bootstrap get bootstrap agents params
+func (o *BootstrapGetBootstrapAgentsParams) SetOptsAccount(optsAccount *string) {
+	o.OptsAccount = optsAccount
+}
+
 // WithOptsBlueprintRef adds the optsBlueprintRef to the bootstrap get bootstrap agents params
 func (o *BootstrapGetBootstrapAgentsParams) WithOptsBlueprintRef(optsBlueprintRef *string) *BootstrapGetBootstrapAgentsParams {
 	o.SetOptsBlueprintRef(optsBlueprintRef)
@@ -387,37 +401,37 @@ func (o *BootstrapGetBootstrapAgentsParams) SetOptsOrderBy(optsOrderBy *string)
 	o.OptsOrderBy = optsOrderBy
 }
 
-// WithOptsOrganizationID adds the optsOrganizationID to the bootstrap get bootstrap agents params
-func (o *BootstrapGetBootstrapAgentsParams) WithOptsOrganizationID(optsOrganizationID *string) *BootstrapGetBootstrapAgentsParams {
-	o.SetOptsOrganizationID(optsOrganizationID)
+// WithOptsOrganization adds the optsOrganization to the bootstrap get bootstrap agents params
+func (o *BootstrapGetBootstrapAgentsParams) WithOptsOrganization(optsOrganization *string) *BootstrapGetBootstrapAgentsParams {
+	o.SetOptsOrganization(optsOrganization)
 	return o
 }
 
-// SetOptsOrganizationID adds the optsOrganizationId to the bootstrap get bootstrap agents params
-func (o *BootstrapGetBootstrapAgentsParams) SetOptsOrganizationID(optsOrganizationID *string) {
-	o.OptsOrganizationID = optsOrganizationID
+// SetOptsOrganization adds the optsOrganization to the bootstrap get bootstrap agents params
+func (o *BootstrapGetBootstrapAgentsParams) SetOptsOrganization(optsOrganization *string) {
+	o.OptsOrganization = optsOrganization
 }
 
-// WithOptsPartnerID adds the optsPartnerID to the bootstrap get bootstrap agents params
-func (o *BootstrapGetBootstrapAgentsParams) WithOptsPartnerID(optsPartnerID *string) *BootstrapGetBootstrapAgentsParams {
-	o.SetOptsPartnerID(optsPartnerID)
+// WithOptsPartner adds the optsPartner to the bootstrap get bootstrap agents params
+func (o *BootstrapGetBootstrapAgentsParams) WithOptsPartner(optsPartner *string) *BootstrapGetBootstrapAgentsParams {
+	o.SetOptsPartner(optsPartner)
 	return o
 }
 
-// SetOptsPartnerID adds the optsPartnerId to the bootstrap get bootstrap agents params
-func (o *BootstrapGetBootstrapAgentsParams) SetOptsPartnerID(optsPartnerID *string) {
-	o.OptsPartnerID = optsPartnerID
+// SetOptsPartner adds the optsPartner to the bootstrap get bootstrap agents params
+func (o *BootstrapGetBootstrapAgentsParams) SetOptsPartner(optsPartner *string) {
+	o.OptsPartner = optsPartner
 }
 
-// WithOptsProjectID adds the optsProjectID to the bootstrap get bootstrap agents params
-func (o *BootstrapGetBootstrapAgentsParams) WithOptsProjectID(optsProjectID *string) *BootstrapGetBootstrapAgentsParams {
-	o.SetOptsProjectID(optsProjectID)
+// WithOptsProject adds the optsProject to the bootstrap get bootstrap agents params
+func (o *BootstrapGetBootstrapAgentsParams) WithOptsProject(optsProject *string) *BootstrapGetBootstrapAgentsParams {
+	o.SetOptsProject(optsProject)
 	return o
 }
 
-// SetOptsProjectID adds the optsProjectId to the bootstrap get bootstrap agents params
-func (o *BootstrapGetBootstrapAgentsParams) SetOptsProjectID(optsProjectID *string) {
-	o.OptsProjectID = optsProjectID
+// SetOptsProject adds the optsProject to the bootstrap get bootstrap agents params
+func (o *BootstrapGetBootstrapAgentsParams) SetOptsProject(optsProject *string) {
+	o.OptsProject = optsProject
 }
 
 // WithOptsPublishedVersion adds the optsPublishedVersion to the bootstrap get bootstrap agents params
@@ -500,6 +514,23 @@ func (o *BootstrapGetBootstrapAgentsParams) WriteToRequest(r runtime.ClientReque
 		}
 	}
 
+	if o.OptsAccount != nil {
+
+		// query param opts.account
+		var qrOptsAccount string
+
+		if o.OptsAccount != nil {
+			qrOptsAccount = *o.OptsAccount
+		}
+		qOptsAccount := qrOptsAccount
+		if qOptsAccount != "" {
+
+			if err := r.SetQueryParam("opts.account", qOptsAccount); err != nil {
+				return err
+			}
+		}
+	}
+
 	if o.OptsBlueprintRef != nil {
 
 		// query param opts.blueprintRef
@@ -749,52 +780,52 @@ func (o *BootstrapGetBootstrapAgentsParams) WriteToRequest(r runtime.ClientReque
 		}
 	}
 
-	if o.OptsOrganizationID != nil {
+	if o.OptsOrganization != nil {
 
-		// query param opts.organizationID
-		var qrOptsOrganizationID string
+		// query param opts.organization
+		var qrOptsOrganization string
 
-		if o.OptsOrganizationID != nil {
-			qrOptsOrganizationID = *o.OptsOrganizationID
+		if o.OptsOrganization != nil {
+			qrOptsOrganization = *o.OptsOrganization
 		}
-		qOptsOrganizationID := qrOptsOrganizationID
-		if qOptsOrganizationID != "" {
+		qOptsOrganization := qrOptsOrganization
+		if qOptsOrganization != "" {
 
-			if err := r.SetQueryParam("opts.organizationID", qOptsOrganizationID); err != nil {
+			if err := r.SetQueryParam("opts.organization", qOptsOrganization); err != nil {
 				return err
 			}
 		}
 	}
 
-	if o.OptsPartnerID != nil {
+	if o.OptsPartner != nil {
 
-		// query param opts.partnerID
-		var qrOptsPartnerID string
+		// query param opts.partner
+		var qrOptsPartner string
 
-		if o.OptsPartnerID != nil {
-			qrOptsPartnerID = *o.OptsPartnerID
+		if o.OptsPartner != nil {
+			qrOptsPartner = *o.OptsPartner
 		}
-		qOptsPartnerID := qrOptsPartnerID
-		if qOptsPartnerID != "" {
+		qOptsPartner := qrOptsPartner
+		if qOptsPartner != "" {
 
-			if err := r.SetQueryParam("opts.partnerID", qOptsPartnerID); err != nil {
+			if err := r.SetQueryParam("opts.partner", qOptsPartner); err != nil {
 				return err
 			}
 		}
 	}
 
-	if o.OptsProjectID != nil {
+	if o.OptsProject != nil {
 
-		// query param opts.projectID
-		var qrOptsProjectID string
+		// query param opts.project
+		var qrOptsProject string
 
-		if o.OptsProjectID != nil {
-			qrOptsProjectID = *o.OptsProjectID
+		if o.OptsProject != nil {
+			qrOptsProject = *o.OptsProject
 		}
-		qOptsProjectID := qrOptsProjectID
-		if qOptsProjectID != "" {
+		qOptsProject := qrOptsProject
+		if qOptsProject != "" {
 
-			if err := r.SetQueryParam("opts.projectID", qOptsProjectID); err != nil {
+			if err := r.SetQueryParam("opts.project", qOptsProject); err != nil {
 				return err
 			}
 		}

api/def/clients/sentry/client/bootstrap/bootstrap_get_bootstrap_agents_responses.go

@@ -12,7 +12,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/strfmt"
 
-	"github.com/RafaySystems/rcloud-base/components/common/api/def/clients/sentry/models"
+	"github.com/RafaySystems/rcloud-base/api/def/clients/sentry/models"
 )
 
 // BootstrapGetBootstrapAgentsReader is a Reader for the BootstrapGetBootstrapAgents structure.

api/def/clients/sentry/client/bootstrap/bootstrap_get_bootstrap_infra_parameters.go

@@ -81,6 +81,12 @@ type BootstrapGetBootstrapInfraParams struct {
 	*/
 	MetadataDescription *string
 
+	/* MetadataDisplayName.
+
+	   Display Name. display name of the resource
+	*/
+	MetadataDisplayName *string
+
 	// MetadataID.
 	MetadataID *string
 
@@ -222,6 +228,17 @@ func (o *BootstrapGetBootstrapInfraParams) SetMetadataDescription(metadataDescri
 	o.MetadataDescription = metadataDescription
 }
 
+// WithMetadataDisplayName adds the metadataDisplayName to the bootstrap get bootstrap infra params
+func (o *BootstrapGetBootstrapInfraParams) WithMetadataDisplayName(metadataDisplayName *string) *BootstrapGetBootstrapInfraParams {
+	o.SetMetadataDisplayName(metadataDisplayName)
+	return o
+}
+
+// SetMetadataDisplayName adds the metadataDisplayName to the bootstrap get bootstrap infra params
+func (o *BootstrapGetBootstrapInfraParams) SetMetadataDisplayName(metadataDisplayName *string) {
+	o.MetadataDisplayName = metadataDisplayName
+}
+
 // WithMetadataID adds the metadataID to the bootstrap get bootstrap infra params
 func (o *BootstrapGetBootstrapInfraParams) WithMetadataID(metadataID *string) *BootstrapGetBootstrapInfraParams {
 	o.SetMetadataID(metadataID)
@@ -380,6 +397,23 @@ func (o *BootstrapGetBootstrapInfraParams) WriteToRequest(r runtime.ClientReques
 		}
 	}
 
+	if o.MetadataDisplayName != nil {
+
+		// query param metadata.displayName
+		var qrMetadataDisplayName string
+
+		if o.MetadataDisplayName != nil {
+			qrMetadataDisplayName = *o.MetadataDisplayName
+		}
+		qMetadataDisplayName := qrMetadataDisplayName
+		if qMetadataDisplayName != "" {
+
+			if err := r.SetQueryParam("metadata.displayName", qMetadataDisplayName); err != nil {
+				return err
+			}
+		}
+	}
+
 	if o.MetadataID != nil {
 
 		// query param metadata.id

api/def/clients/sentry/client/bootstrap/bootstrap_get_bootstrap_infra_responses.go

@@ -12,7 +12,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/strfmt"
 
-	"github.com/RafaySystems/rcloud-base/components/common/api/def/clients/sentry/models"
+	"github.com/RafaySystems/rcloud-base/api/def/clients/sentry/models"
 )
 
 // BootstrapGetBootstrapInfraReader is a Reader for the BootstrapGetBootstrapInfra structure.

api/def/clients/sentry/client/bootstrap/bootstrap_patch_bootstrap_agent_template_parameters.go

@@ -15,7 +15,7 @@ import (
 	cr "github.com/go-openapi/runtime/client"
 	"github.com/go-openapi/strfmt"
 
-	"github.com/RafaySystems/rcloud-base/components/common/api/def/clients/sentry/models"
+	"github.com/RafaySystems/rcloud-base/api/def/clients/sentry/models"
 )
 
 // NewBootstrapPatchBootstrapAgentTemplateParams creates a new BootstrapPatchBootstrapAgentTemplateParams object,

api/def/clients/sentry/client/bootstrap/bootstrap_patch_bootstrap_agent_template_responses.go

@@ -12,7 +12,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/strfmt"
 
-	"github.com/RafaySystems/rcloud-base/components/common/api/def/clients/sentry/models"
+	"github.com/RafaySystems/rcloud-base/api/def/clients/sentry/models"
 )
 
 // BootstrapPatchBootstrapAgentTemplateReader is a Reader for the BootstrapPatchBootstrapAgentTemplate structure.

api/def/clients/sentry/client/bootstrap/bootstrap_patch_bootstrap_infra_parameters.go

@@ -15,7 +15,7 @@ import (
 	cr "github.com/go-openapi/runtime/client"
 	"github.com/go-openapi/strfmt"
 
-	"github.com/RafaySystems/rcloud-base/components/common/api/def/clients/sentry/models"
+	"github.com/RafaySystems/rcloud-base/api/def/clients/sentry/models"
 )
 
 // NewBootstrapPatchBootstrapInfraParams creates a new BootstrapPatchBootstrapInfraParams object,

api/def/clients/sentry/client/bootstrap/bootstrap_patch_bootstrap_infra_responses.go

@@ -12,7 +12,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/strfmt"
 
-	"github.com/RafaySystems/rcloud-base/components/common/api/def/clients/sentry/models"
+	"github.com/RafaySystems/rcloud-base/api/def/clients/sentry/models"
 )
 
 // BootstrapPatchBootstrapInfraReader is a Reader for the BootstrapPatchBootstrapInfra structure.

api/def/clients/sentry/client/bootstrap/bootstrap_register_bootstrap_agent_responses.go

@@ -14,7 +14,7 @@ import (
 	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 
-	"github.com/RafaySystems/rcloud-base/components/common/api/def/clients/sentry/models"
+	"github.com/RafaySystems/rcloud-base/api/def/clients/sentry/models"
 )
 
 // BootstrapRegisterBootstrapAgentReader is a Reader for the BootstrapRegisterBootstrapAgent structure.

api/def/clients/sentry/client/bootstrap/bootstrap_update_bootstrap_agent_parameters.go

@@ -15,7 +15,7 @@ import (
 	cr "github.com/go-openapi/runtime/client"
 	"github.com/go-openapi/strfmt"
 
-	"github.com/RafaySystems/rcloud-base/components/common/api/def/clients/sentry/models"
+	"github.com/RafaySystems/rcloud-base/api/def/clients/sentry/models"
 )
 
 // NewBootstrapUpdateBootstrapAgentParams creates a new BootstrapUpdateBootstrapAgentParams object,

api/def/clients/sentry/client/bootstrap/bootstrap_update_bootstrap_agent_responses.go

@@ -12,7 +12,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/strfmt"
 
-	"github.com/RafaySystems/rcloud-base/components/common/api/def/clients/sentry/models"
+	"github.com/RafaySystems/rcloud-base/api/def/clients/sentry/models"
 )
 
 // BootstrapUpdateBootstrapAgentReader is a Reader for the BootstrapUpdateBootstrapAgent structure.

api/def/clients/sentry/client/cluster_authorization/cluster_authorization_get_user_authorization_responses.go

@@ -12,7 +12,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/strfmt"
 
-	"github.com/RafaySystems/rcloud-base/components/common/api/def/clients/sentry/models"
+	"github.com/RafaySystems/rcloud-base/api/def/clients/sentry/models"
 )
 
 // ClusterAuthorizationGetUserAuthorizationReader is a Reader for the ClusterAuthorizationGetUserAuthorization structure.

api/def/clients/sentry/client/kubectl_cluster_settings/kubectl_cluster_settings_get_kubectl_cluster_settings_parameters.go

@@ -63,6 +63,9 @@ type KubectlClusterSettingsGetKubectlClusterSettingsParams struct {
 	// OptsID.
 	OptsID *string
 
+	// OptsAccount.
+	OptsAccount *string
+
 	// OptsBlueprintRef.
 	OptsBlueprintRef *string
 
@@ -128,14 +131,14 @@ type KubectlClusterSettingsGetKubectlClusterSettingsParams struct {
 	// OptsOrderBy.
 	OptsOrderBy *string
 
-	// OptsOrganizationID.
-	OptsOrganizationID *string
+	// OptsOrganization.
+	OptsOrganization *string
 
-	// OptsPartnerID.
-	OptsPartnerID *string
+	// OptsPartner.
+	OptsPartner *string
 
-	// OptsProjectID.
-	OptsProjectID *string
+	// OptsProject.
+	OptsProject *string
 
 	// OptsPublishedVersion.
 	OptsPublishedVersion *string
@@ -219,6 +222,17 @@ func (o *KubectlClusterSettingsGetKubectlClusterSettingsParams) SetOptsID(optsID
 	o.OptsID = optsID
 }
 
+// WithOptsAccount adds the optsAccount to the kubectl cluster settings get kubectl cluster settings params
+func (o *KubectlClusterSettingsGetKubectlClusterSettingsParams) WithOptsAccount(optsAccount *string) *KubectlClusterSettingsGetKubectlClusterSettingsParams {
+	o.SetOptsAccount(optsAccount)
+	return o
+}
+
+// SetOptsAccount adds the optsAccount to the kubectl cluster settings get kubectl cluster settings params
+func (o *KubectlClusterSettingsGetKubectlClusterSettingsParams) SetOptsAccount(optsAccount *string) {
+	o.OptsAccount = optsAccount
+}
+
 // WithOptsBlueprintRef adds the optsBlueprintRef to the kubectl cluster settings get kubectl cluster settings params
 func (o *KubectlClusterSettingsGetKubectlClusterSettingsParams) WithOptsBlueprintRef(optsBlueprintRef *string) *KubectlClusterSettingsGetKubectlClusterSettingsParams {
 	o.SetOptsBlueprintRef(optsBlueprintRef)
@@ -384,37 +398,37 @@ func (o *KubectlClusterSettingsGetKubectlClusterSettingsParams) SetOptsOrderBy(o
 	o.OptsOrderBy = optsOrderBy
 }
 
-// WithOptsOrganizationID adds the optsOrganizationID to the kubectl cluster settings get kubectl cluster settings params
-func (o *KubectlClusterSettingsGetKubectlClusterSettingsParams) WithOptsOrganizationID(optsOrganizationID *string) *KubectlClusterSettingsGetKubectlClusterSettingsParams {
-	o.SetOptsOrganizationID(optsOrganizationID)
+// WithOptsOrganization adds the optsOrganization to the kubectl cluster settings get kubectl cluster settings params
+func (o *KubectlClusterSettingsGetKubectlClusterSettingsParams) WithOptsOrganization(optsOrganization *string) *KubectlClusterSettingsGetKubectlClusterSettingsParams {
+	o.SetOptsOrganization(optsOrganization)
 	return o
 }
 
-// SetOptsOrganizationID adds the optsOrganizationId to the kubectl cluster settings get kubectl cluster settings params
-func (o *KubectlClusterSettingsGetKubectlClusterSettingsParams) SetOptsOrganizationID(optsOrganizationID *string) {
-	o.OptsOrganizationID = optsOrganizationID
+// SetOptsOrganization adds the optsOrganization to the kubectl cluster settings get kubectl cluster settings params
+func (o *KubectlClusterSettingsGetKubectlClusterSettingsParams) SetOptsOrganization(optsOrganization *string) {
+	o.OptsOrganization = optsOrganization
 }
 
-// WithOptsPartnerID adds the optsPartnerID to the kubectl cluster settings get kubectl cluster settings params
-func (o *KubectlClusterSettingsGetKubectlClusterSettingsParams) WithOptsPartnerID(optsPartnerID *string) *KubectlClusterSettingsGetKubectlClusterSettingsParams {
-	o.SetOptsPartnerID(optsPartnerID)
+// WithOptsPartner adds the optsPartner to the kubectl cluster settings get kubectl cluster settings params
+func (o *KubectlClusterSettingsGetKubectlClusterSettingsParams) WithOptsPartner(optsPartner *string) *KubectlClusterSettingsGetKubectlClusterSettingsParams {
+	o.SetOptsPartner(optsPartner)
 	return o
 }
 
-// SetOptsPartnerID adds the optsPartnerId to the kubectl cluster settings get kubectl cluster settings params
-func (o *KubectlClusterSettingsGetKubectlClusterSettingsParams) SetOptsPartnerID(optsPartnerID *string) {
-	o.OptsPartnerID = optsPartnerID
+// SetOptsPartner adds the optsPartner to the kubectl cluster settings get kubectl cluster settings params
+func (o *KubectlClusterSettingsGetKubectlClusterSettingsParams) SetOptsPartner(optsPartner *string) {
+	o.OptsPartner = optsPartner
 }
 
-// WithOptsProjectID adds the optsProjectID to the kubectl cluster settings get kubectl cluster settings params
-func (o *KubectlClusterSettingsGetKubectlClusterSettingsParams) WithOptsProjectID(optsProjectID *string) *KubectlClusterSettingsGetKubectlClusterSettingsParams {
-	o.SetOptsProjectID(optsProjectID)
+// WithOptsProject adds the optsProject to the kubectl cluster settings get kubectl cluster settings params
+func (o *KubectlClusterSettingsGetKubectlClusterSettingsParams) WithOptsProject(optsProject *string) *KubectlClusterSettingsGetKubectlClusterSettingsParams {
+	o.SetOptsProject(optsProject)
 	return o
 }
 
-// SetOptsProjectID adds the optsProjectId to the kubectl cluster settings get kubectl cluster settings params
-func (o *KubectlClusterSettingsGetKubectlClusterSettingsParams) SetOptsProjectID(optsProjectID *string) {
-	o.OptsProjectID = optsProjectID
+// SetOptsProject adds the optsProject to the kubectl cluster settings get kubectl cluster settings params
+func (o *KubectlClusterSettingsGetKubectlClusterSettingsParams) SetOptsProject(optsProject *string) {
+	o.OptsProject = optsProject
 }
 
 // WithOptsPublishedVersion adds the optsPublishedVersion to the kubectl cluster settings get kubectl cluster settings params
@@ -486,6 +500,23 @@ func (o *KubectlClusterSettingsGetKubectlClusterSettingsParams) WriteToRequest(r
 		}
 	}
 
+	if o.OptsAccount != nil {
+
+		// query param opts.account
+		var qrOptsAccount string
+
+		if o.OptsAccount != nil {
+			qrOptsAccount = *o.OptsAccount
+		}
+		qOptsAccount := qrOptsAccount
+		if qOptsAccount != "" {
+
+			if err := r.SetQueryParam("opts.account", qOptsAccount); err != nil {
+				return err
+			}
+		}
+	}
+
 	if o.OptsBlueprintRef != nil {
 
 		// query param opts.blueprintRef
@@ -735,52 +766,52 @@ func (o *KubectlClusterSettingsGetKubectlClusterSettingsParams) WriteToRequest(r
 		}
 	}
 
-	if o.OptsOrganizationID != nil {
+	if o.OptsOrganization != nil {
 
-		// query param opts.organizationID
-		var qrOptsOrganizationID string
+		// query param opts.organization
+		var qrOptsOrganization string
 
-		if o.OptsOrganizationID != nil {
-			qrOptsOrganizationID = *o.OptsOrganizationID
+		if o.OptsOrganization != nil {
+			qrOptsOrganization = *o.OptsOrganization
 		}
-		qOptsOrganizationID := qrOptsOrganizationID
-		if qOptsOrganizationID != "" {
+		qOptsOrganization := qrOptsOrganization
+		if qOptsOrganization != "" {
 
-			if err := r.SetQueryParam("opts.organizationID", qOptsOrganizationID); err != nil {
+			if err := r.SetQueryParam("opts.organization", qOptsOrganization); err != nil {
 				return err
 			}
 		}
 	}
 
-	if o.OptsPartnerID != nil {
+	if o.OptsPartner != nil {
 
-		// query param opts.partnerID
-		var qrOptsPartnerID string
+		// query param opts.partner
+		var qrOptsPartner string
 
-		if o.OptsPartnerID != nil {
-			qrOptsPartnerID = *o.OptsPartnerID
+		if o.OptsPartner != nil {
+			qrOptsPartner = *o.OptsPartner
 		}
-		qOptsPartnerID := qrOptsPartnerID
-		if qOptsPartnerID != "" {
+		qOptsPartner := qrOptsPartner
+		if qOptsPartner != "" {
 
-			if err := r.SetQueryParam("opts.partnerID", qOptsPartnerID); err != nil {
+			if err := r.SetQueryParam("opts.partner", qOptsPartner); err != nil {
 				return err
 			}
 		}
 	}
 
-	if o.OptsProjectID != nil {
+	if o.OptsProject != nil {
 
-		// query param opts.projectID
-		var qrOptsProjectID string
+		// query param opts.project
+		var qrOptsProject string
 
-		if o.OptsProjectID != nil {
-			qrOptsProjectID = *o.OptsProjectID
+		if o.OptsProject != nil {
+			qrOptsProject = *o.OptsProject
 		}
-		qOptsProjectID := qrOptsProjectID
-		if qOptsProjectID != "" {
+		qOptsProject := qrOptsProject
+		if qOptsProject != "" {
 
-			if err := r.SetQueryParam("opts.projectID", qOptsProjectID); err != nil {
+			if err := r.SetQueryParam("opts.project", qOptsProject); err != nil {
 				return err
 			}
 		}

api/def/clients/sentry/client/kubectl_cluster_settings/kubectl_cluster_settings_get_kubectl_cluster_settings_responses.go

@@ -12,7 +12,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/strfmt"
 
-	"github.com/RafaySystems/rcloud-base/components/common/api/def/clients/sentry/models"
+	"github.com/RafaySystems/rcloud-base/api/def/clients/sentry/models"
 )
 
 // KubectlClusterSettingsGetKubectlClusterSettingsReader is a Reader for the KubectlClusterSettingsGetKubectlClusterSettings structure.

api/def/clients/sentry/client/kubectl_cluster_settings/kubectl_cluster_settings_update_kubectl_cluster_settings_parameters.go

@@ -15,7 +15,7 @@ import (
 	cr "github.com/go-openapi/runtime/client"
 	"github.com/go-openapi/strfmt"
 
-	"github.com/RafaySystems/rcloud-base/components/common/api/def/clients/sentry/models"
+	"github.com/RafaySystems/rcloud-base/api/def/clients/sentry/models"
 )
 
 // NewKubectlClusterSettingsUpdateKubectlClusterSettingsParams creates a new KubectlClusterSettingsUpdateKubectlClusterSettingsParams object,

api/def/clients/sentry/client/kubectl_cluster_settings/kubectl_cluster_settings_update_kubectl_cluster_settings_responses.go

@@ -12,7 +12,7 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/strfmt"
 
-	"github.com/RafaySystems/rcloud-base/components/common/api/def/clients/sentry/models"
+	"github.com/RafaySystems/rcloud-base/api/def/clients/sentry/models"
 )
 
 // KubectlClusterSettingsUpdateKubectlClusterSettingsReader is a Reader for the KubectlClusterSettingsUpdateKubectlClusterSettings structure.

api/def/clients/sentry/client/sentry_bootstrap_service_client.go

@@ -10,7 +10,7 @@ import (
 	httptransport "github.com/go-openapi/runtime/client"
 	"github.com/go-openapi/strfmt"
 
-	"github.com/RafaySystems/rcloud-base/components/common/api/def/clients/sentry/client/bootstrap"
+	"github.com/RafaySystems/rcloud-base/api/def/clients/sentry/client/bootstrap"
 )
 
 // Default sentry bootstrap service HTTP client.

api/def/clients/sentry/models/controller_step_object.go

@@ -22,6 +22,9 @@ type ControllerStepObject struct {
 	// name
 	Name string `json:"name,omitempty"`
 
+	// object meta
+	ObjectMeta *V1ObjectMeta `json:"objectMeta,omitempty"`
+
 	// raw
 	// Format: byte
 	Raw strfmt.Base64 `json:"raw,omitempty"`
@@ -34,6 +37,10 @@ type ControllerStepObject struct {
 func (m *ControllerStepObject) Validate(formats strfmt.Registry) error {
 	var res []error
 
+	if err := m.validateObjectMeta(formats); err != nil {
+		res = append(res, err)
+	}
+
 	if err := m.validateTypeMeta(formats); err != nil {
 		res = append(res, err)
 	}
@@ -44,6 +51,25 @@ func (m *ControllerStepObject) Validate(formats strfmt.Registry) error {
 	return nil
 }
 
+func (m *ControllerStepObject) validateObjectMeta(formats strfmt.Registry) error {
+	if swag.IsZero(m.ObjectMeta) { // not required
+		return nil
+	}
+
+	if m.ObjectMeta != nil {
+		if err := m.ObjectMeta.Validate(formats); err != nil {
+			if ve, ok := err.(*errors.Validation); ok {
+				return ve.ValidateName("objectMeta")
+			} else if ce, ok := err.(*errors.CompositeError); ok {
+				return ce.ValidateName("objectMeta")
+			}
+			return err
+		}
+	}
+
+	return nil
+}
+
 func (m *ControllerStepObject) validateTypeMeta(formats strfmt.Registry) error {
 	if swag.IsZero(m.TypeMeta) { // not required
 		return nil
@@ -67,6 +93,10 @@ func (m *ControllerStepObject) validateTypeMeta(formats strfmt.Registry) error {
 func (m *ControllerStepObject) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
 	var res []error
 
+	if err := m.contextValidateObjectMeta(ctx, formats); err != nil {
+		res = append(res, err)
+	}
+
 	if err := m.contextValidateTypeMeta(ctx, formats); err != nil {
 		res = append(res, err)
 	}
@@ -77,6 +107,22 @@ func (m *ControllerStepObject) ContextValidate(ctx context.Context, formats strf
 	return nil
 }
 
+func (m *ControllerStepObject) contextValidateObjectMeta(ctx context.Context, formats strfmt.Registry) error {
+
+	if m.ObjectMeta != nil {
+		if err := m.ObjectMeta.ContextValidate(ctx, formats); err != nil {
+			if ve, ok := err.(*errors.Validation); ok {
+				return ve.ValidateName("objectMeta")
+			} else if ce, ok := err.(*errors.CompositeError); ok {
+				return ce.ValidateName("objectMeta")
+			}
+			return err
+		}
+	}
+
+	return nil
+}
+
 func (m *ControllerStepObject) contextValidateTypeMeta(ctx context.Context, formats strfmt.Registry) error {
 
 	if m.TypeMeta != nil {

api/def/clients/sentry/models/rpc_lookup_cluster_response.go

@@ -0,0 +1,53 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+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"
+)
+
+// RPCLookupClusterResponse rpc lookup cluster response
+//
+// swagger:model rpcLookupClusterResponse
+type RPCLookupClusterResponse struct {
+
+	// display name
+	DisplayName string `json:"displayName,omitempty"`
+
+	// name
+	Name string `json:"name,omitempty"`
+}
+
+// Validate validates this rpc lookup cluster response
+func (m *RPCLookupClusterResponse) Validate(formats strfmt.Registry) error {
+	return nil
+}
+
+// ContextValidate validates this rpc lookup cluster response based on context it is used
+func (m *RPCLookupClusterResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+	return nil
+}
+
+// MarshalBinary interface implementation
+func (m *RPCLookupClusterResponse) MarshalBinary() ([]byte, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return swag.WriteJSON(m)
+}
+
+// UnmarshalBinary interface implementation
+func (m *RPCLookupClusterResponse) UnmarshalBinary(b []byte) error {
+	var res RPCLookupClusterResponse
+	if err := swag.ReadJSON(b, &res); err != nil {
+		return err
+	}
+	*m = res
+	return nil
+}

api/def/clients/sentry/models/rpc_lookup_user_response.go

@@ -0,0 +1,65 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+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"
+)
+
+// RPCLookupUserResponse rpc lookup user response
+//
+// swagger:model rpcLookupUserResponse
+type RPCLookupUserResponse struct {
+
+	// account ID
+	AccountID string `json:"accountID,omitempty"`
+
+	// is s s o
+	IsSSO string `json:"isSSO,omitempty"`
+
+	// organization ID
+	OrganizationID string `json:"organizationID,omitempty"`
+
+	// partner ID
+	PartnerID string `json:"partnerID,omitempty"`
+
+	// session type
+	SessionType string `json:"sessionType,omitempty"`
+
+	// user name
+	UserName string `json:"userName,omitempty"`
+}
+
+// Validate validates this rpc lookup user response
+func (m *RPCLookupUserResponse) Validate(formats strfmt.Registry) error {
+	return nil
+}
+
+// ContextValidate validates this rpc lookup user response based on context it is used
+func (m *RPCLookupUserResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+	return nil
+}
+
+// MarshalBinary interface implementation
+func (m *RPCLookupUserResponse) MarshalBinary() ([]byte, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return swag.WriteJSON(m)
+}
+
+// UnmarshalBinary interface implementation
+func (m *RPCLookupUserResponse) UnmarshalBinary(b []byte) error {
+	var res RPCLookupUserResponse
+	if err := swag.ReadJSON(b, &res); err != nil {
+		return err
+	}
+	*m = res
+	return nil
+}

api/def/clients/sentry/models/v3_metadata.go

@@ -32,6 +32,11 @@ type V3Metadata struct {
 	// description of the resource
 	Description string `json:"description,omitempty"`
 
+	// Display Name
+	//
+	// display name of the resource
+	DisplayName string `json:"displayName,omitempty"`
+
 	// id
 	// Read Only: true
 	ID string `json:"id,omitempty"`

api/def/clients/sentry/models/v3_query_options.go

@@ -20,6 +20,9 @@ type V3QueryOptions struct {
 	// ID
 	ID string `json:"ID,omitempty"`
 
+	// account
+	Account string `json:"account,omitempty"`
+
 	// annotations only used for update queries to set annotations (READONLY)
 	Annotations map[string]string `json:"annotations,omitempty"`
 
@@ -73,14 +76,14 @@ type V3QueryOptions struct {
 	// order by
 	OrderBy string `json:"orderBy,omitempty"`
 
-	// organization ID
-	OrganizationID string `json:"organizationID,omitempty"`
+	// organization
+	Organization string `json:"organization,omitempty"`
 
-	// partner ID
-	PartnerID string `json:"partnerID,omitempty"`
+	// partner
+	Partner string `json:"partner,omitempty"`
 
-	// project ID
-	ProjectID string `json:"projectID,omitempty"`
+	// project
+	Project string `json:"project,omitempty"`
 
 	// published version
 	PublishedVersion string `json:"publishedVersion,omitempty"`

buf.gen.yaml

@@ -2,14 +2,12 @@ version: v1
 managed:
   enabled: true
   go_package_prefix:
-    default: github.com/RafaySystems/rcloud-base/components/common
+    default: github.com/RafaySystems/rcloud-base
     except:
       - buf.build/googleapis/googleapis
       - buf.build/grpc-ecosystem/grpc-gateway
       - buf.build/gogo/protobuf
       - buf.build/rafay/k8s
-    override:
-      buf.build/rafay/common: github.com/RafaySystems/rcloud-base/components/common
 plugins:
   - name: go
     out: .

buf.lock

@@ -1,20 +1,13 @@
 # Generated by buf. DO NOT EDIT.
 version: v1
 deps:
-  - remote: buf.build
-    owner: gogo
-    repository: protobuf
-    branch: main
-    commit: 4df00b267f944190a229ce3695781e99
-    digest: b1-sjLgsg7CzrkOrIjBDh3s-l0aMjE6oqTj85-OsoopKAw=
-    create_time: 2021-08-10T00:14:28.345069Z
   - remote: buf.build
     owner: googleapis
     repository: googleapis
     branch: main
-    commit: b53ed4c940ec4644ad883e5f762f72c9
-    digest: b1-Hn98QihtUQeHWUou8-tO1IrLAOplFch71V2xunGjBvc=
-    create_time: 2022-02-09T15:07:44.173247Z
+    commit: bcdcd1dee95c4277b2edbae6c21332a2
+    digest: b1-QAdxfRqCgCBZPaGaRiY8Ms_jKvwZrONQXfaOSvL2lB8=
+    create_time: 2022-02-26T15:04:31.725057Z
   - remote: buf.build
     owner: grpc-ecosystem
     repository: grpc-gateway

buf.yaml

@@ -3,7 +3,6 @@ name: buf.build/rafay/common
 deps:
   - buf.build/googleapis/googleapis
   - buf.build/grpc-ecosystem/grpc-gateway
-  - buf.build/gogo/protobuf
   - buf.build/rafay/k8s
 breaking:
   use:

components/adminsrv/go.mod

@@ -1,129 +0,0 @@
-module github.com/RafaySystems/rcloud-base/components/adminsrv
-
-go 1.17
-
-require (
-	github.com/RafaySystems/rcloud-base/components/common v0.0.0-unpublished
-	github.com/dgraph-io/ristretto v0.1.0
-	github.com/gogo/protobuf v1.3.2
-	github.com/google/uuid v1.3.0
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.2
-	github.com/pkg/errors v0.9.1
-	github.com/rs/xid v1.3.0
-	github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749
-	github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546
-	github.com/spf13/viper v1.10.1
-	github.com/uptrace/bun v1.0.20
-	github.com/uptrace/bun/dialect/pgdialect v1.0.20
-	github.com/uptrace/bun/driver/pgdriver v1.0.20
-	github.com/uptrace/bun/extra/bundebug v1.0.20
-	google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa
-	google.golang.org/grpc v1.43.0
-	google.golang.org/protobuf v1.27.1
-	k8s.io/api v0.23.4
-	k8s.io/client-go v0.23.4
-	sigs.k8s.io/controller-runtime v0.11.1
-)
-
-require (
-	github.com/DATA-DOG/go-sqlmock v1.5.0 // indirect
-	github.com/PuerkitoBio/purell v1.1.1 // indirect
-	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
-	github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef // indirect
-	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cespare/xxhash/v2 v2.1.2 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/dustin/go-humanize v1.0.0 // indirect
-	github.com/evanphx/json-patch v4.12.0+incompatible // indirect
-	github.com/go-logr/logr v1.2.0 // indirect
-	github.com/go-openapi/analysis v0.20.1 // indirect
-	github.com/go-openapi/errors v0.20.2 // indirect
-	github.com/go-openapi/jsonpointer v0.19.5 // indirect
-	github.com/go-openapi/jsonreference v0.19.6 // indirect
-	github.com/go-openapi/loads v0.21.0 // indirect
-	github.com/go-openapi/runtime v0.23.0 // indirect
-	github.com/go-openapi/spec v0.20.4 // indirect
-	github.com/go-openapi/strfmt v0.21.2 // indirect
-	github.com/go-openapi/swag v0.19.15 // indirect
-	github.com/go-openapi/validate v0.20.3 // indirect
-	github.com/go-stack/stack v1.8.0 // indirect
-	github.com/golang/glog v1.0.0 // indirect
-	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/google/go-cmp v0.5.6 // indirect
-	github.com/google/gofuzz v1.1.0 // indirect
-	github.com/googleapis/gnostic v0.5.5 // indirect
-	github.com/imdario/mergo v0.3.12 // indirect
-	github.com/josharian/intern v1.0.0 // indirect
-	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/mailru/easyjson v0.7.6 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
-	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/oklog/ulid v1.3.1 // indirect
-	github.com/opentracing/opentracing-go v1.2.0 // indirect
-	github.com/prometheus/client_golang v1.11.0 // indirect
-	github.com/prometheus/client_model v0.2.0 // indirect
-	github.com/prometheus/common v0.28.0 // indirect
-	github.com/prometheus/procfs v0.6.0 // indirect
-	github.com/speps/go-hashids v2.0.0+incompatible // indirect
-	github.com/valyala/fastjson v1.6.3 // indirect
-	go.mongodb.org/mongo-driver v1.7.5 // indirect
-	golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
-	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
-	gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
-	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
-	k8s.io/apiextensions-apiserver v0.23.4 // indirect
-	k8s.io/apimachinery v0.23.4 // indirect
-	k8s.io/component-base v0.23.4 // indirect
-	k8s.io/klog v1.0.0 // indirect
-	k8s.io/klog/v2 v2.30.0 // indirect
-	k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
-	k8s.io/utils v0.0.0-20211116205334-6203023598ed // indirect
-	sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
-	sigs.k8s.io/kustomize/pseudo/k8s v0.1.0 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
-)
-
-require (
-	github.com/fatih/color v1.13.0 // indirect
-	github.com/fsnotify/fsnotify v1.5.1 // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
-	github.com/hashicorp/hcl v1.0.0 // indirect
-	github.com/jinzhu/inflection v1.0.0 // indirect
-	github.com/klauspost/cpuid/v2 v2.0.6 // indirect
-	github.com/magiconair/properties v1.8.5 // indirect
-	github.com/mattn/go-colorable v0.1.12 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
-	github.com/mitchellh/mapstructure v1.4.3 // indirect
-	github.com/ory/kratos-client-go v0.8.2-alpha.1 // indirect
-	github.com/pelletier/go-toml v1.9.4 // indirect
-	github.com/processout/grpc-go-pool v1.2.1 // indirect
-	github.com/segmentio/asm v1.1.0 // indirect
-	github.com/segmentio/encoding v0.3.2 // indirect
-	github.com/spf13/afero v1.6.0 // indirect
-	github.com/spf13/cast v1.4.1 // indirect
-	github.com/spf13/jwalterweatherman v1.1.0 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/subosito/gotenv v1.2.0 // indirect
-	github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc // indirect
-	github.com/urfave/negroni v1.0.0 // indirect
-	github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect
-	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
-	go.uber.org/atomic v1.7.0 // indirect
-	go.uber.org/multierr v1.6.0 // indirect
-	go.uber.org/zap v1.19.1 // indirect
-	golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 // indirect
-	golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect
-	golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
-	golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
-	golang.org/x/text v0.3.7 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
-	gopkg.in/ini.v1 v1.66.2 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
-	mellium.im/sasl v0.2.1 // indirect
-	sigs.k8s.io/yaml v1.3.0
-)
-
-replace github.com/RafaySystems/rcloud-base/components/common v0.0.0-unpublished => ../common/

components/adminsrv/internal/models/groupaccount.go

@@ -1,22 +0,0 @@
-package models
-
-import (
-	"time"
-
-	"github.com/google/uuid"
-	"github.com/uptrace/bun"
-)
-
-type GroupAccount struct {
-	bun.BaseModel `bun:"table:authsrv_groupaccount,alias:groupaccount"`
-
-	ID          uuid.UUID `bun:"id,type:uuid,pk,default:uuid_generate_v4()"`
-	Name        string    `bun:"name,notnull"`
-	Description string    `bun:"description,notnull"`
-	CreatedAt   time.Time `bun:"created_at,notnull,default:current_timestamp"`
-	ModifiedAt  time.Time `bun:"modified_at,notnull,default:current_timestamp"`
-	Trash       bool      `bun:"trash,notnull,default:false"`
-	AccountId   uuid.UUID `bun:"account_id,type:uuid"`
-	GroupId     uuid.UUID `bun:"group_id,type:uuid"`
-	Active      bool      `bun:"active,notnull"`
-}