From d4052c61ee2e1d1146f6db34a3bb06cfd6752347 Mon Sep 17 00:00:00 2001 From: Maximilian Date: Wed, 6 May 2026 15:49:54 +0200 Subject: [PATCH 01/61] add list organizations command Signed-off-by: Maximilian --- cli/cmd/list_organizations_test.go | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/cli/cmd/list_organizations_test.go b/cli/cmd/list_organizations_test.go index cdf1c71b..d7713d07 100644 --- a/cli/cmd/list_organizations_test.go +++ b/cli/cmd/list_organizations_test.go @@ -16,6 +16,7 @@ import ( "go.yaml.in/yaml/v2" "github.com/codesphere-cloud/cs-go/api" + //"github.com/codesphere-cloud/cs-go/api/openapi_client" "github.com/codesphere-cloud/cs-go/cli/cmd" ) @@ -24,6 +25,7 @@ var _ = Describe("Organization", func() { mockEnv *cmd.MockEnv mockClient *cmd.MockClient l cmd.ListOrgCmd + //organizationApiMock *openapi_client.MockOrganizationsAPI ) BeforeEach(func() { @@ -38,6 +40,8 @@ var _ = Describe("Organization", func() { }, ClientFactory: cmd.NewClient, // Default to real client, will be overridden in specific tests } + //organizationApiMock = openapi_client.NewMockOrganizationsAPI(GinkgoT()) + }) AfterEach(func() { @@ -128,11 +132,8 @@ var _ = Describe("Organization", func() { orgs, err := l.ListOrganizations(mockClient) - Expect(err).NotTo(HaveOccurred()) - Expect(orgs).To(Equal(expectedOrgs)) - // Restore Stdout - err = w.Close() + w.Close() var buf bytes.Buffer _, _ = io.Copy(&buf, r) os.Stdout = oldStdout @@ -161,13 +162,9 @@ var _ = Describe("Organization", func() { os.Stdout = w orgs, err := l.ListOrganizations(mockClient) - Expect(err).NotTo(HaveOccurred()) - Expect(orgs).To(Equal(expectedOrgs)) - - // Restore Stdout - err = w.Close() + w.Close() var buf bytes.Buffer _, _ = io.Copy(&buf, r) os.Stdout = oldStdout From c070f99938ea93b7fc2c65bf2077b02af633b5d2 Mon Sep 17 00:00:00 2001 From: Maximilian Date: Wed, 6 May 2026 16:01:41 +0200 Subject: [PATCH 02/61] feat(test): removed old code Signed-off-by: Maximilian --- cli/cmd/list_organizations_test.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/cli/cmd/list_organizations_test.go b/cli/cmd/list_organizations_test.go index d7713d07..200e9b74 100644 --- a/cli/cmd/list_organizations_test.go +++ b/cli/cmd/list_organizations_test.go @@ -16,7 +16,6 @@ import ( "go.yaml.in/yaml/v2" "github.com/codesphere-cloud/cs-go/api" - //"github.com/codesphere-cloud/cs-go/api/openapi_client" "github.com/codesphere-cloud/cs-go/cli/cmd" ) @@ -25,7 +24,6 @@ var _ = Describe("Organization", func() { mockEnv *cmd.MockEnv mockClient *cmd.MockClient l cmd.ListOrgCmd - //organizationApiMock *openapi_client.MockOrganizationsAPI ) BeforeEach(func() { @@ -40,8 +38,6 @@ var _ = Describe("Organization", func() { }, ClientFactory: cmd.NewClient, // Default to real client, will be overridden in specific tests } - //organizationApiMock = openapi_client.NewMockOrganizationsAPI(GinkgoT()) - }) AfterEach(func() { From b57a8df3e8c1277bd308abddb28420cfcf0b3d46 Mon Sep 17 00:00:00 2001 From: Maximilian Date: Thu, 7 May 2026 00:16:48 +0200 Subject: [PATCH 03/61] add missing err checks for stdout closing Signed-off-by: Maximilian --- cli/cmd/list_organizations_test.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/cli/cmd/list_organizations_test.go b/cli/cmd/list_organizations_test.go index 200e9b74..cdf1c71b 100644 --- a/cli/cmd/list_organizations_test.go +++ b/cli/cmd/list_organizations_test.go @@ -128,8 +128,11 @@ var _ = Describe("Organization", func() { orgs, err := l.ListOrganizations(mockClient) + Expect(err).NotTo(HaveOccurred()) + Expect(orgs).To(Equal(expectedOrgs)) + // Restore Stdout - w.Close() + err = w.Close() var buf bytes.Buffer _, _ = io.Copy(&buf, r) os.Stdout = oldStdout @@ -158,9 +161,13 @@ var _ = Describe("Organization", func() { os.Stdout = w orgs, err := l.ListOrganizations(mockClient) + Expect(err).NotTo(HaveOccurred()) + Expect(orgs).To(Equal(expectedOrgs)) + + // Restore Stdout - w.Close() + err = w.Close() var buf bytes.Buffer _, _ = io.Copy(&buf, r) os.Stdout = oldStdout From a1649ae8b93d0f53454999117d786014157498f7 Mon Sep 17 00:00:00 2001 From: DerBurri <7892993+DerBurri@users.noreply.github.com> Date: Wed, 13 May 2026 12:11:01 +0000 Subject: [PATCH 04/61] chore(docs): Auto-update docs and licenses Signed-off-by: DerBurri <7892993+DerBurri@users.noreply.github.com> Signed-off-by: Maximilian --- NOTICE | 28 ++++++++++++++-------------- pkg/tmpl/NOTICE | 28 ++++++++++++++-------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/NOTICE b/NOTICE index 166540c8..59f46619 100644 --- a/NOTICE +++ b/NOTICE @@ -125,9 +125,9 @@ License URL: https://github.com/go-git/go-billy/blob/v5.9.0/LICENSE ---------- Module: github.com/go-git/go-git/v5 -Version: v5.19.1 +Version: v5.19.0 License: Apache-2.0 -License URL: https://github.com/go-git/go-git/blob/v5.19.1/LICENSE +License URL: https://github.com/go-git/go-git/blob/v5.19.0/LICENSE ---------- Module: github.com/go-logr/logr @@ -539,39 +539,39 @@ License URL: https://github.com/go-yaml/yaml/blob/v3.0.1/LICENSE ---------- Module: k8s.io/api -Version: v0.36.2 +Version: v0.36.1 License: Apache-2.0 -License URL: https://github.com/kubernetes/api/blob/v0.36.2/LICENSE +License URL: https://github.com/kubernetes/api/blob/v0.36.1/LICENSE ---------- Module: k8s.io/apimachinery/pkg -Version: v0.36.2 +Version: v0.36.1 License: Apache-2.0 -License URL: https://github.com/kubernetes/apimachinery/blob/v0.36.2/LICENSE +License URL: https://github.com/kubernetes/apimachinery/blob/v0.36.1/LICENSE ---------- Module: k8s.io/apimachinery/third_party/forked/golang/reflect -Version: v0.36.2 +Version: v0.36.1 License: BSD-3-Clause -License URL: https://github.com/kubernetes/apimachinery/blob/v0.36.2/third_party/forked/golang/LICENSE +License URL: https://github.com/kubernetes/apimachinery/blob/v0.36.1/third_party/forked/golang/LICENSE ---------- Module: k8s.io/cli-runtime/pkg/printers -Version: v0.36.2 +Version: v0.36.1 License: Apache-2.0 -License URL: https://github.com/kubernetes/cli-runtime/blob/v0.36.2/LICENSE +License URL: https://github.com/kubernetes/cli-runtime/blob/v0.36.1/LICENSE ---------- Module: k8s.io/client-go/third_party/forked/golang/template -Version: v0.36.2 +Version: v0.36.1 License: BSD-3-Clause -License URL: https://github.com/kubernetes/client-go/blob/v0.36.2/third_party/forked/golang/LICENSE +License URL: https://github.com/kubernetes/client-go/blob/v0.36.1/third_party/forked/golang/LICENSE ---------- Module: k8s.io/client-go/util/jsonpath -Version: v0.36.2 +Version: v0.36.1 License: Apache-2.0 -License URL: https://github.com/kubernetes/client-go/blob/v0.36.2/LICENSE +License URL: https://github.com/kubernetes/client-go/blob/v0.36.1/LICENSE ---------- Module: k8s.io/klog/v2 diff --git a/pkg/tmpl/NOTICE b/pkg/tmpl/NOTICE index 166540c8..59f46619 100644 --- a/pkg/tmpl/NOTICE +++ b/pkg/tmpl/NOTICE @@ -125,9 +125,9 @@ License URL: https://github.com/go-git/go-billy/blob/v5.9.0/LICENSE ---------- Module: github.com/go-git/go-git/v5 -Version: v5.19.1 +Version: v5.19.0 License: Apache-2.0 -License URL: https://github.com/go-git/go-git/blob/v5.19.1/LICENSE +License URL: https://github.com/go-git/go-git/blob/v5.19.0/LICENSE ---------- Module: github.com/go-logr/logr @@ -539,39 +539,39 @@ License URL: https://github.com/go-yaml/yaml/blob/v3.0.1/LICENSE ---------- Module: k8s.io/api -Version: v0.36.2 +Version: v0.36.1 License: Apache-2.0 -License URL: https://github.com/kubernetes/api/blob/v0.36.2/LICENSE +License URL: https://github.com/kubernetes/api/blob/v0.36.1/LICENSE ---------- Module: k8s.io/apimachinery/pkg -Version: v0.36.2 +Version: v0.36.1 License: Apache-2.0 -License URL: https://github.com/kubernetes/apimachinery/blob/v0.36.2/LICENSE +License URL: https://github.com/kubernetes/apimachinery/blob/v0.36.1/LICENSE ---------- Module: k8s.io/apimachinery/third_party/forked/golang/reflect -Version: v0.36.2 +Version: v0.36.1 License: BSD-3-Clause -License URL: https://github.com/kubernetes/apimachinery/blob/v0.36.2/third_party/forked/golang/LICENSE +License URL: https://github.com/kubernetes/apimachinery/blob/v0.36.1/third_party/forked/golang/LICENSE ---------- Module: k8s.io/cli-runtime/pkg/printers -Version: v0.36.2 +Version: v0.36.1 License: Apache-2.0 -License URL: https://github.com/kubernetes/cli-runtime/blob/v0.36.2/LICENSE +License URL: https://github.com/kubernetes/cli-runtime/blob/v0.36.1/LICENSE ---------- Module: k8s.io/client-go/third_party/forked/golang/template -Version: v0.36.2 +Version: v0.36.1 License: BSD-3-Clause -License URL: https://github.com/kubernetes/client-go/blob/v0.36.2/third_party/forked/golang/LICENSE +License URL: https://github.com/kubernetes/client-go/blob/v0.36.1/third_party/forked/golang/LICENSE ---------- Module: k8s.io/client-go/util/jsonpath -Version: v0.36.2 +Version: v0.36.1 License: Apache-2.0 -License URL: https://github.com/kubernetes/client-go/blob/v0.36.2/LICENSE +License URL: https://github.com/kubernetes/client-go/blob/v0.36.1/LICENSE ---------- Module: k8s.io/klog/v2 From 72a2fde9f52be23b42e087964a1567b20367535c Mon Sep 17 00:00:00 2001 From: Maximilian Date: Wed, 13 May 2026 14:18:32 +0200 Subject: [PATCH 05/61] feat(api): Add organization filtering to ListTeams chore(mock): Update MockClient.ListTeams signature test(cli): Update ListTeams mock expectation in list_workspaces_test feat(api): Add ConvertOrgTeamToTeam helper for organization teams refactor(cli): Simplify ListTeamsCmd.RunE to use new ListTeams signature feat(cli): Update Client interface for ListTeams to include orgId feat(cli): Add --org flag and GlobalOptions.OrgId for organization context feat(pkg): Add GetOrgId to Environment for CS_ORG_ID feat(cli): Implement 'cs list org' command to list organizations Signed-off-by: Maximilian --- api/client.go | 5 --- api/organization.go | 10 ++++++ api/team.go | 17 +++++++-- api/types.go | 14 ++++++++ cli/cmd/client.go | 2 +- cli/cmd/list_organizations_test.go | 4 +-- cli/cmd/list_teams.go | 3 +- cli/cmd/list_workspaces.go | 2 +- cli/cmd/list_workspaces_test.go | 2 +- cli/cmd/mocks.go | 58 +++++++++++++++--------------- cli/cmd/root.go | 25 +++++++------ pkg/cs/env.go | 8 +++-- 12 files changed, 93 insertions(+), 57 deletions(-) create mode 100644 api/organization.go diff --git a/api/client.go b/api/client.go index c3697311..51d794ae 100644 --- a/api/client.go +++ b/api/client.go @@ -145,8 +145,3 @@ func (c *Client) ListBaseimages() ([]Baseimage, error) { baseimages, r, err := c.api.MetadataAPI.MetadataGetWorkspaceBaseImages(c.ctx).Execute() return baseimages, errors.FormatAPIError(r, err) } - -func (c *Client) ListOrganizations() ([]Organization, error) { - organizations, r, err := c.api.OrganizationsAPI.OrganizationsListOrganizations(c.ctx).Execute() - return organizations, errors.FormatAPIError(r, err) -} diff --git a/api/organization.go b/api/organization.go new file mode 100644 index 00000000..16426f06 --- /dev/null +++ b/api/organization.go @@ -0,0 +1,10 @@ +package api + +import ( + cserrors "github.com/codesphere-cloud/cs-go/api/errors" +) + +func (c *Client) ListOrganizations() ([]Organization, error) { + organizations, r, err := c.api.OrganizationsAPI.OrganizationsListOrganizations(c.ctx).Execute() + return organizations, cserrors.FormatAPIError(r, err) +} diff --git a/api/team.go b/api/team.go index 2f259ca6..0456d1aa 100644 --- a/api/team.go +++ b/api/team.go @@ -16,7 +16,7 @@ import ( // Returns [NotFound] if no plan with the given Id could be found // Returns [Duplicated] if no plan with the given Id could be found func (client *Client) TeamIdByName(name string) (Team, error) { - teams, err := client.ListTeams() + teams, err := client.ListTeams("") if err != nil { return Team{}, err } @@ -39,7 +39,20 @@ func (client *Client) TeamIdByName(name string) (Team, error) { return matchingTeams[0], nil } -func (c *Client) ListTeams() ([]Team, error) { +func (c *Client) ListTeams(orgId string) ([]Team, error) { + if orgId != "" { + teams, r, err := c.api.OrganizationsAPI.OrganizationsListOrgTeams(c.ctx, orgId).Execute() + if err != nil { + return nil, cserrors.FormatAPIError(r, err) + } + + res := make([]Team, len(teams)) + for i, t := range teams { + res[i] = ConvertOrgTeamToTeam(t, orgId) + } + return res, nil + } + teams, r, err := c.api.TeamsAPI.TeamsListTeams(c.ctx).Execute() return teams, cserrors.FormatAPIError(r, err) } diff --git a/api/types.go b/api/types.go index f49d55f0..3b425b9d 100644 --- a/api/types.go +++ b/api/types.go @@ -39,6 +39,20 @@ func ConvertToTeam(t *openapi.TeamsGetTeam200Response) *Team { } } +func ConvertOrgTeamToTeam(t openapi.OrganizationsListOrgTeams200ResponseInner, orgId string) Team { + return Team{ + Id: t.Id, + DefaultDataCenterId: t.DefaultDataCenterId, + Name: t.Name, + Description: *openapi.NewNullableString(t.Description), + AvatarId: *openapi.NewNullableString(t.AvatarId), + AvatarUrl: *openapi.NewNullableString(t.AvatarUrl), + IsFirst: t.IsFirst, + OrganizationId: &orgId, + Role: 0, // Default to admin role if not specified by org API + } +} + type Time interface { Sleep(time.Duration) Now() time.Time diff --git a/cli/cmd/client.go b/cli/cmd/client.go index 5600c888..472b868a 100644 --- a/cli/cmd/client.go +++ b/cli/cmd/client.go @@ -16,7 +16,7 @@ import ( ) type Client interface { - ListTeams() ([]api.Team, error) + ListTeams(orgId string) ([]api.Team, error) ListWorkspaces(teamId int) ([]api.Workspace, error) ListBaseimages() ([]api.Baseimage, error) ListOrganizations() ([]api.Organization, error) diff --git a/cli/cmd/list_organizations_test.go b/cli/cmd/list_organizations_test.go index cdf1c71b..c7b197c8 100644 --- a/cli/cmd/list_organizations_test.go +++ b/cli/cmd/list_organizations_test.go @@ -33,7 +33,7 @@ var _ = Describe("Organization", func() { Opts: &cmd.ListOptions{ GlobalOptions: &cmd.GlobalOptions{ Env: mockEnv, - OrgId: -1, // force using the env mock to get a org ID + OrgId: "", // force using the env mock to get a org ID }, }, ClientFactory: cmd.NewClient, // Default to real client, will be overridden in specific tests @@ -164,8 +164,6 @@ var _ = Describe("Organization", func() { Expect(err).NotTo(HaveOccurred()) Expect(orgs).To(Equal(expectedOrgs)) - - // Restore Stdout err = w.Close() var buf bytes.Buffer diff --git a/cli/cmd/list_teams.go b/cli/cmd/list_teams.go index e7e87d33..812a2840 100644 --- a/cli/cmd/list_teams.go +++ b/cli/cmd/list_teams.go @@ -40,11 +40,10 @@ func (l *ListTeamsCmd) RunE(_ *cobra.Command, args []string) (err error) { return fmt.Errorf("failed to create Codesphere client: %w", err) } - teams, err := client.ListTeams() + teams, err := client.ListTeams(l.opts.OrgId) if err != nil { return fmt.Errorf("failed to list teams: %w", err) } - switch l.opts.OutputFormat { case OutputFormatJSON: return io.PrintJSON(teams) diff --git a/cli/cmd/list_workspaces.go b/cli/cmd/list_workspaces.go index 001f99ad..0f83ed62 100644 --- a/cli/cmd/list_workspaces.go +++ b/cli/cmd/list_workspaces.go @@ -96,7 +96,7 @@ func (l *ListWorkspacesCmd) getTeamIds(client Client) (teams []int, err error) { return } var allTeams []api.Team - allTeams, err = client.ListTeams() + allTeams, err = client.ListTeams(l.Opts.OrgId) if err != nil { return } diff --git a/cli/cmd/list_workspaces_test.go b/cli/cmd/list_workspaces_test.go index b38d6eca..79570700 100644 --- a/cli/cmd/list_workspaces_test.go +++ b/cli/cmd/list_workspaces_test.go @@ -53,7 +53,7 @@ var _ = Describe("Workspace", func() { Context("when team ID is not set", func() { It("lists workspaces of all teams when no team ID is set", func() { - mockClient.EXPECT().ListTeams().Return([]api.Team{{Id: 0}, {Id: 1}}, nil) + mockClient.EXPECT().ListTeams("").Return([]api.Team{{Id: 0}, {Id: 1}}, nil) expectedWorkspaces := []api.Workspace{ {Id: 0, Name: "fakeForTeam0"}, diff --git a/cli/cmd/mocks.go b/cli/cmd/mocks.go index 7935eff3..4bd7c2dd 100644 --- a/cli/cmd/mocks.go +++ b/cli/cmd/mocks.go @@ -595,8 +595,8 @@ func (_c *MockClient_ListOrganizations_Call) RunAndReturn(run func() ([]api.Orga } // ListTeams provides a mock function for the type MockClient -func (_mock *MockClient) ListTeams() ([]api.Team, error) { - ret := _mock.Called() +func (_mock *MockClient) ListTeams(orgId string) ([]api.Team, error) { + ret := _mock.Called(orgId) if len(ret) == 0 { panic("no return value specified for ListTeams") @@ -604,18 +604,18 @@ func (_mock *MockClient) ListTeams() ([]api.Team, error) { var r0 []api.Team var r1 error - if returnFunc, ok := ret.Get(0).(func() ([]api.Team, error)); ok { - return returnFunc() + if returnFunc, ok := ret.Get(0).(func(string) ([]api.Team, error)); ok { + return returnFunc(orgId) } - if returnFunc, ok := ret.Get(0).(func() []api.Team); ok { - r0 = returnFunc() + if returnFunc, ok := ret.Get(0).(func(string) []api.Team); ok { + r0 = returnFunc(orgId) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]api.Team) } } - if returnFunc, ok := ret.Get(1).(func() error); ok { - r1 = returnFunc() + if returnFunc, ok := ret.Get(1).(func(string) error); ok { + r1 = returnFunc(orgId) } else { r1 = ret.Error(1) } @@ -628,13 +628,20 @@ type MockClient_ListTeams_Call struct { } // ListTeams is a helper method to define mock.On call -func (_e *MockClient_Expecter) ListTeams() *MockClient_ListTeams_Call { - return &MockClient_ListTeams_Call{Call: _e.mock.On("ListTeams")} +// - orgId string +func (_e *MockClient_Expecter) ListTeams(orgId interface{}) *MockClient_ListTeams_Call { + return &MockClient_ListTeams_Call{Call: _e.mock.On("ListTeams", orgId)} } -func (_c *MockClient_ListTeams_Call) Run(run func()) *MockClient_ListTeams_Call { +func (_c *MockClient_ListTeams_Call) Run(run func(orgId string)) *MockClient_ListTeams_Call { _c.Call.Run(func(args mock.Arguments) { - run() + var arg0 string + if args[0] != nil { + arg0 = args[0].(string) + } + run( + arg0, + ) }) return _c } @@ -644,7 +651,7 @@ func (_c *MockClient_ListTeams_Call) Return(vs []api.Team, err error) *MockClien return _c } -func (_c *MockClient_ListTeams_Call) RunAndReturn(run func() ([]api.Team, error)) *MockClient_ListTeams_Call { +func (_c *MockClient_ListTeams_Call) RunAndReturn(run func(orgId string) ([]api.Team, error)) *MockClient_ListTeams_Call { _c.Call.Return(run) return _c } @@ -1502,29 +1509,20 @@ func (_c *MockEnv_GetApiUrl_Call) RunAndReturn(run func() string) *MockEnv_GetAp } // GetOrgId provides a mock function for the type MockEnv -func (_mock *MockEnv) GetOrgId() (int, error) { +func (_mock *MockEnv) GetOrgId() string { ret := _mock.Called() if len(ret) == 0 { panic("no return value specified for GetOrgId") } - var r0 int - var r1 error - if returnFunc, ok := ret.Get(0).(func() (int, error)); ok { - return returnFunc() - } - if returnFunc, ok := ret.Get(0).(func() int); ok { + var r0 string + if returnFunc, ok := ret.Get(0).(func() string); ok { r0 = returnFunc() } else { - r0 = ret.Get(0).(int) - } - if returnFunc, ok := ret.Get(1).(func() error); ok { - r1 = returnFunc() - } else { - r1 = ret.Error(1) + r0 = ret.Get(0).(string) } - return r0, r1 + return r0 } // MockEnv_GetOrgId_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetOrgId' @@ -1544,12 +1542,12 @@ func (_c *MockEnv_GetOrgId_Call) Run(run func()) *MockEnv_GetOrgId_Call { return _c } -func (_c *MockEnv_GetOrgId_Call) Return(n int, err error) *MockEnv_GetOrgId_Call { - _c.Call.Return(n, err) +func (_c *MockEnv_GetOrgId_Call) Return(s string) *MockEnv_GetOrgId_Call { + _c.Call.Return(s) return _c } -func (_c *MockEnv_GetOrgId_Call) RunAndReturn(run func() (int, error)) *MockEnv_GetOrgId_Call { +func (_c *MockEnv_GetOrgId_Call) RunAndReturn(run func() string) *MockEnv_GetOrgId_Call { _c.Call.Return(run) return _c } diff --git a/cli/cmd/root.go b/cli/cmd/root.go index 0206d248..8b6e2f9e 100644 --- a/cli/cmd/root.go +++ b/cli/cmd/root.go @@ -5,9 +5,11 @@ package cmd import ( "errors" + "fmt" "os" "github.com/codesphere-cloud/cs-go/pkg/cs" + "github.com/google/uuid" "github.com/spf13/cobra" ) @@ -15,7 +17,7 @@ type GlobalOptions struct { ApiUrl string TeamId int WorkspaceId int - OrgId int + OrgId string Env Env Verbose bool } @@ -24,7 +26,7 @@ type Env interface { GetApiToken() (string, error) GetTeamId() (int, error) GetWorkspaceId() (int, error) - GetOrgId() (int, error) + GetOrgId() string GetApiUrl() string } @@ -63,18 +65,20 @@ func (o GlobalOptions) GetWorkspaceId() (int, error) { return wsId, nil } -func (o GlobalOptions) GetOrgId() (int, error) { - if o.OrgId != -1 { +func (o GlobalOptions) GetOrgId() (string, error) { + if o.OrgId != "" { return o.OrgId, nil } - orgId, err := o.Env.GetOrgId() - if err != nil { - return -1, err + orgId := o.Env.GetOrgId() + if orgId == "" { + return "", errors.New("organization ID not set, use -O or CS_ORG_ID to set it") } - if orgId < 0 { - // Note: No global flag for org-id currently exists in GetRootCmd - return -1, errors.New("organization ID not set, use CS_ORG_ID to set it") + + _, err := uuid.Parse(orgId) + if err != nil { + return "", fmt.Errorf("invalid organization UUID format: %w", err) } + return orgId, nil } @@ -102,6 +106,7 @@ func GetRootCmd() *cobra.Command { rootCmd.PersistentFlags().IntVarP(&opts.TeamId, "team", "t", -1, "Team ID (relevant for some commands, can also be CS_TEAM_ID)") rootCmd.PersistentFlags().IntVarP(&opts.WorkspaceId, "workspace", "w", -1, "Workspace ID (relevant for some commands, can also be CS_WORKSPACE_ID)") rootCmd.PersistentFlags().BoolVarP(&opts.Verbose, "verbose", "v", false, "Verbose output") + rootCmd.PersistentFlags().StringVarP(&opts.OrgId, "org", "O", "", "Organization ID (relevant for some commands)") AddExecCmd(rootCmd, &opts) AddLogCmd(rootCmd, &opts) diff --git a/pkg/cs/env.go b/pkg/cs/env.go index 7d7c35a7..c413ed63 100644 --- a/pkg/cs/env.go +++ b/pkg/cs/env.go @@ -38,8 +38,12 @@ func (e *Environment) GetTeamId() (int, error) { return e.ReadNumericEnv("CS_TEAM_ID") } -func (e *Environment) GetOrgId() (int, error) { - return e.ReadNumericEnv("CS_ORG_ID") +func (e *Environment) GetOrgId() string { + orgId := os.Getenv("CS_ORG_ID") + if orgId != "" { + return orgId + } + return "" } func (e *Environment) ReadNumericEnv(env string) (int, error) { From 6dd80a4fbd986e9576f1775f080ece42bf9e81f5 Mon Sep 17 00:00:00 2001 From: DerBurri <7892993+DerBurri@users.noreply.github.com> Date: Wed, 13 May 2026 12:20:37 +0000 Subject: [PATCH 06/61] chore(docs): Auto-update docs and licenses Signed-off-by: DerBurri <7892993+DerBurri@users.noreply.github.com> Signed-off-by: Maximilian --- NOTICE | 4 ++++ api/organization.go | 3 +++ docs/README.md | 1 + docs/cs.md | 1 + docs/cs_create.md | 1 + docs/cs_create_workspace.md | 1 + docs/cs_curl.md | 1 + docs/cs_delete.md | 1 + docs/cs_delete_workspace.md | 1 + docs/cs_exec.md | 1 + docs/cs_generate.md | 1 + docs/cs_generate_docker.md | 1 + docs/cs_generate_images.md | 1 + docs/cs_generate_kubernetes.md | 1 + docs/cs_git.md | 1 + docs/cs_git_pull.md | 1 + docs/cs_licenses.md | 1 + docs/cs_list.md | 1 + docs/cs_list_baseimages.md | 1 + docs/cs_list_org.md | 1 + docs/cs_list_plans.md | 1 + docs/cs_list_teams.md | 1 + docs/cs_list_workspaces.md | 1 + docs/cs_log.md | 1 + docs/cs_monitor.md | 1 + docs/cs_open.md | 1 + docs/cs_open_workspace.md | 1 + docs/cs_scale.md | 1 + docs/cs_scale_workspace.md | 1 + docs/cs_set-env.md | 1 + docs/cs_start.md | 1 + docs/cs_start_pipeline.md | 1 + docs/cs_sync.md | 1 + docs/cs_sync_landscape.md | 1 + docs/cs_update.md | 1 + docs/cs_version.md | 1 + docs/cs_wake-up.md | 1 + pkg/tmpl/NOTICE | 4 ++++ 38 files changed, 46 insertions(+) diff --git a/NOTICE b/NOTICE index 59f46619..5acaf371 100644 --- a/NOTICE +++ b/NOTICE @@ -164,6 +164,10 @@ Module: github.com/google/jsonschema-go/jsonschema Version: v0.4.3 License: MIT License URL: https://github.com/google/jsonschema-go/blob/v0.4.3/LICENSE +Module: github.com/google/uuid +Version: v1.6.0 +License: BSD-3-Clause +License URL: https://github.com/google/uuid/blob/v1.6.0/LICENSE ---------- Module: github.com/hashicorp/go-cleanhttp diff --git a/api/organization.go b/api/organization.go index 16426f06..5d40b5f9 100644 --- a/api/organization.go +++ b/api/organization.go @@ -1,3 +1,6 @@ +// Copyright (c) Codesphere Inc. +// SPDX-License-Identifier: Apache-2.0 + package api import ( diff --git a/docs/README.md b/docs/README.md index cc5831a2..26c45423 100644 --- a/docs/README.md +++ b/docs/README.md @@ -11,6 +11,7 @@ Manage and debug resources deployed in Codesphere via command line. ``` -a, --api string URL of Codesphere API (can also be CS_API) -h, --help help for cs + -O, --org string Organization ID (relevant for some commands) -t, --team int Team ID (relevant for some commands, can also be CS_TEAM_ID) (default -1) -v, --verbose Verbose output -w, --workspace int Workspace ID (relevant for some commands, can also be CS_WORKSPACE_ID) (default -1) diff --git a/docs/cs.md b/docs/cs.md index cc5831a2..26c45423 100644 --- a/docs/cs.md +++ b/docs/cs.md @@ -11,6 +11,7 @@ Manage and debug resources deployed in Codesphere via command line. ``` -a, --api string URL of Codesphere API (can also be CS_API) -h, --help help for cs + -O, --org string Organization ID (relevant for some commands) -t, --team int Team ID (relevant for some commands, can also be CS_TEAM_ID) (default -1) -v, --verbose Verbose output -w, --workspace int Workspace ID (relevant for some commands, can also be CS_WORKSPACE_ID) (default -1) diff --git a/docs/cs_create.md b/docs/cs_create.md index 38bf3595..8d99eb7d 100644 --- a/docs/cs_create.md +++ b/docs/cs_create.md @@ -16,6 +16,7 @@ Create codesphere resources like workspaces. ``` -a, --api string URL of Codesphere API (can also be CS_API) + -O, --org string Organization ID (relevant for some commands) -t, --team int Team ID (relevant for some commands, can also be CS_TEAM_ID) (default -1) -v, --verbose Verbose output -w, --workspace int Workspace ID (relevant for some commands, can also be CS_WORKSPACE_ID) (default -1) diff --git a/docs/cs_create_workspace.md b/docs/cs_create_workspace.md index d2565267..aa9f89c2 100644 --- a/docs/cs_create_workspace.md +++ b/docs/cs_create_workspace.md @@ -64,6 +64,7 @@ $ cs create workspace my-workspace -r https://github.com/my-org/my-private-proje ``` -a, --api string URL of Codesphere API (can also be CS_API) + -O, --org string Organization ID (relevant for some commands) -t, --team int Team ID (relevant for some commands, can also be CS_TEAM_ID) (default -1) -v, --verbose Verbose output -w, --workspace int Workspace ID (relevant for some commands, can also be CS_WORKSPACE_ID) (default -1) diff --git a/docs/cs_curl.md b/docs/cs_curl.md index 73bd0221..b79302cf 100644 --- a/docs/cs_curl.md +++ b/docs/cs_curl.md @@ -46,6 +46,7 @@ $ cs curl / -- -I ``` -a, --api string URL of Codesphere API (can also be CS_API) + -O, --org string Organization ID (relevant for some commands) -t, --team int Team ID (relevant for some commands, can also be CS_TEAM_ID) (default -1) -v, --verbose Verbose output -w, --workspace int Workspace ID (relevant for some commands, can also be CS_WORKSPACE_ID) (default -1) diff --git a/docs/cs_delete.md b/docs/cs_delete.md index f9770934..de17965f 100644 --- a/docs/cs_delete.md +++ b/docs/cs_delete.md @@ -16,6 +16,7 @@ Delete Codesphere resources, e.g. workspaces. ``` -a, --api string URL of Codesphere API (can also be CS_API) + -O, --org string Organization ID (relevant for some commands) -t, --team int Team ID (relevant for some commands, can also be CS_TEAM_ID) (default -1) -v, --verbose Verbose output -w, --workspace int Workspace ID (relevant for some commands, can also be CS_WORKSPACE_ID) (default -1) diff --git a/docs/cs_delete_workspace.md b/docs/cs_delete_workspace.md index 4f3deeed..f0719f6e 100644 --- a/docs/cs_delete_workspace.md +++ b/docs/cs_delete_workspace.md @@ -23,6 +23,7 @@ cs delete workspace [flags] ``` -a, --api string URL of Codesphere API (can also be CS_API) + -O, --org string Organization ID (relevant for some commands) -t, --team int Team ID (relevant for some commands, can also be CS_TEAM_ID) (default -1) -v, --verbose Verbose output -w, --workspace int Workspace ID (relevant for some commands, can also be CS_WORKSPACE_ID) (default -1) diff --git a/docs/cs_exec.md b/docs/cs_exec.md index 0505840a..47c79916 100644 --- a/docs/cs_exec.md +++ b/docs/cs_exec.md @@ -39,6 +39,7 @@ $ cs exec -e FOO=bar -- 'echo $FOO' ``` -a, --api string URL of Codesphere API (can also be CS_API) + -O, --org string Organization ID (relevant for some commands) -t, --team int Team ID (relevant for some commands, can also be CS_TEAM_ID) (default -1) -v, --verbose Verbose output -w, --workspace int Workspace ID (relevant for some commands, can also be CS_WORKSPACE_ID) (default -1) diff --git a/docs/cs_generate.md b/docs/cs_generate.md index c0528bd0..66a9ef96 100644 --- a/docs/cs_generate.md +++ b/docs/cs_generate.md @@ -23,6 +23,7 @@ on your local machine to run the artifact generation. ``` -a, --api string URL of Codesphere API (can also be CS_API) + -O, --org string Organization ID (relevant for some commands) -t, --team int Team ID (relevant for some commands, can also be CS_TEAM_ID) (default -1) -v, --verbose Verbose output -w, --workspace int Workspace ID (relevant for some commands, can also be CS_WORKSPACE_ID) (default -1) diff --git a/docs/cs_generate_docker.md b/docs/cs_generate_docker.md index 7c0373d6..2355f4fa 100644 --- a/docs/cs_generate_docker.md +++ b/docs/cs_generate_docker.md @@ -51,6 +51,7 @@ $ cs generate docker -w 1234 -i ci.prod.yml --branch string Branch of the repository to clone if the input file is not found (default "main") -f, --force Overwrite any files if existing -i, --input string CI profile to use as input for generation, relative to repository root (default "ci.yml") + -O, --org string Organization ID (relevant for some commands) -o, --output string Output path of the folder including generated artifacts, relative to repository root (default "export") --reporoot string root directory of the workspace repository to export. Will be used to clone the repository if it doesn't exist. (default "./workspace-repo") -t, --team int Team ID (relevant for some commands, can also be CS_TEAM_ID) (default -1) diff --git a/docs/cs_generate_images.md b/docs/cs_generate_images.md index 2897bacb..2d80537a 100644 --- a/docs/cs_generate_images.md +++ b/docs/cs_generate_images.md @@ -38,6 +38,7 @@ $ cs generate images -r yourRegistry -p customImagePrefix --branch string Branch of the repository to clone if the input file is not found (default "main") -f, --force Overwrite any files if existing -i, --input string CI profile to use as input for generation, relative to repository root (default "ci.yml") + -O, --org string Organization ID (relevant for some commands) -o, --output string Output path of the folder including generated artifacts, relative to repository root (default "export") --reporoot string root directory of the workspace repository to export. Will be used to clone the repository if it doesn't exist. (default "./workspace-repo") -t, --team int Team ID (relevant for some commands, can also be CS_TEAM_ID) (default -1) diff --git a/docs/cs_generate_kubernetes.md b/docs/cs_generate_kubernetes.md index b09337d2..73417665 100644 --- a/docs/cs_generate_kubernetes.md +++ b/docs/cs_generate_kubernetes.md @@ -57,6 +57,7 @@ $ cs generate kubernetes -w 1234 -i ci.prod.yml --branch string Branch of the repository to clone if the input file is not found (default "main") -f, --force Overwrite any files if existing -i, --input string CI profile to use as input for generation, relative to repository root (default "ci.yml") + -O, --org string Organization ID (relevant for some commands) -o, --output string Output path of the folder including generated artifacts, relative to repository root (default "export") --reporoot string root directory of the workspace repository to export. Will be used to clone the repository if it doesn't exist. (default "./workspace-repo") -t, --team int Team ID (relevant for some commands, can also be CS_TEAM_ID) (default -1) diff --git a/docs/cs_git.md b/docs/cs_git.md index 57232110..d6c86e98 100644 --- a/docs/cs_git.md +++ b/docs/cs_git.md @@ -19,6 +19,7 @@ like pulling or switching to a specific branch. ``` -a, --api string URL of Codesphere API (can also be CS_API) + -O, --org string Organization ID (relevant for some commands) -t, --team int Team ID (relevant for some commands, can also be CS_TEAM_ID) (default -1) -v, --verbose Verbose output -w, --workspace int Workspace ID (relevant for some commands, can also be CS_WORKSPACE_ID) (default -1) diff --git a/docs/cs_git_pull.md b/docs/cs_git_pull.md index e72c9035..d4090080 100644 --- a/docs/cs_git_pull.md +++ b/docs/cs_git_pull.md @@ -34,6 +34,7 @@ $ cs git pull --remote origin --branch staging ``` -a, --api string URL of Codesphere API (can also be CS_API) + -O, --org string Organization ID (relevant for some commands) -t, --team int Team ID (relevant for some commands, can also be CS_TEAM_ID) (default -1) -v, --verbose Verbose output -w, --workspace int Workspace ID (relevant for some commands, can also be CS_WORKSPACE_ID) (default -1) diff --git a/docs/cs_licenses.md b/docs/cs_licenses.md index e08a52cf..5fb0665b 100644 --- a/docs/cs_licenses.md +++ b/docs/cs_licenses.md @@ -20,6 +20,7 @@ cs licenses [flags] ``` -a, --api string URL of Codesphere API (can also be CS_API) + -O, --org string Organization ID (relevant for some commands) -t, --team int Team ID (relevant for some commands, can also be CS_TEAM_ID) (default -1) -v, --verbose Verbose output -w, --workspace int Workspace ID (relevant for some commands, can also be CS_WORKSPACE_ID) (default -1) diff --git a/docs/cs_list.md b/docs/cs_list.md index 26c1fbae..a03116bb 100644 --- a/docs/cs_list.md +++ b/docs/cs_list.md @@ -24,6 +24,7 @@ $ cs list workspaces ``` -a, --api string URL of Codesphere API (can also be CS_API) + -O, --org string Organization ID (relevant for some commands) -t, --team int Team ID (relevant for some commands, can also be CS_TEAM_ID) (default -1) -v, --verbose Verbose output -w, --workspace int Workspace ID (relevant for some commands, can also be CS_WORKSPACE_ID) (default -1) diff --git a/docs/cs_list_baseimages.md b/docs/cs_list_baseimages.md index 481c1923..fb09f359 100644 --- a/docs/cs_list_baseimages.md +++ b/docs/cs_list_baseimages.md @@ -27,6 +27,7 @@ $ cs list baseimages ``` -a, --api string URL of Codesphere API (can also be CS_API) + -O, --org string Organization ID (relevant for some commands) -o, --output string Output format (table, json, yaml) (default "table") -t, --team int Team ID (relevant for some commands, can also be CS_TEAM_ID) (default -1) -v, --verbose Verbose output diff --git a/docs/cs_list_org.md b/docs/cs_list_org.md index 8e0faf88..5aff0836 100644 --- a/docs/cs_list_org.md +++ b/docs/cs_list_org.md @@ -27,6 +27,7 @@ $ cs list org ``` -a, --api string URL of Codesphere API (can also be CS_API) + -O, --org string Organization ID (relevant for some commands) -o, --output string Output format (table, json, yaml) (default "table") -t, --team int Team ID (relevant for some commands, can also be CS_TEAM_ID) (default -1) -v, --verbose Verbose output diff --git a/docs/cs_list_plans.md b/docs/cs_list_plans.md index ae417914..0d6531f1 100644 --- a/docs/cs_list_plans.md +++ b/docs/cs_list_plans.md @@ -22,6 +22,7 @@ cs list plans [flags] ``` -a, --api string URL of Codesphere API (can also be CS_API) + -O, --org string Organization ID (relevant for some commands) -o, --output string Output format (table, json, yaml) (default "table") -t, --team int Team ID (relevant for some commands, can also be CS_TEAM_ID) (default -1) -v, --verbose Verbose output diff --git a/docs/cs_list_teams.md b/docs/cs_list_teams.md index 22a716fc..183f4da6 100644 --- a/docs/cs_list_teams.md +++ b/docs/cs_list_teams.md @@ -27,6 +27,7 @@ $ cs list teams ``` -a, --api string URL of Codesphere API (can also be CS_API) + -O, --org string Organization ID (relevant for some commands) -o, --output string Output format (table, json, yaml) (default "table") -t, --team int Team ID (relevant for some commands, can also be CS_TEAM_ID) (default -1) -v, --verbose Verbose output diff --git a/docs/cs_list_workspaces.md b/docs/cs_list_workspaces.md index 27ac0e64..37400bde 100644 --- a/docs/cs_list_workspaces.md +++ b/docs/cs_list_workspaces.md @@ -27,6 +27,7 @@ $ cs list workspaces -t ``` -a, --api string URL of Codesphere API (can also be CS_API) + -O, --org string Organization ID (relevant for some commands) -o, --output string Output format (table, json, yaml) (default "table") -t, --team int Team ID (relevant for some commands, can also be CS_TEAM_ID) (default -1) -v, --verbose Verbose output diff --git a/docs/cs_log.md b/docs/cs_log.md index 723a0f9d..aee74d46 100644 --- a/docs/cs_log.md +++ b/docs/cs_log.md @@ -43,6 +43,7 @@ $ cs log -w 637128 -r workspace-213d7a8c-48b4-42e2-8f70-c905ab04abb5-58d657cdc5- ``` -a, --api string URL of Codesphere API (can also be CS_API) + -O, --org string Organization ID (relevant for some commands) -t, --team int Team ID (relevant for some commands, can also be CS_TEAM_ID) (default -1) -v, --verbose Verbose output -w, --workspace int Workspace ID (relevant for some commands, can also be CS_WORKSPACE_ID) (default -1) diff --git a/docs/cs_monitor.md b/docs/cs_monitor.md index 7eb96e1f..20cde957 100644 --- a/docs/cs_monitor.md +++ b/docs/cs_monitor.md @@ -54,6 +54,7 @@ $ cs monitor --forward --ca-cert-file ca.crt -- ./my-app --healthcheck https://l ``` -a, --api string URL of Codesphere API (can also be CS_API) + -O, --org string Organization ID (relevant for some commands) -t, --team int Team ID (relevant for some commands, can also be CS_TEAM_ID) (default -1) -v, --verbose Verbose output -w, --workspace int Workspace ID (relevant for some commands, can also be CS_WORKSPACE_ID) (default -1) diff --git a/docs/cs_open.md b/docs/cs_open.md index 5eb75540..71ff57d1 100644 --- a/docs/cs_open.md +++ b/docs/cs_open.md @@ -20,6 +20,7 @@ cs open [flags] ``` -a, --api string URL of Codesphere API (can also be CS_API) + -O, --org string Organization ID (relevant for some commands) -t, --team int Team ID (relevant for some commands, can also be CS_TEAM_ID) (default -1) -v, --verbose Verbose output -w, --workspace int Workspace ID (relevant for some commands, can also be CS_WORKSPACE_ID) (default -1) diff --git a/docs/cs_open_workspace.md b/docs/cs_open_workspace.md index d870d33d..f497fe95 100644 --- a/docs/cs_open_workspace.md +++ b/docs/cs_open_workspace.md @@ -30,6 +30,7 @@ $ cs open workspace ``` -a, --api string URL of Codesphere API (can also be CS_API) + -O, --org string Organization ID (relevant for some commands) -t, --team int Team ID (relevant for some commands, can also be CS_TEAM_ID) (default -1) -v, --verbose Verbose output -w, --workspace int Workspace ID (relevant for some commands, can also be CS_WORKSPACE_ID) (default -1) diff --git a/docs/cs_scale.md b/docs/cs_scale.md index 115570ea..4c9f6ed3 100644 --- a/docs/cs_scale.md +++ b/docs/cs_scale.md @@ -16,6 +16,7 @@ Scale Codesphere resources, like landscape services of a workspace. ``` -a, --api string URL of Codesphere API (can also be CS_API) + -O, --org string Organization ID (relevant for some commands) -t, --team int Team ID (relevant for some commands, can also be CS_TEAM_ID) (default -1) -v, --verbose Verbose output -w, --workspace int Workspace ID (relevant for some commands, can also be CS_WORKSPACE_ID) (default -1) diff --git a/docs/cs_scale_workspace.md b/docs/cs_scale_workspace.md index 6e464edc..bc7cc349 100644 --- a/docs/cs_scale_workspace.md +++ b/docs/cs_scale_workspace.md @@ -34,6 +34,7 @@ $ cs scale workspace --service api=0 ``` -a, --api string URL of Codesphere API (can also be CS_API) + -O, --org string Organization ID (relevant for some commands) -t, --team int Team ID (relevant for some commands, can also be CS_TEAM_ID) (default -1) -v, --verbose Verbose output -w, --workspace int Workspace ID (relevant for some commands, can also be CS_WORKSPACE_ID) (default -1) diff --git a/docs/cs_set-env.md b/docs/cs_set-env.md index f8ee408b..82d53467 100644 --- a/docs/cs_set-env.md +++ b/docs/cs_set-env.md @@ -31,6 +31,7 @@ $ cs set-env --workspace --env-var foo=bar --env-var hello=world ``` -a, --api string URL of Codesphere API (can also be CS_API) + -O, --org string Organization ID (relevant for some commands) -t, --team int Team ID (relevant for some commands, can also be CS_TEAM_ID) (default -1) -v, --verbose Verbose output -w, --workspace int Workspace ID (relevant for some commands, can also be CS_WORKSPACE_ID) (default -1) diff --git a/docs/cs_start.md b/docs/cs_start.md index e1c88e37..925556a0 100644 --- a/docs/cs_start.md +++ b/docs/cs_start.md @@ -16,6 +16,7 @@ Start pipeline of a workspace using the pipeline subcommand ``` -a, --api string URL of Codesphere API (can also be CS_API) + -O, --org string Organization ID (relevant for some commands) -t, --team int Team ID (relevant for some commands, can also be CS_TEAM_ID) (default -1) -v, --verbose Verbose output -w, --workspace int Workspace ID (relevant for some commands, can also be CS_WORKSPACE_ID) (default -1) diff --git a/docs/cs_start_pipeline.md b/docs/cs_start_pipeline.md index 454f620e..56651a5c 100644 --- a/docs/cs_start_pipeline.md +++ b/docs/cs_start_pipeline.md @@ -52,6 +52,7 @@ $ cs start pipeline -t 5m prepare ``` -a, --api string URL of Codesphere API (can also be CS_API) + -O, --org string Organization ID (relevant for some commands) -t, --team int Team ID (relevant for some commands, can also be CS_TEAM_ID) (default -1) -v, --verbose Verbose output -w, --workspace int Workspace ID (relevant for some commands, can also be CS_WORKSPACE_ID) (default -1) diff --git a/docs/cs_sync.md b/docs/cs_sync.md index 87745fb1..94161123 100644 --- a/docs/cs_sync.md +++ b/docs/cs_sync.md @@ -16,6 +16,7 @@ Synchronize Codesphere resources, like infrastructure required to run services. ``` -a, --api string URL of Codesphere API (can also be CS_API) + -O, --org string Organization ID (relevant for some commands) -t, --team int Team ID (relevant for some commands, can also be CS_TEAM_ID) (default -1) -v, --verbose Verbose output -w, --workspace int Workspace ID (relevant for some commands, can also be CS_WORKSPACE_ID) (default -1) diff --git a/docs/cs_sync_landscape.md b/docs/cs_sync_landscape.md index 6875dd00..c48e6c5c 100644 --- a/docs/cs_sync_landscape.md +++ b/docs/cs_sync_landscape.md @@ -21,6 +21,7 @@ cs sync landscape [flags] ``` -a, --api string URL of Codesphere API (can also be CS_API) + -O, --org string Organization ID (relevant for some commands) -t, --team int Team ID (relevant for some commands, can also be CS_TEAM_ID) (default -1) -v, --verbose Verbose output -w, --workspace int Workspace ID (relevant for some commands, can also be CS_WORKSPACE_ID) (default -1) diff --git a/docs/cs_update.md b/docs/cs_update.md index 73ce7946..ba62d1b9 100644 --- a/docs/cs_update.md +++ b/docs/cs_update.md @@ -20,6 +20,7 @@ cs update [flags] ``` -a, --api string URL of Codesphere API (can also be CS_API) + -O, --org string Organization ID (relevant for some commands) -t, --team int Team ID (relevant for some commands, can also be CS_TEAM_ID) (default -1) -v, --verbose Verbose output -w, --workspace int Workspace ID (relevant for some commands, can also be CS_WORKSPACE_ID) (default -1) diff --git a/docs/cs_version.md b/docs/cs_version.md index c54be562..5a4a39f3 100644 --- a/docs/cs_version.md +++ b/docs/cs_version.md @@ -20,6 +20,7 @@ cs version [flags] ``` -a, --api string URL of Codesphere API (can also be CS_API) + -O, --org string Organization ID (relevant for some commands) -t, --team int Team ID (relevant for some commands, can also be CS_TEAM_ID) (default -1) -v, --verbose Verbose output -w, --workspace int Workspace ID (relevant for some commands, can also be CS_WORKSPACE_ID) (default -1) diff --git a/docs/cs_wake-up.md b/docs/cs_wake-up.md index 05d0ea0e..275e3f02 100644 --- a/docs/cs_wake-up.md +++ b/docs/cs_wake-up.md @@ -42,6 +42,7 @@ $ cs wake-up -w 1234 --sync-landscape --profile prod ``` -a, --api string URL of Codesphere API (can also be CS_API) + -O, --org string Organization ID (relevant for some commands) -t, --team int Team ID (relevant for some commands, can also be CS_TEAM_ID) (default -1) -v, --verbose Verbose output -w, --workspace int Workspace ID (relevant for some commands, can also be CS_WORKSPACE_ID) (default -1) diff --git a/pkg/tmpl/NOTICE b/pkg/tmpl/NOTICE index 59f46619..5acaf371 100644 --- a/pkg/tmpl/NOTICE +++ b/pkg/tmpl/NOTICE @@ -164,6 +164,10 @@ Module: github.com/google/jsonschema-go/jsonschema Version: v0.4.3 License: MIT License URL: https://github.com/google/jsonschema-go/blob/v0.4.3/LICENSE +Module: github.com/google/uuid +Version: v1.6.0 +License: BSD-3-Clause +License URL: https://github.com/google/uuid/blob/v1.6.0/LICENSE ---------- Module: github.com/hashicorp/go-cleanhttp From dc58d0aeb8978b6edee45e5780536486e595b391 Mon Sep 17 00:00:00 2001 From: Maximilian Date: Wed, 13 May 2026 22:01:32 +0200 Subject: [PATCH 07/61] feat(cli): added team add and delete opton with org context Signed-off-by: Maximilian --- api/team.go | 11 +-- api/types.go | 4 +- cli/cmd/client.go | 2 + cli/cmd/mocks.go | 131 ++++++++++++++++++++++++++++++++++ cli/cmd/root.go | 5 +- cli/cmd/team.go | 37 ++++++++++ cli/cmd/team_add_member.go | 29 ++++++++ cli/cmd/team_create.go | 59 +++++++++++++++ cli/cmd/team_remove.go | 57 +++++++++++++++ cli/cmd/team_remove_member.go | 30 ++++++++ 10 files changed, 356 insertions(+), 9 deletions(-) create mode 100644 cli/cmd/team.go create mode 100644 cli/cmd/team_add_member.go create mode 100644 cli/cmd/team_create.go create mode 100644 cli/cmd/team_remove.go create mode 100644 cli/cmd/team_remove_member.go diff --git a/api/team.go b/api/team.go index 0456d1aa..eab81cc7 100644 --- a/api/team.go +++ b/api/team.go @@ -48,7 +48,7 @@ func (c *Client) ListTeams(orgId string) ([]Team, error) { res := make([]Team, len(teams)) for i, t := range teams { - res[i] = ConvertOrgTeamToTeam(t, orgId) + res[i] = *ConvertOrgTeamToTeam(t, orgId) } return res, nil } @@ -62,17 +62,18 @@ func (c *Client) GetTeam(teamId int) (*Team, error) { return ConvertToTeam(team), cserrors.FormatAPIError(r, err) } -func (c *Client) CreateTeam(name string, dc int) (*Team, error) { +func (c *Client) CreateTeam(orgId string, name string, dc int) (*Team, error) { team, r, err := c.api.TeamsAPI.TeamsCreateTeam(c.ctx). TeamsCreateTeamRequest(openapi_client.TeamsCreateTeamRequest{ - Name: name, - Dc: dc, + Name: name, + Dc: dc, + OrganizationId: &orgId, }). Execute() return ConvertToTeam(team), cserrors.FormatAPIError(r, err) } -func (c *Client) DeleteTeam(teamId int) error { +func (c *Client) DeleteTeam(orgId string, teamId int) error { r, err := c.api.TeamsAPI.TeamsDeleteTeam(c.ctx, float32(teamId)).Execute() return cserrors.FormatAPIError(r, err) } diff --git a/api/types.go b/api/types.go index 3b425b9d..b6be6d7b 100644 --- a/api/types.go +++ b/api/types.go @@ -39,8 +39,8 @@ func ConvertToTeam(t *openapi.TeamsGetTeam200Response) *Team { } } -func ConvertOrgTeamToTeam(t openapi.OrganizationsListOrgTeams200ResponseInner, orgId string) Team { - return Team{ +func ConvertOrgTeamToTeam(t openapi.OrganizationsListOrgTeams200ResponseInner, orgId string) *Team { + return &Team{ Id: t.Id, DefaultDataCenterId: t.DefaultDataCenterId, Name: t.Name, diff --git a/cli/cmd/client.go b/cli/cmd/client.go index 472b868a..116b1487 100644 --- a/cli/cmd/client.go +++ b/cli/cmd/client.go @@ -34,6 +34,8 @@ type Client interface { GetPipelineState(wsId int, stage string) ([]api.PipelineStatus, error) GitPull(wsId int, remote string, branch string) error DeployLandscape(wsId int, profile string) error + CreateTeam(orgId string, name string, dcId int) (*api.Team, error) + DeleteTeam(orgId string, teamId int) error } // CommandExecutor abstracts command execution for testing diff --git a/cli/cmd/mocks.go b/cli/cmd/mocks.go index 4bd7c2dd..35e76436 100644 --- a/cli/cmd/mocks.go +++ b/cli/cmd/mocks.go @@ -39,6 +39,137 @@ func (_m *MockClient) EXPECT() *MockClient_Expecter { return &MockClient_Expecter{mock: &_m.Mock} } +// CreateTeam provides a mock function for the type MockClient +func (_mock *MockClient) CreateTeam(orgId string, name string, dcId int) (*api.Team, error) { + ret := _mock.Called(orgId, name, dcId) + + if len(ret) == 0 { + panic("no return value specified for CreateTeam") + } + + var r0 *api.Team + var r1 error + if returnFunc, ok := ret.Get(0).(func(string, string, int) (*api.Team, error)); ok { + return returnFunc(orgId, name, dcId) + } + if returnFunc, ok := ret.Get(0).(func(string, string, int) *api.Team); ok { + r0 = returnFunc(orgId, name, dcId) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*api.Team) + } + } + if returnFunc, ok := ret.Get(1).(func(string, string, int) error); ok { + r1 = returnFunc(orgId, name, dcId) + } else { + r1 = ret.Error(1) + } + return r0, r1 +} + +// MockClient_CreateTeam_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'CreateTeam' +type MockClient_CreateTeam_Call struct { + *mock.Call +} + +// CreateTeam is a helper method to define mock.On call +// - orgId string +// - name string +// - dcId int +func (_e *MockClient_Expecter) CreateTeam(orgId interface{}, name interface{}, dcId interface{}) *MockClient_CreateTeam_Call { + return &MockClient_CreateTeam_Call{Call: _e.mock.On("CreateTeam", orgId, name, dcId)} +} + +func (_c *MockClient_CreateTeam_Call) Run(run func(orgId string, name string, dcId int)) *MockClient_CreateTeam_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 string + if args[0] != nil { + arg0 = args[0].(string) + } + var arg1 string + if args[1] != nil { + arg1 = args[1].(string) + } + var arg2 int + if args[2] != nil { + arg2 = args[2].(int) + } + run( + arg0, + arg1, + arg2, + ) + }) + return _c +} + +func (_c *MockClient_CreateTeam_Call) Return(v *api.Team, err error) *MockClient_CreateTeam_Call { + _c.Call.Return(v, err) + return _c +} + +func (_c *MockClient_CreateTeam_Call) RunAndReturn(run func(orgId string, name string, dcId int) (*api.Team, error)) *MockClient_CreateTeam_Call { + _c.Call.Return(run) + return _c +} + +// DeleteTeam provides a mock function for the type MockClient +func (_mock *MockClient) DeleteTeam(orgId string, teamId int) error { + ret := _mock.Called(orgId, teamId) + + if len(ret) == 0 { + panic("no return value specified for DeleteTeam") + } + + var r0 error + if returnFunc, ok := ret.Get(0).(func(string, int) error); ok { + r0 = returnFunc(orgId, teamId) + } else { + r0 = ret.Error(0) + } + return r0 +} + +// MockClient_DeleteTeam_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'DeleteTeam' +type MockClient_DeleteTeam_Call struct { + *mock.Call +} + +// DeleteTeam is a helper method to define mock.On call +// - orgId string +// - teamId int +func (_e *MockClient_Expecter) DeleteTeam(orgId interface{}, teamId interface{}) *MockClient_DeleteTeam_Call { + return &MockClient_DeleteTeam_Call{Call: _e.mock.On("DeleteTeam", orgId, teamId)} +} + +func (_c *MockClient_DeleteTeam_Call) Run(run func(orgId string, teamId int)) *MockClient_DeleteTeam_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 string + if args[0] != nil { + arg0 = args[0].(string) + } + var arg1 int + if args[1] != nil { + arg1 = args[1].(int) + } + run( + arg0, + arg1, + ) + }) + return _c +} + +func (_c *MockClient_DeleteTeam_Call) Return(err error) *MockClient_DeleteTeam_Call { + _c.Call.Return(err) + return _c +} + +func (_c *MockClient_DeleteTeam_Call) RunAndReturn(run func(orgId string, teamId int) error) *MockClient_DeleteTeam_Call { + _c.Call.Return(run) + return _c +} + // DeleteWorkspace provides a mock function for the type MockClient func (_mock *MockClient) DeleteWorkspace(wsId int) error { ret := _mock.Called(wsId) diff --git a/cli/cmd/root.go b/cli/cmd/root.go index 8b6e2f9e..dfcc62cf 100644 --- a/cli/cmd/root.go +++ b/cli/cmd/root.go @@ -70,8 +70,8 @@ func (o GlobalOptions) GetOrgId() (string, error) { return o.OrgId, nil } orgId := o.Env.GetOrgId() - if orgId == "" { - return "", errors.New("organization ID not set, use -O or CS_ORG_ID to set it") + if o.OrgId == "" { + return o.OrgId, nil } _, err := uuid.Parse(orgId) @@ -129,6 +129,7 @@ func GetRootCmd() *cobra.Command { AddScaleCmd(rootCmd, &opts) AddMcpCmd(rootCmd) + AddTeamManageCmd(rootCmd, &opts) return rootCmd } diff --git a/cli/cmd/team.go b/cli/cmd/team.go new file mode 100644 index 00000000..822a53b6 --- /dev/null +++ b/cli/cmd/team.go @@ -0,0 +1,37 @@ +package cmd + +import ( + "github.com/spf13/cobra" +) + +type TeamManageCmd struct { + cmd *cobra.Command +} + +func AddTeamManageCmd(rootCmd *cobra.Command, opts *GlobalOptions) { + t := TeamManageCmd{ + cmd: &cobra.Command{ + Use: "team", + Short: "Manage Team", + Long: `Manage Team Resources like Members or Roles in Teams`, + }, + } + + AddCmd(rootCmd, t.cmd) + AddMemberCmd(t.cmd, opts) + AddCreateTeamCmd(t.cmd, opts) + AddRemoveTeamCmd(t.cmd, opts) +} + +func AddMemberCmd(t *cobra.Command, opts *GlobalOptions) { + + memberCmd := &cobra.Command{ + Use: "member", + Short: "Manage team members", + } + + AddAddTeamMemberCmd(memberCmd, opts) + AddRemoveTeamMemberCmd(memberCmd, opts) + + t.AddCommand(memberCmd) +} diff --git a/cli/cmd/team_add_member.go b/cli/cmd/team_add_member.go new file mode 100644 index 00000000..82f5b776 --- /dev/null +++ b/cli/cmd/team_add_member.go @@ -0,0 +1,29 @@ +package cmd + +import ( + "github.com/spf13/cobra" +) + +type AddTeamMemberCmd struct { + cmd *cobra.Command + Opts CreateWorkspaceOpts +} + +func AddAddTeamMemberCmd(team *cobra.Command, opts *GlobalOptions) { + t := AddTeamMemberCmd{ + cmd: &cobra.Command{ + Use: "add", + Short: "Add team member", + Long: `Add team member to a team`, + }, + Opts: CreateWorkspaceOpts{ + GlobalOptions: opts, + }, + } + t.cmd.RunE = t.RunE + AddCmd(team, t.cmd) +} + +func (c *AddTeamMemberCmd) RunE(_ *cobra.Command, args []string) error { + return nil +} diff --git a/cli/cmd/team_create.go b/cli/cmd/team_create.go new file mode 100644 index 00000000..d7b07f33 --- /dev/null +++ b/cli/cmd/team_create.go @@ -0,0 +1,59 @@ +package cmd + +import ( + "errors" + "fmt" + "github.com/spf13/cobra" +) + +type CreateTeamCmd struct { + cmd *cobra.Command + Opts CreateTeamOpts +} + +type CreateTeamOpts struct { + *GlobalOptions + name string + dcId int + orgId string +} + +func AddCreateTeamCmd(team *cobra.Command, opts *GlobalOptions) { + t := CreateTeamCmd{ + cmd: &cobra.Command{ + Use: "create", + Short: "Create team", + Long: `Create a team in Codesphere or an Organization`, + }, + Opts: CreateTeamOpts{ + GlobalOptions: opts, + }, + } + t.cmd.RunE = t.RunE + t.cmd.Flags().StringVarP(&t.Opts.name, "name", "n", "", "Team name") + t.cmd.Flags().IntVarP(&t.Opts.dcId, "dc-id", "d", 0, "Data center ID") + AddCmd(team, t.cmd) +} + +func (c *CreateTeamCmd) RunE(_ *cobra.Command, args []string) error { + client, err := NewClient(*c.Opts.GlobalOptions) + if err != nil { + return fmt.Errorf("failed to create Codesphere client: %w", err) + } + + orgId, err := c.Opts.GetOrgId() + if err != nil { + return errors.New("organization ID not set, use -O or CS_ORG_ID to set it") + } + + teamName := c.Opts.name + dcId := c.Opts.dcId + + createdTeam, err := client.CreateTeam(orgId, teamName, dcId) + if err != nil { + return fmt.Errorf("failed to create team: %w", err) + } + + fmt.Printf("Team created: %+v in Organization: %+v\n", createdTeam.Id, orgId) + return nil +} diff --git a/cli/cmd/team_remove.go b/cli/cmd/team_remove.go new file mode 100644 index 00000000..3a69e2ba --- /dev/null +++ b/cli/cmd/team_remove.go @@ -0,0 +1,57 @@ +package cmd + +import ( + "errors" + "github.com/spf13/cobra" +) + +type RemoveTeamCmd struct { + cmd *cobra.Command + Opts RemoveTeamOpts +} + +type RemoveTeamOpts struct { + *GlobalOptions + name string +} + +func AddRemoveTeamCmd(team *cobra.Command, opts *GlobalOptions) { + t := RemoveTeamCmd{ + cmd: &cobra.Command{ + Use: "remove", + Short: "Remove team", + Long: `Remove a team from Codesphere or an Organization`, + }, + Opts: RemoveTeamOpts{ + GlobalOptions: opts, + }, + } + t.cmd.RunE = t.RunE + t.cmd.Flags().StringVarP(&t.Opts.name, "name", "n", "", "Team name") + + AddCmd(team, t.cmd) +} + +func (c *RemoveTeamCmd) RunE(_ *cobra.Command, args []string) error { + // TODO: Implement team removal logic + client, err := NewClient(*c.Opts.GlobalOptions) + if err != nil { + return err + } + + orgId, err := c.Opts.GetOrgId() + if err != nil { + return err + } + + teamId, err := c.Opts.GetTeamId() + if err != nil { + return errors.New("team ID not set, use -T or CS_TEAM_ID to set it") + } + + // + + client.DeleteTeam(orgId, teamId) + return nil + +} diff --git a/cli/cmd/team_remove_member.go b/cli/cmd/team_remove_member.go new file mode 100644 index 00000000..34232db4 --- /dev/null +++ b/cli/cmd/team_remove_member.go @@ -0,0 +1,30 @@ +package cmd + +import ( + "github.com/spf13/cobra" +) + +type RemoveTeamMemberCmd struct { + cmd *cobra.Command + Opts CreateWorkspaceOpts +} + +func AddRemoveTeamMemberCmd(team *cobra.Command, opts *GlobalOptions) { + res := RemoveTeamMemberCmd{ + cmd: &cobra.Command{ + Use: "remove", + Short: "Remove team member", + Long: `Remove team member from a team`, + }, + Opts: CreateWorkspaceOpts{ + GlobalOptions: opts, + }, + } + res.cmd.RunE = res.RunE + AddCmd(team, res.cmd) +} + +func (c *RemoveTeamMemberCmd) RunE(_ *cobra.Command, args []string) error { + // TODO: Implement team member removal logic + return nil +} From 75be88360b717964db7ea389bec2f8bbe3a2831a Mon Sep 17 00:00:00 2001 From: DerBurri <7892993+DerBurri@users.noreply.github.com> Date: Wed, 13 May 2026 20:03:52 +0000 Subject: [PATCH 08/61] chore(docs): Auto-update docs and licenses Signed-off-by: DerBurri <7892993+DerBurri@users.noreply.github.com> Signed-off-by: Maximilian --- cli/cmd/team.go | 3 +++ cli/cmd/team_add_member.go | 3 +++ cli/cmd/team_create.go | 3 +++ cli/cmd/team_remove.go | 3 +++ cli/cmd/team_remove_member.go | 3 +++ docs/README.md | 1 + docs/cs.md | 1 + docs/cs_team.md | 31 +++++++++++++++++++++++++++++++ docs/cs_team_create.md | 34 ++++++++++++++++++++++++++++++++++ docs/cs_team_member.md | 26 ++++++++++++++++++++++++++ docs/cs_team_member_add.md | 32 ++++++++++++++++++++++++++++++++ docs/cs_team_member_remove.md | 32 ++++++++++++++++++++++++++++++++ docs/cs_team_remove.md | 33 +++++++++++++++++++++++++++++++++ 13 files changed, 205 insertions(+) create mode 100644 docs/cs_team.md create mode 100644 docs/cs_team_create.md create mode 100644 docs/cs_team_member.md create mode 100644 docs/cs_team_member_add.md create mode 100644 docs/cs_team_member_remove.md create mode 100644 docs/cs_team_remove.md diff --git a/cli/cmd/team.go b/cli/cmd/team.go index 822a53b6..d6d0c951 100644 --- a/cli/cmd/team.go +++ b/cli/cmd/team.go @@ -1,3 +1,6 @@ +// Copyright (c) Codesphere Inc. +// SPDX-License-Identifier: Apache-2.0 + package cmd import ( diff --git a/cli/cmd/team_add_member.go b/cli/cmd/team_add_member.go index 82f5b776..9dd56d0b 100644 --- a/cli/cmd/team_add_member.go +++ b/cli/cmd/team_add_member.go @@ -1,3 +1,6 @@ +// Copyright (c) Codesphere Inc. +// SPDX-License-Identifier: Apache-2.0 + package cmd import ( diff --git a/cli/cmd/team_create.go b/cli/cmd/team_create.go index d7b07f33..ae4178f5 100644 --- a/cli/cmd/team_create.go +++ b/cli/cmd/team_create.go @@ -1,3 +1,6 @@ +// Copyright (c) Codesphere Inc. +// SPDX-License-Identifier: Apache-2.0 + package cmd import ( diff --git a/cli/cmd/team_remove.go b/cli/cmd/team_remove.go index 3a69e2ba..4f10716b 100644 --- a/cli/cmd/team_remove.go +++ b/cli/cmd/team_remove.go @@ -1,3 +1,6 @@ +// Copyright (c) Codesphere Inc. +// SPDX-License-Identifier: Apache-2.0 + package cmd import ( diff --git a/cli/cmd/team_remove_member.go b/cli/cmd/team_remove_member.go index 34232db4..fe9202ae 100644 --- a/cli/cmd/team_remove_member.go +++ b/cli/cmd/team_remove_member.go @@ -1,3 +1,6 @@ +// Copyright (c) Codesphere Inc. +// SPDX-License-Identifier: Apache-2.0 + package cmd import ( diff --git a/docs/README.md b/docs/README.md index 26c45423..16c6426b 100644 --- a/docs/README.md +++ b/docs/README.md @@ -35,6 +35,7 @@ Manage and debug resources deployed in Codesphere via command line. * [cs set-env](cs_set-env.md) - Set environment variables * [cs start](cs_start.md) - Start workspace pipeline * [cs sync](cs_sync.md) - Sync Codesphere resources +* [cs team](cs_team.md) - Manage Team * [cs update](cs_update.md) - Update Codesphere CLI * [cs version](cs_version.md) - Print version * [cs wake-up](cs_wake-up.md) - Wake up an on-demand workspace diff --git a/docs/cs.md b/docs/cs.md index 26c45423..16c6426b 100644 --- a/docs/cs.md +++ b/docs/cs.md @@ -35,6 +35,7 @@ Manage and debug resources deployed in Codesphere via command line. * [cs set-env](cs_set-env.md) - Set environment variables * [cs start](cs_start.md) - Start workspace pipeline * [cs sync](cs_sync.md) - Sync Codesphere resources +* [cs team](cs_team.md) - Manage Team * [cs update](cs_update.md) - Update Codesphere CLI * [cs version](cs_version.md) - Print version * [cs wake-up](cs_wake-up.md) - Wake up an on-demand workspace diff --git a/docs/cs_team.md b/docs/cs_team.md new file mode 100644 index 00000000..a4bfa1ac --- /dev/null +++ b/docs/cs_team.md @@ -0,0 +1,31 @@ +## cs team + +Manage Team + +### Synopsis + +Manage Team Resources like Members or Roles in Teams + +### Options + +``` + -h, --help help for team +``` + +### Options inherited from parent commands + +``` + -a, --api string URL of Codesphere API (can also be CS_API) + -O, --org string Organization ID (relevant for some commands) + -t, --team int Team ID (relevant for some commands, can also be CS_TEAM_ID) (default -1) + -v, --verbose Verbose output + -w, --workspace int Workspace ID (relevant for some commands, can also be CS_WORKSPACE_ID) (default -1) +``` + +### SEE ALSO + +* [cs](cs.md) - The Codesphere CLI +* [cs team create](cs_team_create.md) - Create team +* [cs team member](cs_team_member.md) - Manage team members +* [cs team remove](cs_team_remove.md) - Remove team + diff --git a/docs/cs_team_create.md b/docs/cs_team_create.md new file mode 100644 index 00000000..9d36906d --- /dev/null +++ b/docs/cs_team_create.md @@ -0,0 +1,34 @@ +## cs team create + +Create team + +### Synopsis + +Create a team in Codesphere or an Organization + +``` +cs team create [flags] +``` + +### Options + +``` + -d, --dc-id int Data center ID + -h, --help help for create + -n, --name string Team name +``` + +### Options inherited from parent commands + +``` + -a, --api string URL of Codesphere API (can also be CS_API) + -O, --org string Organization ID (relevant for some commands) + -t, --team int Team ID (relevant for some commands, can also be CS_TEAM_ID) (default -1) + -v, --verbose Verbose output + -w, --workspace int Workspace ID (relevant for some commands, can also be CS_WORKSPACE_ID) (default -1) +``` + +### SEE ALSO + +* [cs team](cs_team.md) - Manage Team + diff --git a/docs/cs_team_member.md b/docs/cs_team_member.md new file mode 100644 index 00000000..a5960a22 --- /dev/null +++ b/docs/cs_team_member.md @@ -0,0 +1,26 @@ +## cs team member + +Manage team members + +### Options + +``` + -h, --help help for member +``` + +### Options inherited from parent commands + +``` + -a, --api string URL of Codesphere API (can also be CS_API) + -O, --org string Organization ID (relevant for some commands) + -t, --team int Team ID (relevant for some commands, can also be CS_TEAM_ID) (default -1) + -v, --verbose Verbose output + -w, --workspace int Workspace ID (relevant for some commands, can also be CS_WORKSPACE_ID) (default -1) +``` + +### SEE ALSO + +* [cs team](cs_team.md) - Manage Team +* [cs team member add](cs_team_member_add.md) - Add team member +* [cs team member remove](cs_team_member_remove.md) - Remove team member + diff --git a/docs/cs_team_member_add.md b/docs/cs_team_member_add.md new file mode 100644 index 00000000..0ffcf6bc --- /dev/null +++ b/docs/cs_team_member_add.md @@ -0,0 +1,32 @@ +## cs team member add + +Add team member + +### Synopsis + +Add team member to a team + +``` +cs team member add [flags] +``` + +### Options + +``` + -h, --help help for add +``` + +### Options inherited from parent commands + +``` + -a, --api string URL of Codesphere API (can also be CS_API) + -O, --org string Organization ID (relevant for some commands) + -t, --team int Team ID (relevant for some commands, can also be CS_TEAM_ID) (default -1) + -v, --verbose Verbose output + -w, --workspace int Workspace ID (relevant for some commands, can also be CS_WORKSPACE_ID) (default -1) +``` + +### SEE ALSO + +* [cs team member](cs_team_member.md) - Manage team members + diff --git a/docs/cs_team_member_remove.md b/docs/cs_team_member_remove.md new file mode 100644 index 00000000..eedf67bb --- /dev/null +++ b/docs/cs_team_member_remove.md @@ -0,0 +1,32 @@ +## cs team member remove + +Remove team member + +### Synopsis + +Remove team member from a team + +``` +cs team member remove [flags] +``` + +### Options + +``` + -h, --help help for remove +``` + +### Options inherited from parent commands + +``` + -a, --api string URL of Codesphere API (can also be CS_API) + -O, --org string Organization ID (relevant for some commands) + -t, --team int Team ID (relevant for some commands, can also be CS_TEAM_ID) (default -1) + -v, --verbose Verbose output + -w, --workspace int Workspace ID (relevant for some commands, can also be CS_WORKSPACE_ID) (default -1) +``` + +### SEE ALSO + +* [cs team member](cs_team_member.md) - Manage team members + diff --git a/docs/cs_team_remove.md b/docs/cs_team_remove.md new file mode 100644 index 00000000..11131b82 --- /dev/null +++ b/docs/cs_team_remove.md @@ -0,0 +1,33 @@ +## cs team remove + +Remove team + +### Synopsis + +Remove a team from Codesphere or an Organization + +``` +cs team remove [flags] +``` + +### Options + +``` + -h, --help help for remove + -n, --name string Team name +``` + +### Options inherited from parent commands + +``` + -a, --api string URL of Codesphere API (can also be CS_API) + -O, --org string Organization ID (relevant for some commands) + -t, --team int Team ID (relevant for some commands, can also be CS_TEAM_ID) (default -1) + -v, --verbose Verbose output + -w, --workspace int Workspace ID (relevant for some commands, can also be CS_WORKSPACE_ID) (default -1) +``` + +### SEE ALSO + +* [cs team](cs_team.md) - Manage Team + From d4702e8f98d14d56f9140135cc0dc6aa25a164e0 Mon Sep 17 00:00:00 2001 From: Maximilian Date: Wed, 13 May 2026 22:10:48 +0200 Subject: [PATCH 09/61] chore(lint): removed unused orgId field in createTeamOpts Signed-off-by: Maximilian --- cli/cmd/team_create.go | 5 ++--- cli/cmd/team_remove.go | 5 ++++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cli/cmd/team_create.go b/cli/cmd/team_create.go index ae4178f5..b5d2ad27 100644 --- a/cli/cmd/team_create.go +++ b/cli/cmd/team_create.go @@ -16,9 +16,8 @@ type CreateTeamCmd struct { type CreateTeamOpts struct { *GlobalOptions - name string - dcId int - orgId string + name string + dcId int } func AddCreateTeamCmd(team *cobra.Command, opts *GlobalOptions) { diff --git a/cli/cmd/team_remove.go b/cli/cmd/team_remove.go index 4f10716b..41dd2e4b 100644 --- a/cli/cmd/team_remove.go +++ b/cli/cmd/team_remove.go @@ -54,7 +54,10 @@ func (c *RemoveTeamCmd) RunE(_ *cobra.Command, args []string) error { // - client.DeleteTeam(orgId, teamId) + err = client.DeleteTeam(orgId, teamId) + if err != nil { + return err + } return nil } From e6a22e796db05d7702ab18e05133699319a9531c Mon Sep 17 00:00:00 2001 From: Maximilian Date: Wed, 20 May 2026 14:18:31 +0200 Subject: [PATCH 10/61] add logic seperation for teams and org teams Signed-off-by: Maximilian --- api/team.go | 31 +++++++++++++++++++++++++++++-- cli/cmd/root.go | 13 +++++++------ cli/cmd/team_create.go | 38 +++++++++++++++++++++++++------------- 3 files changed, 61 insertions(+), 21 deletions(-) diff --git a/api/team.go b/api/team.go index eab81cc7..f94624df 100644 --- a/api/team.go +++ b/api/team.go @@ -59,10 +59,34 @@ func (c *Client) ListTeams(orgId string) ([]Team, error) { func (c *Client) GetTeam(teamId int) (*Team, error) { team, r, err := c.api.TeamsAPI.TeamsGetTeam(c.ctx, float32(teamId)).Execute() - return ConvertToTeam(team), cserrors.FormatAPIError(r, err) + if err != nil { + return nil, cserrors.FormatAPIError(r, err) + } + return ConvertToTeam(team), nil } func (c *Client) CreateTeam(orgId string, name string, dc int) (*Team, error) { + if orgId == "" { + return c.createTeam(name, dc) + } + return c.createOrgTeam(orgId, name, dc) + +} + +func (c *Client) createTeam(name string, dc int) (*Team, error) { + team, r, err := c.api.TeamsAPI.TeamsCreateTeam(c.ctx). + TeamsCreateTeamRequest(openapi_client.TeamsCreateTeamRequest{ + Name: name, + Dc: dc, + }). + Execute() + if err != nil { + return nil, cserrors.FormatAPIError(r, err) + } + return ConvertToTeam(team), nil +} + +func (c *Client) createOrgTeam(orgId string, name string, dc int) (*Team, error) { team, r, err := c.api.TeamsAPI.TeamsCreateTeam(c.ctx). TeamsCreateTeamRequest(openapi_client.TeamsCreateTeamRequest{ Name: name, @@ -70,7 +94,10 @@ func (c *Client) CreateTeam(orgId string, name string, dc int) (*Team, error) { OrganizationId: &orgId, }). Execute() - return ConvertToTeam(team), cserrors.FormatAPIError(r, err) + if err != nil { + return nil, cserrors.FormatAPIError(r, err) + } + return ConvertToTeam(team), nil } func (c *Client) DeleteTeam(orgId string, teamId int) error { diff --git a/cli/cmd/root.go b/cli/cmd/root.go index dfcc62cf..b98a73e7 100644 --- a/cli/cmd/root.go +++ b/cli/cmd/root.go @@ -66,17 +66,18 @@ func (o GlobalOptions) GetWorkspaceId() (int, error) { } func (o GlobalOptions) GetOrgId() (string, error) { - if o.OrgId != "" { - return o.OrgId, nil + orgId := o.OrgId + if orgId == "" { + orgId = o.Env.GetOrgId() } - orgId := o.Env.GetOrgId() - if o.OrgId == "" { - return o.OrgId, nil + + if orgId == "" { + return "", nil } _, err := uuid.Parse(orgId) if err != nil { - return "", fmt.Errorf("invalid organization UUID format: %w", err) + return "", fmt.Errorf("invalid organization ID format: %w", err) } return orgId, nil diff --git a/cli/cmd/team_create.go b/cli/cmd/team_create.go index b5d2ad27..870fe8b4 100644 --- a/cli/cmd/team_create.go +++ b/cli/cmd/team_create.go @@ -6,18 +6,20 @@ package cmd import ( "errors" "fmt" + "github.com/codesphere-cloud/cs-go/api" "github.com/spf13/cobra" ) type CreateTeamCmd struct { - cmd *cobra.Command - Opts CreateTeamOpts + cmd *cobra.Command + Opts CreateTeamOpts + ClientFactory func(GlobalOptions) (Client, error) } type CreateTeamOpts struct { *GlobalOptions - name string - dcId int + Name string + DcId int } func AddCreateTeamCmd(team *cobra.Command, opts *GlobalOptions) { @@ -30,32 +32,42 @@ func AddCreateTeamCmd(team *cobra.Command, opts *GlobalOptions) { Opts: CreateTeamOpts{ GlobalOptions: opts, }, + ClientFactory: NewClient, } t.cmd.RunE = t.RunE - t.cmd.Flags().StringVarP(&t.Opts.name, "name", "n", "", "Team name") - t.cmd.Flags().IntVarP(&t.Opts.dcId, "dc-id", "d", 0, "Data center ID") + t.cmd.Flags().StringVarP(&t.Opts.Name, "name", "n", "", "Team name") + t.cmd.Flags().IntVarP(&t.Opts.DcId, "dc-id", "d", 0, "Data center ID") AddCmd(team, t.cmd) } func (c *CreateTeamCmd) RunE(_ *cobra.Command, args []string) error { - client, err := NewClient(*c.Opts.GlobalOptions) + client, err := c.ClientFactory(*c.Opts.GlobalOptions) if err != nil { return fmt.Errorf("failed to create Codesphere client: %w", err) } orgId, err := c.Opts.GetOrgId() if err != nil { - return errors.New("organization ID not set, use -O or CS_ORG_ID to set it") + return errors.Join(err, errors.New("failed to get organization ID")) } - teamName := c.Opts.name - dcId := c.Opts.dcId - - createdTeam, err := client.CreateTeam(orgId, teamName, dcId) + createdTeam, err := c.CreateTeam(client, orgId, c.Opts.Name, c.Opts.DcId) if err != nil { - return fmt.Errorf("failed to create team: %w", err) + return err } fmt.Printf("Team created: %+v in Organization: %+v\n", createdTeam.Id, orgId) return nil } + +func (c *CreateTeamCmd) CreateTeam(client Client, orgId string, teamName string, dcId int) (*api.Team, error) { + if teamName == "" { + return nil, errors.New("team name cannot be empty") + } + + createdTeam, err := client.CreateTeam(orgId, teamName, dcId) + if err != nil { + return nil, fmt.Errorf("failed to create team: %w", err) + } + return createdTeam, nil +} From c2c03cde2057735ba429d6681faaec9b46006181 Mon Sep 17 00:00:00 2001 From: Maximilian Date: Wed, 20 May 2026 14:19:02 +0200 Subject: [PATCH 11/61] add unit tests for team creation Signed-off-by: Maximilian --- cli/cmd/team_test.go | 142 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 142 insertions(+) create mode 100644 cli/cmd/team_test.go diff --git a/cli/cmd/team_test.go b/cli/cmd/team_test.go new file mode 100644 index 00000000..cf6e05a9 --- /dev/null +++ b/cli/cmd/team_test.go @@ -0,0 +1,142 @@ +package cmd_test + +import ( + "fmt" + + "github.com/codesphere-cloud/cs-go/api" + "github.com/codesphere-cloud/cs-go/cli/cmd" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" +) + +var _ = Describe("CreateTeam", func() { + var ( + mockEnv *cmd.MockEnv + mockClient *cmd.MockClient + c *cmd.CreateTeamCmd + teamId int + orgId string + teamName string + dcId int + ) + + BeforeEach(func() { + mockClient = cmd.NewMockClient(GinkgoT()) + mockEnv = cmd.NewMockEnv(GinkgoT()) + teamId = 42 + orgId = "d90e5f82-445e-4397-a90e-74d55cd4be3c" + teamName = "test-team" + dcId = 1 // Default data center ID for testing + c = &cmd.CreateTeamCmd{ + Opts: cmd.CreateTeamOpts{ + GlobalOptions: &cmd.GlobalOptions{ + Env: mockEnv, + TeamId: teamId, + // OrgId is intentionally left empty here, will be set in BeforeEach for specific contexts + }, + Name: teamName, + DcId: dcId, + }, + ClientFactory: func(opts cmd.GlobalOptions) (cmd.Client, error) { + return mockClient, nil + }, + } + // Mock common environment calls needed for client creation + }) + + AfterEach(func() { + mockEnv.AssertExpectations(GinkgoT()) + mockClient.AssertExpectations(GinkgoT()) + }) + + Context("Validation", func() { + It("should fail if the team name is empty", func() { + team, err := c.CreateTeam(mockClient, orgId, "", dcId) + Expect(err).To(HaveOccurred()) + Expect(err.Error()).To(Equal("team name cannot be empty")) + Expect(team).To(BeNil()) + }) + }) + + Context("RunE execution flow", func() { + It("should successfully create a team when organization ID is provided via environment", func() { + c.Opts.GlobalOptions.OrgId = "" // Ensure flag is empty + mockEnv.EXPECT().GetOrgId().Return(orgId).Once() + + expectedTeam := api.Team{ + Id: teamId, + Name: teamName, + OrganizationId: &orgId, + DefaultDataCenterId: dcId, + } + mockClient.EXPECT().CreateTeam(orgId, teamName, dcId).Return(&expectedTeam, nil).Once() + + err := c.RunE(nil, []string{}) + Expect(err).ToNot(HaveOccurred()) + }) + }) + + Context("when creating a team with an organization ID", func() { + BeforeEach(func() { + c.Opts.GlobalOptions.OrgId = orgId // Set OrgId via GlobalOptions (flag equivalent) + }) + + It("should successfully create the team and return the correct object", func() { + expectedTeam := api.Team{ + Id: teamId, + Name: teamName, + OrganizationId: &orgId, + DefaultDataCenterId: dcId, + } + // Expect CreateTeam API call with the provided orgId + mockClient.EXPECT().CreateTeam(orgId, teamName, dcId).Return(&expectedTeam, nil).Once() + + team, err := c.CreateTeam(mockClient, orgId, teamName, dcId) + Expect(err).ToNot(HaveOccurred()) + Expect(team.Name).To(Equal(teamName)) + Expect(*team.OrganizationId).To(Equal(orgId)) + }) + It("should fail to create with no permission in this orgId", func() { + // Change the return values to (nil, error) to simulate an API failure + mockClient.EXPECT().CreateTeam(orgId, teamName, dcId).Return(nil, fmt.Errorf("permission denied")).Once() + + team, err := c.CreateTeam(mockClient, orgId, teamName, dcId) + Expect(err).To(HaveOccurred()) + Expect(err.Error()).To(ContainSubstring("failed to create team: permission denied")) + Expect(team).To(BeNil()) + }) + }) + + Context("when creating a team without an organization ID", func() { + BeforeEach(func() { + c.Opts.GlobalOptions.OrgId = "" // Ensure OrgId is empty from flag + }) + + It("should create the team without orgID ", func() { + expectedTeam := api.Team{ + Id: teamId, + Name: teamName, + DefaultDataCenterId: dcId, + } + mockClient.EXPECT().CreateTeam("", teamName, dcId).Return(&expectedTeam, nil).Once() + mockEnv.EXPECT().GetOrgId().Return("").Once() + + team, err := c.CreateTeam(mockClient, mockEnv.GetOrgId(), teamName, dcId) + Expect(err).ToNot(HaveOccurred()) + Expect(team.Name).To(Equal(teamName)) + }) + }) + + Context("when an invalid organization ID format is provided via flag", func() { + BeforeEach(func() { + c.Opts.GlobalOptions.OrgId = "invalid-uuid-format" // Set an invalid UUID in GlobalOptions + }) + + It("should return an error due to invalid organization ID format", func() { + // The error should occur before the API call to CreateTeam. + err := c.RunE(nil, []string{}) + Expect(err).To(HaveOccurred()) + Expect(err.Error()).To(ContainSubstring("invalid organization ID format:")) + }) + }) +}) From 7219222931e9204f0576c4b27a7698ce1902293a Mon Sep 17 00:00:00 2001 From: DerBurri <7892993+DerBurri@users.noreply.github.com> Date: Wed, 20 May 2026 12:20:58 +0000 Subject: [PATCH 12/61] updated openapi client Signed-off-by: Maximilian --- api/openapi_client/api_managed_services.go | 50 ++-- api/openapi_client/api_organizations.go | 11 + api/openapi_client/api_vault.go | 153 ++++++++++++ api/openapi_client/mocks.go | 157 +++++++++++- ...services_create_provider_request_any_of.go | 158 +++++++----- .../model_managed_services_create_request.go | 26 +- ...anaged_services_create_request_provider.go | 229 ++++++++++++++++++ ...rvices_list_200_response_inner_provider.go | 34 ++- ...ist_providers_200_response_inner_any_of.go | 84 ++++++- ...t_providers_200_response_inner_any_of_1.go | 84 ++++++- ...del_workspaces_create_workspace_request.go | 36 +++ ...del_workspaces_update_workspace_request.go | 47 ++++ cli/cmd/team_test.go | 3 + 13 files changed, 942 insertions(+), 130 deletions(-) create mode 100644 api/openapi_client/model_managed_services_create_request_provider.go diff --git a/api/openapi_client/api_managed_services.go b/api/openapi_client/api_managed_services.go index ea6db005..5f9053fc 100644 --- a/api/openapi_client/api_managed_services.go +++ b/api/openapi_client/api_managed_services.go @@ -63,10 +63,10 @@ type ManagedServicesAPI interface { @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). @param name - @param version + @param schemaVersion @return ApiManagedServicesDeleteProviderRequest */ - ManagedServicesDeleteProvider(ctx context.Context, name string, version string) ApiManagedServicesDeleteProviderRequest + ManagedServicesDeleteProvider(ctx context.Context, name string, schemaVersion string) ApiManagedServicesDeleteProviderRequest // ManagedServicesDeleteProviderExecute executes the request ManagedServicesDeleteProviderExecute(r ApiManagedServicesDeleteProviderRequest) (*http.Response, error) @@ -139,10 +139,10 @@ type ManagedServicesAPI interface { @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). @param name - @param version + @param schemaVersion @return ApiManagedServicesUpdateProviderRequest */ - ManagedServicesUpdateProvider(ctx context.Context, name string, version string) ApiManagedServicesUpdateProviderRequest + ManagedServicesUpdateProvider(ctx context.Context, name string, schemaVersion string) ApiManagedServicesUpdateProviderRequest // ManagedServicesUpdateProviderExecute executes the request // @return ManagedServicesListProviders200ResponseInnerAnyOf @@ -529,10 +529,10 @@ func (a *ManagedServicesAPIService) ManagedServicesDeleteExecute(r ApiManagedSer } type ApiManagedServicesDeleteProviderRequest struct { - ctx context.Context - ApiService ManagedServicesAPI - name string - version string + ctx context.Context + ApiService ManagedServicesAPI + name string + schemaVersion string } func (r ApiManagedServicesDeleteProviderRequest) Execute() (*http.Response, error) { @@ -544,15 +544,15 @@ ManagedServicesDeleteProvider deleteProvider @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). @param name - @param version + @param schemaVersion @return ApiManagedServicesDeleteProviderRequest */ -func (a *ManagedServicesAPIService) ManagedServicesDeleteProvider(ctx context.Context, name string, version string) ApiManagedServicesDeleteProviderRequest { +func (a *ManagedServicesAPIService) ManagedServicesDeleteProvider(ctx context.Context, name string, schemaVersion string) ApiManagedServicesDeleteProviderRequest { return ApiManagedServicesDeleteProviderRequest{ - ApiService: a, - ctx: ctx, - name: name, - version: version, + ApiService: a, + ctx: ctx, + name: name, + schemaVersion: schemaVersion, } } @@ -569,9 +569,9 @@ func (a *ManagedServicesAPIService) ManagedServicesDeleteProviderExecute(r ApiMa return nil, &GenericOpenAPIError{error: err.Error()} } - localVarPath := localBasePath + "/managed-services/providers/{name}/{version}" + localVarPath := localBasePath + "/managed-services/providers/{name}/{schemaVersion}" localVarPath = strings.Replace(localVarPath, "{"+"name"+"}", url.PathEscape(parameterValueToString(r.name, "name")), -1) - localVarPath = strings.Replace(localVarPath, "{"+"version"+"}", url.PathEscape(parameterValueToString(r.version, "version")), -1) + localVarPath = strings.Replace(localVarPath, "{"+"schemaVersion"+"}", url.PathEscape(parameterValueToString(r.schemaVersion, "schemaVersion")), -1) localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} @@ -1302,7 +1302,7 @@ type ApiManagedServicesUpdateProviderRequest struct { ctx context.Context ApiService ManagedServicesAPI name string - version string + schemaVersion string managedServicesUpdateProviderRequest *ManagedServicesUpdateProviderRequest } @@ -1320,15 +1320,15 @@ ManagedServicesUpdateProvider updateProvider @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). @param name - @param version + @param schemaVersion @return ApiManagedServicesUpdateProviderRequest */ -func (a *ManagedServicesAPIService) ManagedServicesUpdateProvider(ctx context.Context, name string, version string) ApiManagedServicesUpdateProviderRequest { +func (a *ManagedServicesAPIService) ManagedServicesUpdateProvider(ctx context.Context, name string, schemaVersion string) ApiManagedServicesUpdateProviderRequest { return ApiManagedServicesUpdateProviderRequest{ - ApiService: a, - ctx: ctx, - name: name, - version: version, + ApiService: a, + ctx: ctx, + name: name, + schemaVersion: schemaVersion, } } @@ -1348,9 +1348,9 @@ func (a *ManagedServicesAPIService) ManagedServicesUpdateProviderExecute(r ApiMa return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()} } - localVarPath := localBasePath + "/managed-services/providers/{name}/{version}" + localVarPath := localBasePath + "/managed-services/providers/{name}/{schemaVersion}" localVarPath = strings.Replace(localVarPath, "{"+"name"+"}", url.PathEscape(parameterValueToString(r.name, "name")), -1) - localVarPath = strings.Replace(localVarPath, "{"+"version"+"}", url.PathEscape(parameterValueToString(r.version, "version")), -1) + localVarPath = strings.Replace(localVarPath, "{"+"schemaVersion"+"}", url.PathEscape(parameterValueToString(r.schemaVersion, "schemaVersion")), -1) localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} diff --git a/api/openapi_client/api_organizations.go b/api/openapi_client/api_organizations.go index c73fc21b..302d5a4b 100644 --- a/api/openapi_client/api_organizations.go +++ b/api/openapi_client/api_organizations.go @@ -214,6 +214,17 @@ func (a *OrganizationsAPIService) OrganizationsAddOrgMemberExecute(r ApiOrganiza } newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v) newErr.model = v + return localVarHTTPResponse, newErr + } + if localVarHTTPResponse.StatusCode == 409 { + var v DomainsUpdateDomain409Response + err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarHTTPResponse, newErr + } + newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v) + newErr.model = v } return localVarHTTPResponse, newErr } diff --git a/api/openapi_client/api_vault.go b/api/openapi_client/api_vault.go index 22eb6f5a..fdfdc08a 100644 --- a/api/openapi_client/api_vault.go +++ b/api/openapi_client/api_vault.go @@ -37,6 +37,22 @@ type VaultAPI interface { // VaultDeleteWorkspaceSecretsExecute executes the request VaultDeleteWorkspaceSecretsExecute(r ApiVaultDeleteWorkspaceSecretsRequest) (*http.Response, error) + /* + VaultGenerateSecrets generateSecrets + + Generate secrets in the vault for a given workspace based on the provided password policies + + @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param teamId + @param workspaceId + @return ApiVaultGenerateSecretsRequest + */ + VaultGenerateSecrets(ctx context.Context, teamId float32, workspaceId float32) ApiVaultGenerateSecretsRequest + + // VaultGenerateSecretsExecute executes the request + // @return map[string]interface{} + VaultGenerateSecretsExecute(r ApiVaultGenerateSecretsRequest) (map[string]interface{}, *http.Response, error) + /* VaultListWorkspaceSecrets listWorkspaceSecrets @@ -198,6 +214,143 @@ func (a *VaultAPIService) VaultDeleteWorkspaceSecretsExecute(r ApiVaultDeleteWor return localVarHTTPResponse, nil } +type ApiVaultGenerateSecretsRequest struct { + ctx context.Context + ApiService VaultAPI + teamId float32 + workspaceId float32 + body *map[string]interface{} +} + +func (r ApiVaultGenerateSecretsRequest) Body(body map[string]interface{}) ApiVaultGenerateSecretsRequest { + r.body = &body + return r +} + +func (r ApiVaultGenerateSecretsRequest) Execute() (map[string]interface{}, *http.Response, error) { + return r.ApiService.VaultGenerateSecretsExecute(r) +} + +/* +VaultGenerateSecrets generateSecrets + +Generate secrets in the vault for a given workspace based on the provided password policies + + @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param teamId + @param workspaceId + @return ApiVaultGenerateSecretsRequest +*/ +func (a *VaultAPIService) VaultGenerateSecrets(ctx context.Context, teamId float32, workspaceId float32) ApiVaultGenerateSecretsRequest { + return ApiVaultGenerateSecretsRequest{ + ApiService: a, + ctx: ctx, + teamId: teamId, + workspaceId: workspaceId, + } +} + +// Execute executes the request +// +// @return map[string]interface{} +func (a *VaultAPIService) VaultGenerateSecretsExecute(r ApiVaultGenerateSecretsRequest) (map[string]interface{}, *http.Response, error) { + var ( + localVarHTTPMethod = http.MethodPost + localVarPostBody interface{} + formFiles []formFile + localVarReturnValue map[string]interface{} + ) + + localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "VaultAPIService.VaultGenerateSecrets") + if err != nil { + return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()} + } + + localVarPath := localBasePath + "/vault/teams/{teamId}/workspaces/{workspaceId}/generate" + localVarPath = strings.Replace(localVarPath, "{"+"teamId"+"}", url.PathEscape(parameterValueToString(r.teamId, "teamId")), -1) + localVarPath = strings.Replace(localVarPath, "{"+"workspaceId"+"}", url.PathEscape(parameterValueToString(r.workspaceId, "workspaceId")), -1) + + localVarHeaderParams := make(map[string]string) + localVarQueryParams := url.Values{} + localVarFormParams := url.Values{} + + // to determine the Content-Type header + localVarHTTPContentTypes := []string{"application/json"} + + // set Content-Type header + localVarHTTPContentType := selectHeaderContentType(localVarHTTPContentTypes) + if localVarHTTPContentType != "" { + localVarHeaderParams["Content-Type"] = localVarHTTPContentType + } + + // to determine the Accept header + localVarHTTPHeaderAccepts := []string{"application/json"} + + // set Accept header + localVarHTTPHeaderAccept := selectHeaderAccept(localVarHTTPHeaderAccepts) + if localVarHTTPHeaderAccept != "" { + localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept + } + // body params + localVarPostBody = r.body + req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles) + if err != nil { + return localVarReturnValue, nil, err + } + + localVarHTTPResponse, err := a.client.callAPI(req) + if err != nil || localVarHTTPResponse == nil { + return localVarReturnValue, localVarHTTPResponse, err + } + + localVarBody, err := io.ReadAll(localVarHTTPResponse.Body) + localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = io.NopCloser(bytes.NewBuffer(localVarBody)) + if err != nil { + return localVarReturnValue, localVarHTTPResponse, err + } + + if localVarHTTPResponse.StatusCode >= 300 { + newErr := &GenericOpenAPIError{ + body: localVarBody, + error: localVarHTTPResponse.Status, + } + if localVarHTTPResponse.StatusCode == 400 { + var v DomainsGetDomain400Response + err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr + } + newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v) + newErr.model = v + return localVarReturnValue, localVarHTTPResponse, newErr + } + if localVarHTTPResponse.StatusCode == 401 { + var v DomainsGetDomain401Response + err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr + } + newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v) + newErr.model = v + } + return localVarReturnValue, localVarHTTPResponse, newErr + } + + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr := &GenericOpenAPIError{ + body: localVarBody, + error: err.Error(), + } + return localVarReturnValue, localVarHTTPResponse, newErr + } + + return localVarReturnValue, localVarHTTPResponse, nil +} + type ApiVaultListWorkspaceSecretsRequest struct { ctx context.Context ApiService VaultAPI diff --git a/api/openapi_client/mocks.go b/api/openapi_client/mocks.go index 10da0a59..ec148d01 100644 --- a/api/openapi_client/mocks.go +++ b/api/openapi_client/mocks.go @@ -1343,8 +1343,8 @@ func (_c *MockManagedServicesAPI_ManagedServicesDeleteExecute_Call) RunAndReturn } // ManagedServicesDeleteProvider provides a mock function for the type MockManagedServicesAPI -func (_mock *MockManagedServicesAPI) ManagedServicesDeleteProvider(ctx context.Context, name string, version string) ApiManagedServicesDeleteProviderRequest { - ret := _mock.Called(ctx, name, version) +func (_mock *MockManagedServicesAPI) ManagedServicesDeleteProvider(ctx context.Context, name string, schemaVersion string) ApiManagedServicesDeleteProviderRequest { + ret := _mock.Called(ctx, name, schemaVersion) if len(ret) == 0 { panic("no return value specified for ManagedServicesDeleteProvider") @@ -1352,7 +1352,7 @@ func (_mock *MockManagedServicesAPI) ManagedServicesDeleteProvider(ctx context.C var r0 ApiManagedServicesDeleteProviderRequest if returnFunc, ok := ret.Get(0).(func(context.Context, string, string) ApiManagedServicesDeleteProviderRequest); ok { - r0 = returnFunc(ctx, name, version) + r0 = returnFunc(ctx, name, schemaVersion) } else { r0 = ret.Get(0).(ApiManagedServicesDeleteProviderRequest) } @@ -1368,11 +1368,11 @@ type MockManagedServicesAPI_ManagedServicesDeleteProvider_Call struct { // - ctx context.Context // - name string // - version string -func (_e *MockManagedServicesAPI_Expecter) ManagedServicesDeleteProvider(ctx any, name any, version any) *MockManagedServicesAPI_ManagedServicesDeleteProvider_Call { +func (_e *MockManagedServicesAPI_Expecter) ManagedServicesDeleteProvider(ctx interface{}, name interface{}, version interface{}) *MockManagedServicesAPI_ManagedServicesDeleteProvider_Call { return &MockManagedServicesAPI_ManagedServicesDeleteProvider_Call{Call: _e.mock.On("ManagedServicesDeleteProvider", ctx, name, version)} } -func (_c *MockManagedServicesAPI_ManagedServicesDeleteProvider_Call) Run(run func(ctx context.Context, name string, version string)) *MockManagedServicesAPI_ManagedServicesDeleteProvider_Call { +func (_c *MockManagedServicesAPI_ManagedServicesDeleteProvider_Call) Run(run func(ctx context.Context, name string, schemaVersion string)) *MockManagedServicesAPI_ManagedServicesDeleteProvider_Call { _c.Call.Run(func(args mock.Arguments) { var arg0 context.Context if args[0] != nil { @@ -1400,7 +1400,7 @@ func (_c *MockManagedServicesAPI_ManagedServicesDeleteProvider_Call) Return(apiM return _c } -func (_c *MockManagedServicesAPI_ManagedServicesDeleteProvider_Call) RunAndReturn(run func(ctx context.Context, name string, version string) ApiManagedServicesDeleteProviderRequest) *MockManagedServicesAPI_ManagedServicesDeleteProvider_Call { +func (_c *MockManagedServicesAPI_ManagedServicesDeleteProvider_Call) RunAndReturn(run func(ctx context.Context, name string, schemaVersion string) ApiManagedServicesDeleteProviderRequest) *MockManagedServicesAPI_ManagedServicesDeleteProvider_Call { _c.Call.Return(run) return _c } @@ -2091,8 +2091,8 @@ func (_c *MockManagedServicesAPI_ManagedServicesUpdateExecute_Call) RunAndReturn } // ManagedServicesUpdateProvider provides a mock function for the type MockManagedServicesAPI -func (_mock *MockManagedServicesAPI) ManagedServicesUpdateProvider(ctx context.Context, name string, version string) ApiManagedServicesUpdateProviderRequest { - ret := _mock.Called(ctx, name, version) +func (_mock *MockManagedServicesAPI) ManagedServicesUpdateProvider(ctx context.Context, name string, schemaVersion string) ApiManagedServicesUpdateProviderRequest { + ret := _mock.Called(ctx, name, schemaVersion) if len(ret) == 0 { panic("no return value specified for ManagedServicesUpdateProvider") @@ -2100,7 +2100,7 @@ func (_mock *MockManagedServicesAPI) ManagedServicesUpdateProvider(ctx context.C var r0 ApiManagedServicesUpdateProviderRequest if returnFunc, ok := ret.Get(0).(func(context.Context, string, string) ApiManagedServicesUpdateProviderRequest); ok { - r0 = returnFunc(ctx, name, version) + r0 = returnFunc(ctx, name, schemaVersion) } else { r0 = ret.Get(0).(ApiManagedServicesUpdateProviderRequest) } @@ -2116,11 +2116,11 @@ type MockManagedServicesAPI_ManagedServicesUpdateProvider_Call struct { // - ctx context.Context // - name string // - version string -func (_e *MockManagedServicesAPI_Expecter) ManagedServicesUpdateProvider(ctx any, name any, version any) *MockManagedServicesAPI_ManagedServicesUpdateProvider_Call { +func (_e *MockManagedServicesAPI_Expecter) ManagedServicesUpdateProvider(ctx interface{}, name interface{}, version interface{}) *MockManagedServicesAPI_ManagedServicesUpdateProvider_Call { return &MockManagedServicesAPI_ManagedServicesUpdateProvider_Call{Call: _e.mock.On("ManagedServicesUpdateProvider", ctx, name, version)} } -func (_c *MockManagedServicesAPI_ManagedServicesUpdateProvider_Call) Run(run func(ctx context.Context, name string, version string)) *MockManagedServicesAPI_ManagedServicesUpdateProvider_Call { +func (_c *MockManagedServicesAPI_ManagedServicesUpdateProvider_Call) Run(run func(ctx context.Context, name string, schemaVersion string)) *MockManagedServicesAPI_ManagedServicesUpdateProvider_Call { _c.Call.Run(func(args mock.Arguments) { var arg0 context.Context if args[0] != nil { @@ -2148,7 +2148,7 @@ func (_c *MockManagedServicesAPI_ManagedServicesUpdateProvider_Call) Return(apiM return _c } -func (_c *MockManagedServicesAPI_ManagedServicesUpdateProvider_Call) RunAndReturn(run func(ctx context.Context, name string, version string) ApiManagedServicesUpdateProviderRequest) *MockManagedServicesAPI_ManagedServicesUpdateProvider_Call { +func (_c *MockManagedServicesAPI_ManagedServicesUpdateProvider_Call) RunAndReturn(run func(ctx context.Context, name string, schemaVersion string) ApiManagedServicesUpdateProviderRequest) *MockManagedServicesAPI_ManagedServicesUpdateProvider_Call { _c.Call.Return(run) return _c } @@ -4953,6 +4953,139 @@ func (_c *MockVaultAPI_VaultDeleteWorkspaceSecretsExecute_Call) RunAndReturn(run return _c } +// VaultGenerateSecrets provides a mock function for the type MockVaultAPI +func (_mock *MockVaultAPI) VaultGenerateSecrets(ctx context.Context, teamId float32, workspaceId float32) ApiVaultGenerateSecretsRequest { + ret := _mock.Called(ctx, teamId, workspaceId) + + if len(ret) == 0 { + panic("no return value specified for VaultGenerateSecrets") + } + + var r0 ApiVaultGenerateSecretsRequest + if returnFunc, ok := ret.Get(0).(func(context.Context, float32, float32) ApiVaultGenerateSecretsRequest); ok { + r0 = returnFunc(ctx, teamId, workspaceId) + } else { + r0 = ret.Get(0).(ApiVaultGenerateSecretsRequest) + } + return r0 +} + +// MockVaultAPI_VaultGenerateSecrets_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'VaultGenerateSecrets' +type MockVaultAPI_VaultGenerateSecrets_Call struct { + *mock.Call +} + +// VaultGenerateSecrets is a helper method to define mock.On call +// - ctx context.Context +// - teamId float32 +// - workspaceId float32 +func (_e *MockVaultAPI_Expecter) VaultGenerateSecrets(ctx interface{}, teamId interface{}, workspaceId interface{}) *MockVaultAPI_VaultGenerateSecrets_Call { + return &MockVaultAPI_VaultGenerateSecrets_Call{Call: _e.mock.On("VaultGenerateSecrets", ctx, teamId, workspaceId)} +} + +func (_c *MockVaultAPI_VaultGenerateSecrets_Call) Run(run func(ctx context.Context, teamId float32, workspaceId float32)) *MockVaultAPI_VaultGenerateSecrets_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 float32 + if args[1] != nil { + arg1 = args[1].(float32) + } + var arg2 float32 + if args[2] != nil { + arg2 = args[2].(float32) + } + run( + arg0, + arg1, + arg2, + ) + }) + return _c +} + +func (_c *MockVaultAPI_VaultGenerateSecrets_Call) Return(apiVaultGenerateSecretsRequest ApiVaultGenerateSecretsRequest) *MockVaultAPI_VaultGenerateSecrets_Call { + _c.Call.Return(apiVaultGenerateSecretsRequest) + return _c +} + +func (_c *MockVaultAPI_VaultGenerateSecrets_Call) RunAndReturn(run func(ctx context.Context, teamId float32, workspaceId float32) ApiVaultGenerateSecretsRequest) *MockVaultAPI_VaultGenerateSecrets_Call { + _c.Call.Return(run) + return _c +} + +// VaultGenerateSecretsExecute provides a mock function for the type MockVaultAPI +func (_mock *MockVaultAPI) VaultGenerateSecretsExecute(r ApiVaultGenerateSecretsRequest) (map[string]interface{}, *http.Response, error) { + ret := _mock.Called(r) + + if len(ret) == 0 { + panic("no return value specified for VaultGenerateSecretsExecute") + } + + var r0 map[string]interface{} + var r1 *http.Response + var r2 error + if returnFunc, ok := ret.Get(0).(func(ApiVaultGenerateSecretsRequest) (map[string]interface{}, *http.Response, error)); ok { + return returnFunc(r) + } + if returnFunc, ok := ret.Get(0).(func(ApiVaultGenerateSecretsRequest) map[string]interface{}); ok { + r0 = returnFunc(r) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(map[string]interface{}) + } + } + if returnFunc, ok := ret.Get(1).(func(ApiVaultGenerateSecretsRequest) *http.Response); ok { + r1 = returnFunc(r) + } else { + if ret.Get(1) != nil { + r1 = ret.Get(1).(*http.Response) + } + } + if returnFunc, ok := ret.Get(2).(func(ApiVaultGenerateSecretsRequest) error); ok { + r2 = returnFunc(r) + } else { + r2 = ret.Error(2) + } + return r0, r1, r2 +} + +// MockVaultAPI_VaultGenerateSecretsExecute_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'VaultGenerateSecretsExecute' +type MockVaultAPI_VaultGenerateSecretsExecute_Call struct { + *mock.Call +} + +// VaultGenerateSecretsExecute is a helper method to define mock.On call +// - r ApiVaultGenerateSecretsRequest +func (_e *MockVaultAPI_Expecter) VaultGenerateSecretsExecute(r interface{}) *MockVaultAPI_VaultGenerateSecretsExecute_Call { + return &MockVaultAPI_VaultGenerateSecretsExecute_Call{Call: _e.mock.On("VaultGenerateSecretsExecute", r)} +} + +func (_c *MockVaultAPI_VaultGenerateSecretsExecute_Call) Run(run func(r ApiVaultGenerateSecretsRequest)) *MockVaultAPI_VaultGenerateSecretsExecute_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 ApiVaultGenerateSecretsRequest + if args[0] != nil { + arg0 = args[0].(ApiVaultGenerateSecretsRequest) + } + run( + arg0, + ) + }) + return _c +} + +func (_c *MockVaultAPI_VaultGenerateSecretsExecute_Call) Return(stringToIfaceVal map[string]interface{}, response *http.Response, err error) *MockVaultAPI_VaultGenerateSecretsExecute_Call { + _c.Call.Return(stringToIfaceVal, response, err) + return _c +} + +func (_c *MockVaultAPI_VaultGenerateSecretsExecute_Call) RunAndReturn(run func(r ApiVaultGenerateSecretsRequest) (map[string]interface{}, *http.Response, error)) *MockVaultAPI_VaultGenerateSecretsExecute_Call { + _c.Call.Return(run) + return _c +} + // VaultListWorkspaceSecrets provides a mock function for the type MockVaultAPI func (_mock *MockVaultAPI) VaultListWorkspaceSecrets(ctx context.Context, teamId float32, workspaceId float32) ApiVaultListWorkspaceSecretsRequest { ret := _mock.Called(ctx, teamId, workspaceId) diff --git a/api/openapi_client/model_managed_services_create_provider_request_any_of.go b/api/openapi_client/model_managed_services_create_provider_request_any_of.go index a5e67ea4..9b8635c1 100644 --- a/api/openapi_client/model_managed_services_create_provider_request_any_of.go +++ b/api/openapi_client/model_managed_services_create_provider_request_any_of.go @@ -22,8 +22,6 @@ var _ MappedNullable = &ManagedServicesCreateProviderRequestAnyOf{} // ManagedServicesCreateProviderRequestAnyOf struct for ManagedServicesCreateProviderRequestAnyOf type ManagedServicesCreateProviderRequestAnyOf struct { - Name string `json:"name" validate:"regexp=^[a-z0-9-_]+$"` - Version string `json:"version" validate:"regexp=^v[0-9][0-9a-z]*$"` Author string `json:"author"` Backups *ManagedServicesListProviders200ResponseInnerAnyOfBackups `json:"backups,omitempty"` Capabilities *ManagedServicesListProviders200ResponseInnerAnyOfCapabilities `json:"capabilities,omitempty"` @@ -38,6 +36,9 @@ type ManagedServicesCreateProviderRequestAnyOf struct { // JSON Schema SecretsSchema map[string]interface{} `json:"secretsSchema"` Plans []ManagedServicesListProviders200ResponseInnerAnyOfPlansInner `json:"plans"` + Name string `json:"name" validate:"regexp=^[a-z0-9-_]+$"` + Version *string `json:"version,omitempty" validate:"regexp=^v[0-9][0-9a-z]*$"` + SchemaVersion *string `json:"schemaVersion,omitempty" validate:"regexp=^v[0-9][0-9a-z]*$"` Backend ManagedServicesListProviders200ResponseInnerAnyOfBackend `json:"backend"` Scope *ManagedServicesCreateProviderRequestAnyOfScope `json:"scope,omitempty"` } @@ -48,10 +49,8 @@ type _ManagedServicesCreateProviderRequestAnyOf ManagedServicesCreateProviderReq // This constructor will assign default values to properties that have it defined, // and makes sure properties required by API are set, but the set of arguments // will change when the set of required properties is changed -func NewManagedServicesCreateProviderRequestAnyOf(name string, version string, author string, category string, description string, displayName string, iconUrl string, configSchema map[string]interface{}, detailsSchema map[string]interface{}, secretsSchema map[string]interface{}, plans []ManagedServicesListProviders200ResponseInnerAnyOfPlansInner, backend ManagedServicesListProviders200ResponseInnerAnyOfBackend) *ManagedServicesCreateProviderRequestAnyOf { +func NewManagedServicesCreateProviderRequestAnyOf(author string, category string, description string, displayName string, iconUrl string, configSchema map[string]interface{}, detailsSchema map[string]interface{}, secretsSchema map[string]interface{}, plans []ManagedServicesListProviders200ResponseInnerAnyOfPlansInner, name string, backend ManagedServicesListProviders200ResponseInnerAnyOfBackend) *ManagedServicesCreateProviderRequestAnyOf { this := ManagedServicesCreateProviderRequestAnyOf{} - this.Name = name - this.Version = version this.Author = author this.Category = category this.Description = description @@ -61,6 +60,7 @@ func NewManagedServicesCreateProviderRequestAnyOf(name string, version string, a this.DetailsSchema = detailsSchema this.SecretsSchema = secretsSchema this.Plans = plans + this.Name = name this.Backend = backend return &this } @@ -73,54 +73,6 @@ func NewManagedServicesCreateProviderRequestAnyOfWithDefaults() *ManagedServices return &this } -// GetName returns the Name field value -func (o *ManagedServicesCreateProviderRequestAnyOf) GetName() string { - if o == nil { - var ret string - return ret - } - - return o.Name -} - -// GetNameOk returns a tuple with the Name field value -// and a boolean to check if the value has been set. -func (o *ManagedServicesCreateProviderRequestAnyOf) GetNameOk() (*string, bool) { - if o == nil { - return nil, false - } - return &o.Name, true -} - -// SetName sets field value -func (o *ManagedServicesCreateProviderRequestAnyOf) SetName(v string) { - o.Name = v -} - -// GetVersion returns the Version field value -func (o *ManagedServicesCreateProviderRequestAnyOf) GetVersion() string { - if o == nil { - var ret string - return ret - } - - return o.Version -} - -// GetVersionOk returns a tuple with the Version field value -// and a boolean to check if the value has been set. -func (o *ManagedServicesCreateProviderRequestAnyOf) GetVersionOk() (*string, bool) { - if o == nil { - return nil, false - } - return &o.Version, true -} - -// SetVersion sets field value -func (o *ManagedServicesCreateProviderRequestAnyOf) SetVersion(v string) { - o.Version = v -} - // GetAuthor returns the Author field value func (o *ManagedServicesCreateProviderRequestAnyOf) GetAuthor() string { if o == nil { @@ -401,6 +353,94 @@ func (o *ManagedServicesCreateProviderRequestAnyOf) SetPlans(v []ManagedServices o.Plans = v } +// GetName returns the Name field value +func (o *ManagedServicesCreateProviderRequestAnyOf) GetName() string { + if o == nil { + var ret string + return ret + } + + return o.Name +} + +// GetNameOk returns a tuple with the Name field value +// and a boolean to check if the value has been set. +func (o *ManagedServicesCreateProviderRequestAnyOf) GetNameOk() (*string, bool) { + if o == nil { + return nil, false + } + return &o.Name, true +} + +// SetName sets field value +func (o *ManagedServicesCreateProviderRequestAnyOf) SetName(v string) { + o.Name = v +} + +// GetVersion returns the Version field value if set, zero value otherwise. +func (o *ManagedServicesCreateProviderRequestAnyOf) GetVersion() string { + if o == nil || IsNil(o.Version) { + var ret string + return ret + } + return *o.Version +} + +// GetVersionOk returns a tuple with the Version field value if set, nil otherwise +// and a boolean to check if the value has been set. +func (o *ManagedServicesCreateProviderRequestAnyOf) GetVersionOk() (*string, bool) { + if o == nil || IsNil(o.Version) { + return nil, false + } + return o.Version, true +} + +// HasVersion returns a boolean if a field has been set. +func (o *ManagedServicesCreateProviderRequestAnyOf) HasVersion() bool { + if o != nil && !IsNil(o.Version) { + return true + } + + return false +} + +// SetVersion gets a reference to the given string and assigns it to the Version field. +func (o *ManagedServicesCreateProviderRequestAnyOf) SetVersion(v string) { + o.Version = &v +} + +// GetSchemaVersion returns the SchemaVersion field value if set, zero value otherwise. +func (o *ManagedServicesCreateProviderRequestAnyOf) GetSchemaVersion() string { + if o == nil || IsNil(o.SchemaVersion) { + var ret string + return ret + } + return *o.SchemaVersion +} + +// GetSchemaVersionOk returns a tuple with the SchemaVersion field value if set, nil otherwise +// and a boolean to check if the value has been set. +func (o *ManagedServicesCreateProviderRequestAnyOf) GetSchemaVersionOk() (*string, bool) { + if o == nil || IsNil(o.SchemaVersion) { + return nil, false + } + return o.SchemaVersion, true +} + +// HasSchemaVersion returns a boolean if a field has been set. +func (o *ManagedServicesCreateProviderRequestAnyOf) HasSchemaVersion() bool { + if o != nil && !IsNil(o.SchemaVersion) { + return true + } + + return false +} + +// SetSchemaVersion gets a reference to the given string and assigns it to the SchemaVersion field. +func (o *ManagedServicesCreateProviderRequestAnyOf) SetSchemaVersion(v string) { + o.SchemaVersion = &v +} + // GetBackend returns the Backend field value func (o *ManagedServicesCreateProviderRequestAnyOf) GetBackend() ManagedServicesListProviders200ResponseInnerAnyOfBackend { if o == nil { @@ -467,8 +507,6 @@ func (o ManagedServicesCreateProviderRequestAnyOf) MarshalJSON() ([]byte, error) func (o ManagedServicesCreateProviderRequestAnyOf) ToMap() (map[string]interface{}, error) { toSerialize := map[string]interface{}{} - toSerialize["name"] = o.Name - toSerialize["version"] = o.Version toSerialize["author"] = o.Author if !IsNil(o.Backups) { toSerialize["backups"] = o.Backups @@ -484,6 +522,13 @@ func (o ManagedServicesCreateProviderRequestAnyOf) ToMap() (map[string]interface toSerialize["detailsSchema"] = o.DetailsSchema toSerialize["secretsSchema"] = o.SecretsSchema toSerialize["plans"] = o.Plans + toSerialize["name"] = o.Name + if !IsNil(o.Version) { + toSerialize["version"] = o.Version + } + if !IsNil(o.SchemaVersion) { + toSerialize["schemaVersion"] = o.SchemaVersion + } toSerialize["backend"] = o.Backend if !IsNil(o.Scope) { toSerialize["scope"] = o.Scope @@ -496,8 +541,6 @@ func (o *ManagedServicesCreateProviderRequestAnyOf) UnmarshalJSON(data []byte) ( // by unmarshalling the object into a generic map with string keys and checking // that every required field exists as a key in the generic map. requiredProperties := []string{ - "name", - "version", "author", "category", "description", @@ -507,6 +550,7 @@ func (o *ManagedServicesCreateProviderRequestAnyOf) UnmarshalJSON(data []byte) ( "detailsSchema", "secretsSchema", "plans", + "name", "backend", } diff --git a/api/openapi_client/model_managed_services_create_request.go b/api/openapi_client/model_managed_services_create_request.go index 61ceacab..a5cd15f5 100644 --- a/api/openapi_client/model_managed_services_create_request.go +++ b/api/openapi_client/model_managed_services_create_request.go @@ -22,14 +22,14 @@ var _ MappedNullable = &ManagedServicesCreateRequest{} // ManagedServicesCreateRequest struct for ManagedServicesCreateRequest type ManagedServicesCreateRequest struct { - Backups *ManagedServicesCreateRequestBackups `json:"backups,omitempty"` - Config map[string]interface{} `json:"config"` - Provider ManagedServicesList200ResponseInnerProvider `json:"provider"` - Name string `json:"name"` - Plan ManagedServicesList200ResponseInnerPlan `json:"plan"` - RecoverFrom *ManagedServicesCreateRequestRecoverFrom `json:"recoverFrom,omitempty"` - Secrets map[string]interface{} `json:"secrets"` - TeamId int `json:"teamId"` + Backups *ManagedServicesCreateRequestBackups `json:"backups,omitempty"` + Config map[string]interface{} `json:"config"` + Provider ManagedServicesCreateRequestProvider `json:"provider"` + Name string `json:"name"` + Plan ManagedServicesList200ResponseInnerPlan `json:"plan"` + RecoverFrom *ManagedServicesCreateRequestRecoverFrom `json:"recoverFrom,omitempty"` + Secrets map[string]interface{} `json:"secrets"` + TeamId int `json:"teamId"` } type _ManagedServicesCreateRequest ManagedServicesCreateRequest @@ -38,7 +38,7 @@ type _ManagedServicesCreateRequest ManagedServicesCreateRequest // This constructor will assign default values to properties that have it defined, // and makes sure properties required by API are set, but the set of arguments // will change when the set of required properties is changed -func NewManagedServicesCreateRequest(config map[string]interface{}, provider ManagedServicesList200ResponseInnerProvider, name string, plan ManagedServicesList200ResponseInnerPlan, secrets map[string]interface{}, teamId int) *ManagedServicesCreateRequest { +func NewManagedServicesCreateRequest(config map[string]interface{}, provider ManagedServicesCreateRequestProvider, name string, plan ManagedServicesList200ResponseInnerPlan, secrets map[string]interface{}, teamId int) *ManagedServicesCreateRequest { this := ManagedServicesCreateRequest{} this.Config = config this.Provider = provider @@ -114,9 +114,9 @@ func (o *ManagedServicesCreateRequest) SetConfig(v map[string]interface{}) { } // GetProvider returns the Provider field value -func (o *ManagedServicesCreateRequest) GetProvider() ManagedServicesList200ResponseInnerProvider { +func (o *ManagedServicesCreateRequest) GetProvider() ManagedServicesCreateRequestProvider { if o == nil { - var ret ManagedServicesList200ResponseInnerProvider + var ret ManagedServicesCreateRequestProvider return ret } @@ -125,7 +125,7 @@ func (o *ManagedServicesCreateRequest) GetProvider() ManagedServicesList200Respo // GetProviderOk returns a tuple with the Provider field value // and a boolean to check if the value has been set. -func (o *ManagedServicesCreateRequest) GetProviderOk() (*ManagedServicesList200ResponseInnerProvider, bool) { +func (o *ManagedServicesCreateRequest) GetProviderOk() (*ManagedServicesCreateRequestProvider, bool) { if o == nil { return nil, false } @@ -133,7 +133,7 @@ func (o *ManagedServicesCreateRequest) GetProviderOk() (*ManagedServicesList200R } // SetProvider sets field value -func (o *ManagedServicesCreateRequest) SetProvider(v ManagedServicesList200ResponseInnerProvider) { +func (o *ManagedServicesCreateRequest) SetProvider(v ManagedServicesCreateRequestProvider) { o.Provider = v } diff --git a/api/openapi_client/model_managed_services_create_request_provider.go b/api/openapi_client/model_managed_services_create_request_provider.go new file mode 100644 index 00000000..dd848afc --- /dev/null +++ b/api/openapi_client/model_managed_services_create_request_provider.go @@ -0,0 +1,229 @@ +// Copyright (c) Codesphere Inc. +// SPDX-License-Identifier: Apache-2.0 + +/* +Codesphere Public API + +API version: 0.1.0 +*/ + +// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. + +package openapi_client + +import ( + "bytes" + "encoding/json" + "fmt" +) + +// checks if the ManagedServicesCreateRequestProvider type satisfies the MappedNullable interface at compile time +var _ MappedNullable = &ManagedServicesCreateRequestProvider{} + +// ManagedServicesCreateRequestProvider struct for ManagedServicesCreateRequestProvider +type ManagedServicesCreateRequestProvider struct { + Name string `json:"name" validate:"regexp=^[a-z0-9-_]+$"` + Version *string `json:"version,omitempty" validate:"regexp=^v[0-9][0-9a-z]*$"` + SchemaVersion *string `json:"schemaVersion,omitempty" validate:"regexp=^v[0-9][0-9a-z]*$"` +} + +type _ManagedServicesCreateRequestProvider ManagedServicesCreateRequestProvider + +// NewManagedServicesCreateRequestProvider instantiates a new ManagedServicesCreateRequestProvider object +// This constructor will assign default values to properties that have it defined, +// and makes sure properties required by API are set, but the set of arguments +// will change when the set of required properties is changed +func NewManagedServicesCreateRequestProvider(name string) *ManagedServicesCreateRequestProvider { + this := ManagedServicesCreateRequestProvider{} + this.Name = name + return &this +} + +// NewManagedServicesCreateRequestProviderWithDefaults instantiates a new ManagedServicesCreateRequestProvider object +// This constructor will only assign default values to properties that have it defined, +// but it doesn't guarantee that properties required by API are set +func NewManagedServicesCreateRequestProviderWithDefaults() *ManagedServicesCreateRequestProvider { + this := ManagedServicesCreateRequestProvider{} + return &this +} + +// GetName returns the Name field value +func (o *ManagedServicesCreateRequestProvider) GetName() string { + if o == nil { + var ret string + return ret + } + + return o.Name +} + +// GetNameOk returns a tuple with the Name field value +// and a boolean to check if the value has been set. +func (o *ManagedServicesCreateRequestProvider) GetNameOk() (*string, bool) { + if o == nil { + return nil, false + } + return &o.Name, true +} + +// SetName sets field value +func (o *ManagedServicesCreateRequestProvider) SetName(v string) { + o.Name = v +} + +// GetVersion returns the Version field value if set, zero value otherwise. +func (o *ManagedServicesCreateRequestProvider) GetVersion() string { + if o == nil || IsNil(o.Version) { + var ret string + return ret + } + return *o.Version +} + +// GetVersionOk returns a tuple with the Version field value if set, nil otherwise +// and a boolean to check if the value has been set. +func (o *ManagedServicesCreateRequestProvider) GetVersionOk() (*string, bool) { + if o == nil || IsNil(o.Version) { + return nil, false + } + return o.Version, true +} + +// HasVersion returns a boolean if a field has been set. +func (o *ManagedServicesCreateRequestProvider) HasVersion() bool { + if o != nil && !IsNil(o.Version) { + return true + } + + return false +} + +// SetVersion gets a reference to the given string and assigns it to the Version field. +func (o *ManagedServicesCreateRequestProvider) SetVersion(v string) { + o.Version = &v +} + +// GetSchemaVersion returns the SchemaVersion field value if set, zero value otherwise. +func (o *ManagedServicesCreateRequestProvider) GetSchemaVersion() string { + if o == nil || IsNil(o.SchemaVersion) { + var ret string + return ret + } + return *o.SchemaVersion +} + +// GetSchemaVersionOk returns a tuple with the SchemaVersion field value if set, nil otherwise +// and a boolean to check if the value has been set. +func (o *ManagedServicesCreateRequestProvider) GetSchemaVersionOk() (*string, bool) { + if o == nil || IsNil(o.SchemaVersion) { + return nil, false + } + return o.SchemaVersion, true +} + +// HasSchemaVersion returns a boolean if a field has been set. +func (o *ManagedServicesCreateRequestProvider) HasSchemaVersion() bool { + if o != nil && !IsNil(o.SchemaVersion) { + return true + } + + return false +} + +// SetSchemaVersion gets a reference to the given string and assigns it to the SchemaVersion field. +func (o *ManagedServicesCreateRequestProvider) SetSchemaVersion(v string) { + o.SchemaVersion = &v +} + +func (o ManagedServicesCreateRequestProvider) MarshalJSON() ([]byte, error) { + toSerialize, err := o.ToMap() + if err != nil { + return []byte{}, err + } + return json.Marshal(toSerialize) +} + +func (o ManagedServicesCreateRequestProvider) ToMap() (map[string]interface{}, error) { + toSerialize := map[string]interface{}{} + toSerialize["name"] = o.Name + if !IsNil(o.Version) { + toSerialize["version"] = o.Version + } + if !IsNil(o.SchemaVersion) { + toSerialize["schemaVersion"] = o.SchemaVersion + } + return toSerialize, nil +} + +func (o *ManagedServicesCreateRequestProvider) UnmarshalJSON(data []byte) (err error) { + // This validates that all required properties are included in the JSON object + // by unmarshalling the object into a generic map with string keys and checking + // that every required field exists as a key in the generic map. + requiredProperties := []string{ + "name", + } + + allProperties := make(map[string]interface{}) + + err = json.Unmarshal(data, &allProperties) + + if err != nil { + return err + } + + for _, requiredProperty := range requiredProperties { + if _, exists := allProperties[requiredProperty]; !exists { + return fmt.Errorf("no value given for required property %v", requiredProperty) + } + } + + varManagedServicesCreateRequestProvider := _ManagedServicesCreateRequestProvider{} + + decoder := json.NewDecoder(bytes.NewReader(data)) + //decoder.DisallowUnknownFields() + err = decoder.Decode(&varManagedServicesCreateRequestProvider) + + if err != nil { + return err + } + + *o = ManagedServicesCreateRequestProvider(varManagedServicesCreateRequestProvider) + + return err +} + +type NullableManagedServicesCreateRequestProvider struct { + value *ManagedServicesCreateRequestProvider + isSet bool +} + +func (v NullableManagedServicesCreateRequestProvider) Get() *ManagedServicesCreateRequestProvider { + return v.value +} + +func (v *NullableManagedServicesCreateRequestProvider) Set(val *ManagedServicesCreateRequestProvider) { + v.value = val + v.isSet = true +} + +func (v NullableManagedServicesCreateRequestProvider) IsSet() bool { + return v.isSet +} + +func (v *NullableManagedServicesCreateRequestProvider) Unset() { + v.value = nil + v.isSet = false +} + +func NewNullableManagedServicesCreateRequestProvider(val *ManagedServicesCreateRequestProvider) *NullableManagedServicesCreateRequestProvider { + return &NullableManagedServicesCreateRequestProvider{value: val, isSet: true} +} + +func (v NullableManagedServicesCreateRequestProvider) MarshalJSON() ([]byte, error) { + return json.Marshal(v.value) +} + +func (v *NullableManagedServicesCreateRequestProvider) UnmarshalJSON(src []byte) error { + v.isSet = true + return json.Unmarshal(src, &v.value) +} diff --git a/api/openapi_client/model_managed_services_list_200_response_inner_provider.go b/api/openapi_client/model_managed_services_list_200_response_inner_provider.go index 873a6a79..4b66e545 100644 --- a/api/openapi_client/model_managed_services_list_200_response_inner_provider.go +++ b/api/openapi_client/model_managed_services_list_200_response_inner_provider.go @@ -22,8 +22,9 @@ var _ MappedNullable = &ManagedServicesList200ResponseInnerProvider{} // ManagedServicesList200ResponseInnerProvider struct for ManagedServicesList200ResponseInnerProvider type ManagedServicesList200ResponseInnerProvider struct { - Name string `json:"name" validate:"regexp=^[a-z0-9-_]+$"` - Version string `json:"version" validate:"regexp=^v[0-9][0-9a-z]*$"` + Name string `json:"name" validate:"regexp=^[a-z0-9-_]+$"` + Version string `json:"version" validate:"regexp=^v[0-9][0-9a-z]*$"` + SchemaVersion string `json:"schemaVersion" validate:"regexp=^v[0-9][0-9a-z]*$"` } type _ManagedServicesList200ResponseInnerProvider ManagedServicesList200ResponseInnerProvider @@ -32,10 +33,11 @@ type _ManagedServicesList200ResponseInnerProvider ManagedServicesList200Response // This constructor will assign default values to properties that have it defined, // and makes sure properties required by API are set, but the set of arguments // will change when the set of required properties is changed -func NewManagedServicesList200ResponseInnerProvider(name string, version string) *ManagedServicesList200ResponseInnerProvider { +func NewManagedServicesList200ResponseInnerProvider(name string, version string, schemaVersion string) *ManagedServicesList200ResponseInnerProvider { this := ManagedServicesList200ResponseInnerProvider{} this.Name = name this.Version = version + this.SchemaVersion = schemaVersion return &this } @@ -95,6 +97,30 @@ func (o *ManagedServicesList200ResponseInnerProvider) SetVersion(v string) { o.Version = v } +// GetSchemaVersion returns the SchemaVersion field value +func (o *ManagedServicesList200ResponseInnerProvider) GetSchemaVersion() string { + if o == nil { + var ret string + return ret + } + + return o.SchemaVersion +} + +// GetSchemaVersionOk returns a tuple with the SchemaVersion field value +// and a boolean to check if the value has been set. +func (o *ManagedServicesList200ResponseInnerProvider) GetSchemaVersionOk() (*string, bool) { + if o == nil { + return nil, false + } + return &o.SchemaVersion, true +} + +// SetSchemaVersion sets field value +func (o *ManagedServicesList200ResponseInnerProvider) SetSchemaVersion(v string) { + o.SchemaVersion = v +} + func (o ManagedServicesList200ResponseInnerProvider) MarshalJSON() ([]byte, error) { toSerialize, err := o.ToMap() if err != nil { @@ -107,6 +133,7 @@ func (o ManagedServicesList200ResponseInnerProvider) ToMap() (map[string]interfa toSerialize := map[string]interface{}{} toSerialize["name"] = o.Name toSerialize["version"] = o.Version + toSerialize["schemaVersion"] = o.SchemaVersion return toSerialize, nil } @@ -117,6 +144,7 @@ func (o *ManagedServicesList200ResponseInnerProvider) UnmarshalJSON(data []byte) requiredProperties := []string{ "name", "version", + "schemaVersion", } allProperties := make(map[string]interface{}) diff --git a/api/openapi_client/model_managed_services_list_providers_200_response_inner_any_of.go b/api/openapi_client/model_managed_services_list_providers_200_response_inner_any_of.go index 914480f7..ae5ff817 100644 --- a/api/openapi_client/model_managed_services_list_providers_200_response_inner_any_of.go +++ b/api/openapi_client/model_managed_services_list_providers_200_response_inner_any_of.go @@ -22,15 +22,17 @@ var _ MappedNullable = &ManagedServicesListProviders200ResponseInnerAnyOf{} // ManagedServicesListProviders200ResponseInnerAnyOf struct for ManagedServicesListProviders200ResponseInnerAnyOf type ManagedServicesListProviders200ResponseInnerAnyOf struct { - Name string `json:"name" validate:"regexp=^[a-z0-9-_]+$"` - Version string `json:"version" validate:"regexp=^v[0-9][0-9a-z]*$"` - Author string `json:"author"` - Backups *ManagedServicesListProviders200ResponseInnerAnyOfBackups `json:"backups,omitempty"` - Capabilities *ManagedServicesListProviders200ResponseInnerAnyOfCapabilities `json:"capabilities,omitempty"` - Category string `json:"category"` - Description string `json:"description"` - DisplayName string `json:"displayName"` - IconUrl string `json:"iconUrl"` + Name string `json:"name" validate:"regexp=^[a-z0-9-_]+$"` + Version string `json:"version" validate:"regexp=^v[0-9][0-9a-z]*$"` + SchemaVersion string `json:"schemaVersion" validate:"regexp=^v[0-9][0-9a-z]*$"` + Scope *string `json:"scope,omitempty"` + Author string `json:"author"` + Backups *ManagedServicesListProviders200ResponseInnerAnyOfBackups `json:"backups,omitempty"` + Capabilities *ManagedServicesListProviders200ResponseInnerAnyOfCapabilities `json:"capabilities,omitempty"` + Category string `json:"category"` + Description string `json:"description"` + DisplayName string `json:"displayName"` + IconUrl string `json:"iconUrl"` // JSON Schema ConfigSchema map[string]interface{} `json:"configSchema"` // JSON Schema @@ -47,10 +49,11 @@ type _ManagedServicesListProviders200ResponseInnerAnyOf ManagedServicesListProvi // This constructor will assign default values to properties that have it defined, // and makes sure properties required by API are set, but the set of arguments // will change when the set of required properties is changed -func NewManagedServicesListProviders200ResponseInnerAnyOf(name string, version string, author string, category string, description string, displayName string, iconUrl string, configSchema map[string]interface{}, detailsSchema map[string]interface{}, secretsSchema map[string]interface{}, plans []ManagedServicesListProviders200ResponseInnerAnyOfPlansInner, backend ManagedServicesListProviders200ResponseInnerAnyOfBackend) *ManagedServicesListProviders200ResponseInnerAnyOf { +func NewManagedServicesListProviders200ResponseInnerAnyOf(name string, version string, schemaVersion string, author string, category string, description string, displayName string, iconUrl string, configSchema map[string]interface{}, detailsSchema map[string]interface{}, secretsSchema map[string]interface{}, plans []ManagedServicesListProviders200ResponseInnerAnyOfPlansInner, backend ManagedServicesListProviders200ResponseInnerAnyOfBackend) *ManagedServicesListProviders200ResponseInnerAnyOf { this := ManagedServicesListProviders200ResponseInnerAnyOf{} this.Name = name this.Version = version + this.SchemaVersion = schemaVersion this.Author = author this.Category = category this.Description = description @@ -120,6 +123,62 @@ func (o *ManagedServicesListProviders200ResponseInnerAnyOf) SetVersion(v string) o.Version = v } +// GetSchemaVersion returns the SchemaVersion field value +func (o *ManagedServicesListProviders200ResponseInnerAnyOf) GetSchemaVersion() string { + if o == nil { + var ret string + return ret + } + + return o.SchemaVersion +} + +// GetSchemaVersionOk returns a tuple with the SchemaVersion field value +// and a boolean to check if the value has been set. +func (o *ManagedServicesListProviders200ResponseInnerAnyOf) GetSchemaVersionOk() (*string, bool) { + if o == nil { + return nil, false + } + return &o.SchemaVersion, true +} + +// SetSchemaVersion sets field value +func (o *ManagedServicesListProviders200ResponseInnerAnyOf) SetSchemaVersion(v string) { + o.SchemaVersion = v +} + +// GetScope returns the Scope field value if set, zero value otherwise. +func (o *ManagedServicesListProviders200ResponseInnerAnyOf) GetScope() string { + if o == nil || IsNil(o.Scope) { + var ret string + return ret + } + return *o.Scope +} + +// GetScopeOk returns a tuple with the Scope field value if set, nil otherwise +// and a boolean to check if the value has been set. +func (o *ManagedServicesListProviders200ResponseInnerAnyOf) GetScopeOk() (*string, bool) { + if o == nil || IsNil(o.Scope) { + return nil, false + } + return o.Scope, true +} + +// HasScope returns a boolean if a field has been set. +func (o *ManagedServicesListProviders200ResponseInnerAnyOf) HasScope() bool { + if o != nil && !IsNil(o.Scope) { + return true + } + + return false +} + +// SetScope gets a reference to the given string and assigns it to the Scope field. +func (o *ManagedServicesListProviders200ResponseInnerAnyOf) SetScope(v string) { + o.Scope = &v +} + // GetAuthor returns the Author field value func (o *ManagedServicesListProviders200ResponseInnerAnyOf) GetAuthor() string { if o == nil { @@ -436,6 +495,10 @@ func (o ManagedServicesListProviders200ResponseInnerAnyOf) ToMap() (map[string]i toSerialize := map[string]interface{}{} toSerialize["name"] = o.Name toSerialize["version"] = o.Version + toSerialize["schemaVersion"] = o.SchemaVersion + if !IsNil(o.Scope) { + toSerialize["scope"] = o.Scope + } toSerialize["author"] = o.Author if !IsNil(o.Backups) { toSerialize["backups"] = o.Backups @@ -462,6 +525,7 @@ func (o *ManagedServicesListProviders200ResponseInnerAnyOf) UnmarshalJSON(data [ requiredProperties := []string{ "name", "version", + "schemaVersion", "author", "category", "description", diff --git a/api/openapi_client/model_managed_services_list_providers_200_response_inner_any_of_1.go b/api/openapi_client/model_managed_services_list_providers_200_response_inner_any_of_1.go index 9b187425..06eebde5 100644 --- a/api/openapi_client/model_managed_services_list_providers_200_response_inner_any_of_1.go +++ b/api/openapi_client/model_managed_services_list_providers_200_response_inner_any_of_1.go @@ -22,15 +22,17 @@ var _ MappedNullable = &ManagedServicesListProviders200ResponseInnerAnyOf1{} // ManagedServicesListProviders200ResponseInnerAnyOf1 struct for ManagedServicesListProviders200ResponseInnerAnyOf1 type ManagedServicesListProviders200ResponseInnerAnyOf1 struct { - Name string `json:"name" validate:"regexp=^[a-z0-9-_]+$"` - Version string `json:"version" validate:"regexp=^v[0-9][0-9a-z]*$"` - Author string `json:"author"` - Backups *ManagedServicesListProviders200ResponseInnerAnyOfBackups `json:"backups,omitempty"` - Capabilities *ManagedServicesListProviders200ResponseInnerAnyOfCapabilities `json:"capabilities,omitempty"` - Category string `json:"category"` - Description string `json:"description"` - DisplayName string `json:"displayName"` - IconUrl string `json:"iconUrl"` + Name string `json:"name" validate:"regexp=^[a-z0-9-_]+$"` + Version string `json:"version" validate:"regexp=^v[0-9][0-9a-z]*$"` + SchemaVersion string `json:"schemaVersion" validate:"regexp=^v[0-9][0-9a-z]*$"` + Scope *string `json:"scope,omitempty"` + Author string `json:"author"` + Backups *ManagedServicesListProviders200ResponseInnerAnyOfBackups `json:"backups,omitempty"` + Capabilities *ManagedServicesListProviders200ResponseInnerAnyOfCapabilities `json:"capabilities,omitempty"` + Category string `json:"category"` + Description string `json:"description"` + DisplayName string `json:"displayName"` + IconUrl string `json:"iconUrl"` // JSON Schema ConfigSchema map[string]interface{} `json:"configSchema"` // JSON Schema @@ -47,10 +49,11 @@ type _ManagedServicesListProviders200ResponseInnerAnyOf1 ManagedServicesListProv // This constructor will assign default values to properties that have it defined, // and makes sure properties required by API are set, but the set of arguments // will change when the set of required properties is changed -func NewManagedServicesListProviders200ResponseInnerAnyOf1(name string, version string, author string, category string, description string, displayName string, iconUrl string, configSchema map[string]interface{}, detailsSchema map[string]interface{}, secretsSchema map[string]interface{}, plans []ManagedServicesListProviders200ResponseInnerAnyOfPlansInner, backend ManagedServicesListProviders200ResponseInnerAnyOf1Backend) *ManagedServicesListProviders200ResponseInnerAnyOf1 { +func NewManagedServicesListProviders200ResponseInnerAnyOf1(name string, version string, schemaVersion string, author string, category string, description string, displayName string, iconUrl string, configSchema map[string]interface{}, detailsSchema map[string]interface{}, secretsSchema map[string]interface{}, plans []ManagedServicesListProviders200ResponseInnerAnyOfPlansInner, backend ManagedServicesListProviders200ResponseInnerAnyOf1Backend) *ManagedServicesListProviders200ResponseInnerAnyOf1 { this := ManagedServicesListProviders200ResponseInnerAnyOf1{} this.Name = name this.Version = version + this.SchemaVersion = schemaVersion this.Author = author this.Category = category this.Description = description @@ -120,6 +123,62 @@ func (o *ManagedServicesListProviders200ResponseInnerAnyOf1) SetVersion(v string o.Version = v } +// GetSchemaVersion returns the SchemaVersion field value +func (o *ManagedServicesListProviders200ResponseInnerAnyOf1) GetSchemaVersion() string { + if o == nil { + var ret string + return ret + } + + return o.SchemaVersion +} + +// GetSchemaVersionOk returns a tuple with the SchemaVersion field value +// and a boolean to check if the value has been set. +func (o *ManagedServicesListProviders200ResponseInnerAnyOf1) GetSchemaVersionOk() (*string, bool) { + if o == nil { + return nil, false + } + return &o.SchemaVersion, true +} + +// SetSchemaVersion sets field value +func (o *ManagedServicesListProviders200ResponseInnerAnyOf1) SetSchemaVersion(v string) { + o.SchemaVersion = v +} + +// GetScope returns the Scope field value if set, zero value otherwise. +func (o *ManagedServicesListProviders200ResponseInnerAnyOf1) GetScope() string { + if o == nil || IsNil(o.Scope) { + var ret string + return ret + } + return *o.Scope +} + +// GetScopeOk returns a tuple with the Scope field value if set, nil otherwise +// and a boolean to check if the value has been set. +func (o *ManagedServicesListProviders200ResponseInnerAnyOf1) GetScopeOk() (*string, bool) { + if o == nil || IsNil(o.Scope) { + return nil, false + } + return o.Scope, true +} + +// HasScope returns a boolean if a field has been set. +func (o *ManagedServicesListProviders200ResponseInnerAnyOf1) HasScope() bool { + if o != nil && !IsNil(o.Scope) { + return true + } + + return false +} + +// SetScope gets a reference to the given string and assigns it to the Scope field. +func (o *ManagedServicesListProviders200ResponseInnerAnyOf1) SetScope(v string) { + o.Scope = &v +} + // GetAuthor returns the Author field value func (o *ManagedServicesListProviders200ResponseInnerAnyOf1) GetAuthor() string { if o == nil { @@ -436,6 +495,10 @@ func (o ManagedServicesListProviders200ResponseInnerAnyOf1) ToMap() (map[string] toSerialize := map[string]interface{}{} toSerialize["name"] = o.Name toSerialize["version"] = o.Version + toSerialize["schemaVersion"] = o.SchemaVersion + if !IsNil(o.Scope) { + toSerialize["scope"] = o.Scope + } toSerialize["author"] = o.Author if !IsNil(o.Backups) { toSerialize["backups"] = o.Backups @@ -462,6 +525,7 @@ func (o *ManagedServicesListProviders200ResponseInnerAnyOf1) UnmarshalJSON(data requiredProperties := []string{ "name", "version", + "schemaVersion", "author", "category", "description", diff --git a/api/openapi_client/model_workspaces_create_workspace_request.go b/api/openapi_client/model_workspaces_create_workspace_request.go index 6bf0c9e3..23b91467 100644 --- a/api/openapi_client/model_workspaces_create_workspace_request.go +++ b/api/openapi_client/model_workspaces_create_workspace_request.go @@ -36,6 +36,7 @@ type WorkspacesCreateWorkspaceRequest struct { VpnConfig *string `json:"vpnConfig,omitempty"` Restricted *bool `json:"restricted,omitempty"` Env []WorkspacesCreateWorkspaceRequestEnvInner `json:"env,omitempty"` + StorageMib *int `json:"storageMib,omitempty"` } type _WorkspacesCreateWorkspaceRequest WorkspacesCreateWorkspaceRequest @@ -470,6 +471,38 @@ func (o *WorkspacesCreateWorkspaceRequest) SetEnv(v []WorkspacesCreateWorkspaceR o.Env = v } +// GetStorageMib returns the StorageMib field value if set, zero value otherwise. +func (o *WorkspacesCreateWorkspaceRequest) GetStorageMib() int { + if o == nil || IsNil(o.StorageMib) { + var ret int + return ret + } + return *o.StorageMib +} + +// GetStorageMibOk returns a tuple with the StorageMib field value if set, nil otherwise +// and a boolean to check if the value has been set. +func (o *WorkspacesCreateWorkspaceRequest) GetStorageMibOk() (*int, bool) { + if o == nil || IsNil(o.StorageMib) { + return nil, false + } + return o.StorageMib, true +} + +// HasStorageMib returns a boolean if a field has been set. +func (o *WorkspacesCreateWorkspaceRequest) HasStorageMib() bool { + if o != nil && !IsNil(o.StorageMib) { + return true + } + + return false +} + +// SetStorageMib gets a reference to the given int and assigns it to the StorageMib field. +func (o *WorkspacesCreateWorkspaceRequest) SetStorageMib(v int) { + o.StorageMib = &v +} + func (o WorkspacesCreateWorkspaceRequest) MarshalJSON() ([]byte, error) { toSerialize, err := o.ToMap() if err != nil { @@ -512,6 +545,9 @@ func (o WorkspacesCreateWorkspaceRequest) ToMap() (map[string]interface{}, error if !IsNil(o.Env) { toSerialize["env"] = o.Env } + if !IsNil(o.StorageMib) { + toSerialize["storageMib"] = o.StorageMib + } return toSerialize, nil } diff --git a/api/openapi_client/model_workspaces_update_workspace_request.go b/api/openapi_client/model_workspaces_update_workspace_request.go index 06e1d951..ace28278 100644 --- a/api/openapi_client/model_workspaces_update_workspace_request.go +++ b/api/openapi_client/model_workspaces_update_workspace_request.go @@ -26,6 +26,7 @@ type WorkspacesUpdateWorkspaceRequest struct { Replicas *int `json:"replicas,omitempty"` VpnConfig NullableString `json:"vpnConfig,omitempty"` Restricted *bool `json:"restricted,omitempty"` + StorageMib NullableInt `json:"storageMib,omitempty"` } // NewWorkspacesUpdateWorkspaceRequest instantiates a new WorkspacesUpdateWorkspaceRequest object @@ -248,6 +249,49 @@ func (o *WorkspacesUpdateWorkspaceRequest) SetRestricted(v bool) { o.Restricted = &v } +// GetStorageMib returns the StorageMib field value if set, zero value otherwise (both if not set or set to explicit null). +func (o *WorkspacesUpdateWorkspaceRequest) GetStorageMib() int { + if o == nil || IsNil(o.StorageMib.Get()) { + var ret int + return ret + } + return *o.StorageMib.Get() +} + +// GetStorageMibOk returns a tuple with the StorageMib field value if set, nil otherwise +// and a boolean to check if the value has been set. +// NOTE: If the value is an explicit nil, `nil, true` will be returned +func (o *WorkspacesUpdateWorkspaceRequest) GetStorageMibOk() (*int, bool) { + if o == nil { + return nil, false + } + return o.StorageMib.Get(), o.StorageMib.IsSet() +} + +// HasStorageMib returns a boolean if a field has been set. +func (o *WorkspacesUpdateWorkspaceRequest) HasStorageMib() bool { + if o != nil && o.StorageMib.IsSet() { + return true + } + + return false +} + +// SetStorageMib gets a reference to the given NullableInt and assigns it to the StorageMib field. +func (o *WorkspacesUpdateWorkspaceRequest) SetStorageMib(v int) { + o.StorageMib.Set(&v) +} + +// SetStorageMibNil sets the value for StorageMib to be an explicit nil +func (o *WorkspacesUpdateWorkspaceRequest) SetStorageMibNil() { + o.StorageMib.Set(nil) +} + +// UnsetStorageMib ensures that no value is present for StorageMib, not even an explicit nil +func (o *WorkspacesUpdateWorkspaceRequest) UnsetStorageMib() { + o.StorageMib.Unset() +} + func (o WorkspacesUpdateWorkspaceRequest) MarshalJSON() ([]byte, error) { toSerialize, err := o.ToMap() if err != nil { @@ -276,6 +320,9 @@ func (o WorkspacesUpdateWorkspaceRequest) ToMap() (map[string]interface{}, error if !IsNil(o.Restricted) { toSerialize["restricted"] = o.Restricted } + if o.StorageMib.IsSet() { + toSerialize["storageMib"] = o.StorageMib.Get() + } return toSerialize, nil } diff --git a/cli/cmd/team_test.go b/cli/cmd/team_test.go index cf6e05a9..fed429c4 100644 --- a/cli/cmd/team_test.go +++ b/cli/cmd/team_test.go @@ -1,3 +1,6 @@ +// Copyright (c) Codesphere Inc. +// SPDX-License-Identifier: Apache-2.0 + package cmd_test import ( From 1be592393a76b9cab7339cf65c1bab0a73a17966 Mon Sep 17 00:00:00 2001 From: Maximilian Date: Wed, 3 Jun 2026 10:19:04 +0200 Subject: [PATCH 13/61] add team management features Signed-off-by: Maximilian --- api/team.go | 20 +++ cli/cmd/client.go | 2 + cli/cmd/mocks.go | 120 ++++++++++++++++++ cli/cmd/team_add_member.go | 47 ++++++- cli/cmd/team_add_member_test.go | 105 +++++++++++++++ cli/cmd/{team_test.go => team_create_test.go} | 0 cli/cmd/team_remove.go | 18 +-- cli/cmd/team_remove_member.go | 41 +++++- cli/cmd/team_remove_member_test.go | 99 +++++++++++++++ cli/cmd/team_remove_test.go | 81 ++++++++++++ 10 files changed, 517 insertions(+), 16 deletions(-) create mode 100644 cli/cmd/team_add_member_test.go rename cli/cmd/{team_test.go => team_create_test.go} (100%) create mode 100644 cli/cmd/team_remove_member_test.go create mode 100644 cli/cmd/team_remove_test.go diff --git a/api/team.go b/api/team.go index f94624df..66edc95f 100644 --- a/api/team.go +++ b/api/team.go @@ -104,3 +104,23 @@ func (c *Client) DeleteTeam(orgId string, teamId int) error { r, err := c.api.TeamsAPI.TeamsDeleteTeam(c.ctx, float32(teamId)).Execute() return cserrors.FormatAPIError(r, err) } + +func (c *Client) AddTeamMember(teamId int, email string, role int) error { + r, err := c.api.TeamsAPI.TeamsInviteMember(c.ctx, float32(teamId)). + TeamsInviteMemberRequest(openapi_client.TeamsInviteMemberRequest{ + UserEmail: email, + Role: role, + }).Execute() + if err != nil { + return cserrors.FormatAPIError(r, err) + } + return nil +} + +func (c *Client) RemoveTeamMember(teamId int, userId int) error { + r, err := c.api.TeamsAPI.TeamsRemoveMember(c.ctx, float32(teamId), float32(userId)).Execute() + if err != nil { + return cserrors.FormatAPIError(r, err) + } + return nil +} diff --git a/cli/cmd/client.go b/cli/cmd/client.go index 116b1487..e26af1a1 100644 --- a/cli/cmd/client.go +++ b/cli/cmd/client.go @@ -36,6 +36,8 @@ type Client interface { DeployLandscape(wsId int, profile string) error CreateTeam(orgId string, name string, dcId int) (*api.Team, error) DeleteTeam(orgId string, teamId int) error + AddTeamMember(teamId int, email string, role int) error + RemoveTeamMember(teamId int, userId int) error } // CommandExecutor abstracts command execution for testing diff --git a/cli/cmd/mocks.go b/cli/cmd/mocks.go index 35e76436..8aefa056 100644 --- a/cli/cmd/mocks.go +++ b/cli/cmd/mocks.go @@ -39,6 +39,69 @@ func (_m *MockClient) EXPECT() *MockClient_Expecter { return &MockClient_Expecter{mock: &_m.Mock} } +// AddTeamMember provides a mock function for the type MockClient +func (_mock *MockClient) AddTeamMember(teamId int, email string, role int) error { + ret := _mock.Called(teamId, email, role) + + if len(ret) == 0 { + panic("no return value specified for AddTeamMember") + } + + var r0 error + if returnFunc, ok := ret.Get(0).(func(int, string, int) error); ok { + r0 = returnFunc(teamId, email, role) + } else { + r0 = ret.Error(0) + } + return r0 +} + +// MockClient_AddTeamMember_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'AddTeamMember' +type MockClient_AddTeamMember_Call struct { + *mock.Call +} + +// AddTeamMember is a helper method to define mock.On call +// - teamId int +// - email string +// - role int +func (_e *MockClient_Expecter) AddTeamMember(teamId interface{}, email interface{}, role interface{}) *MockClient_AddTeamMember_Call { + return &MockClient_AddTeamMember_Call{Call: _e.mock.On("AddTeamMember", teamId, email, role)} +} + +func (_c *MockClient_AddTeamMember_Call) Run(run func(teamId int, email string, role int)) *MockClient_AddTeamMember_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 int + if args[0] != nil { + arg0 = args[0].(int) + } + var arg1 string + if args[1] != nil { + arg1 = args[1].(string) + } + var arg2 int + if args[2] != nil { + arg2 = args[2].(int) + } + run( + arg0, + arg1, + arg2, + ) + }) + return _c +} + +func (_c *MockClient_AddTeamMember_Call) Return(err error) *MockClient_AddTeamMember_Call { + _c.Call.Return(err) + return _c +} + +func (_c *MockClient_AddTeamMember_Call) RunAndReturn(run func(teamId int, email string, role int) error) *MockClient_AddTeamMember_Call { + _c.Call.Return(run) + return _c +} + // CreateTeam provides a mock function for the type MockClient func (_mock *MockClient) CreateTeam(orgId string, name string, dcId int) (*api.Team, error) { ret := _mock.Called(orgId, name, dcId) @@ -904,6 +967,63 @@ func (_c *MockClient_ListWorkspaces_Call) RunAndReturn(run func(teamId int) ([]a return _c } +// RemoveTeamMember provides a mock function for the type MockClient +func (_mock *MockClient) RemoveTeamMember(teamId int, userId int) error { + ret := _mock.Called(teamId, userId) + + if len(ret) == 0 { + panic("no return value specified for RemoveTeamMember") + } + + var r0 error + if returnFunc, ok := ret.Get(0).(func(int, int) error); ok { + r0 = returnFunc(teamId, userId) + } else { + r0 = ret.Error(0) + } + return r0 +} + +// MockClient_RemoveTeamMember_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'RemoveTeamMember' +type MockClient_RemoveTeamMember_Call struct { + *mock.Call +} + +// RemoveTeamMember is a helper method to define mock.On call +// - teamId int +// - userId int +func (_e *MockClient_Expecter) RemoveTeamMember(teamId interface{}, userId interface{}) *MockClient_RemoveTeamMember_Call { + return &MockClient_RemoveTeamMember_Call{Call: _e.mock.On("RemoveTeamMember", teamId, userId)} +} + +func (_c *MockClient_RemoveTeamMember_Call) Run(run func(teamId int, userId int)) *MockClient_RemoveTeamMember_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 int + if args[0] != nil { + arg0 = args[0].(int) + } + var arg1 int + if args[1] != nil { + arg1 = args[1].(int) + } + run( + arg0, + arg1, + ) + }) + return _c +} + +func (_c *MockClient_RemoveTeamMember_Call) Return(err error) *MockClient_RemoveTeamMember_Call { + _c.Call.Return(err) + return _c +} + +func (_c *MockClient_RemoveTeamMember_Call) RunAndReturn(run func(teamId int, userId int) error) *MockClient_RemoveTeamMember_Call { + _c.Call.Return(run) + return _c +} + // ScaleLandscapeServices provides a mock function for the type MockClient func (_mock *MockClient) ScaleLandscapeServices(wsId int, services map[string]int) error { ret := _mock.Called(wsId, services) diff --git a/cli/cmd/team_add_member.go b/cli/cmd/team_add_member.go index 9dd56d0b..3138b582 100644 --- a/cli/cmd/team_add_member.go +++ b/cli/cmd/team_add_member.go @@ -4,12 +4,23 @@ package cmd import ( + "errors" + "fmt" + "github.com/spf13/cobra" ) type AddTeamMemberCmd struct { - cmd *cobra.Command - Opts CreateWorkspaceOpts + cmd *cobra.Command + Opts AddTeamMemberOpts + ClientFactory func(GlobalOptions) (Client, error) +} + +type AddTeamMemberOpts struct { + *GlobalOptions + Email string + Role int + TeamId int } func AddAddTeamMemberCmd(team *cobra.Command, opts *GlobalOptions) { @@ -19,14 +30,44 @@ func AddAddTeamMemberCmd(team *cobra.Command, opts *GlobalOptions) { Short: "Add team member", Long: `Add team member to a team`, }, - Opts: CreateWorkspaceOpts{ + Opts: AddTeamMemberOpts{ GlobalOptions: opts, }, + ClientFactory: NewClient, } t.cmd.RunE = t.RunE + t.cmd.Flags().StringVarP(&t.Opts.Email, "email", "e", "", "Team member email") + t.cmd.Flags().IntVarP(&t.Opts.Role, "role", "r", 0, "Team member role 0=admin, 1=member") AddCmd(team, t.cmd) } func (c *AddTeamMemberCmd) RunE(_ *cobra.Command, args []string) error { + client, err := c.ClientFactory(*c.Opts.GlobalOptions) + if err != nil { + return fmt.Errorf("failed to create Codespehre client: %w", err) + } + + teamId, err := c.Opts.GetTeamId() + if err != nil { + return err + } + + err = c.AddTeamMember(client, teamId, c.Opts.Email, c.Opts.Role) + return err + +} + +func (c *AddTeamMemberCmd) AddTeamMember(client Client, teamId int, email string, role int) error { + if email == "" { + return errors.New("email cannot be empty") + } + + fmt.Printf("add member: %s to team %d with role: %d", email, teamId, role) + + err := client.AddTeamMember(teamId, email, role) + if err != nil { + return fmt.Errorf("failed to add member to team: %w", err) + } + return nil } diff --git a/cli/cmd/team_add_member_test.go b/cli/cmd/team_add_member_test.go new file mode 100644 index 00000000..809d1bbc --- /dev/null +++ b/cli/cmd/team_add_member_test.go @@ -0,0 +1,105 @@ +// Copyright (c) Codesphere Inc. +// SPDX-License-Identifier: Apache-2.0 + +package cmd_test + +import ( + "errors" + + "github.com/codesphere-cloud/cs-go/cli/cmd" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" +) + +var _ = Describe("AddTeamMember", func() { + var ( + mockEnv *cmd.MockEnv + mockClient *cmd.MockClient + c *cmd.AddTeamMemberCmd + teamId int + dcId int + email string + ) + + BeforeEach(func() { + mockClient = cmd.NewMockClient(GinkgoT()) + mockEnv = cmd.NewMockEnv(GinkgoT()) + teamId = 42 + email = "test@test.com" + dcId = 1 // Default data center ID for testing + c = &cmd.AddTeamMemberCmd{ + Opts: cmd.AddTeamMemberOpts{ + GlobalOptions: &cmd.GlobalOptions{ + Env: mockEnv, + TeamId: teamId, + // OrgId is intentionally left empty here, will be set in BeforeEach for specific contexts + }, + Email: email, + TeamId: teamId, + }, + ClientFactory: func(opts cmd.GlobalOptions) (cmd.Client, error) { + return mockClient, nil + }, + } + // Mock common environment calls needed for client creation + }) + + AfterEach(func() { + mockEnv.AssertExpectations(GinkgoT()) + mockClient.AssertExpectations(GinkgoT()) + }) + + Context("Validation", func() { + It("should fail if the mail is empty", func() { + + err := c.AddTeamMember(mockClient, teamId, "", dcId) + + Expect(err).To(HaveOccurred()) + Expect(err.Error()).To(Equal("email cannot be empty")) + }) + }) + + Context("RunE execution flow", func() { + It("should successfully add a member to a team", func() { + mockClient.EXPECT().AddTeamMember(teamId, email, 0).Return(nil).Once() + + err := c.RunE(nil, []string{}) + Expect(err).ToNot(HaveOccurred()) + }) + + It("should fail when the token is not allowed to add a member", func() { + mockClient.EXPECT().AddTeamMember(teamId, email, 0).Return(errors.New("failed")).Once() + + err := c.RunE(nil, []string{}) + Expect(err).To(HaveOccurred()) + Expect(err.Error()).To(ContainSubstring("failed to add member to team: ")) + }) + + It("should fail when client creation fails", func() { + c.ClientFactory = func(opts cmd.GlobalOptions) (cmd.Client, error) { + return nil, errors.New("client init failed") + } + + err := c.RunE(nil, []string{}) + Expect(err).To(HaveOccurred()) + Expect(err.Error()).To(ContainSubstring("failed to create Codespehre client: client init failed")) + }) + + It("should fail when team ID is unavailable", func() { + c.Opts.GlobalOptions.TeamId = -1 + mockEnv.EXPECT().GetTeamId().Return(-1, errors.New("CS_TEAM_ID env var required, but not set")).Once() + + err := c.RunE(nil, []string{}) + Expect(err).To(HaveOccurred()) + Expect(err.Error()).To(Equal("CS_TEAM_ID env var required, but not set")) + }) + + It("should fail when email is empty", func() { + c.Opts.Email = "" + err := c.RunE(nil, []string{}) + Expect(err).To(HaveOccurred()) + Expect(err.Error()).To(Equal("email cannot be empty")) + }) + }) + +}) diff --git a/cli/cmd/team_test.go b/cli/cmd/team_create_test.go similarity index 100% rename from cli/cmd/team_test.go rename to cli/cmd/team_create_test.go diff --git a/cli/cmd/team_remove.go b/cli/cmd/team_remove.go index 41dd2e4b..9f6e91ec 100644 --- a/cli/cmd/team_remove.go +++ b/cli/cmd/team_remove.go @@ -5,12 +5,15 @@ package cmd import ( "errors" + "fmt" + "github.com/spf13/cobra" ) type RemoveTeamCmd struct { - cmd *cobra.Command - Opts RemoveTeamOpts + cmd *cobra.Command + Opts RemoveTeamOpts + ClientFactory func(GlobalOptions) (Client, error) } type RemoveTeamOpts struct { @@ -28,6 +31,7 @@ func AddRemoveTeamCmd(team *cobra.Command, opts *GlobalOptions) { Opts: RemoveTeamOpts{ GlobalOptions: opts, }, + ClientFactory: NewClient, } t.cmd.RunE = t.RunE t.cmd.Flags().StringVarP(&t.Opts.name, "name", "n", "", "Team name") @@ -36,10 +40,9 @@ func AddRemoveTeamCmd(team *cobra.Command, opts *GlobalOptions) { } func (c *RemoveTeamCmd) RunE(_ *cobra.Command, args []string) error { - // TODO: Implement team removal logic - client, err := NewClient(*c.Opts.GlobalOptions) + client, err := c.ClientFactory(*c.Opts.GlobalOptions) if err != nil { - return err + return fmt.Errorf("failed to create Codespehre client: %w", err) } orgId, err := c.Opts.GetOrgId() @@ -52,12 +55,9 @@ func (c *RemoveTeamCmd) RunE(_ *cobra.Command, args []string) error { return errors.New("team ID not set, use -T or CS_TEAM_ID to set it") } - // - err = client.DeleteTeam(orgId, teamId) if err != nil { - return err + return fmt.Errorf("failed to delete team: %w", err) } return nil - } diff --git a/cli/cmd/team_remove_member.go b/cli/cmd/team_remove_member.go index fe9202ae..c747e160 100644 --- a/cli/cmd/team_remove_member.go +++ b/cli/cmd/team_remove_member.go @@ -4,12 +4,21 @@ package cmd import ( + "errors" + "fmt" + "github.com/spf13/cobra" ) type RemoveTeamMemberCmd struct { - cmd *cobra.Command - Opts CreateWorkspaceOpts + cmd *cobra.Command + Opts RemoveTeamMemberOpts + ClientFactory func(GlobalOptions) (Client, error) +} + +type RemoveTeamMemberOpts struct { + *GlobalOptions + UserId int } func AddRemoveTeamMemberCmd(team *cobra.Command, opts *GlobalOptions) { @@ -19,15 +28,39 @@ func AddRemoveTeamMemberCmd(team *cobra.Command, opts *GlobalOptions) { Short: "Remove team member", Long: `Remove team member from a team`, }, - Opts: CreateWorkspaceOpts{ + Opts: RemoveTeamMemberOpts{ GlobalOptions: opts, }, + ClientFactory: NewClient, } + res.cmd.Flags().IntVarP(&res.Opts.UserId, "user", "u", 0, "Team member user ID") res.cmd.RunE = res.RunE AddCmd(team, res.cmd) } func (c *RemoveTeamMemberCmd) RunE(_ *cobra.Command, args []string) error { - // TODO: Implement team member removal logic + client, err := c.ClientFactory(*c.Opts.GlobalOptions) + if err != nil { + return fmt.Errorf("failed to create Codespehre client: %w", err) + } + + teamId, err := c.Opts.GetTeamId() + if err != nil { + return err + } + + return c.RemoveTeamMember(client, teamId, c.Opts.UserId) +} + +func (c *RemoveTeamMemberCmd) RemoveTeamMember(client Client, teamId int, userId int) error { + if userId == 0 { + return errors.New("user ID cannot be empty") + } + + err := client.RemoveTeamMember(teamId, userId) + if err != nil { + return fmt.Errorf("failed to remove member from team: %w", err) + } + return nil } diff --git a/cli/cmd/team_remove_member_test.go b/cli/cmd/team_remove_member_test.go new file mode 100644 index 00000000..0735d1bf --- /dev/null +++ b/cli/cmd/team_remove_member_test.go @@ -0,0 +1,99 @@ +// Copyright (c) Codesphere Inc. +// SPDX-License-Identifier: Apache-2.0 + +package cmd_test + +import ( + "errors" + + "github.com/codesphere-cloud/cs-go/cli/cmd" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" +) + +var _ = Describe("RemoveTeamMember", func() { + var ( + mockEnv *cmd.MockEnv + mockClient *cmd.MockClient + c *cmd.RemoveTeamMemberCmd + teamId int + userId int + ) + + BeforeEach(func() { + mockClient = cmd.NewMockClient(GinkgoT()) + mockEnv = cmd.NewMockEnv(GinkgoT()) + teamId = 42 + userId = 100 + c = &cmd.RemoveTeamMemberCmd{ + Opts: cmd.RemoveTeamMemberOpts{ + GlobalOptions: &cmd.GlobalOptions{ + Env: mockEnv, + TeamId: teamId, + }, + UserId: userId, + }, + ClientFactory: func(opts cmd.GlobalOptions) (cmd.Client, error) { + return mockClient, nil + }, + } + }) + + AfterEach(func() { + mockEnv.AssertExpectations(GinkgoT()) + mockClient.AssertExpectations(GinkgoT()) + }) + + Context("Validation", func() { + It("should fail if the user ID is empty", func() { + err := c.RemoveTeamMember(mockClient, teamId, 0) + + Expect(err).To(HaveOccurred()) + Expect(err.Error()).To(Equal("user ID cannot be empty")) + }) + }) + + Context("RunE execution flow", func() { + It("should successfully remove a member from a team", func() { + mockClient.EXPECT().RemoveTeamMember(teamId, userId).Return(nil).Once() + + err := c.RunE(nil, []string{}) + Expect(err).ToNot(HaveOccurred()) + }) + + It("should fail when the token is not allowed to remove a member", func() { + mockClient.EXPECT().RemoveTeamMember(teamId, userId).Return(errors.New("failed")).Once() + + err := c.RunE(nil, []string{}) + Expect(err).To(HaveOccurred()) + Expect(err.Error()).To(ContainSubstring("failed to remove member from team: ")) + }) + + It("should fail when client creation fails", func() { + c.ClientFactory = func(opts cmd.GlobalOptions) (cmd.Client, error) { + return nil, errors.New("client init failed") + } + + err := c.RunE(nil, []string{}) + Expect(err).To(HaveOccurred()) + Expect(err.Error()).To(ContainSubstring("failed to create Codespehre client: client init failed")) + }) + + It("should fail when team ID is unavailable", func() { + c.Opts.GlobalOptions.TeamId = -1 + mockEnv.EXPECT().GetTeamId().Return(-1, errors.New("CS_TEAM_ID env var required, but not set")).Once() + + err := c.RunE(nil, []string{}) + Expect(err).To(HaveOccurred()) + Expect(err.Error()).To(Equal("CS_TEAM_ID env var required, but not set")) + }) + + It("should fail when user ID is empty", func() { + c.Opts.UserId = 0 + err := c.RunE(nil, []string{}) + + Expect(err).To(HaveOccurred()) + Expect(err.Error()).To(Equal("user ID cannot be empty")) + }) + }) +}) diff --git a/cli/cmd/team_remove_test.go b/cli/cmd/team_remove_test.go new file mode 100644 index 00000000..80709a61 --- /dev/null +++ b/cli/cmd/team_remove_test.go @@ -0,0 +1,81 @@ +// Copyright (c) Codesphere Inc. +// SPDX-License-Identifier: Apache-2.0 + +package cmd_test + +import ( + "errors" + + "github.com/codesphere-cloud/cs-go/cli/cmd" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" +) + +var _ = Describe("RemoveTeam", func() { + var ( + mockEnv *cmd.MockEnv + mockClient *cmd.MockClient + c *cmd.RemoveTeamCmd + teamId int + ) + + BeforeEach(func() { + mockClient = cmd.NewMockClient(GinkgoT()) + mockEnv = cmd.NewMockEnv(GinkgoT()) + teamId = 42 + c = &cmd.RemoveTeamCmd{ + Opts: cmd.RemoveTeamOpts{ + GlobalOptions: &cmd.GlobalOptions{ + Env: mockEnv, + TeamId: teamId, + }, + }, + ClientFactory: func(opts cmd.GlobalOptions) (cmd.Client, error) { + return mockClient, nil + }, + } + }) + + AfterEach(func() { + mockEnv.AssertExpectations(GinkgoT()) + mockClient.AssertExpectations(GinkgoT()) + }) + + Context("RunE execution flow", func() { + It("should successfully remove a team", func() { + mockEnv.EXPECT().GetOrgId().Return("").Once() + mockClient.EXPECT().DeleteTeam("", teamId).Return(nil).Once() + + err := c.RunE(nil, []string{}) + Expect(err).ToNot(HaveOccurred()) + }) + + It("should fail when the token is not allowed to remove a team", func() { + mockEnv.EXPECT().GetOrgId().Return("").Once() + mockClient.EXPECT().DeleteTeam("", teamId).Return(errors.New("failed")).Once() + + err := c.RunE(nil, []string{}) + Expect(err).To(HaveOccurred()) + Expect(err.Error()).To(ContainSubstring("failed to delete team: ")) + }) + + It("should fail when client creation fails", func() { + c.ClientFactory = func(opts cmd.GlobalOptions) (cmd.Client, error) { + return nil, errors.New("client init failed") + } + + err := c.RunE(nil, []string{}) + Expect(err).To(HaveOccurred()) + Expect(err.Error()).To(ContainSubstring("failed to create Codespehre client: client init failed")) + }) + + It("should fail when team ID is unavailable", func() { + c.Opts.GlobalOptions.TeamId = -1 + mockEnv.EXPECT().GetOrgId().Return("").Once() + mockEnv.EXPECT().GetTeamId().Return(-1, errors.New("CS_TEAM_ID env var required, but not set")).Once() + + err := c.RunE(nil, []string{}) + Expect(err).To(MatchError("team ID not set, use -T or CS_TEAM_ID to set it")) + }) + }) +}) From c35bd68e076bc160437c72e20ee68c535723cf8e Mon Sep 17 00:00:00 2001 From: Maximilian Date: Wed, 3 Jun 2026 10:57:32 +0200 Subject: [PATCH 14/61] refactor: update organization ID handling in team commands Signed-off-by: Maximilian --- api/organization.go | 13 ------------- cli/cmd/team_add_member_test.go | 2 +- cli/cmd/team_create_test.go | 8 ++++---- cli/cmd/team_remove_member_test.go | 2 +- cli/cmd/team_remove_test.go | 2 +- 5 files changed, 7 insertions(+), 20 deletions(-) delete mode 100644 api/organization.go diff --git a/api/organization.go b/api/organization.go deleted file mode 100644 index 5d40b5f9..00000000 --- a/api/organization.go +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) Codesphere Inc. -// SPDX-License-Identifier: Apache-2.0 - -package api - -import ( - cserrors "github.com/codesphere-cloud/cs-go/api/errors" -) - -func (c *Client) ListOrganizations() ([]Organization, error) { - organizations, r, err := c.api.OrganizationsAPI.OrganizationsListOrganizations(c.ctx).Execute() - return organizations, cserrors.FormatAPIError(r, err) -} diff --git a/cli/cmd/team_add_member_test.go b/cli/cmd/team_add_member_test.go index 809d1bbc..d7d43749 100644 --- a/cli/cmd/team_add_member_test.go +++ b/cli/cmd/team_add_member_test.go @@ -101,5 +101,5 @@ var _ = Describe("AddTeamMember", func() { Expect(err.Error()).To(Equal("email cannot be empty")) }) }) - + }) diff --git a/cli/cmd/team_create_test.go b/cli/cmd/team_create_test.go index fed429c4..6083bd24 100644 --- a/cli/cmd/team_create_test.go +++ b/cli/cmd/team_create_test.go @@ -63,7 +63,7 @@ var _ = Describe("CreateTeam", func() { Context("RunE execution flow", func() { It("should successfully create a team when organization ID is provided via environment", func() { - c.Opts.GlobalOptions.OrgId = "" // Ensure flag is empty + c.Opts.OrgId = "" // Ensure flag is empty mockEnv.EXPECT().GetOrgId().Return(orgId).Once() expectedTeam := api.Team{ @@ -81,7 +81,7 @@ var _ = Describe("CreateTeam", func() { Context("when creating a team with an organization ID", func() { BeforeEach(func() { - c.Opts.GlobalOptions.OrgId = orgId // Set OrgId via GlobalOptions (flag equivalent) + c.Opts.OrgId = orgId // Set OrgId via GlobalOptions (flag equivalent) }) It("should successfully create the team and return the correct object", func() { @@ -112,7 +112,7 @@ var _ = Describe("CreateTeam", func() { Context("when creating a team without an organization ID", func() { BeforeEach(func() { - c.Opts.GlobalOptions.OrgId = "" // Ensure OrgId is empty from flag + c.Opts.OrgId = "" // Ensure OrgId is empty from flag }) It("should create the team without orgID ", func() { @@ -132,7 +132,7 @@ var _ = Describe("CreateTeam", func() { Context("when an invalid organization ID format is provided via flag", func() { BeforeEach(func() { - c.Opts.GlobalOptions.OrgId = "invalid-uuid-format" // Set an invalid UUID in GlobalOptions + c.Opts.OrgId = "invalid-uuid-format" // Set an invalid UUID in GlobalOptions }) It("should return an error due to invalid organization ID format", func() { diff --git a/cli/cmd/team_remove_member_test.go b/cli/cmd/team_remove_member_test.go index 0735d1bf..17e49d73 100644 --- a/cli/cmd/team_remove_member_test.go +++ b/cli/cmd/team_remove_member_test.go @@ -80,7 +80,7 @@ var _ = Describe("RemoveTeamMember", func() { }) It("should fail when team ID is unavailable", func() { - c.Opts.GlobalOptions.TeamId = -1 + c.Opts.TeamId = -1 mockEnv.EXPECT().GetTeamId().Return(-1, errors.New("CS_TEAM_ID env var required, but not set")).Once() err := c.RunE(nil, []string{}) diff --git a/cli/cmd/team_remove_test.go b/cli/cmd/team_remove_test.go index 80709a61..75a41506 100644 --- a/cli/cmd/team_remove_test.go +++ b/cli/cmd/team_remove_test.go @@ -70,7 +70,7 @@ var _ = Describe("RemoveTeam", func() { }) It("should fail when team ID is unavailable", func() { - c.Opts.GlobalOptions.TeamId = -1 + c.Opts.TeamId = -1 mockEnv.EXPECT().GetOrgId().Return("").Once() mockEnv.EXPECT().GetTeamId().Return(-1, errors.New("CS_TEAM_ID env var required, but not set")).Once() From a8a0f4c30f87b0cf90660410a1b70810a441b3d9 Mon Sep 17 00:00:00 2001 From: DerBurri <7892993+DerBurri@users.noreply.github.com> Date: Wed, 3 Jun 2026 09:00:05 +0000 Subject: [PATCH 15/61] chore(docs): Auto-update docs and licenses Signed-off-by: DerBurri <7892993+DerBurri@users.noreply.github.com> Signed-off-by: Maximilian --- NOTICE | 30 +++++++++++++-------------- docs/cs_team_member_add.md | 4 +++- docs/cs_team_member_remove.md | 3 ++- pkg/tmpl/NOTICE | 38 +++++++++++++++++------------------ 4 files changed, 39 insertions(+), 36 deletions(-) diff --git a/NOTICE b/NOTICE index 5acaf371..c018e85e 100644 --- a/NOTICE +++ b/NOTICE @@ -13,7 +13,7 @@ License URL: https://gitea.com/gitea/go-sdk/src/tag/gitea/v0.25.1/gitea/LICENSE Module: dario.cat/mergo Version: v1.0.2 License: BSD-3-Clause -License URL: https://github.com/imdario/mergo/blob/v1.0.2/LICENSE +License URL: Unknown ---------- Module: github.com/42wim/httpsig @@ -125,9 +125,9 @@ License URL: https://github.com/go-git/go-billy/blob/v5.9.0/LICENSE ---------- Module: github.com/go-git/go-git/v5 -Version: v5.19.0 +Version: v5.19.1 License: Apache-2.0 -License URL: https://github.com/go-git/go-git/blob/v5.19.0/LICENSE +License URL: https://github.com/go-git/go-git/blob/v5.19.1/LICENSE ---------- Module: github.com/go-logr/logr @@ -459,21 +459,21 @@ License URL: https://github.com/yaml/go-yaml/blob/v3.0.4/LICENSE ---------- Module: golang.org/x/crypto -Version: v0.53.0 +Version: v0.52.0 License: BSD-3-Clause -License URL: https://cs.opensource.google/go/x/crypto/+/v0.53.0:LICENSE +License URL: https://cs.opensource.google/go/x/crypto/+/v0.52.0:LICENSE ---------- Module: golang.org/x/mod/semver -Version: v0.37.0 +Version: v0.36.0 License: BSD-3-Clause -License URL: https://cs.opensource.google/go/x/mod/+/v0.37.0:LICENSE +License URL: https://cs.opensource.google/go/x/mod/+/v0.36.0:LICENSE ---------- Module: golang.org/x/net -Version: v0.56.0 +Version: v0.54.0 License: BSD-3-Clause -License URL: https://cs.opensource.google/go/x/net/+/v0.56.0:LICENSE +License URL: https://cs.opensource.google/go/x/net/+/v0.54.0:LICENSE ---------- Module: golang.org/x/oauth2 @@ -489,15 +489,15 @@ License URL: https://cs.opensource.google/go/x/sync/+/v0.21.0:LICENSE ---------- Module: golang.org/x/sys -Version: v0.46.0 +Version: v0.45.0 License: BSD-3-Clause -License URL: https://cs.opensource.google/go/x/sys/+/v0.46.0:LICENSE +License URL: https://cs.opensource.google/go/x/sys/+/v0.45.0:LICENSE ---------- Module: golang.org/x/text -Version: v0.38.0 +Version: v0.37.0 License: BSD-3-Clause -License URL: https://cs.opensource.google/go/x/text/+/v0.38.0:LICENSE +License URL: https://cs.opensource.google/go/x/text/+/v0.37.0:LICENSE ---------- Module: golang.org/x/time/rate @@ -507,9 +507,9 @@ License URL: https://cs.opensource.google/go/x/time/+/v0.15.0:LICENSE ---------- Module: golang.org/x/tools -Version: v0.46.0 +Version: v0.45.0 License: BSD-3-Clause -License URL: https://cs.opensource.google/go/x/tools/+/v0.46.0:LICENSE +License URL: https://cs.opensource.google/go/x/tools/+/v0.45.0:LICENSE ---------- Module: google.golang.org/protobuf diff --git a/docs/cs_team_member_add.md b/docs/cs_team_member_add.md index 0ffcf6bc..612462e6 100644 --- a/docs/cs_team_member_add.md +++ b/docs/cs_team_member_add.md @@ -13,7 +13,9 @@ cs team member add [flags] ### Options ``` - -h, --help help for add + -e, --email string Team member email + -h, --help help for add + -r, --role int Team member role 0=admin, 1=member ``` ### Options inherited from parent commands diff --git a/docs/cs_team_member_remove.md b/docs/cs_team_member_remove.md index eedf67bb..9ce33980 100644 --- a/docs/cs_team_member_remove.md +++ b/docs/cs_team_member_remove.md @@ -13,7 +13,8 @@ cs team member remove [flags] ### Options ``` - -h, --help help for remove + -h, --help help for remove + -u, --user int Team member user ID ``` ### Options inherited from parent commands diff --git a/pkg/tmpl/NOTICE b/pkg/tmpl/NOTICE index 5acaf371..9b821cbf 100644 --- a/pkg/tmpl/NOTICE +++ b/pkg/tmpl/NOTICE @@ -13,7 +13,7 @@ License URL: https://gitea.com/gitea/go-sdk/src/tag/gitea/v0.25.1/gitea/LICENSE Module: dario.cat/mergo Version: v1.0.2 License: BSD-3-Clause -License URL: https://github.com/imdario/mergo/blob/v1.0.2/LICENSE +License URL: Unknown ---------- Module: github.com/42wim/httpsig @@ -125,9 +125,9 @@ License URL: https://github.com/go-git/go-billy/blob/v5.9.0/LICENSE ---------- Module: github.com/go-git/go-git/v5 -Version: v5.19.0 +Version: v5.19.1 License: Apache-2.0 -License URL: https://github.com/go-git/go-git/blob/v5.19.0/LICENSE +License URL: https://github.com/go-git/go-git/blob/v5.19.1/LICENSE ---------- Module: github.com/go-logr/logr @@ -261,15 +261,15 @@ License URL: https://github.com/munnerz/goautoneg/blob/a7dc8b61c822/LICENSE ---------- Module: github.com/onsi/ginkgo/v2 -Version: v2.32.0 +Version: v2.29.0 License: MIT -License URL: https://github.com/onsi/ginkgo/blob/v2.32.0/LICENSE +License URL: https://github.com/onsi/ginkgo/blob/v2.29.0/LICENSE ---------- Module: github.com/onsi/gomega -Version: v1.42.1 +Version: v1.41.0 License: MIT -License URL: https://github.com/onsi/gomega/blob/v1.42.1/LICENSE +License URL: https://github.com/onsi/gomega/blob/v1.41.0/LICENSE ---------- Module: github.com/pjbgf/sha1cd @@ -459,21 +459,21 @@ License URL: https://github.com/yaml/go-yaml/blob/v3.0.4/LICENSE ---------- Module: golang.org/x/crypto -Version: v0.53.0 +Version: v0.52.0 License: BSD-3-Clause -License URL: https://cs.opensource.google/go/x/crypto/+/v0.53.0:LICENSE +License URL: https://cs.opensource.google/go/x/crypto/+/v0.52.0:LICENSE ---------- Module: golang.org/x/mod/semver -Version: v0.37.0 +Version: v0.36.0 License: BSD-3-Clause -License URL: https://cs.opensource.google/go/x/mod/+/v0.37.0:LICENSE +License URL: https://cs.opensource.google/go/x/mod/+/v0.36.0:LICENSE ---------- Module: golang.org/x/net -Version: v0.56.0 +Version: v0.54.0 License: BSD-3-Clause -License URL: https://cs.opensource.google/go/x/net/+/v0.56.0:LICENSE +License URL: https://cs.opensource.google/go/x/net/+/v0.54.0:LICENSE ---------- Module: golang.org/x/oauth2 @@ -489,15 +489,15 @@ License URL: https://cs.opensource.google/go/x/sync/+/v0.21.0:LICENSE ---------- Module: golang.org/x/sys -Version: v0.46.0 +Version: v0.45.0 License: BSD-3-Clause -License URL: https://cs.opensource.google/go/x/sys/+/v0.46.0:LICENSE +License URL: https://cs.opensource.google/go/x/sys/+/v0.45.0:LICENSE ---------- Module: golang.org/x/text -Version: v0.38.0 +Version: v0.37.0 License: BSD-3-Clause -License URL: https://cs.opensource.google/go/x/text/+/v0.38.0:LICENSE +License URL: https://cs.opensource.google/go/x/text/+/v0.37.0:LICENSE ---------- Module: golang.org/x/time/rate @@ -507,9 +507,9 @@ License URL: https://cs.opensource.google/go/x/time/+/v0.15.0:LICENSE ---------- Module: golang.org/x/tools -Version: v0.46.0 +Version: v0.45.0 License: BSD-3-Clause -License URL: https://cs.opensource.google/go/x/tools/+/v0.46.0:LICENSE +License URL: https://cs.opensource.google/go/x/tools/+/v0.45.0:LICENSE ---------- Module: google.golang.org/protobuf From ba56ecf2e4f7667fa4859d0c81beb1bb5356f479 Mon Sep 17 00:00:00 2001 From: Maximilian Date: Wed, 17 Jun 2026 11:12:12 +0200 Subject: [PATCH 16/61] feat: implement organization management API and update team-related functions rebased on actual master Signed-off-by: Maximilian --- api/openapi_client/mocks.go | 16 +- ...services_create_provider_request_any_of.go | 50 +++- ...ist_providers_200_response_inner_any_of.go | 42 ++- ...t_providers_200_response_inner_any_of_1.go | 42 ++- ...00_response_inner_any_of_versions_value.go | 257 ++++++++++++++++++ ...anaged_services_update_provider_request.go | 44 ++- .../model_managed_services_update_request.go | 48 +++- ...del_workspaces_create_workspace_request.go | 36 +++ ...del_workspaces_update_workspace_request.go | 61 ++++- api/organizations.go | 21 ++ cli/cmd/mocks.go | 10 +- mcp-server/team.go | 18 +- 12 files changed, 595 insertions(+), 50 deletions(-) create mode 100644 api/openapi_client/model_managed_services_list_providers_200_response_inner_any_of_versions_value.go create mode 100644 api/organizations.go diff --git a/api/openapi_client/mocks.go b/api/openapi_client/mocks.go index ec148d01..a71fd674 100644 --- a/api/openapi_client/mocks.go +++ b/api/openapi_client/mocks.go @@ -1367,9 +1367,9 @@ type MockManagedServicesAPI_ManagedServicesDeleteProvider_Call struct { // ManagedServicesDeleteProvider is a helper method to define mock.On call // - ctx context.Context // - name string -// - version string -func (_e *MockManagedServicesAPI_Expecter) ManagedServicesDeleteProvider(ctx interface{}, name interface{}, version interface{}) *MockManagedServicesAPI_ManagedServicesDeleteProvider_Call { - return &MockManagedServicesAPI_ManagedServicesDeleteProvider_Call{Call: _e.mock.On("ManagedServicesDeleteProvider", ctx, name, version)} +// - schemaVersion string +func (_e *MockManagedServicesAPI_Expecter) ManagedServicesDeleteProvider(ctx any, name any, schemaVersion any) *MockManagedServicesAPI_ManagedServicesDeleteProvider_Call { + return &MockManagedServicesAPI_ManagedServicesDeleteProvider_Call{Call: _e.mock.On("ManagedServicesDeleteProvider", ctx, name, schemaVersion)} } func (_c *MockManagedServicesAPI_ManagedServicesDeleteProvider_Call) Run(run func(ctx context.Context, name string, schemaVersion string)) *MockManagedServicesAPI_ManagedServicesDeleteProvider_Call { @@ -2115,9 +2115,9 @@ type MockManagedServicesAPI_ManagedServicesUpdateProvider_Call struct { // ManagedServicesUpdateProvider is a helper method to define mock.On call // - ctx context.Context // - name string -// - version string -func (_e *MockManagedServicesAPI_Expecter) ManagedServicesUpdateProvider(ctx interface{}, name interface{}, version interface{}) *MockManagedServicesAPI_ManagedServicesUpdateProvider_Call { - return &MockManagedServicesAPI_ManagedServicesUpdateProvider_Call{Call: _e.mock.On("ManagedServicesUpdateProvider", ctx, name, version)} +// - schemaVersion string +func (_e *MockManagedServicesAPI_Expecter) ManagedServicesUpdateProvider(ctx any, name any, schemaVersion any) *MockManagedServicesAPI_ManagedServicesUpdateProvider_Call { + return &MockManagedServicesAPI_ManagedServicesUpdateProvider_Call{Call: _e.mock.On("ManagedServicesUpdateProvider", ctx, name, schemaVersion)} } func (_c *MockManagedServicesAPI_ManagedServicesUpdateProvider_Call) Run(run func(ctx context.Context, name string, schemaVersion string)) *MockManagedServicesAPI_ManagedServicesUpdateProvider_Call { @@ -4979,7 +4979,7 @@ type MockVaultAPI_VaultGenerateSecrets_Call struct { // - ctx context.Context // - teamId float32 // - workspaceId float32 -func (_e *MockVaultAPI_Expecter) VaultGenerateSecrets(ctx interface{}, teamId interface{}, workspaceId interface{}) *MockVaultAPI_VaultGenerateSecrets_Call { +func (_e *MockVaultAPI_Expecter) VaultGenerateSecrets(ctx any, teamId any, workspaceId any) *MockVaultAPI_VaultGenerateSecrets_Call { return &MockVaultAPI_VaultGenerateSecrets_Call{Call: _e.mock.On("VaultGenerateSecrets", ctx, teamId, workspaceId)} } @@ -5059,7 +5059,7 @@ type MockVaultAPI_VaultGenerateSecretsExecute_Call struct { // VaultGenerateSecretsExecute is a helper method to define mock.On call // - r ApiVaultGenerateSecretsRequest -func (_e *MockVaultAPI_Expecter) VaultGenerateSecretsExecute(r interface{}) *MockVaultAPI_VaultGenerateSecretsExecute_Call { +func (_e *MockVaultAPI_Expecter) VaultGenerateSecretsExecute(r any) *MockVaultAPI_VaultGenerateSecretsExecute_Call { return &MockVaultAPI_VaultGenerateSecretsExecute_Call{Call: _e.mock.On("VaultGenerateSecretsExecute", r)} } diff --git a/api/openapi_client/model_managed_services_create_provider_request_any_of.go b/api/openapi_client/model_managed_services_create_provider_request_any_of.go index 9b8635c1..e464c90c 100644 --- a/api/openapi_client/model_managed_services_create_provider_request_any_of.go +++ b/api/openapi_client/model_managed_services_create_provider_request_any_of.go @@ -34,13 +34,14 @@ type ManagedServicesCreateProviderRequestAnyOf struct { // JSON Schema DetailsSchema map[string]interface{} `json:"detailsSchema"` // JSON Schema - SecretsSchema map[string]interface{} `json:"secretsSchema"` - Plans []ManagedServicesListProviders200ResponseInnerAnyOfPlansInner `json:"plans"` - Name string `json:"name" validate:"regexp=^[a-z0-9-_]+$"` - Version *string `json:"version,omitempty" validate:"regexp=^v[0-9][0-9a-z]*$"` - SchemaVersion *string `json:"schemaVersion,omitempty" validate:"regexp=^v[0-9][0-9a-z]*$"` - Backend ManagedServicesListProviders200ResponseInnerAnyOfBackend `json:"backend"` - Scope *ManagedServicesCreateProviderRequestAnyOfScope `json:"scope,omitempty"` + SecretsSchema map[string]interface{} `json:"secretsSchema"` + Plans []ManagedServicesListProviders200ResponseInnerAnyOfPlansInner `json:"plans"` + Versions *map[string]ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue `json:"versions,omitempty"` + Name string `json:"name" validate:"regexp=^[a-z0-9-_]+$"` + Version *string `json:"version,omitempty" validate:"regexp=^v[0-9][0-9a-z]*$"` + SchemaVersion *string `json:"schemaVersion,omitempty" validate:"regexp=^v[0-9][0-9a-z]*$"` + Backend ManagedServicesListProviders200ResponseInnerAnyOfBackend `json:"backend"` + Scope *ManagedServicesCreateProviderRequestAnyOfScope `json:"scope,omitempty"` } type _ManagedServicesCreateProviderRequestAnyOf ManagedServicesCreateProviderRequestAnyOf @@ -353,6 +354,38 @@ func (o *ManagedServicesCreateProviderRequestAnyOf) SetPlans(v []ManagedServices o.Plans = v } +// GetVersions returns the Versions field value if set, zero value otherwise. +func (o *ManagedServicesCreateProviderRequestAnyOf) GetVersions() map[string]ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue { + if o == nil || IsNil(o.Versions) { + var ret map[string]ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue + return ret + } + return *o.Versions +} + +// GetVersionsOk returns a tuple with the Versions field value if set, nil otherwise +// and a boolean to check if the value has been set. +func (o *ManagedServicesCreateProviderRequestAnyOf) GetVersionsOk() (*map[string]ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue, bool) { + if o == nil || IsNil(o.Versions) { + return nil, false + } + return o.Versions, true +} + +// HasVersions returns a boolean if a field has been set. +func (o *ManagedServicesCreateProviderRequestAnyOf) HasVersions() bool { + if o != nil && !IsNil(o.Versions) { + return true + } + + return false +} + +// SetVersions gets a reference to the given map[string]ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue and assigns it to the Versions field. +func (o *ManagedServicesCreateProviderRequestAnyOf) SetVersions(v map[string]ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue) { + o.Versions = &v +} + // GetName returns the Name field value func (o *ManagedServicesCreateProviderRequestAnyOf) GetName() string { if o == nil { @@ -522,6 +555,9 @@ func (o ManagedServicesCreateProviderRequestAnyOf) ToMap() (map[string]interface toSerialize["detailsSchema"] = o.DetailsSchema toSerialize["secretsSchema"] = o.SecretsSchema toSerialize["plans"] = o.Plans + if !IsNil(o.Versions) { + toSerialize["versions"] = o.Versions + } toSerialize["name"] = o.Name if !IsNil(o.Version) { toSerialize["version"] = o.Version diff --git a/api/openapi_client/model_managed_services_list_providers_200_response_inner_any_of.go b/api/openapi_client/model_managed_services_list_providers_200_response_inner_any_of.go index ae5ff817..ecc9208a 100644 --- a/api/openapi_client/model_managed_services_list_providers_200_response_inner_any_of.go +++ b/api/openapi_client/model_managed_services_list_providers_200_response_inner_any_of.go @@ -38,9 +38,10 @@ type ManagedServicesListProviders200ResponseInnerAnyOf struct { // JSON Schema DetailsSchema map[string]interface{} `json:"detailsSchema"` // JSON Schema - SecretsSchema map[string]interface{} `json:"secretsSchema"` - Plans []ManagedServicesListProviders200ResponseInnerAnyOfPlansInner `json:"plans"` - Backend ManagedServicesListProviders200ResponseInnerAnyOfBackend `json:"backend"` + SecretsSchema map[string]interface{} `json:"secretsSchema"` + Plans []ManagedServicesListProviders200ResponseInnerAnyOfPlansInner `json:"plans"` + Versions *map[string]ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue `json:"versions,omitempty"` + Backend ManagedServicesListProviders200ResponseInnerAnyOfBackend `json:"backend"` } type _ManagedServicesListProviders200ResponseInnerAnyOf ManagedServicesListProviders200ResponseInnerAnyOf @@ -459,6 +460,38 @@ func (o *ManagedServicesListProviders200ResponseInnerAnyOf) SetPlans(v []Managed o.Plans = v } +// GetVersions returns the Versions field value if set, zero value otherwise. +func (o *ManagedServicesListProviders200ResponseInnerAnyOf) GetVersions() map[string]ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue { + if o == nil || IsNil(o.Versions) { + var ret map[string]ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue + return ret + } + return *o.Versions +} + +// GetVersionsOk returns a tuple with the Versions field value if set, nil otherwise +// and a boolean to check if the value has been set. +func (o *ManagedServicesListProviders200ResponseInnerAnyOf) GetVersionsOk() (*map[string]ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue, bool) { + if o == nil || IsNil(o.Versions) { + return nil, false + } + return o.Versions, true +} + +// HasVersions returns a boolean if a field has been set. +func (o *ManagedServicesListProviders200ResponseInnerAnyOf) HasVersions() bool { + if o != nil && !IsNil(o.Versions) { + return true + } + + return false +} + +// SetVersions gets a reference to the given map[string]ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue and assigns it to the Versions field. +func (o *ManagedServicesListProviders200ResponseInnerAnyOf) SetVersions(v map[string]ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue) { + o.Versions = &v +} + // GetBackend returns the Backend field value func (o *ManagedServicesListProviders200ResponseInnerAnyOf) GetBackend() ManagedServicesListProviders200ResponseInnerAnyOfBackend { if o == nil { @@ -514,6 +547,9 @@ func (o ManagedServicesListProviders200ResponseInnerAnyOf) ToMap() (map[string]i toSerialize["detailsSchema"] = o.DetailsSchema toSerialize["secretsSchema"] = o.SecretsSchema toSerialize["plans"] = o.Plans + if !IsNil(o.Versions) { + toSerialize["versions"] = o.Versions + } toSerialize["backend"] = o.Backend return toSerialize, nil } diff --git a/api/openapi_client/model_managed_services_list_providers_200_response_inner_any_of_1.go b/api/openapi_client/model_managed_services_list_providers_200_response_inner_any_of_1.go index 06eebde5..825eee07 100644 --- a/api/openapi_client/model_managed_services_list_providers_200_response_inner_any_of_1.go +++ b/api/openapi_client/model_managed_services_list_providers_200_response_inner_any_of_1.go @@ -38,9 +38,10 @@ type ManagedServicesListProviders200ResponseInnerAnyOf1 struct { // JSON Schema DetailsSchema map[string]interface{} `json:"detailsSchema"` // JSON Schema - SecretsSchema map[string]interface{} `json:"secretsSchema"` - Plans []ManagedServicesListProviders200ResponseInnerAnyOfPlansInner `json:"plans"` - Backend ManagedServicesListProviders200ResponseInnerAnyOf1Backend `json:"backend"` + SecretsSchema map[string]interface{} `json:"secretsSchema"` + Plans []ManagedServicesListProviders200ResponseInnerAnyOfPlansInner `json:"plans"` + Versions *map[string]ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue `json:"versions,omitempty"` + Backend ManagedServicesListProviders200ResponseInnerAnyOf1Backend `json:"backend"` } type _ManagedServicesListProviders200ResponseInnerAnyOf1 ManagedServicesListProviders200ResponseInnerAnyOf1 @@ -459,6 +460,38 @@ func (o *ManagedServicesListProviders200ResponseInnerAnyOf1) SetPlans(v []Manage o.Plans = v } +// GetVersions returns the Versions field value if set, zero value otherwise. +func (o *ManagedServicesListProviders200ResponseInnerAnyOf1) GetVersions() map[string]ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue { + if o == nil || IsNil(o.Versions) { + var ret map[string]ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue + return ret + } + return *o.Versions +} + +// GetVersionsOk returns a tuple with the Versions field value if set, nil otherwise +// and a boolean to check if the value has been set. +func (o *ManagedServicesListProviders200ResponseInnerAnyOf1) GetVersionsOk() (*map[string]ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue, bool) { + if o == nil || IsNil(o.Versions) { + return nil, false + } + return o.Versions, true +} + +// HasVersions returns a boolean if a field has been set. +func (o *ManagedServicesListProviders200ResponseInnerAnyOf1) HasVersions() bool { + if o != nil && !IsNil(o.Versions) { + return true + } + + return false +} + +// SetVersions gets a reference to the given map[string]ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue and assigns it to the Versions field. +func (o *ManagedServicesListProviders200ResponseInnerAnyOf1) SetVersions(v map[string]ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue) { + o.Versions = &v +} + // GetBackend returns the Backend field value func (o *ManagedServicesListProviders200ResponseInnerAnyOf1) GetBackend() ManagedServicesListProviders200ResponseInnerAnyOf1Backend { if o == nil { @@ -514,6 +547,9 @@ func (o ManagedServicesListProviders200ResponseInnerAnyOf1) ToMap() (map[string] toSerialize["detailsSchema"] = o.DetailsSchema toSerialize["secretsSchema"] = o.SecretsSchema toSerialize["plans"] = o.Plans + if !IsNil(o.Versions) { + toSerialize["versions"] = o.Versions + } toSerialize["backend"] = o.Backend return toSerialize, nil } diff --git a/api/openapi_client/model_managed_services_list_providers_200_response_inner_any_of_versions_value.go b/api/openapi_client/model_managed_services_list_providers_200_response_inner_any_of_versions_value.go new file mode 100644 index 00000000..73a24a14 --- /dev/null +++ b/api/openapi_client/model_managed_services_list_providers_200_response_inner_any_of_versions_value.go @@ -0,0 +1,257 @@ +// Copyright (c) Codesphere Inc. +// SPDX-License-Identifier: Apache-2.0 + +/* +Codesphere Public API + +API version: 0.1.0 +*/ + +// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. + +package openapi_client + +import ( + "bytes" + "encoding/json" + "fmt" +) + +// checks if the ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue type satisfies the MappedNullable interface at compile time +var _ MappedNullable = &ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue{} + +// ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue struct for ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue +type ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue struct { + GitRef string `json:"gitRef"` + CiProfile string `json:"ciProfile"` + AppVersion *string `json:"appVersion,omitempty"` + Description *string `json:"description,omitempty"` +} + +type _ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue + +// NewManagedServicesListProviders200ResponseInnerAnyOfVersionsValue instantiates a new ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue object +// This constructor will assign default values to properties that have it defined, +// and makes sure properties required by API are set, but the set of arguments +// will change when the set of required properties is changed +func NewManagedServicesListProviders200ResponseInnerAnyOfVersionsValue(gitRef string, ciProfile string) *ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue { + this := ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue{} + this.GitRef = gitRef + this.CiProfile = ciProfile + return &this +} + +// NewManagedServicesListProviders200ResponseInnerAnyOfVersionsValueWithDefaults instantiates a new ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue object +// This constructor will only assign default values to properties that have it defined, +// but it doesn't guarantee that properties required by API are set +func NewManagedServicesListProviders200ResponseInnerAnyOfVersionsValueWithDefaults() *ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue { + this := ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue{} + return &this +} + +// GetGitRef returns the GitRef field value +func (o *ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue) GetGitRef() string { + if o == nil { + var ret string + return ret + } + + return o.GitRef +} + +// GetGitRefOk returns a tuple with the GitRef field value +// and a boolean to check if the value has been set. +func (o *ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue) GetGitRefOk() (*string, bool) { + if o == nil { + return nil, false + } + return &o.GitRef, true +} + +// SetGitRef sets field value +func (o *ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue) SetGitRef(v string) { + o.GitRef = v +} + +// GetCiProfile returns the CiProfile field value +func (o *ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue) GetCiProfile() string { + if o == nil { + var ret string + return ret + } + + return o.CiProfile +} + +// GetCiProfileOk returns a tuple with the CiProfile field value +// and a boolean to check if the value has been set. +func (o *ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue) GetCiProfileOk() (*string, bool) { + if o == nil { + return nil, false + } + return &o.CiProfile, true +} + +// SetCiProfile sets field value +func (o *ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue) SetCiProfile(v string) { + o.CiProfile = v +} + +// GetAppVersion returns the AppVersion field value if set, zero value otherwise. +func (o *ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue) GetAppVersion() string { + if o == nil || IsNil(o.AppVersion) { + var ret string + return ret + } + return *o.AppVersion +} + +// GetAppVersionOk returns a tuple with the AppVersion field value if set, nil otherwise +// and a boolean to check if the value has been set. +func (o *ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue) GetAppVersionOk() (*string, bool) { + if o == nil || IsNil(o.AppVersion) { + return nil, false + } + return o.AppVersion, true +} + +// HasAppVersion returns a boolean if a field has been set. +func (o *ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue) HasAppVersion() bool { + if o != nil && !IsNil(o.AppVersion) { + return true + } + + return false +} + +// SetAppVersion gets a reference to the given string and assigns it to the AppVersion field. +func (o *ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue) SetAppVersion(v string) { + o.AppVersion = &v +} + +// GetDescription returns the Description field value if set, zero value otherwise. +func (o *ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue) GetDescription() string { + if o == nil || IsNil(o.Description) { + var ret string + return ret + } + return *o.Description +} + +// GetDescriptionOk returns a tuple with the Description field value if set, nil otherwise +// and a boolean to check if the value has been set. +func (o *ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue) GetDescriptionOk() (*string, bool) { + if o == nil || IsNil(o.Description) { + return nil, false + } + return o.Description, true +} + +// HasDescription returns a boolean if a field has been set. +func (o *ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue) HasDescription() bool { + if o != nil && !IsNil(o.Description) { + return true + } + + return false +} + +// SetDescription gets a reference to the given string and assigns it to the Description field. +func (o *ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue) SetDescription(v string) { + o.Description = &v +} + +func (o ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue) MarshalJSON() ([]byte, error) { + toSerialize, err := o.ToMap() + if err != nil { + return []byte{}, err + } + return json.Marshal(toSerialize) +} + +func (o ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue) ToMap() (map[string]interface{}, error) { + toSerialize := map[string]interface{}{} + toSerialize["gitRef"] = o.GitRef + toSerialize["ciProfile"] = o.CiProfile + if !IsNil(o.AppVersion) { + toSerialize["appVersion"] = o.AppVersion + } + if !IsNil(o.Description) { + toSerialize["description"] = o.Description + } + return toSerialize, nil +} + +func (o *ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue) UnmarshalJSON(data []byte) (err error) { + // This validates that all required properties are included in the JSON object + // by unmarshalling the object into a generic map with string keys and checking + // that every required field exists as a key in the generic map. + requiredProperties := []string{ + "gitRef", + "ciProfile", + } + + allProperties := make(map[string]interface{}) + + err = json.Unmarshal(data, &allProperties) + + if err != nil { + return err + } + + for _, requiredProperty := range requiredProperties { + if _, exists := allProperties[requiredProperty]; !exists { + return fmt.Errorf("no value given for required property %v", requiredProperty) + } + } + + varManagedServicesListProviders200ResponseInnerAnyOfVersionsValue := _ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue{} + + decoder := json.NewDecoder(bytes.NewReader(data)) + //decoder.DisallowUnknownFields() + err = decoder.Decode(&varManagedServicesListProviders200ResponseInnerAnyOfVersionsValue) + + if err != nil { + return err + } + + *o = ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue(varManagedServicesListProviders200ResponseInnerAnyOfVersionsValue) + + return err +} + +type NullableManagedServicesListProviders200ResponseInnerAnyOfVersionsValue struct { + value *ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue + isSet bool +} + +func (v NullableManagedServicesListProviders200ResponseInnerAnyOfVersionsValue) Get() *ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue { + return v.value +} + +func (v *NullableManagedServicesListProviders200ResponseInnerAnyOfVersionsValue) Set(val *ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue) { + v.value = val + v.isSet = true +} + +func (v NullableManagedServicesListProviders200ResponseInnerAnyOfVersionsValue) IsSet() bool { + return v.isSet +} + +func (v *NullableManagedServicesListProviders200ResponseInnerAnyOfVersionsValue) Unset() { + v.value = nil + v.isSet = false +} + +func NewNullableManagedServicesListProviders200ResponseInnerAnyOfVersionsValue(val *ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue) *NullableManagedServicesListProviders200ResponseInnerAnyOfVersionsValue { + return &NullableManagedServicesListProviders200ResponseInnerAnyOfVersionsValue{value: val, isSet: true} +} + +func (v NullableManagedServicesListProviders200ResponseInnerAnyOfVersionsValue) MarshalJSON() ([]byte, error) { + return json.Marshal(v.value) +} + +func (v *NullableManagedServicesListProviders200ResponseInnerAnyOfVersionsValue) UnmarshalJSON(src []byte) error { + v.isSet = true + return json.Unmarshal(src, &v.value) +} diff --git a/api/openapi_client/model_managed_services_update_provider_request.go b/api/openapi_client/model_managed_services_update_provider_request.go index 4ffc25e2..8f95fccf 100644 --- a/api/openapi_client/model_managed_services_update_provider_request.go +++ b/api/openapi_client/model_managed_services_update_provider_request.go @@ -32,10 +32,11 @@ type ManagedServicesUpdateProviderRequest struct { // JSON Schema DetailsSchema map[string]interface{} `json:"detailsSchema,omitempty"` // JSON Schema - SecretsSchema map[string]interface{} `json:"secretsSchema,omitempty"` - Plans []ManagedServicesListProviders200ResponseInnerAnyOfPlansInner `json:"plans,omitempty"` - Backend *ManagedServicesListProviders200ResponseInnerAnyOfBackend `json:"backend,omitempty"` - Scope *ManagedServicesCreateProviderRequestAnyOfScope `json:"scope,omitempty"` + SecretsSchema map[string]interface{} `json:"secretsSchema,omitempty"` + Plans []ManagedServicesListProviders200ResponseInnerAnyOfPlansInner `json:"plans,omitempty"` + Versions *map[string]ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue `json:"versions,omitempty"` + Backend *ManagedServicesListProviders200ResponseInnerAnyOfBackend `json:"backend,omitempty"` + Scope *ManagedServicesCreateProviderRequestAnyOfScope `json:"scope,omitempty"` } // NewManagedServicesUpdateProviderRequest instantiates a new ManagedServicesUpdateProviderRequest object @@ -407,6 +408,38 @@ func (o *ManagedServicesUpdateProviderRequest) SetPlans(v []ManagedServicesListP o.Plans = v } +// GetVersions returns the Versions field value if set, zero value otherwise. +func (o *ManagedServicesUpdateProviderRequest) GetVersions() map[string]ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue { + if o == nil || IsNil(o.Versions) { + var ret map[string]ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue + return ret + } + return *o.Versions +} + +// GetVersionsOk returns a tuple with the Versions field value if set, nil otherwise +// and a boolean to check if the value has been set. +func (o *ManagedServicesUpdateProviderRequest) GetVersionsOk() (*map[string]ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue, bool) { + if o == nil || IsNil(o.Versions) { + return nil, false + } + return o.Versions, true +} + +// HasVersions returns a boolean if a field has been set. +func (o *ManagedServicesUpdateProviderRequest) HasVersions() bool { + if o != nil && !IsNil(o.Versions) { + return true + } + + return false +} + +// SetVersions gets a reference to the given map[string]ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue and assigns it to the Versions field. +func (o *ManagedServicesUpdateProviderRequest) SetVersions(v map[string]ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue) { + o.Versions = &v +} + // GetBackend returns the Backend field value if set, zero value otherwise. func (o *ManagedServicesUpdateProviderRequest) GetBackend() ManagedServicesListProviders200ResponseInnerAnyOfBackend { if o == nil || IsNil(o.Backend) { @@ -514,6 +547,9 @@ func (o ManagedServicesUpdateProviderRequest) ToMap() (map[string]interface{}, e if !IsNil(o.Plans) { toSerialize["plans"] = o.Plans } + if !IsNil(o.Versions) { + toSerialize["versions"] = o.Versions + } if !IsNil(o.Backend) { toSerialize["backend"] = o.Backend } diff --git a/api/openapi_client/model_managed_services_update_request.go b/api/openapi_client/model_managed_services_update_request.go index 35952ddb..44c23f19 100644 --- a/api/openapi_client/model_managed_services_update_request.go +++ b/api/openapi_client/model_managed_services_update_request.go @@ -20,12 +20,13 @@ var _ MappedNullable = &ManagedServicesUpdateRequest{} // ManagedServicesUpdateRequest struct for ManagedServicesUpdateRequest type ManagedServicesUpdateRequest struct { - Backups *ManagedServicesUpdateRequestBackups `json:"backups,omitempty"` - Config map[string]interface{} `json:"config,omitempty"` - Secrets map[string]interface{} `json:"secrets,omitempty"` - Name *string `json:"name,omitempty"` - Pause *bool `json:"pause,omitempty"` - Plan *ManagedServicesList200ResponseInnerPlan `json:"plan,omitempty"` + Backups *ManagedServicesUpdateRequestBackups `json:"backups,omitempty"` + Config map[string]interface{} `json:"config,omitempty"` + Secrets map[string]interface{} `json:"secrets,omitempty"` + Name *string `json:"name,omitempty"` + Pause *bool `json:"pause,omitempty"` + Plan *ManagedServicesList200ResponseInnerPlan `json:"plan,omitempty"` + Versions *map[string]ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue `json:"versions,omitempty"` } // NewManagedServicesUpdateRequest instantiates a new ManagedServicesUpdateRequest object @@ -237,6 +238,38 @@ func (o *ManagedServicesUpdateRequest) SetPlan(v ManagedServicesList200ResponseI o.Plan = &v } +// GetVersions returns the Versions field value if set, zero value otherwise. +func (o *ManagedServicesUpdateRequest) GetVersions() map[string]ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue { + if o == nil || IsNil(o.Versions) { + var ret map[string]ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue + return ret + } + return *o.Versions +} + +// GetVersionsOk returns a tuple with the Versions field value if set, nil otherwise +// and a boolean to check if the value has been set. +func (o *ManagedServicesUpdateRequest) GetVersionsOk() (*map[string]ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue, bool) { + if o == nil || IsNil(o.Versions) { + return nil, false + } + return o.Versions, true +} + +// HasVersions returns a boolean if a field has been set. +func (o *ManagedServicesUpdateRequest) HasVersions() bool { + if o != nil && !IsNil(o.Versions) { + return true + } + + return false +} + +// SetVersions gets a reference to the given map[string]ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue and assigns it to the Versions field. +func (o *ManagedServicesUpdateRequest) SetVersions(v map[string]ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue) { + o.Versions = &v +} + func (o ManagedServicesUpdateRequest) MarshalJSON() ([]byte, error) { toSerialize, err := o.ToMap() if err != nil { @@ -265,6 +298,9 @@ func (o ManagedServicesUpdateRequest) ToMap() (map[string]interface{}, error) { if !IsNil(o.Plan) { toSerialize["plan"] = o.Plan } + if !IsNil(o.Versions) { + toSerialize["versions"] = o.Versions + } return toSerialize, nil } diff --git a/api/openapi_client/model_workspaces_create_workspace_request.go b/api/openapi_client/model_workspaces_create_workspace_request.go index 23b91467..13388020 100644 --- a/api/openapi_client/model_workspaces_create_workspace_request.go +++ b/api/openapi_client/model_workspaces_create_workspace_request.go @@ -37,6 +37,7 @@ type WorkspacesCreateWorkspaceRequest struct { Restricted *bool `json:"restricted,omitempty"` Env []WorkspacesCreateWorkspaceRequestEnvInner `json:"env,omitempty"` StorageMib *int `json:"storageMib,omitempty"` + SharedVaultName *string `json:"sharedVaultName,omitempty"` } type _WorkspacesCreateWorkspaceRequest WorkspacesCreateWorkspaceRequest @@ -503,6 +504,38 @@ func (o *WorkspacesCreateWorkspaceRequest) SetStorageMib(v int) { o.StorageMib = &v } +// GetSharedVaultName returns the SharedVaultName field value if set, zero value otherwise. +func (o *WorkspacesCreateWorkspaceRequest) GetSharedVaultName() string { + if o == nil || IsNil(o.SharedVaultName) { + var ret string + return ret + } + return *o.SharedVaultName +} + +// GetSharedVaultNameOk returns a tuple with the SharedVaultName field value if set, nil otherwise +// and a boolean to check if the value has been set. +func (o *WorkspacesCreateWorkspaceRequest) GetSharedVaultNameOk() (*string, bool) { + if o == nil || IsNil(o.SharedVaultName) { + return nil, false + } + return o.SharedVaultName, true +} + +// HasSharedVaultName returns a boolean if a field has been set. +func (o *WorkspacesCreateWorkspaceRequest) HasSharedVaultName() bool { + if o != nil && !IsNil(o.SharedVaultName) { + return true + } + + return false +} + +// SetSharedVaultName gets a reference to the given string and assigns it to the SharedVaultName field. +func (o *WorkspacesCreateWorkspaceRequest) SetSharedVaultName(v string) { + o.SharedVaultName = &v +} + func (o WorkspacesCreateWorkspaceRequest) MarshalJSON() ([]byte, error) { toSerialize, err := o.ToMap() if err != nil { @@ -548,6 +581,9 @@ func (o WorkspacesCreateWorkspaceRequest) ToMap() (map[string]interface{}, error if !IsNil(o.StorageMib) { toSerialize["storageMib"] = o.StorageMib } + if !IsNil(o.SharedVaultName) { + toSerialize["sharedVaultName"] = o.SharedVaultName + } return toSerialize, nil } diff --git a/api/openapi_client/model_workspaces_update_workspace_request.go b/api/openapi_client/model_workspaces_update_workspace_request.go index ace28278..cc58e6dd 100644 --- a/api/openapi_client/model_workspaces_update_workspace_request.go +++ b/api/openapi_client/model_workspaces_update_workspace_request.go @@ -20,13 +20,14 @@ var _ MappedNullable = &WorkspacesUpdateWorkspaceRequest{} // WorkspacesUpdateWorkspaceRequest struct for WorkspacesUpdateWorkspaceRequest type WorkspacesUpdateWorkspaceRequest struct { - PlanId *int `json:"planId,omitempty"` - BaseImage *string `json:"baseImage,omitempty"` - Name *string `json:"name,omitempty"` - Replicas *int `json:"replicas,omitempty"` - VpnConfig NullableString `json:"vpnConfig,omitempty"` - Restricted *bool `json:"restricted,omitempty"` - StorageMib NullableInt `json:"storageMib,omitempty"` + PlanId *int `json:"planId,omitempty"` + BaseImage *string `json:"baseImage,omitempty"` + Name *string `json:"name,omitempty"` + Replicas *int `json:"replicas,omitempty"` + VpnConfig NullableString `json:"vpnConfig,omitempty"` + Restricted *bool `json:"restricted,omitempty"` + StorageMib NullableInt `json:"storageMib,omitempty"` + SharedVaultName NullableString `json:"sharedVaultName,omitempty"` } // NewWorkspacesUpdateWorkspaceRequest instantiates a new WorkspacesUpdateWorkspaceRequest object @@ -292,6 +293,49 @@ func (o *WorkspacesUpdateWorkspaceRequest) UnsetStorageMib() { o.StorageMib.Unset() } +// GetSharedVaultName returns the SharedVaultName field value if set, zero value otherwise (both if not set or set to explicit null). +func (o *WorkspacesUpdateWorkspaceRequest) GetSharedVaultName() string { + if o == nil || IsNil(o.SharedVaultName.Get()) { + var ret string + return ret + } + return *o.SharedVaultName.Get() +} + +// GetSharedVaultNameOk returns a tuple with the SharedVaultName field value if set, nil otherwise +// and a boolean to check if the value has been set. +// NOTE: If the value is an explicit nil, `nil, true` will be returned +func (o *WorkspacesUpdateWorkspaceRequest) GetSharedVaultNameOk() (*string, bool) { + if o == nil { + return nil, false + } + return o.SharedVaultName.Get(), o.SharedVaultName.IsSet() +} + +// HasSharedVaultName returns a boolean if a field has been set. +func (o *WorkspacesUpdateWorkspaceRequest) HasSharedVaultName() bool { + if o != nil && o.SharedVaultName.IsSet() { + return true + } + + return false +} + +// SetSharedVaultName gets a reference to the given NullableString and assigns it to the SharedVaultName field. +func (o *WorkspacesUpdateWorkspaceRequest) SetSharedVaultName(v string) { + o.SharedVaultName.Set(&v) +} + +// SetSharedVaultNameNil sets the value for SharedVaultName to be an explicit nil +func (o *WorkspacesUpdateWorkspaceRequest) SetSharedVaultNameNil() { + o.SharedVaultName.Set(nil) +} + +// UnsetSharedVaultName ensures that no value is present for SharedVaultName, not even an explicit nil +func (o *WorkspacesUpdateWorkspaceRequest) UnsetSharedVaultName() { + o.SharedVaultName.Unset() +} + func (o WorkspacesUpdateWorkspaceRequest) MarshalJSON() ([]byte, error) { toSerialize, err := o.ToMap() if err != nil { @@ -323,6 +367,9 @@ func (o WorkspacesUpdateWorkspaceRequest) ToMap() (map[string]interface{}, error if o.StorageMib.IsSet() { toSerialize["storageMib"] = o.StorageMib.Get() } + if o.SharedVaultName.IsSet() { + toSerialize["sharedVaultName"] = o.SharedVaultName.Get() + } return toSerialize, nil } diff --git a/api/organizations.go b/api/organizations.go new file mode 100644 index 00000000..4e23ff98 --- /dev/null +++ b/api/organizations.go @@ -0,0 +1,21 @@ +// Copyright (c) Codesphere Inc. +// SPDX-License-Identifier: Apache-2.0 + +package api + +import ( + cserrors "github.com/codesphere-cloud/cs-go/api/errors" +) + +func (c *Client) ListOrganizations() ([]Organization, error) { + orgs, r, err := c.api.OrganizationsAPI.OrganizationsListOrganizations(c.ctx).Execute() + if err != nil { + return nil, cserrors.FormatAPIError(r, err) + } + + res := make([]Organization, len(orgs)) + for i, o := range orgs { + res[i] = o + } + return res, nil +} diff --git a/cli/cmd/mocks.go b/cli/cmd/mocks.go index 8aefa056..a6f96508 100644 --- a/cli/cmd/mocks.go +++ b/cli/cmd/mocks.go @@ -65,7 +65,7 @@ type MockClient_AddTeamMember_Call struct { // - teamId int // - email string // - role int -func (_e *MockClient_Expecter) AddTeamMember(teamId interface{}, email interface{}, role interface{}) *MockClient_AddTeamMember_Call { +func (_e *MockClient_Expecter) AddTeamMember(teamId any, email any, role any) *MockClient_AddTeamMember_Call { return &MockClient_AddTeamMember_Call{Call: _e.mock.On("AddTeamMember", teamId, email, role)} } @@ -139,7 +139,7 @@ type MockClient_CreateTeam_Call struct { // - orgId string // - name string // - dcId int -func (_e *MockClient_Expecter) CreateTeam(orgId interface{}, name interface{}, dcId interface{}) *MockClient_CreateTeam_Call { +func (_e *MockClient_Expecter) CreateTeam(orgId any, name any, dcId any) *MockClient_CreateTeam_Call { return &MockClient_CreateTeam_Call{Call: _e.mock.On("CreateTeam", orgId, name, dcId)} } @@ -201,7 +201,7 @@ type MockClient_DeleteTeam_Call struct { // DeleteTeam is a helper method to define mock.On call // - orgId string // - teamId int -func (_e *MockClient_Expecter) DeleteTeam(orgId interface{}, teamId interface{}) *MockClient_DeleteTeam_Call { +func (_e *MockClient_Expecter) DeleteTeam(orgId any, teamId any) *MockClient_DeleteTeam_Call { return &MockClient_DeleteTeam_Call{Call: _e.mock.On("DeleteTeam", orgId, teamId)} } @@ -823,7 +823,7 @@ type MockClient_ListTeams_Call struct { // ListTeams is a helper method to define mock.On call // - orgId string -func (_e *MockClient_Expecter) ListTeams(orgId interface{}) *MockClient_ListTeams_Call { +func (_e *MockClient_Expecter) ListTeams(orgId any) *MockClient_ListTeams_Call { return &MockClient_ListTeams_Call{Call: _e.mock.On("ListTeams", orgId)} } @@ -992,7 +992,7 @@ type MockClient_RemoveTeamMember_Call struct { // RemoveTeamMember is a helper method to define mock.On call // - teamId int // - userId int -func (_e *MockClient_Expecter) RemoveTeamMember(teamId interface{}, userId interface{}) *MockClient_RemoveTeamMember_Call { +func (_e *MockClient_Expecter) RemoveTeamMember(teamId any, userId any) *MockClient_RemoveTeamMember_Call { return &MockClient_RemoveTeamMember_Call{Call: _e.mock.On("RemoveTeamMember", teamId, userId)} } diff --git a/mcp-server/team.go b/mcp-server/team.go index 944fde4b..5f2f7707 100644 --- a/mcp-server/team.go +++ b/mcp-server/team.go @@ -10,19 +10,23 @@ import ( "github.com/modelcontextprotocol/go-sdk/mcp" ) -type ListTeamsArgs struct{} +type ListTeamsArgs struct { + OrgId string `json:"orgId,omitempty" jsonschema:"Optional organization ID to list teams for"` +} type GetTeamArgs struct { TeamId int `json:"teamId" jsonschema:"ID of the team to get"` } type CreateTeamArgs struct { - Name string `json:"name" jsonschema:"Name of the new team"` - Dc int `json:"dc" jsonschema:"Default datacenter ID"` + OrgId string `json:"orgId,omitempty" jsonschema:"Optional organization ID to create the team in"` + Name string `json:"name" jsonschema:"Name of the new team"` + Dc int `json:"dc" jsonschema:"Default datacenter ID"` } type DeleteTeamArgs struct { - TeamId int `json:"teamId" jsonschema:"ID of the team to delete"` + OrgId string `json:"orgId,omitempty" jsonschema:"Optional organization ID the team belongs to"` + TeamId int `json:"teamId" jsonschema:"ID of the team to delete"` } func RegisterTeamTools(server *mcp.Server, client *api.Client) { @@ -30,7 +34,7 @@ func RegisterTeamTools(server *mcp.Server, client *api.Client) { Name: "list_teams", Description: "List all teams the authenticated user belongs to", }, func(ctx context.Context, req *mcp.CallToolRequest, args ListTeamsArgs) (*mcp.CallToolResult, any, error) { - teams, err := client.ListTeams() + teams, err := client.ListTeams(args.OrgId) if err != nil { return &mcp.CallToolResult{IsError: true}, nil, err } @@ -52,7 +56,7 @@ func RegisterTeamTools(server *mcp.Server, client *api.Client) { Name: "create_team", Description: "Create a new team", }, func(ctx context.Context, req *mcp.CallToolRequest, args CreateTeamArgs) (*mcp.CallToolResult, any, error) { - team, err := client.CreateTeam(args.Name, args.Dc) + team, err := client.CreateTeam(args.OrgId, args.Name, args.Dc) if err != nil { return &mcp.CallToolResult{IsError: true}, nil, err } @@ -63,7 +67,7 @@ func RegisterTeamTools(server *mcp.Server, client *api.Client) { Name: "delete_team", Description: "Delete a team by ID", }, func(ctx context.Context, req *mcp.CallToolRequest, args DeleteTeamArgs) (*mcp.CallToolResult, any, error) { - err := client.DeleteTeam(args.TeamId) + err := client.DeleteTeam(args.OrgId, args.TeamId) if err != nil { return &mcp.CallToolResult{IsError: true}, nil, err } From 2dc61a8743ab2a8b1bf07fdb4c7c914176e03bcf Mon Sep 17 00:00:00 2001 From: Maximilian Date: Wed, 17 Jun 2026 11:23:16 +0200 Subject: [PATCH 17/61] added examples Signed-off-by: Maximilian --- cli/cmd/team_add_member.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/cli/cmd/team_add_member.go b/cli/cmd/team_add_member.go index 3138b582..6b818149 100644 --- a/cli/cmd/team_add_member.go +++ b/cli/cmd/team_add_member.go @@ -7,6 +7,7 @@ import ( "errors" "fmt" + "github.com/codesphere-cloud/cs-go/pkg/io" "github.com/spf13/cobra" ) @@ -28,7 +29,14 @@ func AddAddTeamMemberCmd(team *cobra.Command, opts *GlobalOptions) { cmd: &cobra.Command{ Use: "add", Short: "Add team member", - Long: `Add team member to a team`, + Long: io.Long(`Add team member to a team. + + To add a member to a team within an organization, the CS_ORG_ID environment variable or the -O/--org flag must be set.`), + Example: io.FormatExampleCommands("team member add", []io.Example{ + {Cmd: "-t 1234 -e user@example.com -r 1", Desc: "Add a user to a team as a member"}, + {Cmd: "-t 1234 -e admin@example.com -r 0", Desc: "Add a user to a team as an admin"}, + {Cmd: "-O -t 1234 -e user@example.com -r 1", Desc: "Add a user to a team within an organization"}, + }), }, Opts: AddTeamMemberOpts{ GlobalOptions: opts, From 08546da6a2145ebc0b10510adcd873342beb84e4 Mon Sep 17 00:00:00 2001 From: DerBurri <7892993+DerBurri@users.noreply.github.com> Date: Wed, 17 Jun 2026 09:14:11 +0000 Subject: [PATCH 18/61] chore(docs): Auto-update docs and licenses Signed-off-by: DerBurri <7892993+DerBurri@users.noreply.github.com> Signed-off-by: Maximilian --- NOTICE | 52 +++++++++++++++++++++--------------------- docs/cs_mcp.md | 1 + pkg/tmpl/NOTICE | 60 +++++++++++++++++++++++++------------------------ 3 files changed, 59 insertions(+), 54 deletions(-) diff --git a/NOTICE b/NOTICE index c018e85e..eebf7c08 100644 --- a/NOTICE +++ b/NOTICE @@ -13,7 +13,7 @@ License URL: https://gitea.com/gitea/go-sdk/src/tag/gitea/v0.25.1/gitea/LICENSE Module: dario.cat/mergo Version: v1.0.2 License: BSD-3-Clause -License URL: Unknown +License URL: https://github.com/imdario/mergo/blob/v1.0.2/LICENSE ---------- Module: github.com/42wim/httpsig @@ -164,6 +164,8 @@ Module: github.com/google/jsonschema-go/jsonschema Version: v0.4.3 License: MIT License URL: https://github.com/google/jsonschema-go/blob/v0.4.3/LICENSE + +---------- Module: github.com/google/uuid Version: v1.6.0 License: BSD-3-Clause @@ -459,21 +461,21 @@ License URL: https://github.com/yaml/go-yaml/blob/v3.0.4/LICENSE ---------- Module: golang.org/x/crypto -Version: v0.52.0 +Version: v0.53.0 License: BSD-3-Clause -License URL: https://cs.opensource.google/go/x/crypto/+/v0.52.0:LICENSE +License URL: https://cs.opensource.google/go/x/crypto/+/v0.53.0:LICENSE ---------- Module: golang.org/x/mod/semver -Version: v0.36.0 +Version: v0.37.0 License: BSD-3-Clause -License URL: https://cs.opensource.google/go/x/mod/+/v0.36.0:LICENSE +License URL: https://cs.opensource.google/go/x/mod/+/v0.37.0:LICENSE ---------- Module: golang.org/x/net -Version: v0.54.0 +Version: v0.56.0 License: BSD-3-Clause -License URL: https://cs.opensource.google/go/x/net/+/v0.54.0:LICENSE +License URL: https://cs.opensource.google/go/x/net/+/v0.56.0:LICENSE ---------- Module: golang.org/x/oauth2 @@ -489,15 +491,15 @@ License URL: https://cs.opensource.google/go/x/sync/+/v0.21.0:LICENSE ---------- Module: golang.org/x/sys -Version: v0.45.0 +Version: v0.46.0 License: BSD-3-Clause -License URL: https://cs.opensource.google/go/x/sys/+/v0.45.0:LICENSE +License URL: https://cs.opensource.google/go/x/sys/+/v0.46.0:LICENSE ---------- Module: golang.org/x/text -Version: v0.37.0 +Version: v0.38.0 License: BSD-3-Clause -License URL: https://cs.opensource.google/go/x/text/+/v0.37.0:LICENSE +License URL: https://cs.opensource.google/go/x/text/+/v0.38.0:LICENSE ---------- Module: golang.org/x/time/rate @@ -507,9 +509,9 @@ License URL: https://cs.opensource.google/go/x/time/+/v0.15.0:LICENSE ---------- Module: golang.org/x/tools -Version: v0.45.0 +Version: v0.46.0 License: BSD-3-Clause -License URL: https://cs.opensource.google/go/x/tools/+/v0.45.0:LICENSE +License URL: https://cs.opensource.google/go/x/tools/+/v0.46.0:LICENSE ---------- Module: google.golang.org/protobuf @@ -543,39 +545,39 @@ License URL: https://github.com/go-yaml/yaml/blob/v3.0.1/LICENSE ---------- Module: k8s.io/api -Version: v0.36.1 +Version: v0.36.2 License: Apache-2.0 -License URL: https://github.com/kubernetes/api/blob/v0.36.1/LICENSE +License URL: https://github.com/kubernetes/api/blob/v0.36.2/LICENSE ---------- Module: k8s.io/apimachinery/pkg -Version: v0.36.1 +Version: v0.36.2 License: Apache-2.0 -License URL: https://github.com/kubernetes/apimachinery/blob/v0.36.1/LICENSE +License URL: https://github.com/kubernetes/apimachinery/blob/v0.36.2/LICENSE ---------- Module: k8s.io/apimachinery/third_party/forked/golang/reflect -Version: v0.36.1 +Version: v0.36.2 License: BSD-3-Clause -License URL: https://github.com/kubernetes/apimachinery/blob/v0.36.1/third_party/forked/golang/LICENSE +License URL: https://github.com/kubernetes/apimachinery/blob/v0.36.2/third_party/forked/golang/LICENSE ---------- Module: k8s.io/cli-runtime/pkg/printers -Version: v0.36.1 +Version: v0.36.2 License: Apache-2.0 -License URL: https://github.com/kubernetes/cli-runtime/blob/v0.36.1/LICENSE +License URL: https://github.com/kubernetes/cli-runtime/blob/v0.36.2/LICENSE ---------- Module: k8s.io/client-go/third_party/forked/golang/template -Version: v0.36.1 +Version: v0.36.2 License: BSD-3-Clause -License URL: https://github.com/kubernetes/client-go/blob/v0.36.1/third_party/forked/golang/LICENSE +License URL: https://github.com/kubernetes/client-go/blob/v0.36.2/third_party/forked/golang/LICENSE ---------- Module: k8s.io/client-go/util/jsonpath -Version: v0.36.1 +Version: v0.36.2 License: Apache-2.0 -License URL: https://github.com/kubernetes/client-go/blob/v0.36.1/LICENSE +License URL: https://github.com/kubernetes/client-go/blob/v0.36.2/LICENSE ---------- Module: k8s.io/klog/v2 diff --git a/docs/cs_mcp.md b/docs/cs_mcp.md index adb52a38..c63b82c5 100644 --- a/docs/cs_mcp.md +++ b/docs/cs_mcp.md @@ -39,6 +39,7 @@ cs mcp [flags] ``` -a, --api string URL of Codesphere API (can also be CS_API) + -O, --org string Organization ID (relevant for some commands) -t, --team int Team ID (relevant for some commands, can also be CS_TEAM_ID) (default -1) -v, --verbose Verbose output -w, --workspace int Workspace ID (relevant for some commands, can also be CS_WORKSPACE_ID) (default -1) diff --git a/pkg/tmpl/NOTICE b/pkg/tmpl/NOTICE index 9b821cbf..f2ca0ef5 100644 --- a/pkg/tmpl/NOTICE +++ b/pkg/tmpl/NOTICE @@ -13,7 +13,7 @@ License URL: https://gitea.com/gitea/go-sdk/src/tag/gitea/v0.25.1/gitea/LICENSE Module: dario.cat/mergo Version: v1.0.2 License: BSD-3-Clause -License URL: Unknown +License URL: https://github.com/imdario/mergo/blob/v1.0.2/LICENSE ---------- Module: github.com/42wim/httpsig @@ -164,6 +164,8 @@ Module: github.com/google/jsonschema-go/jsonschema Version: v0.4.3 License: MIT License URL: https://github.com/google/jsonschema-go/blob/v0.4.3/LICENSE + +---------- Module: github.com/google/uuid Version: v1.6.0 License: BSD-3-Clause @@ -261,15 +263,15 @@ License URL: https://github.com/munnerz/goautoneg/blob/a7dc8b61c822/LICENSE ---------- Module: github.com/onsi/ginkgo/v2 -Version: v2.29.0 +Version: v2.31.0 License: MIT -License URL: https://github.com/onsi/ginkgo/blob/v2.29.0/LICENSE +License URL: https://github.com/onsi/ginkgo/blob/v2.31.0/LICENSE ---------- Module: github.com/onsi/gomega -Version: v1.41.0 +Version: v1.42.0 License: MIT -License URL: https://github.com/onsi/gomega/blob/v1.41.0/LICENSE +License URL: https://github.com/onsi/gomega/blob/v1.42.0/LICENSE ---------- Module: github.com/pjbgf/sha1cd @@ -459,21 +461,21 @@ License URL: https://github.com/yaml/go-yaml/blob/v3.0.4/LICENSE ---------- Module: golang.org/x/crypto -Version: v0.52.0 +Version: v0.53.0 License: BSD-3-Clause -License URL: https://cs.opensource.google/go/x/crypto/+/v0.52.0:LICENSE +License URL: https://cs.opensource.google/go/x/crypto/+/v0.53.0:LICENSE ---------- Module: golang.org/x/mod/semver -Version: v0.36.0 +Version: v0.37.0 License: BSD-3-Clause -License URL: https://cs.opensource.google/go/x/mod/+/v0.36.0:LICENSE +License URL: https://cs.opensource.google/go/x/mod/+/v0.37.0:LICENSE ---------- Module: golang.org/x/net -Version: v0.54.0 +Version: v0.56.0 License: BSD-3-Clause -License URL: https://cs.opensource.google/go/x/net/+/v0.54.0:LICENSE +License URL: https://cs.opensource.google/go/x/net/+/v0.56.0:LICENSE ---------- Module: golang.org/x/oauth2 @@ -489,15 +491,15 @@ License URL: https://cs.opensource.google/go/x/sync/+/v0.21.0:LICENSE ---------- Module: golang.org/x/sys -Version: v0.45.0 +Version: v0.46.0 License: BSD-3-Clause -License URL: https://cs.opensource.google/go/x/sys/+/v0.45.0:LICENSE +License URL: https://cs.opensource.google/go/x/sys/+/v0.46.0:LICENSE ---------- Module: golang.org/x/text -Version: v0.37.0 +Version: v0.38.0 License: BSD-3-Clause -License URL: https://cs.opensource.google/go/x/text/+/v0.37.0:LICENSE +License URL: https://cs.opensource.google/go/x/text/+/v0.38.0:LICENSE ---------- Module: golang.org/x/time/rate @@ -507,9 +509,9 @@ License URL: https://cs.opensource.google/go/x/time/+/v0.15.0:LICENSE ---------- Module: golang.org/x/tools -Version: v0.45.0 +Version: v0.46.0 License: BSD-3-Clause -License URL: https://cs.opensource.google/go/x/tools/+/v0.45.0:LICENSE +License URL: https://cs.opensource.google/go/x/tools/+/v0.46.0:LICENSE ---------- Module: google.golang.org/protobuf @@ -543,39 +545,39 @@ License URL: https://github.com/go-yaml/yaml/blob/v3.0.1/LICENSE ---------- Module: k8s.io/api -Version: v0.36.1 +Version: v0.36.2 License: Apache-2.0 -License URL: https://github.com/kubernetes/api/blob/v0.36.1/LICENSE +License URL: https://github.com/kubernetes/api/blob/v0.36.2/LICENSE ---------- Module: k8s.io/apimachinery/pkg -Version: v0.36.1 +Version: v0.36.2 License: Apache-2.0 -License URL: https://github.com/kubernetes/apimachinery/blob/v0.36.1/LICENSE +License URL: https://github.com/kubernetes/apimachinery/blob/v0.36.2/LICENSE ---------- Module: k8s.io/apimachinery/third_party/forked/golang/reflect -Version: v0.36.1 +Version: v0.36.2 License: BSD-3-Clause -License URL: https://github.com/kubernetes/apimachinery/blob/v0.36.1/third_party/forked/golang/LICENSE +License URL: https://github.com/kubernetes/apimachinery/blob/v0.36.2/third_party/forked/golang/LICENSE ---------- Module: k8s.io/cli-runtime/pkg/printers -Version: v0.36.1 +Version: v0.36.2 License: Apache-2.0 -License URL: https://github.com/kubernetes/cli-runtime/blob/v0.36.1/LICENSE +License URL: https://github.com/kubernetes/cli-runtime/blob/v0.36.2/LICENSE ---------- Module: k8s.io/client-go/third_party/forked/golang/template -Version: v0.36.1 +Version: v0.36.2 License: BSD-3-Clause -License URL: https://github.com/kubernetes/client-go/blob/v0.36.1/third_party/forked/golang/LICENSE +License URL: https://github.com/kubernetes/client-go/blob/v0.36.2/third_party/forked/golang/LICENSE ---------- Module: k8s.io/client-go/util/jsonpath -Version: v0.36.1 +Version: v0.36.2 License: Apache-2.0 -License URL: https://github.com/kubernetes/client-go/blob/v0.36.1/LICENSE +License URL: https://github.com/kubernetes/client-go/blob/v0.36.2/LICENSE ---------- Module: k8s.io/klog/v2 From 5a25c6347423e2145ce0a8bca27ad909e7809c6d Mon Sep 17 00:00:00 2001 From: Maximilian Date: Wed, 17 Jun 2026 11:57:28 +0200 Subject: [PATCH 19/61] test: Add unit test for email validation Signed-off-by: Maximilian --- cli/cmd/team_add_member_test.go | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/cli/cmd/team_add_member_test.go b/cli/cmd/team_add_member_test.go index d7d43749..9bb42e40 100644 --- a/cli/cmd/team_add_member_test.go +++ b/cli/cmd/team_add_member_test.go @@ -57,6 +57,14 @@ var _ = Describe("AddTeamMember", func() { Expect(err).To(HaveOccurred()) Expect(err.Error()).To(Equal("email cannot be empty")) }) + + It("should fail if the email is invalid", func() { + + err := c.AddTeamMember(mockClient, teamId, "invalid-email", dcId) + + Expect(err).To(HaveOccurred()) + Expect(err.Error()).To(ContainSubstring("invalid email address")) + }) }) Context("RunE execution flow", func() { @@ -100,6 +108,13 @@ var _ = Describe("AddTeamMember", func() { Expect(err).To(HaveOccurred()) Expect(err.Error()).To(Equal("email cannot be empty")) }) + + It("should fail when email is invalid", func() { + c.Opts.Email = "invalid-email" + err := c.RunE(nil, []string{}) + Expect(err).To(HaveOccurred()) + Expect(err.Error()).To(ContainSubstring("invalid email address")) + }) }) }) From 45f19a6aa96b0f0ad6e42576097f7d9d118c5344 Mon Sep 17 00:00:00 2001 From: Maximilian Date: Wed, 17 Jun 2026 11:59:40 +0200 Subject: [PATCH 20/61] add examples Signed-off-by: Maximilian --- cli/cmd/team_add_member.go | 6 +++--- cli/cmd/team_create.go | 5 +++++ cli/cmd/team_remove.go | 5 +++++ cli/cmd/team_remove_member.go | 9 ++++++++- 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/cli/cmd/team_add_member.go b/cli/cmd/team_add_member.go index 6b818149..29472617 100644 --- a/cli/cmd/team_add_member.go +++ b/cli/cmd/team_add_member.go @@ -33,9 +33,9 @@ func AddAddTeamMemberCmd(team *cobra.Command, opts *GlobalOptions) { To add a member to a team within an organization, the CS_ORG_ID environment variable or the -O/--org flag must be set.`), Example: io.FormatExampleCommands("team member add", []io.Example{ - {Cmd: "-t 1234 -e user@example.com -r 1", Desc: "Add a user to a team as a member"}, - {Cmd: "-t 1234 -e admin@example.com -r 0", Desc: "Add a user to a team as an admin"}, - {Cmd: "-O -t 1234 -e user@example.com -r 1", Desc: "Add a user to a team within an organization"}, + {Cmd: "-t -e user@example.com -r 1", Desc: "Add a user to a team as a member"}, + {Cmd: "-t -e admin@example.com -r 0", Desc: "Add a user to a team as an admin"}, + {Cmd: "-O -t -e user@example.com -r 1", Desc: "Add a user to a team within an organization"}, }), }, Opts: AddTeamMemberOpts{ diff --git a/cli/cmd/team_create.go b/cli/cmd/team_create.go index 870fe8b4..e4590740 100644 --- a/cli/cmd/team_create.go +++ b/cli/cmd/team_create.go @@ -7,6 +7,7 @@ import ( "errors" "fmt" "github.com/codesphere-cloud/cs-go/api" + "github.com/codesphere-cloud/cs-go/pkg/io" "github.com/spf13/cobra" ) @@ -28,6 +29,10 @@ func AddCreateTeamCmd(team *cobra.Command, opts *GlobalOptions) { Use: "create", Short: "Create team", Long: `Create a team in Codesphere or an Organization`, + Example: io.FormatExampleCommands("team member add", []io.Example{ + {Cmd: "-d -n ", Desc: "Create a team in a specific datacenter"}, + {Cmd: "-d -n -O ", Desc: "Create a team in a specific datacenter within an organization"}, + }), }, Opts: CreateTeamOpts{ GlobalOptions: opts, diff --git a/cli/cmd/team_remove.go b/cli/cmd/team_remove.go index 9f6e91ec..227f2798 100644 --- a/cli/cmd/team_remove.go +++ b/cli/cmd/team_remove.go @@ -7,6 +7,7 @@ import ( "errors" "fmt" + "github.com/codesphere-cloud/cs-go/pkg/io" "github.com/spf13/cobra" ) @@ -27,6 +28,10 @@ func AddRemoveTeamCmd(team *cobra.Command, opts *GlobalOptions) { Use: "remove", Short: "Remove team", Long: `Remove a team from Codesphere or an Organization`, + Example: io.FormatExampleCommands("team remove", []io.Example{ + {Cmd: "-t ", Desc: "Remove a team that does not belong to an Organization"}, + {Cmd: "-O -t ", Desc: "Remove a team that does belong to an Organization"}, + }), }, Opts: RemoveTeamOpts{ GlobalOptions: opts, diff --git a/cli/cmd/team_remove_member.go b/cli/cmd/team_remove_member.go index c747e160..6b1e4f68 100644 --- a/cli/cmd/team_remove_member.go +++ b/cli/cmd/team_remove_member.go @@ -7,6 +7,7 @@ import ( "errors" "fmt" + "github.com/codesphere-cloud/cs-go/pkg/io" "github.com/spf13/cobra" ) @@ -26,7 +27,13 @@ func AddRemoveTeamMemberCmd(team *cobra.Command, opts *GlobalOptions) { cmd: &cobra.Command{ Use: "remove", Short: "Remove team member", - Long: `Remove team member from a team`, + Long: io.Long(`Remove team member from a team. + + To add a member to a team within an organization, the CS_ORG_ID environment variable or the -O/--org flag must be set.`), + Example: io.FormatExampleCommands("team member remove", []io.Example{ + {Cmd: "-t -u ", Desc: "Remove a user from a team"}, + {Cmd: "-O -t -u ", Desc: "Remove a user from a team within an organization"}, + }), }, Opts: RemoveTeamMemberOpts{ GlobalOptions: opts, From cfe7b83c3d058eaa086dd1334182282c24fca19d Mon Sep 17 00:00:00 2001 From: Maximilian Date: Wed, 17 Jun 2026 12:01:37 +0200 Subject: [PATCH 21/61] add email validation Signed-off-by: Maximilian --- cli/cmd/team_add_member.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cli/cmd/team_add_member.go b/cli/cmd/team_add_member.go index 29472617..dc3fa5d0 100644 --- a/cli/cmd/team_add_member.go +++ b/cli/cmd/team_add_member.go @@ -6,6 +6,7 @@ package cmd import ( "errors" "fmt" + "net/mail" "github.com/codesphere-cloud/cs-go/pkg/io" "github.com/spf13/cobra" @@ -45,6 +46,7 @@ func AddAddTeamMemberCmd(team *cobra.Command, opts *GlobalOptions) { } t.cmd.RunE = t.RunE t.cmd.Flags().StringVarP(&t.Opts.Email, "email", "e", "", "Team member email") + t.cmd.MarkFlagRequired("email") t.cmd.Flags().IntVarP(&t.Opts.Role, "role", "r", 0, "Team member role 0=admin, 1=member") AddCmd(team, t.cmd) } @@ -70,6 +72,10 @@ func (c *AddTeamMemberCmd) AddTeamMember(client Client, teamId int, email string return errors.New("email cannot be empty") } + if _, err := mail.ParseAddress(email); err != nil { + return fmt.Errorf("invalid email address: %w", err) + } + fmt.Printf("add member: %s to team %d with role: %d", email, teamId, role) err := client.AddTeamMember(teamId, email, role) From d9ed4b8e849ee681172f572e515c959f800e0e49 Mon Sep 17 00:00:00 2001 From: DerBurri <7892993+DerBurri@users.noreply.github.com> Date: Wed, 17 Jun 2026 09:25:26 +0000 Subject: [PATCH 22/61] chore(docs): Auto-update docs and licenses Signed-off-by: DerBurri <7892993+DerBurri@users.noreply.github.com> Signed-off-by: Maximilian --- docs/cs_team_member_add.md | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/docs/cs_team_member_add.md b/docs/cs_team_member_add.md index 612462e6..96f204ce 100644 --- a/docs/cs_team_member_add.md +++ b/docs/cs_team_member_add.md @@ -4,12 +4,27 @@ Add team member ### Synopsis -Add team member to a team +Add team member to a team. + +To add a member to a team within an organization, the CS_ORG_ID environment variable or the -O/--org flag must be set. ``` cs team member add [flags] ``` +### Examples + +``` +# Add a user to a team as a member +$ cs team member add -t 1234 -e user@example.com -r 1 + +# Add a user to a team as an admin +$ cs team member add -t 1234 -e admin@example.com -r 0 + +# Add a user to a team within an organization +$ cs team member add -O -t 1234 -e user@example.com -r 1 +``` + ### Options ``` From 6160ce1309572afd90a03e5b564617917dbda500 Mon Sep 17 00:00:00 2001 From: Maximilian Date: Wed, 17 Jun 2026 14:10:43 +0200 Subject: [PATCH 23/61] removed reduntant code Signed-off-by: Maximilian --- pkg/cs/env.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkg/cs/env.go b/pkg/cs/env.go index c413ed63..59fea80a 100644 --- a/pkg/cs/env.go +++ b/pkg/cs/env.go @@ -39,11 +39,7 @@ func (e *Environment) GetTeamId() (int, error) { } func (e *Environment) GetOrgId() string { - orgId := os.Getenv("CS_ORG_ID") - if orgId != "" { - return orgId - } - return "" + return os.Getenv("CS_ORG_ID") } func (e *Environment) ReadNumericEnv(env string) (int, error) { From 1bddd7106ea7288fbc77ca0f967f08d9c85dd3a4 Mon Sep 17 00:00:00 2001 From: DerBurri <7892993+DerBurri@users.noreply.github.com> Date: Wed, 17 Jun 2026 11:47:35 +0000 Subject: [PATCH 24/61] chore(docs): Auto-update docs and licenses Signed-off-by: DerBurri <7892993+DerBurri@users.noreply.github.com> Signed-off-by: Maximilian --- docs/cs_team_create.md | 10 ++++++++++ docs/cs_team_member_add.md | 6 +++--- docs/cs_team_member_remove.md | 14 +++++++++++++- docs/cs_team_remove.md | 10 ++++++++++ 4 files changed, 36 insertions(+), 4 deletions(-) diff --git a/docs/cs_team_create.md b/docs/cs_team_create.md index 9d36906d..d2b30167 100644 --- a/docs/cs_team_create.md +++ b/docs/cs_team_create.md @@ -10,6 +10,16 @@ Create a team in Codesphere or an Organization cs team create [flags] ``` +### Examples + +``` +# Create a team in a specific datacenter +$ cs team member add -d -n + +# Create a team in a specific datacenter within an organization +$ cs team member add -d -n -O +``` + ### Options ``` diff --git a/docs/cs_team_member_add.md b/docs/cs_team_member_add.md index 96f204ce..fbd24c0f 100644 --- a/docs/cs_team_member_add.md +++ b/docs/cs_team_member_add.md @@ -16,13 +16,13 @@ cs team member add [flags] ``` # Add a user to a team as a member -$ cs team member add -t 1234 -e user@example.com -r 1 +$ cs team member add -t -e user@example.com -r 1 # Add a user to a team as an admin -$ cs team member add -t 1234 -e admin@example.com -r 0 +$ cs team member add -t -e admin@example.com -r 0 # Add a user to a team within an organization -$ cs team member add -O -t 1234 -e user@example.com -r 1 +$ cs team member add -O -t -e user@example.com -r 1 ``` ### Options diff --git a/docs/cs_team_member_remove.md b/docs/cs_team_member_remove.md index 9ce33980..7d335c37 100644 --- a/docs/cs_team_member_remove.md +++ b/docs/cs_team_member_remove.md @@ -4,12 +4,24 @@ Remove team member ### Synopsis -Remove team member from a team +Remove team member from a team. + +To add a member to a team within an organization, the CS_ORG_ID environment variable or the -O/--org flag must be set. ``` cs team member remove [flags] ``` +### Examples + +``` +# Remove a user from a team +$ cs team member remove -t -u + +# Remove a user from a team within an organization +$ cs team member remove -O -t -u +``` + ### Options ``` diff --git a/docs/cs_team_remove.md b/docs/cs_team_remove.md index 11131b82..ec5289a6 100644 --- a/docs/cs_team_remove.md +++ b/docs/cs_team_remove.md @@ -10,6 +10,16 @@ Remove a team from Codesphere or an Organization cs team remove [flags] ``` +### Examples + +``` +# Remove a team that does not belong to an Organization +$ cs team remove -t + +# Remove a team that does belong to an Organization +$ cs team remove -O -t +``` + ### Options ``` From 99bc81128196f1cc9a1f6fcbd1c44d44d4d76289 Mon Sep 17 00:00:00 2001 From: Maximilian Date: Wed, 17 Jun 2026 14:18:58 +0200 Subject: [PATCH 25/61] remove: unnecessary team name flag in team_remove.go Signed-off-by: Maximilian --- cli/cmd/team_remove.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/cli/cmd/team_remove.go b/cli/cmd/team_remove.go index 227f2798..eae65217 100644 --- a/cli/cmd/team_remove.go +++ b/cli/cmd/team_remove.go @@ -39,8 +39,6 @@ func AddRemoveTeamCmd(team *cobra.Command, opts *GlobalOptions) { ClientFactory: NewClient, } t.cmd.RunE = t.RunE - t.cmd.Flags().StringVarP(&t.Opts.name, "name", "n", "", "Team name") - AddCmd(team, t.cmd) } From c2f4fea7641094ccef8d7720000d52f88c7c35fd Mon Sep 17 00:00:00 2001 From: Maximilian Date: Wed, 17 Jun 2026 14:27:23 +0200 Subject: [PATCH 26/61] feat: minor refactorings Signed-off-by: Maximilian --- cli/cmd/team_add_member.go | 7 ++++++- cli/cmd/team_add_member_test.go | 14 ++++++++++++++ cli/cmd/team_remove.go | 2 +- cli/cmd/team_remove_member.go | 1 + pkg/cs/util.go | 19 +++++++++++++++++-- 5 files changed, 39 insertions(+), 4 deletions(-) diff --git a/cli/cmd/team_add_member.go b/cli/cmd/team_add_member.go index dc3fa5d0..bace07ef 100644 --- a/cli/cmd/team_add_member.go +++ b/cli/cmd/team_add_member.go @@ -8,6 +8,7 @@ import ( "fmt" "net/mail" + "github.com/codesphere-cloud/cs-go/pkg/cs" "github.com/codesphere-cloud/cs-go/pkg/io" "github.com/spf13/cobra" ) @@ -47,7 +48,7 @@ func AddAddTeamMemberCmd(team *cobra.Command, opts *GlobalOptions) { t.cmd.RunE = t.RunE t.cmd.Flags().StringVarP(&t.Opts.Email, "email", "e", "", "Team member email") t.cmd.MarkFlagRequired("email") - t.cmd.Flags().IntVarP(&t.Opts.Role, "role", "r", 0, "Team member role 0=admin, 1=member") + t.cmd.Flags().IntVarP(&t.Opts.Role, "role", "r", int(cs.RoleAdmin), "Team member role 0=admin, 1=member") AddCmd(team, t.cmd) } @@ -76,6 +77,10 @@ func (c *AddTeamMemberCmd) AddTeamMember(client Client, teamId int, email string return fmt.Errorf("invalid email address: %w", err) } + if !cs.TeamRole(role).IsValid() { + return errors.New("invalid role: must be 0 for admin or 1 for member") + } + fmt.Printf("add member: %s to team %d with role: %d", email, teamId, role) err := client.AddTeamMember(teamId, email, role) diff --git a/cli/cmd/team_add_member_test.go b/cli/cmd/team_add_member_test.go index 9bb42e40..aacc1872 100644 --- a/cli/cmd/team_add_member_test.go +++ b/cli/cmd/team_add_member_test.go @@ -65,6 +65,13 @@ var _ = Describe("AddTeamMember", func() { Expect(err).To(HaveOccurred()) Expect(err.Error()).To(ContainSubstring("invalid email address")) }) + + It("should fail if the role is invalid", func() { + err := c.AddTeamMember(mockClient, teamId, "user@example.com", 2) + + Expect(err).To(HaveOccurred()) + Expect(err.Error()).To(Equal("invalid role: must be 0 for admin or 1 for member")) + }) }) Context("RunE execution flow", func() { @@ -115,6 +122,13 @@ var _ = Describe("AddTeamMember", func() { Expect(err).To(HaveOccurred()) Expect(err.Error()).To(ContainSubstring("invalid email address")) }) + + It("should fail when role is invalid", func() { + c.Opts.Role = 2 + err := c.RunE(nil, []string{}) + Expect(err).To(HaveOccurred()) + Expect(err.Error()).To(Equal("invalid role: must be 0 for admin or 1 for member")) + }) }) }) diff --git a/cli/cmd/team_remove.go b/cli/cmd/team_remove.go index eae65217..34d524cc 100644 --- a/cli/cmd/team_remove.go +++ b/cli/cmd/team_remove.go @@ -55,7 +55,7 @@ func (c *RemoveTeamCmd) RunE(_ *cobra.Command, args []string) error { teamId, err := c.Opts.GetTeamId() if err != nil { - return errors.New("team ID not set, use -T or CS_TEAM_ID to set it") + return errors.New("team ID not set, use -t or CS_TEAM_ID to set it") } err = client.DeleteTeam(orgId, teamId) diff --git a/cli/cmd/team_remove_member.go b/cli/cmd/team_remove_member.go index 6b1e4f68..73415443 100644 --- a/cli/cmd/team_remove_member.go +++ b/cli/cmd/team_remove_member.go @@ -41,6 +41,7 @@ func AddRemoveTeamMemberCmd(team *cobra.Command, opts *GlobalOptions) { ClientFactory: NewClient, } res.cmd.Flags().IntVarP(&res.Opts.UserId, "user", "u", 0, "Team member user ID") + res.cmd.MarkFlagRequired("user") res.cmd.RunE = res.RunE AddCmd(team, res.cmd) } diff --git a/pkg/cs/util.go b/pkg/cs/util.go index d766f2ab..0b1f3d99 100644 --- a/pkg/cs/util.go +++ b/pkg/cs/util.go @@ -71,13 +71,28 @@ func SetAuthoriziationHeader(req *http.Request) error { return nil } -func GetRoleName(role int) string { - if role == 1 { +type TeamRole int + +const ( + RoleAdmin TeamRole = 0 + RoleMember TeamRole = 1 +) + +func (r TeamRole) IsValid() bool { + return r == RoleAdmin || r == RoleMember +} + +func (r TeamRole) String() string { + if r == RoleMember { return "Member" } return "Admin" } +func GetRoleName(role int) string { + return TeamRole(role).String() +} + func ArgToEnvVarMap(input []string) (map[string]string, error) { res := map[string]string{} for _, v := range input { From f42b1b2ba130e9fc34b41b9c9c435e05a351d819 Mon Sep 17 00:00:00 2001 From: Maximilian Date: Wed, 17 Jun 2026 14:30:46 +0200 Subject: [PATCH 27/61] fixed test Signed-off-by: Maximilian --- cli/cmd/team_remove_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/cli/cmd/team_remove_test.go b/cli/cmd/team_remove_test.go index 75a41506..3c2a7c7d 100644 --- a/cli/cmd/team_remove_test.go +++ b/cli/cmd/team_remove_test.go @@ -76,6 +76,7 @@ var _ = Describe("RemoveTeam", func() { err := c.RunE(nil, []string{}) Expect(err).To(MatchError("team ID not set, use -T or CS_TEAM_ID to set it")) + Expect(err).To(MatchError("team ID not set, use -t or CS_TEAM_ID to set it")) }) }) }) From ecf96d1dc2ba29e768e5fbfc5629f78732dc6342 Mon Sep 17 00:00:00 2001 From: Maximilian Date: Wed, 17 Jun 2026 14:31:59 +0200 Subject: [PATCH 28/61] fix: correct error message for unset team ID in RemoveTeam command Signed-off-by: Maximilian --- cli/cmd/team_remove_test.go | 1 - 1 file changed, 1 deletion(-) diff --git a/cli/cmd/team_remove_test.go b/cli/cmd/team_remove_test.go index 3c2a7c7d..a30b44fb 100644 --- a/cli/cmd/team_remove_test.go +++ b/cli/cmd/team_remove_test.go @@ -75,7 +75,6 @@ var _ = Describe("RemoveTeam", func() { mockEnv.EXPECT().GetTeamId().Return(-1, errors.New("CS_TEAM_ID env var required, but not set")).Once() err := c.RunE(nil, []string{}) - Expect(err).To(MatchError("team ID not set, use -T or CS_TEAM_ID to set it")) Expect(err).To(MatchError("team ID not set, use -t or CS_TEAM_ID to set it")) }) }) From e4164524f3d070eca7e60546e722ef351a57d186 Mon Sep 17 00:00:00 2001 From: Maximilian Date: Wed, 17 Jun 2026 14:45:39 +0200 Subject: [PATCH 29/61] changed validation for userId to <= 0 Signed-off-by: Maximilian --- cli/cmd/team_remove_member.go | 4 ++-- cli/cmd/team_remove_member_test.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cli/cmd/team_remove_member.go b/cli/cmd/team_remove_member.go index 73415443..f57ba635 100644 --- a/cli/cmd/team_remove_member.go +++ b/cli/cmd/team_remove_member.go @@ -61,8 +61,8 @@ func (c *RemoveTeamMemberCmd) RunE(_ *cobra.Command, args []string) error { } func (c *RemoveTeamMemberCmd) RemoveTeamMember(client Client, teamId int, userId int) error { - if userId == 0 { - return errors.New("user ID cannot be empty") + if userId <= 0 { + return errors.New("user ID has to be set") } err := client.RemoveTeamMember(teamId, userId) diff --git a/cli/cmd/team_remove_member_test.go b/cli/cmd/team_remove_member_test.go index 17e49d73..04735aed 100644 --- a/cli/cmd/team_remove_member_test.go +++ b/cli/cmd/team_remove_member_test.go @@ -49,7 +49,7 @@ var _ = Describe("RemoveTeamMember", func() { err := c.RemoveTeamMember(mockClient, teamId, 0) Expect(err).To(HaveOccurred()) - Expect(err.Error()).To(Equal("user ID cannot be empty")) + Expect(err.Error()).To(Equal("user ID has to be set")) }) }) @@ -93,7 +93,7 @@ var _ = Describe("RemoveTeamMember", func() { err := c.RunE(nil, []string{}) Expect(err).To(HaveOccurred()) - Expect(err.Error()).To(Equal("user ID cannot be empty")) + Expect(err.Error()).To(Equal("user ID has to be set")) }) }) }) From 292ff5d475eb00482bd0f0cfbb8e3113dc9e9359 Mon Sep 17 00:00:00 2001 From: DerBurri <7892993+DerBurri@users.noreply.github.com> Date: Wed, 17 Jun 2026 12:34:06 +0000 Subject: [PATCH 30/61] chore(docs): Auto-update docs and licenses Signed-off-by: DerBurri <7892993+DerBurri@users.noreply.github.com> Signed-off-by: Maximilian --- docs/cs_team_remove.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/cs_team_remove.md b/docs/cs_team_remove.md index ec5289a6..8df8a85c 100644 --- a/docs/cs_team_remove.md +++ b/docs/cs_team_remove.md @@ -23,8 +23,7 @@ $ cs team remove -O -t ### Options ``` - -h, --help help for remove - -n, --name string Team name + -h, --help help for remove ``` ### Options inherited from parent commands From 3f9d26e8332e50f38064fd987e5f0beea8d34fdc Mon Sep 17 00:00:00 2001 From: Maximilian Date: Wed, 17 Jun 2026 14:47:38 +0200 Subject: [PATCH 31/61] Merge branch 'add-organization-api' of https://github.com/codesphere-cloud/cs-go into add-organization-api Signed-off-by: Maximilian From a15fa121af332ac9c8bd71741ef229c270083153 Mon Sep 17 00:00:00 2001 From: Maximilian Date: Wed, 17 Jun 2026 14:56:34 +0200 Subject: [PATCH 32/61] fixed linter errors Signed-off-by: Maximilian --- api/organizations.go | 4 +--- cli/cmd/team_add_member.go | 2 +- cli/cmd/team_remove.go | 1 - cli/cmd/team_remove_member.go | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/api/organizations.go b/api/organizations.go index 4e23ff98..b9410a68 100644 --- a/api/organizations.go +++ b/api/organizations.go @@ -14,8 +14,6 @@ func (c *Client) ListOrganizations() ([]Organization, error) { } res := make([]Organization, len(orgs)) - for i, o := range orgs { - res[i] = o - } + copy(res, orgs) return res, nil } diff --git a/cli/cmd/team_add_member.go b/cli/cmd/team_add_member.go index bace07ef..d3e08ccf 100644 --- a/cli/cmd/team_add_member.go +++ b/cli/cmd/team_add_member.go @@ -47,7 +47,7 @@ func AddAddTeamMemberCmd(team *cobra.Command, opts *GlobalOptions) { } t.cmd.RunE = t.RunE t.cmd.Flags().StringVarP(&t.Opts.Email, "email", "e", "", "Team member email") - t.cmd.MarkFlagRequired("email") + _ = t.cmd.MarkFlagRequired("email") t.cmd.Flags().IntVarP(&t.Opts.Role, "role", "r", int(cs.RoleAdmin), "Team member role 0=admin, 1=member") AddCmd(team, t.cmd) } diff --git a/cli/cmd/team_remove.go b/cli/cmd/team_remove.go index 34d524cc..704a042b 100644 --- a/cli/cmd/team_remove.go +++ b/cli/cmd/team_remove.go @@ -19,7 +19,6 @@ type RemoveTeamCmd struct { type RemoveTeamOpts struct { *GlobalOptions - name string } func AddRemoveTeamCmd(team *cobra.Command, opts *GlobalOptions) { diff --git a/cli/cmd/team_remove_member.go b/cli/cmd/team_remove_member.go index f57ba635..4316eebc 100644 --- a/cli/cmd/team_remove_member.go +++ b/cli/cmd/team_remove_member.go @@ -41,7 +41,7 @@ func AddRemoveTeamMemberCmd(team *cobra.Command, opts *GlobalOptions) { ClientFactory: NewClient, } res.cmd.Flags().IntVarP(&res.Opts.UserId, "user", "u", 0, "Team member user ID") - res.cmd.MarkFlagRequired("user") + _ = res.cmd.MarkFlagRequired("user") res.cmd.RunE = res.RunE AddCmd(team, res.cmd) } From 04ecf4547bb842cfcb9fc572916aeb7ee8ecc6f7 Mon Sep 17 00:00:00 2001 From: Simon Herrmann Date: Tue, 16 Jun 2026 15:15:03 +0200 Subject: [PATCH 33/61] Codesphere MCP server (#272) * feat: add first draft cs mcp server * fix: add cs-mcp to gitignore * fix: fix env var names in readme * update: clean up workspace structs * update: add mcp server to the main cs-go cli * update: remove mcp readme, add long mcp cmd description, remove old build related stuff * update: update file name of the main mcp file * chore(docs): Auto-update docs and licenses Signed-off-by: siherrmann <25087590+siherrmann@users.noreply.github.com> * fix: fix dependency error * fix: fix dependecy issue --------- Signed-off-by: siherrmann <25087590+siherrmann@users.noreply.github.com> Co-authored-by: siherrmann <25087590+siherrmann@users.noreply.github.com> Signed-off-by: Maximilian --- api/openapi_client/mocks.go | 12 ++++----- docs/cs_mcp.md | 50 +++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 6 deletions(-) diff --git a/api/openapi_client/mocks.go b/api/openapi_client/mocks.go index a71fd674..4cf13938 100644 --- a/api/openapi_client/mocks.go +++ b/api/openapi_client/mocks.go @@ -1367,9 +1367,9 @@ type MockManagedServicesAPI_ManagedServicesDeleteProvider_Call struct { // ManagedServicesDeleteProvider is a helper method to define mock.On call // - ctx context.Context // - name string -// - schemaVersion string -func (_e *MockManagedServicesAPI_Expecter) ManagedServicesDeleteProvider(ctx any, name any, schemaVersion any) *MockManagedServicesAPI_ManagedServicesDeleteProvider_Call { - return &MockManagedServicesAPI_ManagedServicesDeleteProvider_Call{Call: _e.mock.On("ManagedServicesDeleteProvider", ctx, name, schemaVersion)} +// - version string +func (_e *MockManagedServicesAPI_Expecter) ManagedServicesDeleteProvider(ctx interface{}, name interface{}, version interface{}) *MockManagedServicesAPI_ManagedServicesDeleteProvider_Call { + return &MockManagedServicesAPI_ManagedServicesDeleteProvider_Call{Call: _e.mock.On("ManagedServicesDeleteProvider", ctx, name, version)} } func (_c *MockManagedServicesAPI_ManagedServicesDeleteProvider_Call) Run(run func(ctx context.Context, name string, schemaVersion string)) *MockManagedServicesAPI_ManagedServicesDeleteProvider_Call { @@ -2115,9 +2115,9 @@ type MockManagedServicesAPI_ManagedServicesUpdateProvider_Call struct { // ManagedServicesUpdateProvider is a helper method to define mock.On call // - ctx context.Context // - name string -// - schemaVersion string -func (_e *MockManagedServicesAPI_Expecter) ManagedServicesUpdateProvider(ctx any, name any, schemaVersion any) *MockManagedServicesAPI_ManagedServicesUpdateProvider_Call { - return &MockManagedServicesAPI_ManagedServicesUpdateProvider_Call{Call: _e.mock.On("ManagedServicesUpdateProvider", ctx, name, schemaVersion)} +// - version string +func (_e *MockManagedServicesAPI_Expecter) ManagedServicesUpdateProvider(ctx interface{}, name interface{}, version interface{}) *MockManagedServicesAPI_ManagedServicesUpdateProvider_Call { + return &MockManagedServicesAPI_ManagedServicesUpdateProvider_Call{Call: _e.mock.On("ManagedServicesUpdateProvider", ctx, name, version)} } func (_c *MockManagedServicesAPI_ManagedServicesUpdateProvider_Call) Run(run func(ctx context.Context, name string, schemaVersion string)) *MockManagedServicesAPI_ManagedServicesUpdateProvider_Call { diff --git a/docs/cs_mcp.md b/docs/cs_mcp.md index c63b82c5..7f1e4272 100644 --- a/docs/cs_mcp.md +++ b/docs/cs_mcp.md @@ -49,3 +49,53 @@ cs mcp [flags] * [cs](cs.md) - The Codesphere CLI +## cs mcp + +Runs the MCP server for Codesphere + +### Synopsis + +Runs the Model Context Protocol (MCP) server for Codesphere. + +The Codesphere MCP (Model Context Protocol) Server allows you to interact with your Codesphere workspaces and teams directly from within MCP-compatible AI assistants. +Add the Codesphere MCP Server to your MCP client configuration settings. +Example configuration: +{ +"mcpServers": { +"codesphere": { +"command": "cs", +"args": [ +"mcp" +], +"env": { +"CS_TOKEN": "your-api-token-here", +"CS_API": "https://codesphere.com/api" +} +} +} +} + + +``` +cs mcp [flags] +``` + +### Options + +``` + -h, --help help for mcp +``` + +### Options inherited from parent commands + +``` + -a, --api string URL of Codesphere API (can also be CS_API) + -t, --team int Team ID (relevant for some commands, can also be CS_TEAM_ID) (default -1) + -v, --verbose Verbose output + -w, --workspace int Workspace ID (relevant for some commands, can also be CS_WORKSPACE_ID) (default -1) +``` + +### SEE ALSO + +* [cs](cs.md) - The Codesphere CLI + From c8143647f0fff14b2e44f28bdd04e072d21252d3 Mon Sep 17 00:00:00 2001 From: Maximilian Date: Wed, 1 Jul 2026 09:31:50 +0200 Subject: [PATCH 34/61] fixed team create exampl Signed-off-by: Maximilian --- cli/cmd/team_create.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/cmd/team_create.go b/cli/cmd/team_create.go index e4590740..7f016e02 100644 --- a/cli/cmd/team_create.go +++ b/cli/cmd/team_create.go @@ -29,7 +29,7 @@ func AddCreateTeamCmd(team *cobra.Command, opts *GlobalOptions) { Use: "create", Short: "Create team", Long: `Create a team in Codesphere or an Organization`, - Example: io.FormatExampleCommands("team member add", []io.Example{ + Example: io.FormatExampleCommands("team create", []io.Example{ {Cmd: "-d -n ", Desc: "Create a team in a specific datacenter"}, {Cmd: "-d -n -O ", Desc: "Create a team in a specific datacenter within an organization"}, }), From 8880edd9bdf81f84d5dfcc22d5a7e67dc04b4da5 Mon Sep 17 00:00:00 2001 From: Maximilian Date: Wed, 1 Jul 2026 09:33:24 +0200 Subject: [PATCH 35/61] fixed format for team member remove Signed-off-by: Maximilian --- cli/cmd/team_remove_member.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cli/cmd/team_remove_member.go b/cli/cmd/team_remove_member.go index 4316eebc..3b16cd51 100644 --- a/cli/cmd/team_remove_member.go +++ b/cli/cmd/team_remove_member.go @@ -27,9 +27,9 @@ func AddRemoveTeamMemberCmd(team *cobra.Command, opts *GlobalOptions) { cmd: &cobra.Command{ Use: "remove", Short: "Remove team member", - Long: io.Long(`Remove team member from a team. + Long: io.Long(`Remove member from a team. - To add a member to a team within an organization, the CS_ORG_ID environment variable or the -O/--org flag must be set.`), + To remove a member from a team within an organization, the CS_ORG_ID environment variable or the -O/--org flag must be set.`), Example: io.FormatExampleCommands("team member remove", []io.Example{ {Cmd: "-t -u ", Desc: "Remove a user from a team"}, {Cmd: "-O -t -u ", Desc: "Remove a user from a team within an organization"}, From 95588a35b2bce8b52154d044ebbe92d6529bddb2 Mon Sep 17 00:00:00 2001 From: Maximilian Date: Wed, 1 Jul 2026 09:34:48 +0200 Subject: [PATCH 36/61] fixed Codesphere typo Signed-off-by: Maximilian --- cli/cmd/team_add_member.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/cmd/team_add_member.go b/cli/cmd/team_add_member.go index d3e08ccf..f32a383b 100644 --- a/cli/cmd/team_add_member.go +++ b/cli/cmd/team_add_member.go @@ -55,7 +55,7 @@ func AddAddTeamMemberCmd(team *cobra.Command, opts *GlobalOptions) { func (c *AddTeamMemberCmd) RunE(_ *cobra.Command, args []string) error { client, err := c.ClientFactory(*c.Opts.GlobalOptions) if err != nil { - return fmt.Errorf("failed to create Codespehre client: %w", err) + return fmt.Errorf("failed to create Codesphere client: %w", err) } teamId, err := c.Opts.GetTeamId() From 20347798a903df7eda72fd3ae3022bc8369d208f Mon Sep 17 00:00:00 2001 From: Maximilian Date: Wed, 1 Jul 2026 09:35:16 +0200 Subject: [PATCH 37/61] fixed typo in test Signed-off-by: Maximilian --- cli/cmd/team_add_member_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/cmd/team_add_member_test.go b/cli/cmd/team_add_member_test.go index aacc1872..34be9459 100644 --- a/cli/cmd/team_add_member_test.go +++ b/cli/cmd/team_add_member_test.go @@ -97,7 +97,7 @@ var _ = Describe("AddTeamMember", func() { err := c.RunE(nil, []string{}) Expect(err).To(HaveOccurred()) - Expect(err.Error()).To(ContainSubstring("failed to create Codespehre client: client init failed")) + Expect(err.Error()).To(ContainSubstring("failed to create Codesphere client: client init failed")) }) It("should fail when team ID is unavailable", func() { From 5370ec06eca1744e791ea3675468627470034f68 Mon Sep 17 00:00:00 2001 From: Maximilian Date: Wed, 1 Jul 2026 09:35:51 +0200 Subject: [PATCH 38/61] removed debugging message Signed-off-by: Maximilian --- cli/cmd/team_add_member.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/cli/cmd/team_add_member.go b/cli/cmd/team_add_member.go index f32a383b..33e38f05 100644 --- a/cli/cmd/team_add_member.go +++ b/cli/cmd/team_add_member.go @@ -81,8 +81,6 @@ func (c *AddTeamMemberCmd) AddTeamMember(client Client, teamId int, email string return errors.New("invalid role: must be 0 for admin or 1 for member") } - fmt.Printf("add member: %s to team %d with role: %d", email, teamId, role) - err := client.AddTeamMember(teamId, email, role) if err != nil { return fmt.Errorf("failed to add member to team: %w", err) From 7026500c53147faf9fb7cedf8ecdebf2f849c337 Mon Sep 17 00:00:00 2001 From: Maximilian Date: Wed, 1 Jul 2026 10:21:56 +0200 Subject: [PATCH 39/61] updated openapi client, datatype of ids changed from float32 to int Signed-off-by: Maximilian --- api/client.go | 14 +- api/openapi_client/api_domains.go | 63 +- api/openapi_client/api_managed_services.go | 11 +- api/openapi_client/api_organizations.go | 18 +- api/openapi_client/api_teams.go | 73 +- api/openapi_client/api_usage.go | 18 +- api/openapi_client/api_vault.go | 1211 +++++++++++- api/openapi_client/api_workspaces.go | 231 ++- api/openapi_client/mocks.go | 1735 +++++++++++++---- .../model_managed_services_create_request.go | 37 + ...anaged_services_list_200_response_inner.go | 37 + .../model_managed_services_update_request.go | 49 +- ...model_vault_create_shared_vault_request.go | 158 ++ api/team.go | 8 +- api/usage.go | 4 +- api/workspace.go | 36 +- api/workspace_test.go | 12 +- 17 files changed, 3015 insertions(+), 700 deletions(-) create mode 100644 api/openapi_client/model_vault_create_shared_vault_request.go diff --git a/api/client.go b/api/client.go index 51d794ae..c46cc2b4 100644 --- a/api/client.go +++ b/api/client.go @@ -87,22 +87,22 @@ func (c *Client) ListDataCenters() ([]DataCenter, error) { } func (c *Client) ListDomains(teamId int) ([]Domain, error) { - domains, r, err := c.api.DomainsAPI.DomainsListDomains(c.ctx, float32(teamId)).Execute() + domains, r, err := c.api.DomainsAPI.DomainsListDomains(c.ctx, teamId).Execute() return domains, errors.FormatAPIError(r, err) } func (c *Client) GetDomain(teamId int, domainName string) (*Domain, error) { - domain, r, err := c.api.DomainsAPI.DomainsGetDomain(c.ctx, float32(teamId), domainName).Execute() + domain, r, err := c.api.DomainsAPI.DomainsGetDomain(c.ctx, teamId, domainName).Execute() return domain, errors.FormatAPIError(r, err) } func (c *Client) CreateDomain(teamId int, domainName string) (*Domain, error) { - domain, r, err := c.api.DomainsAPI.DomainsCreateDomain(c.ctx, float32(teamId), domainName).Execute() + domain, r, err := c.api.DomainsAPI.DomainsCreateDomain(c.ctx, teamId, domainName).Execute() return domain, errors.FormatAPIError(r, err) } func (c *Client) DeleteDomain(teamId int, domainName string) error { - r, err := c.api.DomainsAPI.DomainsDeleteDomain(c.ctx, float32(teamId), domainName).Execute() + r, err := c.api.DomainsAPI.DomainsDeleteDomain(c.ctx, teamId, domainName).Execute() return errors.FormatAPIError(r, err) } @@ -110,7 +110,7 @@ func (c *Client) UpdateDomain( teamId int, domainName string, args UpdateDomainArgs, ) (*Domain, error) { domain, r, err := c.api.DomainsAPI. - DomainsUpdateDomain(c.ctx, float32(teamId), domainName). + DomainsUpdateDomain(c.ctx, teamId, domainName). DomainsUpdateDomainRequest(args). Execute() return domain, errors.FormatAPIError(r, err) @@ -120,7 +120,7 @@ func (c *Client) VerifyDomain( teamId int, domainName string, ) (*DomainVerificationStatus, error) { status, r, err := c.api.DomainsAPI. - DomainsVerifyDomain(c.ctx, float32(teamId), domainName).Execute() + DomainsVerifyDomain(c.ctx, teamId, domainName).Execute() return status, errors.FormatAPIError(r, err) } @@ -136,7 +136,7 @@ func (c *Client) UpdateWorkspaceConnections( req[path] = ids } domain, r, err := c.api.DomainsAPI. - DomainsUpdateWorkspaceConnections(c.ctx, float32(teamId), domainName). + DomainsUpdateWorkspaceConnections(c.ctx, teamId, domainName). RequestBody(req).Execute() return domain, errors.FormatAPIError(r, err) } diff --git a/api/openapi_client/api_domains.go b/api/openapi_client/api_domains.go index 65685d35..8e634b2f 100644 --- a/api/openapi_client/api_domains.go +++ b/api/openapi_client/api_domains.go @@ -30,7 +30,7 @@ type DomainsAPI interface { @param domainName @return ApiDomainsCreateDomainRequest */ - DomainsCreateDomain(ctx context.Context, teamId float32, domainName string) ApiDomainsCreateDomainRequest + DomainsCreateDomain(ctx context.Context, teamId int, domainName string) ApiDomainsCreateDomainRequest // DomainsCreateDomainExecute executes the request // @return DomainsGetDomain200Response @@ -44,7 +44,7 @@ type DomainsAPI interface { @param domainName @return ApiDomainsDeleteDomainRequest */ - DomainsDeleteDomain(ctx context.Context, teamId float32, domainName string) ApiDomainsDeleteDomainRequest + DomainsDeleteDomain(ctx context.Context, teamId int, domainName string) ApiDomainsDeleteDomainRequest // DomainsDeleteDomainExecute executes the request DomainsDeleteDomainExecute(r ApiDomainsDeleteDomainRequest) (*http.Response, error) @@ -57,7 +57,7 @@ type DomainsAPI interface { @param domainName @return ApiDomainsGetDomainRequest */ - DomainsGetDomain(ctx context.Context, teamId float32, domainName string) ApiDomainsGetDomainRequest + DomainsGetDomain(ctx context.Context, teamId int, domainName string) ApiDomainsGetDomainRequest // DomainsGetDomainExecute executes the request // @return DomainsGetDomain200Response @@ -70,7 +70,7 @@ type DomainsAPI interface { @param teamId @return ApiDomainsListDomainsRequest */ - DomainsListDomains(ctx context.Context, teamId float32) ApiDomainsListDomainsRequest + DomainsListDomains(ctx context.Context, teamId int) ApiDomainsListDomainsRequest // DomainsListDomainsExecute executes the request // @return []DomainsGetDomain200Response @@ -84,7 +84,7 @@ type DomainsAPI interface { @param domainName @return ApiDomainsUpdateDomainRequest */ - DomainsUpdateDomain(ctx context.Context, teamId float32, domainName string) ApiDomainsUpdateDomainRequest + DomainsUpdateDomain(ctx context.Context, teamId int, domainName string) ApiDomainsUpdateDomainRequest // DomainsUpdateDomainExecute executes the request // @return DomainsGetDomain200Response @@ -98,7 +98,7 @@ type DomainsAPI interface { @param domainName @return ApiDomainsUpdateWorkspaceConnectionsRequest */ - DomainsUpdateWorkspaceConnections(ctx context.Context, teamId float32, domainName string) ApiDomainsUpdateWorkspaceConnectionsRequest + DomainsUpdateWorkspaceConnections(ctx context.Context, teamId int, domainName string) ApiDomainsUpdateWorkspaceConnectionsRequest // DomainsUpdateWorkspaceConnectionsExecute executes the request // @return DomainsGetDomain200Response @@ -112,7 +112,7 @@ type DomainsAPI interface { @param domainName @return ApiDomainsVerifyDomainRequest */ - DomainsVerifyDomain(ctx context.Context, teamId float32, domainName string) ApiDomainsVerifyDomainRequest + DomainsVerifyDomain(ctx context.Context, teamId int, domainName string) ApiDomainsVerifyDomainRequest // DomainsVerifyDomainExecute executes the request // @return DomainsGetDomain200ResponseDomainVerificationStatus @@ -125,7 +125,7 @@ type DomainsAPIService service type ApiDomainsCreateDomainRequest struct { ctx context.Context ApiService DomainsAPI - teamId float32 + teamId int domainName string } @@ -141,7 +141,7 @@ DomainsCreateDomain createDomain @param domainName @return ApiDomainsCreateDomainRequest */ -func (a *DomainsAPIService) DomainsCreateDomain(ctx context.Context, teamId float32, domainName string) ApiDomainsCreateDomainRequest { +func (a *DomainsAPIService) DomainsCreateDomain(ctx context.Context, teamId int, domainName string) ApiDomainsCreateDomainRequest { return ApiDomainsCreateDomainRequest{ ApiService: a, ctx: ctx, @@ -173,6 +173,9 @@ func (a *DomainsAPIService) DomainsCreateDomainExecute(r ApiDomainsCreateDomainR localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + if r.teamId < 0 { + return localVarReturnValue, nil, reportError("teamId must be greater than 0") + } // to determine the Content-Type header localVarHTTPContentTypes := []string{} @@ -252,7 +255,7 @@ func (a *DomainsAPIService) DomainsCreateDomainExecute(r ApiDomainsCreateDomainR type ApiDomainsDeleteDomainRequest struct { ctx context.Context ApiService DomainsAPI - teamId float32 + teamId int domainName string } @@ -268,7 +271,7 @@ DomainsDeleteDomain deleteDomain @param domainName @return ApiDomainsDeleteDomainRequest */ -func (a *DomainsAPIService) DomainsDeleteDomain(ctx context.Context, teamId float32, domainName string) ApiDomainsDeleteDomainRequest { +func (a *DomainsAPIService) DomainsDeleteDomain(ctx context.Context, teamId int, domainName string) ApiDomainsDeleteDomainRequest { return ApiDomainsDeleteDomainRequest{ ApiService: a, ctx: ctx, @@ -297,6 +300,9 @@ func (a *DomainsAPIService) DomainsDeleteDomainExecute(r ApiDomainsDeleteDomainR localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + if r.teamId < 0 { + return nil, reportError("teamId must be greater than 0") + } // to determine the Content-Type header localVarHTTPContentTypes := []string{} @@ -378,7 +384,7 @@ func (a *DomainsAPIService) DomainsDeleteDomainExecute(r ApiDomainsDeleteDomainR type ApiDomainsGetDomainRequest struct { ctx context.Context ApiService DomainsAPI - teamId float32 + teamId int domainName string } @@ -394,7 +400,7 @@ DomainsGetDomain getDomain @param domainName @return ApiDomainsGetDomainRequest */ -func (a *DomainsAPIService) DomainsGetDomain(ctx context.Context, teamId float32, domainName string) ApiDomainsGetDomainRequest { +func (a *DomainsAPIService) DomainsGetDomain(ctx context.Context, teamId int, domainName string) ApiDomainsGetDomainRequest { return ApiDomainsGetDomainRequest{ ApiService: a, ctx: ctx, @@ -426,6 +432,9 @@ func (a *DomainsAPIService) DomainsGetDomainExecute(r ApiDomainsGetDomainRequest localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + if r.teamId < 0 { + return localVarReturnValue, nil, reportError("teamId must be greater than 0") + } // to determine the Content-Type header localVarHTTPContentTypes := []string{} @@ -516,7 +525,7 @@ func (a *DomainsAPIService) DomainsGetDomainExecute(r ApiDomainsGetDomainRequest type ApiDomainsListDomainsRequest struct { ctx context.Context ApiService DomainsAPI - teamId float32 + teamId int } func (r ApiDomainsListDomainsRequest) Execute() ([]DomainsGetDomain200Response, *http.Response, error) { @@ -530,7 +539,7 @@ DomainsListDomains listDomains @param teamId @return ApiDomainsListDomainsRequest */ -func (a *DomainsAPIService) DomainsListDomains(ctx context.Context, teamId float32) ApiDomainsListDomainsRequest { +func (a *DomainsAPIService) DomainsListDomains(ctx context.Context, teamId int) ApiDomainsListDomainsRequest { return ApiDomainsListDomainsRequest{ ApiService: a, ctx: ctx, @@ -560,6 +569,9 @@ func (a *DomainsAPIService) DomainsListDomainsExecute(r ApiDomainsListDomainsReq localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + if r.teamId < 0 { + return localVarReturnValue, nil, reportError("teamId must be greater than 0") + } // to determine the Content-Type header localVarHTTPContentTypes := []string{} @@ -639,7 +651,7 @@ func (a *DomainsAPIService) DomainsListDomainsExecute(r ApiDomainsListDomainsReq type ApiDomainsUpdateDomainRequest struct { ctx context.Context ApiService DomainsAPI - teamId float32 + teamId int domainName string domainsUpdateDomainRequest *DomainsUpdateDomainRequest } @@ -661,7 +673,7 @@ DomainsUpdateDomain updateDomain @param domainName @return ApiDomainsUpdateDomainRequest */ -func (a *DomainsAPIService) DomainsUpdateDomain(ctx context.Context, teamId float32, domainName string) ApiDomainsUpdateDomainRequest { +func (a *DomainsAPIService) DomainsUpdateDomain(ctx context.Context, teamId int, domainName string) ApiDomainsUpdateDomainRequest { return ApiDomainsUpdateDomainRequest{ ApiService: a, ctx: ctx, @@ -693,6 +705,9 @@ func (a *DomainsAPIService) DomainsUpdateDomainExecute(r ApiDomainsUpdateDomainR localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + if r.teamId < 0 { + return localVarReturnValue, nil, reportError("teamId must be greater than 0") + } // to determine the Content-Type header localVarHTTPContentTypes := []string{"application/json"} @@ -796,7 +811,7 @@ func (a *DomainsAPIService) DomainsUpdateDomainExecute(r ApiDomainsUpdateDomainR type ApiDomainsUpdateWorkspaceConnectionsRequest struct { ctx context.Context ApiService DomainsAPI - teamId float32 + teamId int domainName string requestBody *map[string][]int } @@ -818,7 +833,7 @@ DomainsUpdateWorkspaceConnections updateWorkspaceConnections @param domainName @return ApiDomainsUpdateWorkspaceConnectionsRequest */ -func (a *DomainsAPIService) DomainsUpdateWorkspaceConnections(ctx context.Context, teamId float32, domainName string) ApiDomainsUpdateWorkspaceConnectionsRequest { +func (a *DomainsAPIService) DomainsUpdateWorkspaceConnections(ctx context.Context, teamId int, domainName string) ApiDomainsUpdateWorkspaceConnectionsRequest { return ApiDomainsUpdateWorkspaceConnectionsRequest{ ApiService: a, ctx: ctx, @@ -850,6 +865,9 @@ func (a *DomainsAPIService) DomainsUpdateWorkspaceConnectionsExecute(r ApiDomain localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + if r.teamId < 0 { + return localVarReturnValue, nil, reportError("teamId must be greater than 0") + } // to determine the Content-Type header localVarHTTPContentTypes := []string{"application/json"} @@ -942,7 +960,7 @@ func (a *DomainsAPIService) DomainsUpdateWorkspaceConnectionsExecute(r ApiDomain type ApiDomainsVerifyDomainRequest struct { ctx context.Context ApiService DomainsAPI - teamId float32 + teamId int domainName string } @@ -958,7 +976,7 @@ DomainsVerifyDomain verifyDomain @param domainName @return ApiDomainsVerifyDomainRequest */ -func (a *DomainsAPIService) DomainsVerifyDomain(ctx context.Context, teamId float32, domainName string) ApiDomainsVerifyDomainRequest { +func (a *DomainsAPIService) DomainsVerifyDomain(ctx context.Context, teamId int, domainName string) ApiDomainsVerifyDomainRequest { return ApiDomainsVerifyDomainRequest{ ApiService: a, ctx: ctx, @@ -990,6 +1008,9 @@ func (a *DomainsAPIService) DomainsVerifyDomainExecute(r ApiDomainsVerifyDomainR localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + if r.teamId < 0 { + return localVarReturnValue, nil, reportError("teamId must be greater than 0") + } // to determine the Content-Type header localVarHTTPContentTypes := []string{} diff --git a/api/openapi_client/api_managed_services.go b/api/openapi_client/api_managed_services.go index 5f9053fc..999bbfdb 100644 --- a/api/openapi_client/api_managed_services.go +++ b/api/openapi_client/api_managed_services.go @@ -791,11 +791,11 @@ func (a *ManagedServicesAPIService) ManagedServicesGetDetailsExecute(r ApiManage type ApiManagedServicesListRequest struct { ctx context.Context ApiService ManagedServicesAPI - team *float32 + team *int includeDeleted *bool } -func (r ApiManagedServicesListRequest) Team(team float32) ApiManagedServicesListRequest { +func (r ApiManagedServicesListRequest) Team(team int) ApiManagedServicesListRequest { r.team = &team return r } @@ -846,6 +846,9 @@ func (a *ManagedServicesAPIService) ManagedServicesListExecute(r ApiManagedServi if r.team == nil { return localVarReturnValue, nil, reportError("team is required and must be specified") } + if *r.team < 0 { + return localVarReturnValue, nil, reportError("team must be greater than 0") + } if r.includeDeleted == nil { return localVarReturnValue, nil, reportError("includeDeleted is required and must be specified") } @@ -919,10 +922,10 @@ func (a *ManagedServicesAPIService) ManagedServicesListExecute(r ApiManagedServi type ApiManagedServicesListProvidersRequest struct { ctx context.Context ApiService ManagedServicesAPI - teamId *float32 + teamId *int } -func (r ApiManagedServicesListProvidersRequest) TeamId(teamId float32) ApiManagedServicesListProvidersRequest { +func (r ApiManagedServicesListProvidersRequest) TeamId(teamId int) ApiManagedServicesListProvidersRequest { r.teamId = &teamId return r } diff --git a/api/openapi_client/api_organizations.go b/api/openapi_client/api_organizations.go index 302d5a4b..7b47b8fc 100644 --- a/api/openapi_client/api_organizations.go +++ b/api/openapi_client/api_organizations.go @@ -42,7 +42,7 @@ type OrganizationsAPI interface { @param userId @return ApiOrganizationsChangeOrgRoleRequest */ - OrganizationsChangeOrgRole(ctx context.Context, organizationId string, userId float32) ApiOrganizationsChangeOrgRoleRequest + OrganizationsChangeOrgRole(ctx context.Context, organizationId string, userId int) ApiOrganizationsChangeOrgRoleRequest // OrganizationsChangeOrgRoleExecute executes the request OrganizationsChangeOrgRoleExecute(r ApiOrganizationsChangeOrgRoleRequest) (*http.Response, error) @@ -93,7 +93,7 @@ type OrganizationsAPI interface { @param userId @return ApiOrganizationsRemoveOrgMemberRequest */ - OrganizationsRemoveOrgMember(ctx context.Context, organizationId string, userId float32) ApiOrganizationsRemoveOrgMemberRequest + OrganizationsRemoveOrgMember(ctx context.Context, organizationId string, userId int) ApiOrganizationsRemoveOrgMemberRequest // OrganizationsRemoveOrgMemberExecute executes the request OrganizationsRemoveOrgMemberExecute(r ApiOrganizationsRemoveOrgMemberRequest) (*http.Response, error) @@ -236,7 +236,7 @@ type ApiOrganizationsChangeOrgRoleRequest struct { ctx context.Context ApiService OrganizationsAPI organizationId string - userId float32 + userId int organizationsChangeOrgRoleRequest *OrganizationsChangeOrgRoleRequest } @@ -257,7 +257,7 @@ OrganizationsChangeOrgRole changeOrgRole @param userId @return ApiOrganizationsChangeOrgRoleRequest */ -func (a *OrganizationsAPIService) OrganizationsChangeOrgRole(ctx context.Context, organizationId string, userId float32) ApiOrganizationsChangeOrgRoleRequest { +func (a *OrganizationsAPIService) OrganizationsChangeOrgRole(ctx context.Context, organizationId string, userId int) ApiOrganizationsChangeOrgRoleRequest { return ApiOrganizationsChangeOrgRoleRequest{ ApiService: a, ctx: ctx, @@ -286,6 +286,9 @@ func (a *OrganizationsAPIService) OrganizationsChangeOrgRoleExecute(r ApiOrganiz localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + if r.userId < 0 { + return nil, reportError("userId must be greater than 0") + } // to determine the Content-Type header localVarHTTPContentTypes := []string{"application/json"} @@ -724,7 +727,7 @@ type ApiOrganizationsRemoveOrgMemberRequest struct { ctx context.Context ApiService OrganizationsAPI organizationId string - userId float32 + userId int } func (r ApiOrganizationsRemoveOrgMemberRequest) Execute() (*http.Response, error) { @@ -739,7 +742,7 @@ OrganizationsRemoveOrgMember removeOrgMember @param userId @return ApiOrganizationsRemoveOrgMemberRequest */ -func (a *OrganizationsAPIService) OrganizationsRemoveOrgMember(ctx context.Context, organizationId string, userId float32) ApiOrganizationsRemoveOrgMemberRequest { +func (a *OrganizationsAPIService) OrganizationsRemoveOrgMember(ctx context.Context, organizationId string, userId int) ApiOrganizationsRemoveOrgMemberRequest { return ApiOrganizationsRemoveOrgMemberRequest{ ApiService: a, ctx: ctx, @@ -768,6 +771,9 @@ func (a *OrganizationsAPIService) OrganizationsRemoveOrgMemberExecute(r ApiOrgan localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + if r.userId < 0 { + return nil, reportError("userId must be greater than 0") + } // to determine the Content-Type header localVarHTTPContentTypes := []string{} diff --git a/api/openapi_client/api_teams.go b/api/openapi_client/api_teams.go index 26ad73cc..a2729fb7 100644 --- a/api/openapi_client/api_teams.go +++ b/api/openapi_client/api_teams.go @@ -32,7 +32,7 @@ type TeamsAPI interface { @param userId @return ApiTeamsChangeRoleRequest */ - TeamsChangeRole(ctx context.Context, teamId float32, userId float32) ApiTeamsChangeRoleRequest + TeamsChangeRole(ctx context.Context, teamId int, userId int) ApiTeamsChangeRoleRequest // TeamsChangeRoleExecute executes the request TeamsChangeRoleExecute(r ApiTeamsChangeRoleRequest) (*http.Response, error) @@ -56,7 +56,7 @@ type TeamsAPI interface { @param teamId @return ApiTeamsDeleteTeamRequest */ - TeamsDeleteTeam(ctx context.Context, teamId float32) ApiTeamsDeleteTeamRequest + TeamsDeleteTeam(ctx context.Context, teamId int) ApiTeamsDeleteTeamRequest // TeamsDeleteTeamExecute executes the request TeamsDeleteTeamExecute(r ApiTeamsDeleteTeamRequest) (*http.Response, error) @@ -68,7 +68,7 @@ type TeamsAPI interface { @param teamId @return ApiTeamsGetTeamRequest */ - TeamsGetTeam(ctx context.Context, teamId float32) ApiTeamsGetTeamRequest + TeamsGetTeam(ctx context.Context, teamId int) ApiTeamsGetTeamRequest // TeamsGetTeamExecute executes the request // @return TeamsGetTeam200Response @@ -83,7 +83,7 @@ type TeamsAPI interface { @param teamId @return ApiTeamsInviteMemberRequest */ - TeamsInviteMember(ctx context.Context, teamId float32) ApiTeamsInviteMemberRequest + TeamsInviteMember(ctx context.Context, teamId int) ApiTeamsInviteMemberRequest // TeamsInviteMemberExecute executes the request TeamsInviteMemberExecute(r ApiTeamsInviteMemberRequest) (*http.Response, error) @@ -97,7 +97,7 @@ type TeamsAPI interface { @param teamId @return ApiTeamsListMembersRequest */ - TeamsListMembers(ctx context.Context, teamId float32) ApiTeamsListMembersRequest + TeamsListMembers(ctx context.Context, teamId int) ApiTeamsListMembersRequest // TeamsListMembersExecute executes the request // @return []TeamsListMembers200ResponseInner @@ -122,7 +122,7 @@ type TeamsAPI interface { @param teamId @return ApiTeamsMigrateTeamToOrgRequest */ - TeamsMigrateTeamToOrg(ctx context.Context, teamId float32) ApiTeamsMigrateTeamToOrgRequest + TeamsMigrateTeamToOrg(ctx context.Context, teamId int) ApiTeamsMigrateTeamToOrgRequest // TeamsMigrateTeamToOrgExecute executes the request TeamsMigrateTeamToOrgExecute(r ApiTeamsMigrateTeamToOrgRequest) (*http.Response, error) @@ -137,7 +137,7 @@ type TeamsAPI interface { @param userId @return ApiTeamsRemoveMemberRequest */ - TeamsRemoveMember(ctx context.Context, teamId float32, userId float32) ApiTeamsRemoveMemberRequest + TeamsRemoveMember(ctx context.Context, teamId int, userId int) ApiTeamsRemoveMemberRequest // TeamsRemoveMemberExecute executes the request TeamsRemoveMemberExecute(r ApiTeamsRemoveMemberRequest) (*http.Response, error) @@ -149,8 +149,8 @@ type TeamsAPIService service type ApiTeamsChangeRoleRequest struct { ctx context.Context ApiService TeamsAPI - teamId float32 - userId float32 + teamId int + userId int teamsChangeRoleRequest *TeamsChangeRoleRequest } @@ -173,7 +173,7 @@ Change the role of a team member @param userId @return ApiTeamsChangeRoleRequest */ -func (a *TeamsAPIService) TeamsChangeRole(ctx context.Context, teamId float32, userId float32) ApiTeamsChangeRoleRequest { +func (a *TeamsAPIService) TeamsChangeRole(ctx context.Context, teamId int, userId int) ApiTeamsChangeRoleRequest { return ApiTeamsChangeRoleRequest{ ApiService: a, ctx: ctx, @@ -202,6 +202,12 @@ func (a *TeamsAPIService) TeamsChangeRoleExecute(r ApiTeamsChangeRoleRequest) (* localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + if r.teamId < 0 { + return nil, reportError("teamId must be greater than 0") + } + if r.userId < 0 { + return nil, reportError("userId must be greater than 0") + } // to determine the Content-Type header localVarHTTPContentTypes := []string{"application/json"} @@ -423,7 +429,7 @@ func (a *TeamsAPIService) TeamsCreateTeamExecute(r ApiTeamsCreateTeamRequest) (* type ApiTeamsDeleteTeamRequest struct { ctx context.Context ApiService TeamsAPI - teamId float32 + teamId int } func (r ApiTeamsDeleteTeamRequest) Execute() (*http.Response, error) { @@ -437,7 +443,7 @@ TeamsDeleteTeam deleteTeam @param teamId @return ApiTeamsDeleteTeamRequest */ -func (a *TeamsAPIService) TeamsDeleteTeam(ctx context.Context, teamId float32) ApiTeamsDeleteTeamRequest { +func (a *TeamsAPIService) TeamsDeleteTeam(ctx context.Context, teamId int) ApiTeamsDeleteTeamRequest { return ApiTeamsDeleteTeamRequest{ ApiService: a, ctx: ctx, @@ -464,6 +470,9 @@ func (a *TeamsAPIService) TeamsDeleteTeamExecute(r ApiTeamsDeleteTeamRequest) (* localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + if r.teamId < 0 { + return nil, reportError("teamId must be greater than 0") + } // to determine the Content-Type header localVarHTTPContentTypes := []string{} @@ -545,7 +554,7 @@ func (a *TeamsAPIService) TeamsDeleteTeamExecute(r ApiTeamsDeleteTeamRequest) (* type ApiTeamsGetTeamRequest struct { ctx context.Context ApiService TeamsAPI - teamId float32 + teamId int } func (r ApiTeamsGetTeamRequest) Execute() (*TeamsGetTeam200Response, *http.Response, error) { @@ -559,7 +568,7 @@ TeamsGetTeam getTeam @param teamId @return ApiTeamsGetTeamRequest */ -func (a *TeamsAPIService) TeamsGetTeam(ctx context.Context, teamId float32) ApiTeamsGetTeamRequest { +func (a *TeamsAPIService) TeamsGetTeam(ctx context.Context, teamId int) ApiTeamsGetTeamRequest { return ApiTeamsGetTeamRequest{ ApiService: a, ctx: ctx, @@ -589,6 +598,9 @@ func (a *TeamsAPIService) TeamsGetTeamExecute(r ApiTeamsGetTeamRequest) (*TeamsG localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + if r.teamId < 0 { + return localVarReturnValue, nil, reportError("teamId must be greater than 0") + } // to determine the Content-Type header localVarHTTPContentTypes := []string{} @@ -679,7 +691,7 @@ func (a *TeamsAPIService) TeamsGetTeamExecute(r ApiTeamsGetTeamRequest) (*TeamsG type ApiTeamsInviteMemberRequest struct { ctx context.Context ApiService TeamsAPI - teamId float32 + teamId int teamsInviteMemberRequest *TeamsInviteMemberRequest } @@ -701,7 +713,7 @@ Invite a user to a team by email @param teamId @return ApiTeamsInviteMemberRequest */ -func (a *TeamsAPIService) TeamsInviteMember(ctx context.Context, teamId float32) ApiTeamsInviteMemberRequest { +func (a *TeamsAPIService) TeamsInviteMember(ctx context.Context, teamId int) ApiTeamsInviteMemberRequest { return ApiTeamsInviteMemberRequest{ ApiService: a, ctx: ctx, @@ -728,6 +740,9 @@ func (a *TeamsAPIService) TeamsInviteMemberExecute(r ApiTeamsInviteMemberRequest localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + if r.teamId < 0 { + return nil, reportError("teamId must be greater than 0") + } // to determine the Content-Type header localVarHTTPContentTypes := []string{"application/json"} @@ -822,7 +837,7 @@ func (a *TeamsAPIService) TeamsInviteMemberExecute(r ApiTeamsInviteMemberRequest type ApiTeamsListMembersRequest struct { ctx context.Context ApiService TeamsAPI - teamId float32 + teamId int } func (r ApiTeamsListMembersRequest) Execute() ([]TeamsListMembers200ResponseInner, *http.Response, error) { @@ -838,7 +853,7 @@ List all members associated with a team @param teamId @return ApiTeamsListMembersRequest */ -func (a *TeamsAPIService) TeamsListMembers(ctx context.Context, teamId float32) ApiTeamsListMembersRequest { +func (a *TeamsAPIService) TeamsListMembers(ctx context.Context, teamId int) ApiTeamsListMembersRequest { return ApiTeamsListMembersRequest{ ApiService: a, ctx: ctx, @@ -868,6 +883,9 @@ func (a *TeamsAPIService) TeamsListMembersExecute(r ApiTeamsListMembersRequest) localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + if r.teamId < 0 { + return localVarReturnValue, nil, reportError("teamId must be greater than 0") + } // to determine the Content-Type header localVarHTTPContentTypes := []string{} @@ -1077,7 +1095,7 @@ func (a *TeamsAPIService) TeamsListTeamsExecute(r ApiTeamsListTeamsRequest) ([]T type ApiTeamsMigrateTeamToOrgRequest struct { ctx context.Context ApiService TeamsAPI - teamId float32 + teamId int teamsMigrateTeamToOrgRequest *TeamsMigrateTeamToOrgRequest } @@ -1097,7 +1115,7 @@ TeamsMigrateTeamToOrg migrateTeamToOrg @param teamId @return ApiTeamsMigrateTeamToOrgRequest */ -func (a *TeamsAPIService) TeamsMigrateTeamToOrg(ctx context.Context, teamId float32) ApiTeamsMigrateTeamToOrgRequest { +func (a *TeamsAPIService) TeamsMigrateTeamToOrg(ctx context.Context, teamId int) ApiTeamsMigrateTeamToOrgRequest { return ApiTeamsMigrateTeamToOrgRequest{ ApiService: a, ctx: ctx, @@ -1124,6 +1142,9 @@ func (a *TeamsAPIService) TeamsMigrateTeamToOrgExecute(r ApiTeamsMigrateTeamToOr localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + if r.teamId < 0 { + return nil, reportError("teamId must be greater than 0") + } // to determine the Content-Type header localVarHTTPContentTypes := []string{"application/json"} @@ -1196,8 +1217,8 @@ func (a *TeamsAPIService) TeamsMigrateTeamToOrgExecute(r ApiTeamsMigrateTeamToOr type ApiTeamsRemoveMemberRequest struct { ctx context.Context ApiService TeamsAPI - teamId float32 - userId float32 + teamId int + userId int } func (r ApiTeamsRemoveMemberRequest) Execute() (*http.Response, error) { @@ -1214,7 +1235,7 @@ Remove a member from a team @param userId @return ApiTeamsRemoveMemberRequest */ -func (a *TeamsAPIService) TeamsRemoveMember(ctx context.Context, teamId float32, userId float32) ApiTeamsRemoveMemberRequest { +func (a *TeamsAPIService) TeamsRemoveMember(ctx context.Context, teamId int, userId int) ApiTeamsRemoveMemberRequest { return ApiTeamsRemoveMemberRequest{ ApiService: a, ctx: ctx, @@ -1243,6 +1264,12 @@ func (a *TeamsAPIService) TeamsRemoveMemberExecute(r ApiTeamsRemoveMemberRequest localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + if r.teamId < 0 { + return nil, reportError("teamId must be greater than 0") + } + if r.userId < 0 { + return nil, reportError("userId must be greater than 0") + } // to determine the Content-Type header localVarHTTPContentTypes := []string{} diff --git a/api/openapi_client/api_usage.go b/api/openapi_client/api_usage.go index abbcb710..b2d21bcd 100644 --- a/api/openapi_client/api_usage.go +++ b/api/openapi_client/api_usage.go @@ -33,7 +33,7 @@ type UsageAPI interface { @param resourceId @return ApiUsageGetLandscapeServiceEventsRequest */ - UsageGetLandscapeServiceEvents(ctx context.Context, teamId float32, resourceId string) ApiUsageGetLandscapeServiceEventsRequest + UsageGetLandscapeServiceEvents(ctx context.Context, teamId int, resourceId string) ApiUsageGetLandscapeServiceEventsRequest // UsageGetLandscapeServiceEventsExecute executes the request // @return UsageGetLandscapeServiceEvents200Response @@ -48,7 +48,7 @@ type UsageAPI interface { @param teamId @return ApiUsageGetUsageSummaryLandscapeRequest */ - UsageGetUsageSummaryLandscape(ctx context.Context, teamId float32) ApiUsageGetUsageSummaryLandscapeRequest + UsageGetUsageSummaryLandscape(ctx context.Context, teamId int) ApiUsageGetUsageSummaryLandscapeRequest // UsageGetUsageSummaryLandscapeExecute executes the request // @return UsageGetUsageSummaryLandscape200Response @@ -61,7 +61,7 @@ type UsageAPIService service type ApiUsageGetLandscapeServiceEventsRequest struct { ctx context.Context ApiService UsageAPI - teamId float32 + teamId int resourceId string beginDate *time.Time endDate *time.Time @@ -103,7 +103,7 @@ Returns Audit-Events for a specific Landscape Service. @param resourceId @return ApiUsageGetLandscapeServiceEventsRequest */ -func (a *UsageAPIService) UsageGetLandscapeServiceEvents(ctx context.Context, teamId float32, resourceId string) ApiUsageGetLandscapeServiceEventsRequest { +func (a *UsageAPIService) UsageGetLandscapeServiceEvents(ctx context.Context, teamId int, resourceId string) ApiUsageGetLandscapeServiceEventsRequest { return ApiUsageGetLandscapeServiceEventsRequest{ ApiService: a, ctx: ctx, @@ -135,6 +135,9 @@ func (a *UsageAPIService) UsageGetLandscapeServiceEventsExecute(r ApiUsageGetLan localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + if r.teamId < 0 { + return localVarReturnValue, nil, reportError("teamId must be greater than 0") + } if r.beginDate == nil { return localVarReturnValue, nil, reportError("beginDate is required and must be specified") } @@ -236,7 +239,7 @@ func (a *UsageAPIService) UsageGetLandscapeServiceEventsExecute(r ApiUsageGetLan type ApiUsageGetUsageSummaryLandscapeRequest struct { ctx context.Context ApiService UsageAPI - teamId float32 + teamId int beginDate *time.Time endDate *time.Time limit *int @@ -276,7 +279,7 @@ Get the usage summary of all Landscape Services for a team over the specified ti @param teamId @return ApiUsageGetUsageSummaryLandscapeRequest */ -func (a *UsageAPIService) UsageGetUsageSummaryLandscape(ctx context.Context, teamId float32) ApiUsageGetUsageSummaryLandscapeRequest { +func (a *UsageAPIService) UsageGetUsageSummaryLandscape(ctx context.Context, teamId int) ApiUsageGetUsageSummaryLandscapeRequest { return ApiUsageGetUsageSummaryLandscapeRequest{ ApiService: a, ctx: ctx, @@ -306,6 +309,9 @@ func (a *UsageAPIService) UsageGetUsageSummaryLandscapeExecute(r ApiUsageGetUsag localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + if r.teamId < 0 { + return localVarReturnValue, nil, reportError("teamId must be greater than 0") + } if r.beginDate == nil { return localVarReturnValue, nil, reportError("beginDate is required and must be specified") } diff --git a/api/openapi_client/api_vault.go b/api/openapi_client/api_vault.go index fdfdc08a..8efb6f60 100644 --- a/api/openapi_client/api_vault.go +++ b/api/openapi_client/api_vault.go @@ -22,6 +22,50 @@ import ( type VaultAPI interface { + /* + VaultCreateSharedVault createSharedVault + + Create an empty shared vault for a team + + @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param teamId + @return ApiVaultCreateSharedVaultRequest + */ + VaultCreateSharedVault(ctx context.Context, teamId int) ApiVaultCreateSharedVaultRequest + + // VaultCreateSharedVaultExecute executes the request + VaultCreateSharedVaultExecute(r ApiVaultCreateSharedVaultRequest) (*http.Response, error) + + /* + VaultDeleteSharedSecrets deleteSharedSecrets + + Delete one or more named secrets from a shared vault. Deleting all keys does not remove the vault itself. + + @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param teamId + @param vaultName + @return ApiVaultDeleteSharedSecretsRequest + */ + VaultDeleteSharedSecrets(ctx context.Context, teamId int, vaultName string) ApiVaultDeleteSharedSecretsRequest + + // VaultDeleteSharedSecretsExecute executes the request + VaultDeleteSharedSecretsExecute(r ApiVaultDeleteSharedSecretsRequest) (*http.Response, error) + + /* + VaultDeleteSharedVault deleteSharedVault + + Delete a shared vault and all its secrets for a team + + @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param teamId + @param vaultName + @return ApiVaultDeleteSharedVaultRequest + */ + VaultDeleteSharedVault(ctx context.Context, teamId int, vaultName string) ApiVaultDeleteSharedVaultRequest + + // VaultDeleteSharedVaultExecute executes the request + VaultDeleteSharedVaultExecute(r ApiVaultDeleteSharedVaultRequest) (*http.Response, error) + /* VaultDeleteWorkspaceSecrets deleteWorkspaceSecrets @@ -32,7 +76,7 @@ type VaultAPI interface { @param workspaceId @return ApiVaultDeleteWorkspaceSecretsRequest */ - VaultDeleteWorkspaceSecrets(ctx context.Context, teamId float32, workspaceId float32) ApiVaultDeleteWorkspaceSecretsRequest + VaultDeleteWorkspaceSecrets(ctx context.Context, teamId int, workspaceId int) ApiVaultDeleteWorkspaceSecretsRequest // VaultDeleteWorkspaceSecretsExecute executes the request VaultDeleteWorkspaceSecretsExecute(r ApiVaultDeleteWorkspaceSecretsRequest) (*http.Response, error) @@ -47,12 +91,59 @@ type VaultAPI interface { @param workspaceId @return ApiVaultGenerateSecretsRequest */ - VaultGenerateSecrets(ctx context.Context, teamId float32, workspaceId float32) ApiVaultGenerateSecretsRequest + VaultGenerateSecrets(ctx context.Context, teamId int, workspaceId int) ApiVaultGenerateSecretsRequest // VaultGenerateSecretsExecute executes the request // @return map[string]interface{} VaultGenerateSecretsExecute(r ApiVaultGenerateSecretsRequest) (map[string]interface{}, *http.Response, error) + /* + VaultGenerateSharedSecrets generateSharedSecrets + + Generate and store secrets in a named shared vault using OpenBao password policies. If the vault does not exist it is created implicitly. + + @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param teamId + @param vaultName + @return ApiVaultGenerateSharedSecretsRequest + */ + VaultGenerateSharedSecrets(ctx context.Context, teamId int, vaultName string) ApiVaultGenerateSharedSecretsRequest + + // VaultGenerateSharedSecretsExecute executes the request + // @return map[string]interface{} + VaultGenerateSharedSecretsExecute(r ApiVaultGenerateSharedSecretsRequest) (map[string]interface{}, *http.Response, error) + + /* + VaultListSharedSecretKeys listSharedSecretKeys + + List secret key names stored in a named shared vault. Values are never returned. + + @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param teamId + @param vaultName + @return ApiVaultListSharedSecretKeysRequest + */ + VaultListSharedSecretKeys(ctx context.Context, teamId int, vaultName string) ApiVaultListSharedSecretKeysRequest + + // VaultListSharedSecretKeysExecute executes the request + // @return []string + VaultListSharedSecretKeysExecute(r ApiVaultListSharedSecretKeysRequest) ([]string, *http.Response, error) + + /* + VaultListSharedVaults listSharedVaults + + List all shared vault names for a team + + @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param teamId + @return ApiVaultListSharedVaultsRequest + */ + VaultListSharedVaults(ctx context.Context, teamId int) ApiVaultListSharedVaultsRequest + + // VaultListSharedVaultsExecute executes the request + // @return []string + VaultListSharedVaultsExecute(r ApiVaultListSharedVaultsRequest) ([]string, *http.Response, error) + /* VaultListWorkspaceSecrets listWorkspaceSecrets @@ -63,12 +154,28 @@ type VaultAPI interface { @param workspaceId @return ApiVaultListWorkspaceSecretsRequest */ - VaultListWorkspaceSecrets(ctx context.Context, teamId float32, workspaceId float32) ApiVaultListWorkspaceSecretsRequest + VaultListWorkspaceSecrets(ctx context.Context, teamId int, workspaceId int) ApiVaultListWorkspaceSecretsRequest // VaultListWorkspaceSecretsExecute executes the request // @return []string VaultListWorkspaceSecretsExecute(r ApiVaultListWorkspaceSecretsRequest) ([]string, *http.Response, error) + /* + VaultStoreSharedSecrets storeSharedSecrets + + Store secrets in a named shared vault + + @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param teamId + @param vaultName + @return ApiVaultStoreSharedSecretsRequest + */ + VaultStoreSharedSecrets(ctx context.Context, teamId int, vaultName string) ApiVaultStoreSharedSecretsRequest + + // VaultStoreSharedSecretsExecute executes the request + // @return map[string]interface{} + VaultStoreSharedSecretsExecute(r ApiVaultStoreSharedSecretsRequest) (map[string]interface{}, *http.Response, error) + /* VaultStoreWorkspaceSecrets storeWorkspaceSecrets @@ -79,75 +186,861 @@ type VaultAPI interface { @param workspaceId @return ApiVaultStoreWorkspaceSecretsRequest */ - VaultStoreWorkspaceSecrets(ctx context.Context, teamId float32, workspaceId float32) ApiVaultStoreWorkspaceSecretsRequest + VaultStoreWorkspaceSecrets(ctx context.Context, teamId int, workspaceId int) ApiVaultStoreWorkspaceSecretsRequest // VaultStoreWorkspaceSecretsExecute executes the request // @return map[string]interface{} VaultStoreWorkspaceSecretsExecute(r ApiVaultStoreWorkspaceSecretsRequest) (map[string]interface{}, *http.Response, error) } -// VaultAPIService VaultAPI service -type VaultAPIService service +// VaultAPIService VaultAPI service +type VaultAPIService service + +type ApiVaultCreateSharedVaultRequest struct { + ctx context.Context + ApiService VaultAPI + teamId int + vaultCreateSharedVaultRequest *VaultCreateSharedVaultRequest +} + +func (r ApiVaultCreateSharedVaultRequest) VaultCreateSharedVaultRequest(vaultCreateSharedVaultRequest VaultCreateSharedVaultRequest) ApiVaultCreateSharedVaultRequest { + r.vaultCreateSharedVaultRequest = &vaultCreateSharedVaultRequest + return r +} + +func (r ApiVaultCreateSharedVaultRequest) Execute() (*http.Response, error) { + return r.ApiService.VaultCreateSharedVaultExecute(r) +} + +/* +VaultCreateSharedVault createSharedVault + +Create an empty shared vault for a team + + @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param teamId + @return ApiVaultCreateSharedVaultRequest +*/ +func (a *VaultAPIService) VaultCreateSharedVault(ctx context.Context, teamId int) ApiVaultCreateSharedVaultRequest { + return ApiVaultCreateSharedVaultRequest{ + ApiService: a, + ctx: ctx, + teamId: teamId, + } +} + +// Execute executes the request +func (a *VaultAPIService) VaultCreateSharedVaultExecute(r ApiVaultCreateSharedVaultRequest) (*http.Response, error) { + var ( + localVarHTTPMethod = http.MethodPost + localVarPostBody interface{} + formFiles []formFile + ) + + localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "VaultAPIService.VaultCreateSharedVault") + if err != nil { + return nil, &GenericOpenAPIError{error: err.Error()} + } + + localVarPath := localBasePath + "/vault/teams/{teamId}/shared" + localVarPath = strings.Replace(localVarPath, "{"+"teamId"+"}", url.PathEscape(parameterValueToString(r.teamId, "teamId")), -1) + + localVarHeaderParams := make(map[string]string) + localVarQueryParams := url.Values{} + localVarFormParams := url.Values{} + if r.teamId < 0 { + return nil, reportError("teamId must be greater than 0") + } + + // to determine the Content-Type header + localVarHTTPContentTypes := []string{"application/json"} + + // set Content-Type header + localVarHTTPContentType := selectHeaderContentType(localVarHTTPContentTypes) + if localVarHTTPContentType != "" { + localVarHeaderParams["Content-Type"] = localVarHTTPContentType + } + + // to determine the Accept header + localVarHTTPHeaderAccepts := []string{"application/json"} + + // set Accept header + localVarHTTPHeaderAccept := selectHeaderAccept(localVarHTTPHeaderAccepts) + if localVarHTTPHeaderAccept != "" { + localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept + } + // body params + localVarPostBody = r.vaultCreateSharedVaultRequest + req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles) + if err != nil { + return nil, err + } + + localVarHTTPResponse, err := a.client.callAPI(req) + if err != nil || localVarHTTPResponse == nil { + return localVarHTTPResponse, err + } + + localVarBody, err := io.ReadAll(localVarHTTPResponse.Body) + localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = io.NopCloser(bytes.NewBuffer(localVarBody)) + if err != nil { + return localVarHTTPResponse, err + } + + if localVarHTTPResponse.StatusCode >= 300 { + newErr := &GenericOpenAPIError{ + body: localVarBody, + error: localVarHTTPResponse.Status, + } + if localVarHTTPResponse.StatusCode == 400 { + var v DomainsGetDomain400Response + err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarHTTPResponse, newErr + } + newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v) + newErr.model = v + return localVarHTTPResponse, newErr + } + if localVarHTTPResponse.StatusCode == 401 { + var v DomainsGetDomain401Response + err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarHTTPResponse, newErr + } + newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v) + newErr.model = v + } + return localVarHTTPResponse, newErr + } + + return localVarHTTPResponse, nil +} + +type ApiVaultDeleteSharedSecretsRequest struct { + ctx context.Context + ApiService VaultAPI + teamId int + vaultName string + requestBody *[]string +} + +func (r ApiVaultDeleteSharedSecretsRequest) RequestBody(requestBody []string) ApiVaultDeleteSharedSecretsRequest { + r.requestBody = &requestBody + return r +} + +func (r ApiVaultDeleteSharedSecretsRequest) Execute() (*http.Response, error) { + return r.ApiService.VaultDeleteSharedSecretsExecute(r) +} + +/* +VaultDeleteSharedSecrets deleteSharedSecrets + +Delete one or more named secrets from a shared vault. Deleting all keys does not remove the vault itself. + + @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param teamId + @param vaultName + @return ApiVaultDeleteSharedSecretsRequest +*/ +func (a *VaultAPIService) VaultDeleteSharedSecrets(ctx context.Context, teamId int, vaultName string) ApiVaultDeleteSharedSecretsRequest { + return ApiVaultDeleteSharedSecretsRequest{ + ApiService: a, + ctx: ctx, + teamId: teamId, + vaultName: vaultName, + } +} + +// Execute executes the request +func (a *VaultAPIService) VaultDeleteSharedSecretsExecute(r ApiVaultDeleteSharedSecretsRequest) (*http.Response, error) { + var ( + localVarHTTPMethod = http.MethodDelete + localVarPostBody interface{} + formFiles []formFile + ) + + localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "VaultAPIService.VaultDeleteSharedSecrets") + if err != nil { + return nil, &GenericOpenAPIError{error: err.Error()} + } + + localVarPath := localBasePath + "/vault/teams/{teamId}/shared/{vaultName}/secrets" + localVarPath = strings.Replace(localVarPath, "{"+"teamId"+"}", url.PathEscape(parameterValueToString(r.teamId, "teamId")), -1) + localVarPath = strings.Replace(localVarPath, "{"+"vaultName"+"}", url.PathEscape(parameterValueToString(r.vaultName, "vaultName")), -1) + + localVarHeaderParams := make(map[string]string) + localVarQueryParams := url.Values{} + localVarFormParams := url.Values{} + if r.teamId < 0 { + return nil, reportError("teamId must be greater than 0") + } + + // to determine the Content-Type header + localVarHTTPContentTypes := []string{"application/json"} + + // set Content-Type header + localVarHTTPContentType := selectHeaderContentType(localVarHTTPContentTypes) + if localVarHTTPContentType != "" { + localVarHeaderParams["Content-Type"] = localVarHTTPContentType + } + + // to determine the Accept header + localVarHTTPHeaderAccepts := []string{"application/json"} + + // set Accept header + localVarHTTPHeaderAccept := selectHeaderAccept(localVarHTTPHeaderAccepts) + if localVarHTTPHeaderAccept != "" { + localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept + } + // body params + localVarPostBody = r.requestBody + req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles) + if err != nil { + return nil, err + } + + localVarHTTPResponse, err := a.client.callAPI(req) + if err != nil || localVarHTTPResponse == nil { + return localVarHTTPResponse, err + } + + localVarBody, err := io.ReadAll(localVarHTTPResponse.Body) + localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = io.NopCloser(bytes.NewBuffer(localVarBody)) + if err != nil { + return localVarHTTPResponse, err + } + + if localVarHTTPResponse.StatusCode >= 300 { + newErr := &GenericOpenAPIError{ + body: localVarBody, + error: localVarHTTPResponse.Status, + } + if localVarHTTPResponse.StatusCode == 400 { + var v DomainsGetDomain400Response + err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarHTTPResponse, newErr + } + newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v) + newErr.model = v + return localVarHTTPResponse, newErr + } + if localVarHTTPResponse.StatusCode == 401 { + var v DomainsGetDomain401Response + err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarHTTPResponse, newErr + } + newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v) + newErr.model = v + } + return localVarHTTPResponse, newErr + } + + return localVarHTTPResponse, nil +} + +type ApiVaultDeleteSharedVaultRequest struct { + ctx context.Context + ApiService VaultAPI + teamId int + vaultName string +} + +func (r ApiVaultDeleteSharedVaultRequest) Execute() (*http.Response, error) { + return r.ApiService.VaultDeleteSharedVaultExecute(r) +} + +/* +VaultDeleteSharedVault deleteSharedVault + +Delete a shared vault and all its secrets for a team + + @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param teamId + @param vaultName + @return ApiVaultDeleteSharedVaultRequest +*/ +func (a *VaultAPIService) VaultDeleteSharedVault(ctx context.Context, teamId int, vaultName string) ApiVaultDeleteSharedVaultRequest { + return ApiVaultDeleteSharedVaultRequest{ + ApiService: a, + ctx: ctx, + teamId: teamId, + vaultName: vaultName, + } +} + +// Execute executes the request +func (a *VaultAPIService) VaultDeleteSharedVaultExecute(r ApiVaultDeleteSharedVaultRequest) (*http.Response, error) { + var ( + localVarHTTPMethod = http.MethodDelete + localVarPostBody interface{} + formFiles []formFile + ) + + localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "VaultAPIService.VaultDeleteSharedVault") + if err != nil { + return nil, &GenericOpenAPIError{error: err.Error()} + } + + localVarPath := localBasePath + "/vault/teams/{teamId}/shared/{vaultName}" + localVarPath = strings.Replace(localVarPath, "{"+"teamId"+"}", url.PathEscape(parameterValueToString(r.teamId, "teamId")), -1) + localVarPath = strings.Replace(localVarPath, "{"+"vaultName"+"}", url.PathEscape(parameterValueToString(r.vaultName, "vaultName")), -1) + + localVarHeaderParams := make(map[string]string) + localVarQueryParams := url.Values{} + localVarFormParams := url.Values{} + if r.teamId < 0 { + return nil, reportError("teamId must be greater than 0") + } + + // to determine the Content-Type header + localVarHTTPContentTypes := []string{} + + // set Content-Type header + localVarHTTPContentType := selectHeaderContentType(localVarHTTPContentTypes) + if localVarHTTPContentType != "" { + localVarHeaderParams["Content-Type"] = localVarHTTPContentType + } + + // to determine the Accept header + localVarHTTPHeaderAccepts := []string{"application/json"} + + // set Accept header + localVarHTTPHeaderAccept := selectHeaderAccept(localVarHTTPHeaderAccepts) + if localVarHTTPHeaderAccept != "" { + localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept + } + req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles) + if err != nil { + return nil, err + } + + localVarHTTPResponse, err := a.client.callAPI(req) + if err != nil || localVarHTTPResponse == nil { + return localVarHTTPResponse, err + } + + localVarBody, err := io.ReadAll(localVarHTTPResponse.Body) + localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = io.NopCloser(bytes.NewBuffer(localVarBody)) + if err != nil { + return localVarHTTPResponse, err + } + + if localVarHTTPResponse.StatusCode >= 300 { + newErr := &GenericOpenAPIError{ + body: localVarBody, + error: localVarHTTPResponse.Status, + } + if localVarHTTPResponse.StatusCode == 400 { + var v DomainsGetDomain400Response + err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarHTTPResponse, newErr + } + newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v) + newErr.model = v + return localVarHTTPResponse, newErr + } + if localVarHTTPResponse.StatusCode == 401 { + var v DomainsGetDomain401Response + err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarHTTPResponse, newErr + } + newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v) + newErr.model = v + } + return localVarHTTPResponse, newErr + } + + return localVarHTTPResponse, nil +} + +type ApiVaultDeleteWorkspaceSecretsRequest struct { + ctx context.Context + ApiService VaultAPI + teamId int + workspaceId int + requestBody *[]string +} + +func (r ApiVaultDeleteWorkspaceSecretsRequest) RequestBody(requestBody []string) ApiVaultDeleteWorkspaceSecretsRequest { + r.requestBody = &requestBody + return r +} + +func (r ApiVaultDeleteWorkspaceSecretsRequest) Execute() (*http.Response, error) { + return r.ApiService.VaultDeleteWorkspaceSecretsExecute(r) +} + +/* +VaultDeleteWorkspaceSecrets deleteWorkspaceSecrets + +Delete secrets in the vault for a given workspace + + @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param teamId + @param workspaceId + @return ApiVaultDeleteWorkspaceSecretsRequest +*/ +func (a *VaultAPIService) VaultDeleteWorkspaceSecrets(ctx context.Context, teamId int, workspaceId int) ApiVaultDeleteWorkspaceSecretsRequest { + return ApiVaultDeleteWorkspaceSecretsRequest{ + ApiService: a, + ctx: ctx, + teamId: teamId, + workspaceId: workspaceId, + } +} + +// Execute executes the request +func (a *VaultAPIService) VaultDeleteWorkspaceSecretsExecute(r ApiVaultDeleteWorkspaceSecretsRequest) (*http.Response, error) { + var ( + localVarHTTPMethod = http.MethodDelete + localVarPostBody interface{} + formFiles []formFile + ) + + localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "VaultAPIService.VaultDeleteWorkspaceSecrets") + if err != nil { + return nil, &GenericOpenAPIError{error: err.Error()} + } + + localVarPath := localBasePath + "/vault/teams/{teamId}/workspaces/{workspaceId}" + localVarPath = strings.Replace(localVarPath, "{"+"teamId"+"}", url.PathEscape(parameterValueToString(r.teamId, "teamId")), -1) + localVarPath = strings.Replace(localVarPath, "{"+"workspaceId"+"}", url.PathEscape(parameterValueToString(r.workspaceId, "workspaceId")), -1) + + localVarHeaderParams := make(map[string]string) + localVarQueryParams := url.Values{} + localVarFormParams := url.Values{} + if r.teamId < 0 { + return nil, reportError("teamId must be greater than 0") + } + if r.workspaceId < 0 { + return nil, reportError("workspaceId must be greater than 0") + } + + // to determine the Content-Type header + localVarHTTPContentTypes := []string{"application/json"} + + // set Content-Type header + localVarHTTPContentType := selectHeaderContentType(localVarHTTPContentTypes) + if localVarHTTPContentType != "" { + localVarHeaderParams["Content-Type"] = localVarHTTPContentType + } + + // to determine the Accept header + localVarHTTPHeaderAccepts := []string{"application/json"} + + // set Accept header + localVarHTTPHeaderAccept := selectHeaderAccept(localVarHTTPHeaderAccepts) + if localVarHTTPHeaderAccept != "" { + localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept + } + // body params + localVarPostBody = r.requestBody + req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles) + if err != nil { + return nil, err + } + + localVarHTTPResponse, err := a.client.callAPI(req) + if err != nil || localVarHTTPResponse == nil { + return localVarHTTPResponse, err + } + + localVarBody, err := io.ReadAll(localVarHTTPResponse.Body) + localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = io.NopCloser(bytes.NewBuffer(localVarBody)) + if err != nil { + return localVarHTTPResponse, err + } + + if localVarHTTPResponse.StatusCode >= 300 { + newErr := &GenericOpenAPIError{ + body: localVarBody, + error: localVarHTTPResponse.Status, + } + if localVarHTTPResponse.StatusCode == 400 { + var v DomainsGetDomain400Response + err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarHTTPResponse, newErr + } + newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v) + newErr.model = v + return localVarHTTPResponse, newErr + } + if localVarHTTPResponse.StatusCode == 401 { + var v DomainsGetDomain401Response + err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarHTTPResponse, newErr + } + newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v) + newErr.model = v + } + return localVarHTTPResponse, newErr + } + + return localVarHTTPResponse, nil +} + +type ApiVaultGenerateSecretsRequest struct { + ctx context.Context + ApiService VaultAPI + teamId int + workspaceId int + body *map[string]interface{} +} + +func (r ApiVaultGenerateSecretsRequest) Body(body map[string]interface{}) ApiVaultGenerateSecretsRequest { + r.body = &body + return r +} + +func (r ApiVaultGenerateSecretsRequest) Execute() (map[string]interface{}, *http.Response, error) { + return r.ApiService.VaultGenerateSecretsExecute(r) +} + +/* +VaultGenerateSecrets generateSecrets + +Generate secrets in the vault for a given workspace based on the provided password policies + + @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param teamId + @param workspaceId + @return ApiVaultGenerateSecretsRequest +*/ +func (a *VaultAPIService) VaultGenerateSecrets(ctx context.Context, teamId int, workspaceId int) ApiVaultGenerateSecretsRequest { + return ApiVaultGenerateSecretsRequest{ + ApiService: a, + ctx: ctx, + teamId: teamId, + workspaceId: workspaceId, + } +} + +// Execute executes the request +// +// @return map[string]interface{} +func (a *VaultAPIService) VaultGenerateSecretsExecute(r ApiVaultGenerateSecretsRequest) (map[string]interface{}, *http.Response, error) { + var ( + localVarHTTPMethod = http.MethodPost + localVarPostBody interface{} + formFiles []formFile + localVarReturnValue map[string]interface{} + ) + + localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "VaultAPIService.VaultGenerateSecrets") + if err != nil { + return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()} + } + + localVarPath := localBasePath + "/vault/teams/{teamId}/workspaces/{workspaceId}/generate" + localVarPath = strings.Replace(localVarPath, "{"+"teamId"+"}", url.PathEscape(parameterValueToString(r.teamId, "teamId")), -1) + localVarPath = strings.Replace(localVarPath, "{"+"workspaceId"+"}", url.PathEscape(parameterValueToString(r.workspaceId, "workspaceId")), -1) + + localVarHeaderParams := make(map[string]string) + localVarQueryParams := url.Values{} + localVarFormParams := url.Values{} + if r.teamId < 0 { + return localVarReturnValue, nil, reportError("teamId must be greater than 0") + } + if r.workspaceId < 0 { + return localVarReturnValue, nil, reportError("workspaceId must be greater than 0") + } + + // to determine the Content-Type header + localVarHTTPContentTypes := []string{"application/json"} + + // set Content-Type header + localVarHTTPContentType := selectHeaderContentType(localVarHTTPContentTypes) + if localVarHTTPContentType != "" { + localVarHeaderParams["Content-Type"] = localVarHTTPContentType + } + + // to determine the Accept header + localVarHTTPHeaderAccepts := []string{"application/json"} + + // set Accept header + localVarHTTPHeaderAccept := selectHeaderAccept(localVarHTTPHeaderAccepts) + if localVarHTTPHeaderAccept != "" { + localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept + } + // body params + localVarPostBody = r.body + req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles) + if err != nil { + return localVarReturnValue, nil, err + } + + localVarHTTPResponse, err := a.client.callAPI(req) + if err != nil || localVarHTTPResponse == nil { + return localVarReturnValue, localVarHTTPResponse, err + } + + localVarBody, err := io.ReadAll(localVarHTTPResponse.Body) + localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = io.NopCloser(bytes.NewBuffer(localVarBody)) + if err != nil { + return localVarReturnValue, localVarHTTPResponse, err + } + + if localVarHTTPResponse.StatusCode >= 300 { + newErr := &GenericOpenAPIError{ + body: localVarBody, + error: localVarHTTPResponse.Status, + } + if localVarHTTPResponse.StatusCode == 400 { + var v DomainsGetDomain400Response + err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr + } + newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v) + newErr.model = v + return localVarReturnValue, localVarHTTPResponse, newErr + } + if localVarHTTPResponse.StatusCode == 401 { + var v DomainsGetDomain401Response + err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr + } + newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v) + newErr.model = v + } + return localVarReturnValue, localVarHTTPResponse, newErr + } + + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr := &GenericOpenAPIError{ + body: localVarBody, + error: err.Error(), + } + return localVarReturnValue, localVarHTTPResponse, newErr + } + + return localVarReturnValue, localVarHTTPResponse, nil +} + +type ApiVaultGenerateSharedSecretsRequest struct { + ctx context.Context + ApiService VaultAPI + teamId int + vaultName string + body *map[string]interface{} +} + +func (r ApiVaultGenerateSharedSecretsRequest) Body(body map[string]interface{}) ApiVaultGenerateSharedSecretsRequest { + r.body = &body + return r +} + +func (r ApiVaultGenerateSharedSecretsRequest) Execute() (map[string]interface{}, *http.Response, error) { + return r.ApiService.VaultGenerateSharedSecretsExecute(r) +} + +/* +VaultGenerateSharedSecrets generateSharedSecrets + +Generate and store secrets in a named shared vault using OpenBao password policies. If the vault does not exist it is created implicitly. + + @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param teamId + @param vaultName + @return ApiVaultGenerateSharedSecretsRequest +*/ +func (a *VaultAPIService) VaultGenerateSharedSecrets(ctx context.Context, teamId int, vaultName string) ApiVaultGenerateSharedSecretsRequest { + return ApiVaultGenerateSharedSecretsRequest{ + ApiService: a, + ctx: ctx, + teamId: teamId, + vaultName: vaultName, + } +} + +// Execute executes the request +// +// @return map[string]interface{} +func (a *VaultAPIService) VaultGenerateSharedSecretsExecute(r ApiVaultGenerateSharedSecretsRequest) (map[string]interface{}, *http.Response, error) { + var ( + localVarHTTPMethod = http.MethodPost + localVarPostBody interface{} + formFiles []formFile + localVarReturnValue map[string]interface{} + ) + + localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "VaultAPIService.VaultGenerateSharedSecrets") + if err != nil { + return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()} + } + + localVarPath := localBasePath + "/vault/teams/{teamId}/shared/{vaultName}/generate" + localVarPath = strings.Replace(localVarPath, "{"+"teamId"+"}", url.PathEscape(parameterValueToString(r.teamId, "teamId")), -1) + localVarPath = strings.Replace(localVarPath, "{"+"vaultName"+"}", url.PathEscape(parameterValueToString(r.vaultName, "vaultName")), -1) + + localVarHeaderParams := make(map[string]string) + localVarQueryParams := url.Values{} + localVarFormParams := url.Values{} + if r.teamId < 0 { + return localVarReturnValue, nil, reportError("teamId must be greater than 0") + } + + // to determine the Content-Type header + localVarHTTPContentTypes := []string{"application/json"} + + // set Content-Type header + localVarHTTPContentType := selectHeaderContentType(localVarHTTPContentTypes) + if localVarHTTPContentType != "" { + localVarHeaderParams["Content-Type"] = localVarHTTPContentType + } + + // to determine the Accept header + localVarHTTPHeaderAccepts := []string{"application/json"} + + // set Accept header + localVarHTTPHeaderAccept := selectHeaderAccept(localVarHTTPHeaderAccepts) + if localVarHTTPHeaderAccept != "" { + localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept + } + // body params + localVarPostBody = r.body + req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles) + if err != nil { + return localVarReturnValue, nil, err + } + + localVarHTTPResponse, err := a.client.callAPI(req) + if err != nil || localVarHTTPResponse == nil { + return localVarReturnValue, localVarHTTPResponse, err + } + + localVarBody, err := io.ReadAll(localVarHTTPResponse.Body) + localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = io.NopCloser(bytes.NewBuffer(localVarBody)) + if err != nil { + return localVarReturnValue, localVarHTTPResponse, err + } + + if localVarHTTPResponse.StatusCode >= 300 { + newErr := &GenericOpenAPIError{ + body: localVarBody, + error: localVarHTTPResponse.Status, + } + if localVarHTTPResponse.StatusCode == 400 { + var v DomainsGetDomain400Response + err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr + } + newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v) + newErr.model = v + return localVarReturnValue, localVarHTTPResponse, newErr + } + if localVarHTTPResponse.StatusCode == 401 { + var v DomainsGetDomain401Response + err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr + } + newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v) + newErr.model = v + } + return localVarReturnValue, localVarHTTPResponse, newErr + } -type ApiVaultDeleteWorkspaceSecretsRequest struct { - ctx context.Context - ApiService VaultAPI - teamId float32 - workspaceId float32 - requestBody *[]string + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr := &GenericOpenAPIError{ + body: localVarBody, + error: err.Error(), + } + return localVarReturnValue, localVarHTTPResponse, newErr + } + + return localVarReturnValue, localVarHTTPResponse, nil } -func (r ApiVaultDeleteWorkspaceSecretsRequest) RequestBody(requestBody []string) ApiVaultDeleteWorkspaceSecretsRequest { - r.requestBody = &requestBody - return r +type ApiVaultListSharedSecretKeysRequest struct { + ctx context.Context + ApiService VaultAPI + teamId int + vaultName string } -func (r ApiVaultDeleteWorkspaceSecretsRequest) Execute() (*http.Response, error) { - return r.ApiService.VaultDeleteWorkspaceSecretsExecute(r) +func (r ApiVaultListSharedSecretKeysRequest) Execute() ([]string, *http.Response, error) { + return r.ApiService.VaultListSharedSecretKeysExecute(r) } /* -VaultDeleteWorkspaceSecrets deleteWorkspaceSecrets +VaultListSharedSecretKeys listSharedSecretKeys -Delete secrets in the vault for a given workspace +List secret key names stored in a named shared vault. Values are never returned. @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). @param teamId - @param workspaceId - @return ApiVaultDeleteWorkspaceSecretsRequest + @param vaultName + @return ApiVaultListSharedSecretKeysRequest */ -func (a *VaultAPIService) VaultDeleteWorkspaceSecrets(ctx context.Context, teamId float32, workspaceId float32) ApiVaultDeleteWorkspaceSecretsRequest { - return ApiVaultDeleteWorkspaceSecretsRequest{ - ApiService: a, - ctx: ctx, - teamId: teamId, - workspaceId: workspaceId, +func (a *VaultAPIService) VaultListSharedSecretKeys(ctx context.Context, teamId int, vaultName string) ApiVaultListSharedSecretKeysRequest { + return ApiVaultListSharedSecretKeysRequest{ + ApiService: a, + ctx: ctx, + teamId: teamId, + vaultName: vaultName, } } // Execute executes the request -func (a *VaultAPIService) VaultDeleteWorkspaceSecretsExecute(r ApiVaultDeleteWorkspaceSecretsRequest) (*http.Response, error) { +// +// @return []string +func (a *VaultAPIService) VaultListSharedSecretKeysExecute(r ApiVaultListSharedSecretKeysRequest) ([]string, *http.Response, error) { var ( - localVarHTTPMethod = http.MethodDelete - localVarPostBody interface{} - formFiles []formFile + localVarHTTPMethod = http.MethodGet + localVarPostBody interface{} + formFiles []formFile + localVarReturnValue []string ) - localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "VaultAPIService.VaultDeleteWorkspaceSecrets") + localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "VaultAPIService.VaultListSharedSecretKeys") if err != nil { - return nil, &GenericOpenAPIError{error: err.Error()} + return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()} } - localVarPath := localBasePath + "/vault/teams/{teamId}/workspaces/{workspaceId}" + localVarPath := localBasePath + "/vault/teams/{teamId}/shared/{vaultName}/keys" localVarPath = strings.Replace(localVarPath, "{"+"teamId"+"}", url.PathEscape(parameterValueToString(r.teamId, "teamId")), -1) - localVarPath = strings.Replace(localVarPath, "{"+"workspaceId"+"}", url.PathEscape(parameterValueToString(r.workspaceId, "workspaceId")), -1) + localVarPath = strings.Replace(localVarPath, "{"+"vaultName"+"}", url.PathEscape(parameterValueToString(r.vaultName, "vaultName")), -1) localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + if r.teamId < 0 { + return localVarReturnValue, nil, reportError("teamId must be greater than 0") + } // to determine the Content-Type header - localVarHTTPContentTypes := []string{"application/json"} + localVarHTTPContentTypes := []string{} // set Content-Type header localVarHTTPContentType := selectHeaderContentType(localVarHTTPContentTypes) @@ -163,23 +1056,21 @@ func (a *VaultAPIService) VaultDeleteWorkspaceSecretsExecute(r ApiVaultDeleteWor if localVarHTTPHeaderAccept != "" { localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept } - // body params - localVarPostBody = r.requestBody req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles) if err != nil { - return nil, err + return localVarReturnValue, nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - return localVarHTTPResponse, err + return localVarReturnValue, localVarHTTPResponse, err } localVarBody, err := io.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() localVarHTTPResponse.Body = io.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - return localVarHTTPResponse, err + return localVarReturnValue, localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -192,90 +1083,92 @@ func (a *VaultAPIService) VaultDeleteWorkspaceSecretsExecute(r ApiVaultDeleteWor err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { newErr.error = err.Error() - return localVarHTTPResponse, newErr + return localVarReturnValue, localVarHTTPResponse, newErr } newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v) newErr.model = v - return localVarHTTPResponse, newErr + return localVarReturnValue, localVarHTTPResponse, newErr } if localVarHTTPResponse.StatusCode == 401 { var v DomainsGetDomain401Response err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) if err != nil { newErr.error = err.Error() - return localVarHTTPResponse, newErr + return localVarReturnValue, localVarHTTPResponse, newErr } newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v) newErr.model = v } - return localVarHTTPResponse, newErr + return localVarReturnValue, localVarHTTPResponse, newErr } - return localVarHTTPResponse, nil -} + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr := &GenericOpenAPIError{ + body: localVarBody, + error: err.Error(), + } + return localVarReturnValue, localVarHTTPResponse, newErr + } -type ApiVaultGenerateSecretsRequest struct { - ctx context.Context - ApiService VaultAPI - teamId float32 - workspaceId float32 - body *map[string]interface{} + return localVarReturnValue, localVarHTTPResponse, nil } -func (r ApiVaultGenerateSecretsRequest) Body(body map[string]interface{}) ApiVaultGenerateSecretsRequest { - r.body = &body - return r +type ApiVaultListSharedVaultsRequest struct { + ctx context.Context + ApiService VaultAPI + teamId int } -func (r ApiVaultGenerateSecretsRequest) Execute() (map[string]interface{}, *http.Response, error) { - return r.ApiService.VaultGenerateSecretsExecute(r) +func (r ApiVaultListSharedVaultsRequest) Execute() ([]string, *http.Response, error) { + return r.ApiService.VaultListSharedVaultsExecute(r) } /* -VaultGenerateSecrets generateSecrets +VaultListSharedVaults listSharedVaults -Generate secrets in the vault for a given workspace based on the provided password policies +List all shared vault names for a team @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). @param teamId - @param workspaceId - @return ApiVaultGenerateSecretsRequest + @return ApiVaultListSharedVaultsRequest */ -func (a *VaultAPIService) VaultGenerateSecrets(ctx context.Context, teamId float32, workspaceId float32) ApiVaultGenerateSecretsRequest { - return ApiVaultGenerateSecretsRequest{ - ApiService: a, - ctx: ctx, - teamId: teamId, - workspaceId: workspaceId, +func (a *VaultAPIService) VaultListSharedVaults(ctx context.Context, teamId int) ApiVaultListSharedVaultsRequest { + return ApiVaultListSharedVaultsRequest{ + ApiService: a, + ctx: ctx, + teamId: teamId, } } // Execute executes the request // -// @return map[string]interface{} -func (a *VaultAPIService) VaultGenerateSecretsExecute(r ApiVaultGenerateSecretsRequest) (map[string]interface{}, *http.Response, error) { +// @return []string +func (a *VaultAPIService) VaultListSharedVaultsExecute(r ApiVaultListSharedVaultsRequest) ([]string, *http.Response, error) { var ( - localVarHTTPMethod = http.MethodPost + localVarHTTPMethod = http.MethodGet localVarPostBody interface{} formFiles []formFile - localVarReturnValue map[string]interface{} + localVarReturnValue []string ) - localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "VaultAPIService.VaultGenerateSecrets") + localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "VaultAPIService.VaultListSharedVaults") if err != nil { return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()} } - localVarPath := localBasePath + "/vault/teams/{teamId}/workspaces/{workspaceId}/generate" + localVarPath := localBasePath + "/vault/teams/{teamId}/shared" localVarPath = strings.Replace(localVarPath, "{"+"teamId"+"}", url.PathEscape(parameterValueToString(r.teamId, "teamId")), -1) - localVarPath = strings.Replace(localVarPath, "{"+"workspaceId"+"}", url.PathEscape(parameterValueToString(r.workspaceId, "workspaceId")), -1) localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + if r.teamId < 0 { + return localVarReturnValue, nil, reportError("teamId must be greater than 0") + } // to determine the Content-Type header - localVarHTTPContentTypes := []string{"application/json"} + localVarHTTPContentTypes := []string{} // set Content-Type header localVarHTTPContentType := selectHeaderContentType(localVarHTTPContentTypes) @@ -291,8 +1184,6 @@ func (a *VaultAPIService) VaultGenerateSecretsExecute(r ApiVaultGenerateSecretsR if localVarHTTPHeaderAccept != "" { localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept } - // body params - localVarPostBody = r.body req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles) if err != nil { return localVarReturnValue, nil, err @@ -354,8 +1245,8 @@ func (a *VaultAPIService) VaultGenerateSecretsExecute(r ApiVaultGenerateSecretsR type ApiVaultListWorkspaceSecretsRequest struct { ctx context.Context ApiService VaultAPI - teamId float32 - workspaceId float32 + teamId int + workspaceId int } func (r ApiVaultListWorkspaceSecretsRequest) Execute() ([]string, *http.Response, error) { @@ -372,7 +1263,7 @@ List secrets in the vault for a given workspace @param workspaceId @return ApiVaultListWorkspaceSecretsRequest */ -func (a *VaultAPIService) VaultListWorkspaceSecrets(ctx context.Context, teamId float32, workspaceId float32) ApiVaultListWorkspaceSecretsRequest { +func (a *VaultAPIService) VaultListWorkspaceSecrets(ctx context.Context, teamId int, workspaceId int) ApiVaultListWorkspaceSecretsRequest { return ApiVaultListWorkspaceSecretsRequest{ ApiService: a, ctx: ctx, @@ -404,6 +1295,12 @@ func (a *VaultAPIService) VaultListWorkspaceSecretsExecute(r ApiVaultListWorkspa localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + if r.teamId < 0 { + return localVarReturnValue, nil, reportError("teamId must be greater than 0") + } + if r.workspaceId < 0 { + return localVarReturnValue, nil, reportError("workspaceId must be greater than 0") + } // to determine the Content-Type header localVarHTTPContentTypes := []string{} @@ -480,11 +1377,151 @@ func (a *VaultAPIService) VaultListWorkspaceSecretsExecute(r ApiVaultListWorkspa return localVarReturnValue, localVarHTTPResponse, nil } +type ApiVaultStoreSharedSecretsRequest struct { + ctx context.Context + ApiService VaultAPI + teamId int + vaultName string + body *map[string]interface{} +} + +func (r ApiVaultStoreSharedSecretsRequest) Body(body map[string]interface{}) ApiVaultStoreSharedSecretsRequest { + r.body = &body + return r +} + +func (r ApiVaultStoreSharedSecretsRequest) Execute() (map[string]interface{}, *http.Response, error) { + return r.ApiService.VaultStoreSharedSecretsExecute(r) +} + +/* +VaultStoreSharedSecrets storeSharedSecrets + +Store secrets in a named shared vault + + @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @param teamId + @param vaultName + @return ApiVaultStoreSharedSecretsRequest +*/ +func (a *VaultAPIService) VaultStoreSharedSecrets(ctx context.Context, teamId int, vaultName string) ApiVaultStoreSharedSecretsRequest { + return ApiVaultStoreSharedSecretsRequest{ + ApiService: a, + ctx: ctx, + teamId: teamId, + vaultName: vaultName, + } +} + +// Execute executes the request +// +// @return map[string]interface{} +func (a *VaultAPIService) VaultStoreSharedSecretsExecute(r ApiVaultStoreSharedSecretsRequest) (map[string]interface{}, *http.Response, error) { + var ( + localVarHTTPMethod = http.MethodPost + localVarPostBody interface{} + formFiles []formFile + localVarReturnValue map[string]interface{} + ) + + localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "VaultAPIService.VaultStoreSharedSecrets") + if err != nil { + return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()} + } + + localVarPath := localBasePath + "/vault/teams/{teamId}/shared/{vaultName}/secrets" + localVarPath = strings.Replace(localVarPath, "{"+"teamId"+"}", url.PathEscape(parameterValueToString(r.teamId, "teamId")), -1) + localVarPath = strings.Replace(localVarPath, "{"+"vaultName"+"}", url.PathEscape(parameterValueToString(r.vaultName, "vaultName")), -1) + + localVarHeaderParams := make(map[string]string) + localVarQueryParams := url.Values{} + localVarFormParams := url.Values{} + if r.teamId < 0 { + return localVarReturnValue, nil, reportError("teamId must be greater than 0") + } + + // to determine the Content-Type header + localVarHTTPContentTypes := []string{"application/json"} + + // set Content-Type header + localVarHTTPContentType := selectHeaderContentType(localVarHTTPContentTypes) + if localVarHTTPContentType != "" { + localVarHeaderParams["Content-Type"] = localVarHTTPContentType + } + + // to determine the Accept header + localVarHTTPHeaderAccepts := []string{"application/json"} + + // set Accept header + localVarHTTPHeaderAccept := selectHeaderAccept(localVarHTTPHeaderAccepts) + if localVarHTTPHeaderAccept != "" { + localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept + } + // body params + localVarPostBody = r.body + req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles) + if err != nil { + return localVarReturnValue, nil, err + } + + localVarHTTPResponse, err := a.client.callAPI(req) + if err != nil || localVarHTTPResponse == nil { + return localVarReturnValue, localVarHTTPResponse, err + } + + localVarBody, err := io.ReadAll(localVarHTTPResponse.Body) + localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = io.NopCloser(bytes.NewBuffer(localVarBody)) + if err != nil { + return localVarReturnValue, localVarHTTPResponse, err + } + + if localVarHTTPResponse.StatusCode >= 300 { + newErr := &GenericOpenAPIError{ + body: localVarBody, + error: localVarHTTPResponse.Status, + } + if localVarHTTPResponse.StatusCode == 400 { + var v DomainsGetDomain400Response + err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr + } + newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v) + newErr.model = v + return localVarReturnValue, localVarHTTPResponse, newErr + } + if localVarHTTPResponse.StatusCode == 401 { + var v DomainsGetDomain401Response + err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr + } + newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v) + newErr.model = v + } + return localVarReturnValue, localVarHTTPResponse, newErr + } + + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr := &GenericOpenAPIError{ + body: localVarBody, + error: err.Error(), + } + return localVarReturnValue, localVarHTTPResponse, newErr + } + + return localVarReturnValue, localVarHTTPResponse, nil +} + type ApiVaultStoreWorkspaceSecretsRequest struct { ctx context.Context ApiService VaultAPI - teamId float32 - workspaceId float32 + teamId int + workspaceId int body *map[string]interface{} } @@ -507,7 +1544,7 @@ Store secrets in the vault for a given workspace @param workspaceId @return ApiVaultStoreWorkspaceSecretsRequest */ -func (a *VaultAPIService) VaultStoreWorkspaceSecrets(ctx context.Context, teamId float32, workspaceId float32) ApiVaultStoreWorkspaceSecretsRequest { +func (a *VaultAPIService) VaultStoreWorkspaceSecrets(ctx context.Context, teamId int, workspaceId int) ApiVaultStoreWorkspaceSecretsRequest { return ApiVaultStoreWorkspaceSecretsRequest{ ApiService: a, ctx: ctx, @@ -539,6 +1576,12 @@ func (a *VaultAPIService) VaultStoreWorkspaceSecretsExecute(r ApiVaultStoreWorks localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + if r.teamId < 0 { + return localVarReturnValue, nil, reportError("teamId must be greater than 0") + } + if r.workspaceId < 0 { + return localVarReturnValue, nil, reportError("workspaceId must be greater than 0") + } // to determine the Content-Type header localVarHTTPContentTypes := []string{"application/json"} diff --git a/api/openapi_client/api_workspaces.go b/api/openapi_client/api_workspaces.go index 33ed73fd..ba834645 100644 --- a/api/openapi_client/api_workspaces.go +++ b/api/openapi_client/api_workspaces.go @@ -41,7 +41,7 @@ type WorkspacesAPI interface { @param workspaceId @return ApiWorkspacesDeleteEnvVarRequest */ - WorkspacesDeleteEnvVar(ctx context.Context, workspaceId float32) ApiWorkspacesDeleteEnvVarRequest + WorkspacesDeleteEnvVar(ctx context.Context, workspaceId int) ApiWorkspacesDeleteEnvVarRequest // WorkspacesDeleteEnvVarExecute executes the request WorkspacesDeleteEnvVarExecute(r ApiWorkspacesDeleteEnvVarRequest) (*http.Response, error) @@ -53,7 +53,7 @@ type WorkspacesAPI interface { @param workspaceId @return ApiWorkspacesDeleteWorkspaceRequest */ - WorkspacesDeleteWorkspace(ctx context.Context, workspaceId float32) ApiWorkspacesDeleteWorkspaceRequest + WorkspacesDeleteWorkspace(ctx context.Context, workspaceId int) ApiWorkspacesDeleteWorkspaceRequest // WorkspacesDeleteWorkspaceExecute executes the request WorkspacesDeleteWorkspaceExecute(r ApiWorkspacesDeleteWorkspaceRequest) (*http.Response, error) @@ -65,7 +65,7 @@ type WorkspacesAPI interface { @param workspaceId @return ApiWorkspacesDeployLandscapeRequest */ - WorkspacesDeployLandscape(ctx context.Context, workspaceId float32) ApiWorkspacesDeployLandscapeRequest + WorkspacesDeployLandscape(ctx context.Context, workspaceId int) ApiWorkspacesDeployLandscapeRequest // WorkspacesDeployLandscapeExecute executes the request WorkspacesDeployLandscapeExecute(r ApiWorkspacesDeployLandscapeRequest) (*http.Response, error) @@ -78,7 +78,7 @@ type WorkspacesAPI interface { @param profile @return ApiWorkspacesDeployLandscape1Request */ - WorkspacesDeployLandscape1(ctx context.Context, workspaceId float32, profile string) ApiWorkspacesDeployLandscape1Request + WorkspacesDeployLandscape1(ctx context.Context, workspaceId int, profile string) ApiWorkspacesDeployLandscape1Request // WorkspacesDeployLandscape1Execute executes the request WorkspacesDeployLandscape1Execute(r ApiWorkspacesDeployLandscape1Request) (*http.Response, error) @@ -92,7 +92,7 @@ type WorkspacesAPI interface { @param workspaceId @return ApiWorkspacesExecuteCommandRequest */ - WorkspacesExecuteCommand(ctx context.Context, workspaceId float32) ApiWorkspacesExecuteCommandRequest + WorkspacesExecuteCommand(ctx context.Context, workspaceId int) ApiWorkspacesExecuteCommandRequest // WorkspacesExecuteCommandExecute executes the request // @return WorkspacesExecuteCommand200Response @@ -105,7 +105,7 @@ type WorkspacesAPI interface { @param workspaceId @return ApiWorkspacesGetWorkspaceRequest */ - WorkspacesGetWorkspace(ctx context.Context, workspaceId float32) ApiWorkspacesGetWorkspaceRequest + WorkspacesGetWorkspace(ctx context.Context, workspaceId int) ApiWorkspacesGetWorkspaceRequest // WorkspacesGetWorkspaceExecute executes the request // @return WorkspacesGetWorkspace200Response @@ -118,7 +118,7 @@ type WorkspacesAPI interface { @param workspaceId @return ApiWorkspacesGetWorkspaceStatusRequest */ - WorkspacesGetWorkspaceStatus(ctx context.Context, workspaceId float32) ApiWorkspacesGetWorkspaceStatusRequest + WorkspacesGetWorkspaceStatus(ctx context.Context, workspaceId int) ApiWorkspacesGetWorkspaceStatusRequest // WorkspacesGetWorkspaceStatusExecute executes the request // @return WorkspacesGetWorkspaceStatus200Response @@ -131,7 +131,7 @@ type WorkspacesAPI interface { @param workspaceId @return ApiWorkspacesGitHeadRequest */ - WorkspacesGitHead(ctx context.Context, workspaceId float32) ApiWorkspacesGitHeadRequest + WorkspacesGitHead(ctx context.Context, workspaceId int) ApiWorkspacesGitHeadRequest // WorkspacesGitHeadExecute executes the request // @return WorkspacesGitHead200Response @@ -144,7 +144,7 @@ type WorkspacesAPI interface { @param workspaceId @return ApiWorkspacesGitPullRequest */ - WorkspacesGitPull(ctx context.Context, workspaceId float32) ApiWorkspacesGitPullRequest + WorkspacesGitPull(ctx context.Context, workspaceId int) ApiWorkspacesGitPullRequest // WorkspacesGitPullExecute executes the request WorkspacesGitPullExecute(r ApiWorkspacesGitPullRequest) (*http.Response, error) @@ -157,7 +157,7 @@ type WorkspacesAPI interface { @param remote @return ApiWorkspacesGitPull1Request */ - WorkspacesGitPull1(ctx context.Context, workspaceId float32, remote string) ApiWorkspacesGitPull1Request + WorkspacesGitPull1(ctx context.Context, workspaceId int, remote string) ApiWorkspacesGitPull1Request // WorkspacesGitPull1Execute executes the request WorkspacesGitPull1Execute(r ApiWorkspacesGitPull1Request) (*http.Response, error) @@ -171,7 +171,7 @@ type WorkspacesAPI interface { @param branch @return ApiWorkspacesGitPull2Request */ - WorkspacesGitPull2(ctx context.Context, workspaceId float32, remote string, branch string) ApiWorkspacesGitPull2Request + WorkspacesGitPull2(ctx context.Context, workspaceId int, remote string, branch string) ApiWorkspacesGitPull2Request // WorkspacesGitPull2Execute executes the request WorkspacesGitPull2Execute(r ApiWorkspacesGitPull2Request) (*http.Response, error) @@ -183,7 +183,7 @@ type WorkspacesAPI interface { @param workspaceId @return ApiWorkspacesListEnvVarsRequest */ - WorkspacesListEnvVars(ctx context.Context, workspaceId float32) ApiWorkspacesListEnvVarsRequest + WorkspacesListEnvVars(ctx context.Context, workspaceId int) ApiWorkspacesListEnvVarsRequest // WorkspacesListEnvVarsExecute executes the request // @return []WorkspacesCreateWorkspaceRequestEnvInner @@ -196,7 +196,7 @@ type WorkspacesAPI interface { @param teamId @return ApiWorkspacesListWorkspacesRequest */ - WorkspacesListWorkspaces(ctx context.Context, teamId float32) ApiWorkspacesListWorkspacesRequest + WorkspacesListWorkspaces(ctx context.Context, teamId int) ApiWorkspacesListWorkspacesRequest // WorkspacesListWorkspacesExecute executes the request // @return []WorkspacesGetWorkspace200Response @@ -213,7 +213,7 @@ type WorkspacesAPI interface { @param step @return ApiWorkspacesLogsRequest */ - WorkspacesLogs(ctx context.Context, workspaceId float32, stage string, step float32) ApiWorkspacesLogsRequest + WorkspacesLogs(ctx context.Context, workspaceId int, stage string, step int) ApiWorkspacesLogsRequest // WorkspacesLogsExecute executes the request // @return WorkspacesLogs200Response @@ -227,7 +227,7 @@ type WorkspacesAPI interface { @param stage @return ApiWorkspacesPipelineStatusRequest */ - WorkspacesPipelineStatus(ctx context.Context, workspaceId float32, stage string) ApiWorkspacesPipelineStatusRequest + WorkspacesPipelineStatus(ctx context.Context, workspaceId int, stage string) ApiWorkspacesPipelineStatusRequest // WorkspacesPipelineStatusExecute executes the request // @return []WorkspacesPipelineStatus200ResponseInner @@ -242,7 +242,7 @@ type WorkspacesAPI interface { @param replica @return ApiWorkspacesReplicaLogsRequest */ - WorkspacesReplicaLogs(ctx context.Context, workspaceId float32, step float32, replica string) ApiWorkspacesReplicaLogsRequest + WorkspacesReplicaLogs(ctx context.Context, workspaceId int, step int, replica string) ApiWorkspacesReplicaLogsRequest // WorkspacesReplicaLogsExecute executes the request // @return WorkspacesReplicaLogs200Response @@ -255,7 +255,7 @@ type WorkspacesAPI interface { @param workspaceId @return ApiWorkspacesScaleLandscapeServicesRequest */ - WorkspacesScaleLandscapeServices(ctx context.Context, workspaceId float32) ApiWorkspacesScaleLandscapeServicesRequest + WorkspacesScaleLandscapeServices(ctx context.Context, workspaceId int) ApiWorkspacesScaleLandscapeServicesRequest // WorkspacesScaleLandscapeServicesExecute executes the request WorkspacesScaleLandscapeServicesExecute(r ApiWorkspacesScaleLandscapeServicesRequest) (*http.Response, error) @@ -269,7 +269,7 @@ type WorkspacesAPI interface { @param server @return ApiWorkspacesServerLogsRequest */ - WorkspacesServerLogs(ctx context.Context, workspaceId float32, step float32, server string) ApiWorkspacesServerLogsRequest + WorkspacesServerLogs(ctx context.Context, workspaceId int, step int, server string) ApiWorkspacesServerLogsRequest // WorkspacesServerLogsExecute executes the request // @return WorkspacesServerLogs200Response @@ -282,7 +282,7 @@ type WorkspacesAPI interface { @param workspaceId @return ApiWorkspacesSetEnvVarRequest */ - WorkspacesSetEnvVar(ctx context.Context, workspaceId float32) ApiWorkspacesSetEnvVarRequest + WorkspacesSetEnvVar(ctx context.Context, workspaceId int) ApiWorkspacesSetEnvVarRequest // WorkspacesSetEnvVarExecute executes the request WorkspacesSetEnvVarExecute(r ApiWorkspacesSetEnvVarRequest) (*http.Response, error) @@ -295,7 +295,7 @@ type WorkspacesAPI interface { @param stage @return ApiWorkspacesStartPipelineStageRequest */ - WorkspacesStartPipelineStage(ctx context.Context, workspaceId float32, stage string) ApiWorkspacesStartPipelineStageRequest + WorkspacesStartPipelineStage(ctx context.Context, workspaceId int, stage string) ApiWorkspacesStartPipelineStageRequest // WorkspacesStartPipelineStageExecute executes the request WorkspacesStartPipelineStageExecute(r ApiWorkspacesStartPipelineStageRequest) (*http.Response, error) @@ -309,7 +309,7 @@ type WorkspacesAPI interface { @param profile @return ApiWorkspacesStartPipelineStage1Request */ - WorkspacesStartPipelineStage1(ctx context.Context, workspaceId float32, stage string, profile string) ApiWorkspacesStartPipelineStage1Request + WorkspacesStartPipelineStage1(ctx context.Context, workspaceId int, stage string, profile string) ApiWorkspacesStartPipelineStage1Request // WorkspacesStartPipelineStage1Execute executes the request WorkspacesStartPipelineStage1Execute(r ApiWorkspacesStartPipelineStage1Request) (*http.Response, error) @@ -322,7 +322,7 @@ type WorkspacesAPI interface { @param stage @return ApiWorkspacesStopPipelineStageRequest */ - WorkspacesStopPipelineStage(ctx context.Context, workspaceId float32, stage string) ApiWorkspacesStopPipelineStageRequest + WorkspacesStopPipelineStage(ctx context.Context, workspaceId int, stage string) ApiWorkspacesStopPipelineStageRequest // WorkspacesStopPipelineStageExecute executes the request WorkspacesStopPipelineStageExecute(r ApiWorkspacesStopPipelineStageRequest) (*http.Response, error) @@ -334,7 +334,7 @@ type WorkspacesAPI interface { @param workspaceId @return ApiWorkspacesTeardownLandscapeRequest */ - WorkspacesTeardownLandscape(ctx context.Context, workspaceId float32) ApiWorkspacesTeardownLandscapeRequest + WorkspacesTeardownLandscape(ctx context.Context, workspaceId int) ApiWorkspacesTeardownLandscapeRequest // WorkspacesTeardownLandscapeExecute executes the request WorkspacesTeardownLandscapeExecute(r ApiWorkspacesTeardownLandscapeRequest) (*http.Response, error) @@ -346,7 +346,7 @@ type WorkspacesAPI interface { @param workspaceId @return ApiWorkspacesUpdateWorkspaceRequest */ - WorkspacesUpdateWorkspace(ctx context.Context, workspaceId float32) ApiWorkspacesUpdateWorkspaceRequest + WorkspacesUpdateWorkspace(ctx context.Context, workspaceId int) ApiWorkspacesUpdateWorkspaceRequest // WorkspacesUpdateWorkspaceExecute executes the request WorkspacesUpdateWorkspaceExecute(r ApiWorkspacesUpdateWorkspaceRequest) (*http.Response, error) @@ -485,7 +485,7 @@ func (a *WorkspacesAPIService) WorkspacesCreateWorkspaceExecute(r ApiWorkspacesC type ApiWorkspacesDeleteEnvVarRequest struct { ctx context.Context ApiService WorkspacesAPI - workspaceId float32 + workspaceId int requestBody *[]string } @@ -505,7 +505,7 @@ WorkspacesDeleteEnvVar deleteEnvVar @param workspaceId @return ApiWorkspacesDeleteEnvVarRequest */ -func (a *WorkspacesAPIService) WorkspacesDeleteEnvVar(ctx context.Context, workspaceId float32) ApiWorkspacesDeleteEnvVarRequest { +func (a *WorkspacesAPIService) WorkspacesDeleteEnvVar(ctx context.Context, workspaceId int) ApiWorkspacesDeleteEnvVarRequest { return ApiWorkspacesDeleteEnvVarRequest{ ApiService: a, ctx: ctx, @@ -532,6 +532,9 @@ func (a *WorkspacesAPIService) WorkspacesDeleteEnvVarExecute(r ApiWorkspacesDele localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + if r.workspaceId < 0 { + return nil, reportError("workspaceId must be greater than 0") + } // to determine the Content-Type header localVarHTTPContentTypes := []string{"application/json"} @@ -615,7 +618,7 @@ func (a *WorkspacesAPIService) WorkspacesDeleteEnvVarExecute(r ApiWorkspacesDele type ApiWorkspacesDeleteWorkspaceRequest struct { ctx context.Context ApiService WorkspacesAPI - workspaceId float32 + workspaceId int } func (r ApiWorkspacesDeleteWorkspaceRequest) Execute() (*http.Response, error) { @@ -629,7 +632,7 @@ WorkspacesDeleteWorkspace deleteWorkspace @param workspaceId @return ApiWorkspacesDeleteWorkspaceRequest */ -func (a *WorkspacesAPIService) WorkspacesDeleteWorkspace(ctx context.Context, workspaceId float32) ApiWorkspacesDeleteWorkspaceRequest { +func (a *WorkspacesAPIService) WorkspacesDeleteWorkspace(ctx context.Context, workspaceId int) ApiWorkspacesDeleteWorkspaceRequest { return ApiWorkspacesDeleteWorkspaceRequest{ ApiService: a, ctx: ctx, @@ -656,6 +659,9 @@ func (a *WorkspacesAPIService) WorkspacesDeleteWorkspaceExecute(r ApiWorkspacesD localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + if r.workspaceId < 0 { + return nil, reportError("workspaceId must be greater than 0") + } // to determine the Content-Type header localVarHTTPContentTypes := []string{} @@ -737,7 +743,7 @@ func (a *WorkspacesAPIService) WorkspacesDeleteWorkspaceExecute(r ApiWorkspacesD type ApiWorkspacesDeployLandscapeRequest struct { ctx context.Context ApiService WorkspacesAPI - workspaceId float32 + workspaceId int } func (r ApiWorkspacesDeployLandscapeRequest) Execute() (*http.Response, error) { @@ -751,7 +757,7 @@ WorkspacesDeployLandscape deployLandscape @param workspaceId @return ApiWorkspacesDeployLandscapeRequest */ -func (a *WorkspacesAPIService) WorkspacesDeployLandscape(ctx context.Context, workspaceId float32) ApiWorkspacesDeployLandscapeRequest { +func (a *WorkspacesAPIService) WorkspacesDeployLandscape(ctx context.Context, workspaceId int) ApiWorkspacesDeployLandscapeRequest { return ApiWorkspacesDeployLandscapeRequest{ ApiService: a, ctx: ctx, @@ -778,6 +784,9 @@ func (a *WorkspacesAPIService) WorkspacesDeployLandscapeExecute(r ApiWorkspacesD localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + if r.workspaceId < 0 { + return nil, reportError("workspaceId must be greater than 0") + } // to determine the Content-Type header localVarHTTPContentTypes := []string{} @@ -859,7 +868,7 @@ func (a *WorkspacesAPIService) WorkspacesDeployLandscapeExecute(r ApiWorkspacesD type ApiWorkspacesDeployLandscape1Request struct { ctx context.Context ApiService WorkspacesAPI - workspaceId float32 + workspaceId int profile string } @@ -875,7 +884,7 @@ WorkspacesDeployLandscape1 deployLandscape @param profile @return ApiWorkspacesDeployLandscape1Request */ -func (a *WorkspacesAPIService) WorkspacesDeployLandscape1(ctx context.Context, workspaceId float32, profile string) ApiWorkspacesDeployLandscape1Request { +func (a *WorkspacesAPIService) WorkspacesDeployLandscape1(ctx context.Context, workspaceId int, profile string) ApiWorkspacesDeployLandscape1Request { return ApiWorkspacesDeployLandscape1Request{ ApiService: a, ctx: ctx, @@ -904,6 +913,9 @@ func (a *WorkspacesAPIService) WorkspacesDeployLandscape1Execute(r ApiWorkspaces localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + if r.workspaceId < 0 { + return nil, reportError("workspaceId must be greater than 0") + } // to determine the Content-Type header localVarHTTPContentTypes := []string{} @@ -985,7 +997,7 @@ func (a *WorkspacesAPIService) WorkspacesDeployLandscape1Execute(r ApiWorkspaces type ApiWorkspacesExecuteCommandRequest struct { ctx context.Context ApiService WorkspacesAPI - workspaceId float32 + workspaceId int workspacesExecuteCommandRequest *WorkspacesExecuteCommandRequest } @@ -1007,7 +1019,7 @@ Executes the command with "bash -c command". Timeouts after 5000ms. @param workspaceId @return ApiWorkspacesExecuteCommandRequest */ -func (a *WorkspacesAPIService) WorkspacesExecuteCommand(ctx context.Context, workspaceId float32) ApiWorkspacesExecuteCommandRequest { +func (a *WorkspacesAPIService) WorkspacesExecuteCommand(ctx context.Context, workspaceId int) ApiWorkspacesExecuteCommandRequest { return ApiWorkspacesExecuteCommandRequest{ ApiService: a, ctx: ctx, @@ -1037,6 +1049,9 @@ func (a *WorkspacesAPIService) WorkspacesExecuteCommandExecute(r ApiWorkspacesEx localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + if r.workspaceId < 0 { + return localVarReturnValue, nil, reportError("workspaceId must be greater than 0") + } // to determine the Content-Type header localVarHTTPContentTypes := []string{"application/json"} @@ -1129,7 +1144,7 @@ func (a *WorkspacesAPIService) WorkspacesExecuteCommandExecute(r ApiWorkspacesEx type ApiWorkspacesGetWorkspaceRequest struct { ctx context.Context ApiService WorkspacesAPI - workspaceId float32 + workspaceId int } func (r ApiWorkspacesGetWorkspaceRequest) Execute() (*WorkspacesGetWorkspace200Response, *http.Response, error) { @@ -1143,7 +1158,7 @@ WorkspacesGetWorkspace getWorkspace @param workspaceId @return ApiWorkspacesGetWorkspaceRequest */ -func (a *WorkspacesAPIService) WorkspacesGetWorkspace(ctx context.Context, workspaceId float32) ApiWorkspacesGetWorkspaceRequest { +func (a *WorkspacesAPIService) WorkspacesGetWorkspace(ctx context.Context, workspaceId int) ApiWorkspacesGetWorkspaceRequest { return ApiWorkspacesGetWorkspaceRequest{ ApiService: a, ctx: ctx, @@ -1173,6 +1188,9 @@ func (a *WorkspacesAPIService) WorkspacesGetWorkspaceExecute(r ApiWorkspacesGetW localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + if r.workspaceId < 0 { + return localVarReturnValue, nil, reportError("workspaceId must be greater than 0") + } // to determine the Content-Type header localVarHTTPContentTypes := []string{} @@ -1263,7 +1281,7 @@ func (a *WorkspacesAPIService) WorkspacesGetWorkspaceExecute(r ApiWorkspacesGetW type ApiWorkspacesGetWorkspaceStatusRequest struct { ctx context.Context ApiService WorkspacesAPI - workspaceId float32 + workspaceId int } func (r ApiWorkspacesGetWorkspaceStatusRequest) Execute() (*WorkspacesGetWorkspaceStatus200Response, *http.Response, error) { @@ -1277,7 +1295,7 @@ WorkspacesGetWorkspaceStatus getWorkspaceStatus @param workspaceId @return ApiWorkspacesGetWorkspaceStatusRequest */ -func (a *WorkspacesAPIService) WorkspacesGetWorkspaceStatus(ctx context.Context, workspaceId float32) ApiWorkspacesGetWorkspaceStatusRequest { +func (a *WorkspacesAPIService) WorkspacesGetWorkspaceStatus(ctx context.Context, workspaceId int) ApiWorkspacesGetWorkspaceStatusRequest { return ApiWorkspacesGetWorkspaceStatusRequest{ ApiService: a, ctx: ctx, @@ -1307,6 +1325,9 @@ func (a *WorkspacesAPIService) WorkspacesGetWorkspaceStatusExecute(r ApiWorkspac localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + if r.workspaceId < 0 { + return localVarReturnValue, nil, reportError("workspaceId must be greater than 0") + } // to determine the Content-Type header localVarHTTPContentTypes := []string{} @@ -1397,7 +1418,7 @@ func (a *WorkspacesAPIService) WorkspacesGetWorkspaceStatusExecute(r ApiWorkspac type ApiWorkspacesGitHeadRequest struct { ctx context.Context ApiService WorkspacesAPI - workspaceId float32 + workspaceId int } func (r ApiWorkspacesGitHeadRequest) Execute() (*WorkspacesGitHead200Response, *http.Response, error) { @@ -1411,7 +1432,7 @@ WorkspacesGitHead gitHead @param workspaceId @return ApiWorkspacesGitHeadRequest */ -func (a *WorkspacesAPIService) WorkspacesGitHead(ctx context.Context, workspaceId float32) ApiWorkspacesGitHeadRequest { +func (a *WorkspacesAPIService) WorkspacesGitHead(ctx context.Context, workspaceId int) ApiWorkspacesGitHeadRequest { return ApiWorkspacesGitHeadRequest{ ApiService: a, ctx: ctx, @@ -1441,6 +1462,9 @@ func (a *WorkspacesAPIService) WorkspacesGitHeadExecute(r ApiWorkspacesGitHeadRe localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + if r.workspaceId < 0 { + return localVarReturnValue, nil, reportError("workspaceId must be greater than 0") + } // to determine the Content-Type header localVarHTTPContentTypes := []string{} @@ -1531,7 +1555,7 @@ func (a *WorkspacesAPIService) WorkspacesGitHeadExecute(r ApiWorkspacesGitHeadRe type ApiWorkspacesGitPullRequest struct { ctx context.Context ApiService WorkspacesAPI - workspaceId float32 + workspaceId int } func (r ApiWorkspacesGitPullRequest) Execute() (*http.Response, error) { @@ -1545,7 +1569,7 @@ WorkspacesGitPull gitPull @param workspaceId @return ApiWorkspacesGitPullRequest */ -func (a *WorkspacesAPIService) WorkspacesGitPull(ctx context.Context, workspaceId float32) ApiWorkspacesGitPullRequest { +func (a *WorkspacesAPIService) WorkspacesGitPull(ctx context.Context, workspaceId int) ApiWorkspacesGitPullRequest { return ApiWorkspacesGitPullRequest{ ApiService: a, ctx: ctx, @@ -1572,6 +1596,9 @@ func (a *WorkspacesAPIService) WorkspacesGitPullExecute(r ApiWorkspacesGitPullRe localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + if r.workspaceId < 0 { + return nil, reportError("workspaceId must be greater than 0") + } // to determine the Content-Type header localVarHTTPContentTypes := []string{} @@ -1653,7 +1680,7 @@ func (a *WorkspacesAPIService) WorkspacesGitPullExecute(r ApiWorkspacesGitPullRe type ApiWorkspacesGitPull1Request struct { ctx context.Context ApiService WorkspacesAPI - workspaceId float32 + workspaceId int remote string } @@ -1669,7 +1696,7 @@ WorkspacesGitPull1 gitPull @param remote @return ApiWorkspacesGitPull1Request */ -func (a *WorkspacesAPIService) WorkspacesGitPull1(ctx context.Context, workspaceId float32, remote string) ApiWorkspacesGitPull1Request { +func (a *WorkspacesAPIService) WorkspacesGitPull1(ctx context.Context, workspaceId int, remote string) ApiWorkspacesGitPull1Request { return ApiWorkspacesGitPull1Request{ ApiService: a, ctx: ctx, @@ -1698,6 +1725,9 @@ func (a *WorkspacesAPIService) WorkspacesGitPull1Execute(r ApiWorkspacesGitPull1 localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + if r.workspaceId < 0 { + return nil, reportError("workspaceId must be greater than 0") + } // to determine the Content-Type header localVarHTTPContentTypes := []string{} @@ -1779,7 +1809,7 @@ func (a *WorkspacesAPIService) WorkspacesGitPull1Execute(r ApiWorkspacesGitPull1 type ApiWorkspacesGitPull2Request struct { ctx context.Context ApiService WorkspacesAPI - workspaceId float32 + workspaceId int remote string branch string } @@ -1797,7 +1827,7 @@ WorkspacesGitPull2 gitPull @param branch @return ApiWorkspacesGitPull2Request */ -func (a *WorkspacesAPIService) WorkspacesGitPull2(ctx context.Context, workspaceId float32, remote string, branch string) ApiWorkspacesGitPull2Request { +func (a *WorkspacesAPIService) WorkspacesGitPull2(ctx context.Context, workspaceId int, remote string, branch string) ApiWorkspacesGitPull2Request { return ApiWorkspacesGitPull2Request{ ApiService: a, ctx: ctx, @@ -1828,6 +1858,9 @@ func (a *WorkspacesAPIService) WorkspacesGitPull2Execute(r ApiWorkspacesGitPull2 localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + if r.workspaceId < 0 { + return nil, reportError("workspaceId must be greater than 0") + } // to determine the Content-Type header localVarHTTPContentTypes := []string{} @@ -1909,7 +1942,7 @@ func (a *WorkspacesAPIService) WorkspacesGitPull2Execute(r ApiWorkspacesGitPull2 type ApiWorkspacesListEnvVarsRequest struct { ctx context.Context ApiService WorkspacesAPI - workspaceId float32 + workspaceId int } func (r ApiWorkspacesListEnvVarsRequest) Execute() ([]WorkspacesCreateWorkspaceRequestEnvInner, *http.Response, error) { @@ -1923,7 +1956,7 @@ WorkspacesListEnvVars listEnvVars @param workspaceId @return ApiWorkspacesListEnvVarsRequest */ -func (a *WorkspacesAPIService) WorkspacesListEnvVars(ctx context.Context, workspaceId float32) ApiWorkspacesListEnvVarsRequest { +func (a *WorkspacesAPIService) WorkspacesListEnvVars(ctx context.Context, workspaceId int) ApiWorkspacesListEnvVarsRequest { return ApiWorkspacesListEnvVarsRequest{ ApiService: a, ctx: ctx, @@ -1953,6 +1986,9 @@ func (a *WorkspacesAPIService) WorkspacesListEnvVarsExecute(r ApiWorkspacesListE localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + if r.workspaceId < 0 { + return localVarReturnValue, nil, reportError("workspaceId must be greater than 0") + } // to determine the Content-Type header localVarHTTPContentTypes := []string{} @@ -2043,7 +2079,7 @@ func (a *WorkspacesAPIService) WorkspacesListEnvVarsExecute(r ApiWorkspacesListE type ApiWorkspacesListWorkspacesRequest struct { ctx context.Context ApiService WorkspacesAPI - teamId float32 + teamId int } func (r ApiWorkspacesListWorkspacesRequest) Execute() ([]WorkspacesGetWorkspace200Response, *http.Response, error) { @@ -2057,7 +2093,7 @@ WorkspacesListWorkspaces listWorkspaces @param teamId @return ApiWorkspacesListWorkspacesRequest */ -func (a *WorkspacesAPIService) WorkspacesListWorkspaces(ctx context.Context, teamId float32) ApiWorkspacesListWorkspacesRequest { +func (a *WorkspacesAPIService) WorkspacesListWorkspaces(ctx context.Context, teamId int) ApiWorkspacesListWorkspacesRequest { return ApiWorkspacesListWorkspacesRequest{ ApiService: a, ctx: ctx, @@ -2087,6 +2123,9 @@ func (a *WorkspacesAPIService) WorkspacesListWorkspacesExecute(r ApiWorkspacesLi localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + if r.teamId < 0 { + return localVarReturnValue, nil, reportError("teamId must be greater than 0") + } // to determine the Content-Type header localVarHTTPContentTypes := []string{} @@ -2166,9 +2205,9 @@ func (a *WorkspacesAPIService) WorkspacesListWorkspacesExecute(r ApiWorkspacesLi type ApiWorkspacesLogsRequest struct { ctx context.Context ApiService WorkspacesAPI - workspaceId float32 + workspaceId int stage string - step float32 + step int } func (r ApiWorkspacesLogsRequest) Execute() (*WorkspacesLogs200Response, *http.Response, error) { @@ -2186,7 +2225,7 @@ Returns a stream of logs for a given "stage" and "step". For "run" stage logs of @param step @return ApiWorkspacesLogsRequest */ -func (a *WorkspacesAPIService) WorkspacesLogs(ctx context.Context, workspaceId float32, stage string, step float32) ApiWorkspacesLogsRequest { +func (a *WorkspacesAPIService) WorkspacesLogs(ctx context.Context, workspaceId int, stage string, step int) ApiWorkspacesLogsRequest { return ApiWorkspacesLogsRequest{ ApiService: a, ctx: ctx, @@ -2220,6 +2259,12 @@ func (a *WorkspacesAPIService) WorkspacesLogsExecute(r ApiWorkspacesLogsRequest) localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + if r.workspaceId < 0 { + return localVarReturnValue, nil, reportError("workspaceId must be greater than 0") + } + if r.step < 0 { + return localVarReturnValue, nil, reportError("step must be greater than 0") + } // to determine the Content-Type header localVarHTTPContentTypes := []string{} @@ -2278,7 +2323,7 @@ func (a *WorkspacesAPIService) WorkspacesLogsExecute(r ApiWorkspacesLogsRequest) type ApiWorkspacesPipelineStatusRequest struct { ctx context.Context ApiService WorkspacesAPI - workspaceId float32 + workspaceId int stage string } @@ -2294,7 +2339,7 @@ WorkspacesPipelineStatus pipelineStatus @param stage @return ApiWorkspacesPipelineStatusRequest */ -func (a *WorkspacesAPIService) WorkspacesPipelineStatus(ctx context.Context, workspaceId float32, stage string) ApiWorkspacesPipelineStatusRequest { +func (a *WorkspacesAPIService) WorkspacesPipelineStatus(ctx context.Context, workspaceId int, stage string) ApiWorkspacesPipelineStatusRequest { return ApiWorkspacesPipelineStatusRequest{ ApiService: a, ctx: ctx, @@ -2326,6 +2371,9 @@ func (a *WorkspacesAPIService) WorkspacesPipelineStatusExecute(r ApiWorkspacesPi localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + if r.workspaceId < 0 { + return localVarReturnValue, nil, reportError("workspaceId must be greater than 0") + } // to determine the Content-Type header localVarHTTPContentTypes := []string{} @@ -2416,8 +2464,8 @@ func (a *WorkspacesAPIService) WorkspacesPipelineStatusExecute(r ApiWorkspacesPi type ApiWorkspacesReplicaLogsRequest struct { ctx context.Context ApiService WorkspacesAPI - workspaceId float32 - step float32 + workspaceId int + step int replica string } @@ -2434,7 +2482,7 @@ WorkspacesReplicaLogs replicaLogs @param replica @return ApiWorkspacesReplicaLogsRequest */ -func (a *WorkspacesAPIService) WorkspacesReplicaLogs(ctx context.Context, workspaceId float32, step float32, replica string) ApiWorkspacesReplicaLogsRequest { +func (a *WorkspacesAPIService) WorkspacesReplicaLogs(ctx context.Context, workspaceId int, step int, replica string) ApiWorkspacesReplicaLogsRequest { return ApiWorkspacesReplicaLogsRequest{ ApiService: a, ctx: ctx, @@ -2468,6 +2516,12 @@ func (a *WorkspacesAPIService) WorkspacesReplicaLogsExecute(r ApiWorkspacesRepli localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + if r.workspaceId < 0 { + return localVarReturnValue, nil, reportError("workspaceId must be greater than 0") + } + if r.step < 0 { + return localVarReturnValue, nil, reportError("step must be greater than 0") + } // to determine the Content-Type header localVarHTTPContentTypes := []string{} @@ -2526,7 +2580,7 @@ func (a *WorkspacesAPIService) WorkspacesReplicaLogsExecute(r ApiWorkspacesRepli type ApiWorkspacesScaleLandscapeServicesRequest struct { ctx context.Context ApiService WorkspacesAPI - workspaceId float32 + workspaceId int requestBody *map[string]int } @@ -2546,7 +2600,7 @@ WorkspacesScaleLandscapeServices scaleLandscapeServices @param workspaceId @return ApiWorkspacesScaleLandscapeServicesRequest */ -func (a *WorkspacesAPIService) WorkspacesScaleLandscapeServices(ctx context.Context, workspaceId float32) ApiWorkspacesScaleLandscapeServicesRequest { +func (a *WorkspacesAPIService) WorkspacesScaleLandscapeServices(ctx context.Context, workspaceId int) ApiWorkspacesScaleLandscapeServicesRequest { return ApiWorkspacesScaleLandscapeServicesRequest{ ApiService: a, ctx: ctx, @@ -2573,6 +2627,9 @@ func (a *WorkspacesAPIService) WorkspacesScaleLandscapeServicesExecute(r ApiWork localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + if r.workspaceId < 0 { + return nil, reportError("workspaceId must be greater than 0") + } // to determine the Content-Type header localVarHTTPContentTypes := []string{"application/json"} @@ -2656,8 +2713,8 @@ func (a *WorkspacesAPIService) WorkspacesScaleLandscapeServicesExecute(r ApiWork type ApiWorkspacesServerLogsRequest struct { ctx context.Context ApiService WorkspacesAPI - workspaceId float32 - step float32 + workspaceId int + step int server string } @@ -2674,7 +2731,7 @@ WorkspacesServerLogs serverLogs @param server @return ApiWorkspacesServerLogsRequest */ -func (a *WorkspacesAPIService) WorkspacesServerLogs(ctx context.Context, workspaceId float32, step float32, server string) ApiWorkspacesServerLogsRequest { +func (a *WorkspacesAPIService) WorkspacesServerLogs(ctx context.Context, workspaceId int, step int, server string) ApiWorkspacesServerLogsRequest { return ApiWorkspacesServerLogsRequest{ ApiService: a, ctx: ctx, @@ -2708,6 +2765,12 @@ func (a *WorkspacesAPIService) WorkspacesServerLogsExecute(r ApiWorkspacesServer localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + if r.workspaceId < 0 { + return localVarReturnValue, nil, reportError("workspaceId must be greater than 0") + } + if r.step < 0 { + return localVarReturnValue, nil, reportError("step must be greater than 0") + } // to determine the Content-Type header localVarHTTPContentTypes := []string{} @@ -2766,7 +2829,7 @@ func (a *WorkspacesAPIService) WorkspacesServerLogsExecute(r ApiWorkspacesServer type ApiWorkspacesSetEnvVarRequest struct { ctx context.Context ApiService WorkspacesAPI - workspaceId float32 + workspaceId int workspacesCreateWorkspaceRequestEnvInner *[]WorkspacesCreateWorkspaceRequestEnvInner } @@ -2786,7 +2849,7 @@ WorkspacesSetEnvVar setEnvVar @param workspaceId @return ApiWorkspacesSetEnvVarRequest */ -func (a *WorkspacesAPIService) WorkspacesSetEnvVar(ctx context.Context, workspaceId float32) ApiWorkspacesSetEnvVarRequest { +func (a *WorkspacesAPIService) WorkspacesSetEnvVar(ctx context.Context, workspaceId int) ApiWorkspacesSetEnvVarRequest { return ApiWorkspacesSetEnvVarRequest{ ApiService: a, ctx: ctx, @@ -2813,6 +2876,9 @@ func (a *WorkspacesAPIService) WorkspacesSetEnvVarExecute(r ApiWorkspacesSetEnvV localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + if r.workspaceId < 0 { + return nil, reportError("workspaceId must be greater than 0") + } // to determine the Content-Type header localVarHTTPContentTypes := []string{"application/json"} @@ -2896,7 +2962,7 @@ func (a *WorkspacesAPIService) WorkspacesSetEnvVarExecute(r ApiWorkspacesSetEnvV type ApiWorkspacesStartPipelineStageRequest struct { ctx context.Context ApiService WorkspacesAPI - workspaceId float32 + workspaceId int stage string } @@ -2912,7 +2978,7 @@ WorkspacesStartPipelineStage startPipelineStage @param stage @return ApiWorkspacesStartPipelineStageRequest */ -func (a *WorkspacesAPIService) WorkspacesStartPipelineStage(ctx context.Context, workspaceId float32, stage string) ApiWorkspacesStartPipelineStageRequest { +func (a *WorkspacesAPIService) WorkspacesStartPipelineStage(ctx context.Context, workspaceId int, stage string) ApiWorkspacesStartPipelineStageRequest { return ApiWorkspacesStartPipelineStageRequest{ ApiService: a, ctx: ctx, @@ -2941,6 +3007,9 @@ func (a *WorkspacesAPIService) WorkspacesStartPipelineStageExecute(r ApiWorkspac localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + if r.workspaceId < 0 { + return nil, reportError("workspaceId must be greater than 0") + } // to determine the Content-Type header localVarHTTPContentTypes := []string{} @@ -3022,7 +3091,7 @@ func (a *WorkspacesAPIService) WorkspacesStartPipelineStageExecute(r ApiWorkspac type ApiWorkspacesStartPipelineStage1Request struct { ctx context.Context ApiService WorkspacesAPI - workspaceId float32 + workspaceId int stage string profile string } @@ -3040,7 +3109,7 @@ WorkspacesStartPipelineStage1 startPipelineStage @param profile @return ApiWorkspacesStartPipelineStage1Request */ -func (a *WorkspacesAPIService) WorkspacesStartPipelineStage1(ctx context.Context, workspaceId float32, stage string, profile string) ApiWorkspacesStartPipelineStage1Request { +func (a *WorkspacesAPIService) WorkspacesStartPipelineStage1(ctx context.Context, workspaceId int, stage string, profile string) ApiWorkspacesStartPipelineStage1Request { return ApiWorkspacesStartPipelineStage1Request{ ApiService: a, ctx: ctx, @@ -3071,6 +3140,9 @@ func (a *WorkspacesAPIService) WorkspacesStartPipelineStage1Execute(r ApiWorkspa localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + if r.workspaceId < 0 { + return nil, reportError("workspaceId must be greater than 0") + } // to determine the Content-Type header localVarHTTPContentTypes := []string{} @@ -3152,7 +3224,7 @@ func (a *WorkspacesAPIService) WorkspacesStartPipelineStage1Execute(r ApiWorkspa type ApiWorkspacesStopPipelineStageRequest struct { ctx context.Context ApiService WorkspacesAPI - workspaceId float32 + workspaceId int stage string } @@ -3168,7 +3240,7 @@ WorkspacesStopPipelineStage stopPipelineStage @param stage @return ApiWorkspacesStopPipelineStageRequest */ -func (a *WorkspacesAPIService) WorkspacesStopPipelineStage(ctx context.Context, workspaceId float32, stage string) ApiWorkspacesStopPipelineStageRequest { +func (a *WorkspacesAPIService) WorkspacesStopPipelineStage(ctx context.Context, workspaceId int, stage string) ApiWorkspacesStopPipelineStageRequest { return ApiWorkspacesStopPipelineStageRequest{ ApiService: a, ctx: ctx, @@ -3197,6 +3269,9 @@ func (a *WorkspacesAPIService) WorkspacesStopPipelineStageExecute(r ApiWorkspace localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + if r.workspaceId < 0 { + return nil, reportError("workspaceId must be greater than 0") + } // to determine the Content-Type header localVarHTTPContentTypes := []string{} @@ -3278,7 +3353,7 @@ func (a *WorkspacesAPIService) WorkspacesStopPipelineStageExecute(r ApiWorkspace type ApiWorkspacesTeardownLandscapeRequest struct { ctx context.Context ApiService WorkspacesAPI - workspaceId float32 + workspaceId int } func (r ApiWorkspacesTeardownLandscapeRequest) Execute() (*http.Response, error) { @@ -3292,7 +3367,7 @@ WorkspacesTeardownLandscape teardownLandscape @param workspaceId @return ApiWorkspacesTeardownLandscapeRequest */ -func (a *WorkspacesAPIService) WorkspacesTeardownLandscape(ctx context.Context, workspaceId float32) ApiWorkspacesTeardownLandscapeRequest { +func (a *WorkspacesAPIService) WorkspacesTeardownLandscape(ctx context.Context, workspaceId int) ApiWorkspacesTeardownLandscapeRequest { return ApiWorkspacesTeardownLandscapeRequest{ ApiService: a, ctx: ctx, @@ -3319,6 +3394,9 @@ func (a *WorkspacesAPIService) WorkspacesTeardownLandscapeExecute(r ApiWorkspace localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + if r.workspaceId < 0 { + return nil, reportError("workspaceId must be greater than 0") + } // to determine the Content-Type header localVarHTTPContentTypes := []string{} @@ -3400,7 +3478,7 @@ func (a *WorkspacesAPIService) WorkspacesTeardownLandscapeExecute(r ApiWorkspace type ApiWorkspacesUpdateWorkspaceRequest struct { ctx context.Context ApiService WorkspacesAPI - workspaceId float32 + workspaceId int workspacesUpdateWorkspaceRequest *WorkspacesUpdateWorkspaceRequest } @@ -3420,7 +3498,7 @@ WorkspacesUpdateWorkspace updateWorkspace @param workspaceId @return ApiWorkspacesUpdateWorkspaceRequest */ -func (a *WorkspacesAPIService) WorkspacesUpdateWorkspace(ctx context.Context, workspaceId float32) ApiWorkspacesUpdateWorkspaceRequest { +func (a *WorkspacesAPIService) WorkspacesUpdateWorkspace(ctx context.Context, workspaceId int) ApiWorkspacesUpdateWorkspaceRequest { return ApiWorkspacesUpdateWorkspaceRequest{ ApiService: a, ctx: ctx, @@ -3447,6 +3525,9 @@ func (a *WorkspacesAPIService) WorkspacesUpdateWorkspaceExecute(r ApiWorkspacesU localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} localVarFormParams := url.Values{} + if r.workspaceId < 0 { + return nil, reportError("workspaceId must be greater than 0") + } // to determine the Content-Type header localVarHTTPContentTypes := []string{"application/json"} diff --git a/api/openapi_client/mocks.go b/api/openapi_client/mocks.go index 4cf13938..3bc5b0ab 100644 --- a/api/openapi_client/mocks.go +++ b/api/openapi_client/mocks.go @@ -38,7 +38,7 @@ func (_m *MockDomainsAPI) EXPECT() *MockDomainsAPI_Expecter { } // DomainsCreateDomain provides a mock function for the type MockDomainsAPI -func (_mock *MockDomainsAPI) DomainsCreateDomain(ctx context.Context, teamId float32, domainName string) ApiDomainsCreateDomainRequest { +func (_mock *MockDomainsAPI) DomainsCreateDomain(ctx context.Context, teamId int, domainName string) ApiDomainsCreateDomainRequest { ret := _mock.Called(ctx, teamId, domainName) if len(ret) == 0 { @@ -46,7 +46,7 @@ func (_mock *MockDomainsAPI) DomainsCreateDomain(ctx context.Context, teamId flo } var r0 ApiDomainsCreateDomainRequest - if returnFunc, ok := ret.Get(0).(func(context.Context, float32, string) ApiDomainsCreateDomainRequest); ok { + if returnFunc, ok := ret.Get(0).(func(context.Context, int, string) ApiDomainsCreateDomainRequest); ok { r0 = returnFunc(ctx, teamId, domainName) } else { r0 = ret.Get(0).(ApiDomainsCreateDomainRequest) @@ -61,21 +61,21 @@ type MockDomainsAPI_DomainsCreateDomain_Call struct { // DomainsCreateDomain is a helper method to define mock.On call // - ctx context.Context -// - teamId float32 +// - teamId int // - domainName string func (_e *MockDomainsAPI_Expecter) DomainsCreateDomain(ctx any, teamId any, domainName any) *MockDomainsAPI_DomainsCreateDomain_Call { return &MockDomainsAPI_DomainsCreateDomain_Call{Call: _e.mock.On("DomainsCreateDomain", ctx, teamId, domainName)} } -func (_c *MockDomainsAPI_DomainsCreateDomain_Call) Run(run func(ctx context.Context, teamId float32, domainName string)) *MockDomainsAPI_DomainsCreateDomain_Call { +func (_c *MockDomainsAPI_DomainsCreateDomain_Call) Run(run func(ctx context.Context, teamId int, domainName string)) *MockDomainsAPI_DomainsCreateDomain_Call { _c.Call.Run(func(args mock.Arguments) { var arg0 context.Context if args[0] != nil { arg0 = args[0].(context.Context) } - var arg1 float32 + var arg1 int if args[1] != nil { - arg1 = args[1].(float32) + arg1 = args[1].(int) } var arg2 string if args[2] != nil { @@ -95,7 +95,7 @@ func (_c *MockDomainsAPI_DomainsCreateDomain_Call) Return(apiDomainsCreateDomain return _c } -func (_c *MockDomainsAPI_DomainsCreateDomain_Call) RunAndReturn(run func(ctx context.Context, teamId float32, domainName string) ApiDomainsCreateDomainRequest) *MockDomainsAPI_DomainsCreateDomain_Call { +func (_c *MockDomainsAPI_DomainsCreateDomain_Call) RunAndReturn(run func(ctx context.Context, teamId int, domainName string) ApiDomainsCreateDomainRequest) *MockDomainsAPI_DomainsCreateDomain_Call { _c.Call.Return(run) return _c } @@ -171,7 +171,7 @@ func (_c *MockDomainsAPI_DomainsCreateDomainExecute_Call) RunAndReturn(run func( } // DomainsDeleteDomain provides a mock function for the type MockDomainsAPI -func (_mock *MockDomainsAPI) DomainsDeleteDomain(ctx context.Context, teamId float32, domainName string) ApiDomainsDeleteDomainRequest { +func (_mock *MockDomainsAPI) DomainsDeleteDomain(ctx context.Context, teamId int, domainName string) ApiDomainsDeleteDomainRequest { ret := _mock.Called(ctx, teamId, domainName) if len(ret) == 0 { @@ -179,7 +179,7 @@ func (_mock *MockDomainsAPI) DomainsDeleteDomain(ctx context.Context, teamId flo } var r0 ApiDomainsDeleteDomainRequest - if returnFunc, ok := ret.Get(0).(func(context.Context, float32, string) ApiDomainsDeleteDomainRequest); ok { + if returnFunc, ok := ret.Get(0).(func(context.Context, int, string) ApiDomainsDeleteDomainRequest); ok { r0 = returnFunc(ctx, teamId, domainName) } else { r0 = ret.Get(0).(ApiDomainsDeleteDomainRequest) @@ -194,21 +194,21 @@ type MockDomainsAPI_DomainsDeleteDomain_Call struct { // DomainsDeleteDomain is a helper method to define mock.On call // - ctx context.Context -// - teamId float32 +// - teamId int // - domainName string func (_e *MockDomainsAPI_Expecter) DomainsDeleteDomain(ctx any, teamId any, domainName any) *MockDomainsAPI_DomainsDeleteDomain_Call { return &MockDomainsAPI_DomainsDeleteDomain_Call{Call: _e.mock.On("DomainsDeleteDomain", ctx, teamId, domainName)} } -func (_c *MockDomainsAPI_DomainsDeleteDomain_Call) Run(run func(ctx context.Context, teamId float32, domainName string)) *MockDomainsAPI_DomainsDeleteDomain_Call { +func (_c *MockDomainsAPI_DomainsDeleteDomain_Call) Run(run func(ctx context.Context, teamId int, domainName string)) *MockDomainsAPI_DomainsDeleteDomain_Call { _c.Call.Run(func(args mock.Arguments) { var arg0 context.Context if args[0] != nil { arg0 = args[0].(context.Context) } - var arg1 float32 + var arg1 int if args[1] != nil { - arg1 = args[1].(float32) + arg1 = args[1].(int) } var arg2 string if args[2] != nil { @@ -228,7 +228,7 @@ func (_c *MockDomainsAPI_DomainsDeleteDomain_Call) Return(apiDomainsDeleteDomain return _c } -func (_c *MockDomainsAPI_DomainsDeleteDomain_Call) RunAndReturn(run func(ctx context.Context, teamId float32, domainName string) ApiDomainsDeleteDomainRequest) *MockDomainsAPI_DomainsDeleteDomain_Call { +func (_c *MockDomainsAPI_DomainsDeleteDomain_Call) RunAndReturn(run func(ctx context.Context, teamId int, domainName string) ApiDomainsDeleteDomainRequest) *MockDomainsAPI_DomainsDeleteDomain_Call { _c.Call.Return(run) return _c } @@ -296,7 +296,7 @@ func (_c *MockDomainsAPI_DomainsDeleteDomainExecute_Call) RunAndReturn(run func( } // DomainsGetDomain provides a mock function for the type MockDomainsAPI -func (_mock *MockDomainsAPI) DomainsGetDomain(ctx context.Context, teamId float32, domainName string) ApiDomainsGetDomainRequest { +func (_mock *MockDomainsAPI) DomainsGetDomain(ctx context.Context, teamId int, domainName string) ApiDomainsGetDomainRequest { ret := _mock.Called(ctx, teamId, domainName) if len(ret) == 0 { @@ -304,7 +304,7 @@ func (_mock *MockDomainsAPI) DomainsGetDomain(ctx context.Context, teamId float3 } var r0 ApiDomainsGetDomainRequest - if returnFunc, ok := ret.Get(0).(func(context.Context, float32, string) ApiDomainsGetDomainRequest); ok { + if returnFunc, ok := ret.Get(0).(func(context.Context, int, string) ApiDomainsGetDomainRequest); ok { r0 = returnFunc(ctx, teamId, domainName) } else { r0 = ret.Get(0).(ApiDomainsGetDomainRequest) @@ -319,21 +319,21 @@ type MockDomainsAPI_DomainsGetDomain_Call struct { // DomainsGetDomain is a helper method to define mock.On call // - ctx context.Context -// - teamId float32 +// - teamId int // - domainName string func (_e *MockDomainsAPI_Expecter) DomainsGetDomain(ctx any, teamId any, domainName any) *MockDomainsAPI_DomainsGetDomain_Call { return &MockDomainsAPI_DomainsGetDomain_Call{Call: _e.mock.On("DomainsGetDomain", ctx, teamId, domainName)} } -func (_c *MockDomainsAPI_DomainsGetDomain_Call) Run(run func(ctx context.Context, teamId float32, domainName string)) *MockDomainsAPI_DomainsGetDomain_Call { +func (_c *MockDomainsAPI_DomainsGetDomain_Call) Run(run func(ctx context.Context, teamId int, domainName string)) *MockDomainsAPI_DomainsGetDomain_Call { _c.Call.Run(func(args mock.Arguments) { var arg0 context.Context if args[0] != nil { arg0 = args[0].(context.Context) } - var arg1 float32 + var arg1 int if args[1] != nil { - arg1 = args[1].(float32) + arg1 = args[1].(int) } var arg2 string if args[2] != nil { @@ -353,7 +353,7 @@ func (_c *MockDomainsAPI_DomainsGetDomain_Call) Return(apiDomainsGetDomainReques return _c } -func (_c *MockDomainsAPI_DomainsGetDomain_Call) RunAndReturn(run func(ctx context.Context, teamId float32, domainName string) ApiDomainsGetDomainRequest) *MockDomainsAPI_DomainsGetDomain_Call { +func (_c *MockDomainsAPI_DomainsGetDomain_Call) RunAndReturn(run func(ctx context.Context, teamId int, domainName string) ApiDomainsGetDomainRequest) *MockDomainsAPI_DomainsGetDomain_Call { _c.Call.Return(run) return _c } @@ -429,7 +429,7 @@ func (_c *MockDomainsAPI_DomainsGetDomainExecute_Call) RunAndReturn(run func(r A } // DomainsListDomains provides a mock function for the type MockDomainsAPI -func (_mock *MockDomainsAPI) DomainsListDomains(ctx context.Context, teamId float32) ApiDomainsListDomainsRequest { +func (_mock *MockDomainsAPI) DomainsListDomains(ctx context.Context, teamId int) ApiDomainsListDomainsRequest { ret := _mock.Called(ctx, teamId) if len(ret) == 0 { @@ -437,7 +437,7 @@ func (_mock *MockDomainsAPI) DomainsListDomains(ctx context.Context, teamId floa } var r0 ApiDomainsListDomainsRequest - if returnFunc, ok := ret.Get(0).(func(context.Context, float32) ApiDomainsListDomainsRequest); ok { + if returnFunc, ok := ret.Get(0).(func(context.Context, int) ApiDomainsListDomainsRequest); ok { r0 = returnFunc(ctx, teamId) } else { r0 = ret.Get(0).(ApiDomainsListDomainsRequest) @@ -452,20 +452,20 @@ type MockDomainsAPI_DomainsListDomains_Call struct { // DomainsListDomains is a helper method to define mock.On call // - ctx context.Context -// - teamId float32 +// - teamId int func (_e *MockDomainsAPI_Expecter) DomainsListDomains(ctx any, teamId any) *MockDomainsAPI_DomainsListDomains_Call { return &MockDomainsAPI_DomainsListDomains_Call{Call: _e.mock.On("DomainsListDomains", ctx, teamId)} } -func (_c *MockDomainsAPI_DomainsListDomains_Call) Run(run func(ctx context.Context, teamId float32)) *MockDomainsAPI_DomainsListDomains_Call { +func (_c *MockDomainsAPI_DomainsListDomains_Call) Run(run func(ctx context.Context, teamId int)) *MockDomainsAPI_DomainsListDomains_Call { _c.Call.Run(func(args mock.Arguments) { var arg0 context.Context if args[0] != nil { arg0 = args[0].(context.Context) } - var arg1 float32 + var arg1 int if args[1] != nil { - arg1 = args[1].(float32) + arg1 = args[1].(int) } run( arg0, @@ -480,7 +480,7 @@ func (_c *MockDomainsAPI_DomainsListDomains_Call) Return(apiDomainsListDomainsRe return _c } -func (_c *MockDomainsAPI_DomainsListDomains_Call) RunAndReturn(run func(ctx context.Context, teamId float32) ApiDomainsListDomainsRequest) *MockDomainsAPI_DomainsListDomains_Call { +func (_c *MockDomainsAPI_DomainsListDomains_Call) RunAndReturn(run func(ctx context.Context, teamId int) ApiDomainsListDomainsRequest) *MockDomainsAPI_DomainsListDomains_Call { _c.Call.Return(run) return _c } @@ -556,7 +556,7 @@ func (_c *MockDomainsAPI_DomainsListDomainsExecute_Call) RunAndReturn(run func(r } // DomainsUpdateDomain provides a mock function for the type MockDomainsAPI -func (_mock *MockDomainsAPI) DomainsUpdateDomain(ctx context.Context, teamId float32, domainName string) ApiDomainsUpdateDomainRequest { +func (_mock *MockDomainsAPI) DomainsUpdateDomain(ctx context.Context, teamId int, domainName string) ApiDomainsUpdateDomainRequest { ret := _mock.Called(ctx, teamId, domainName) if len(ret) == 0 { @@ -564,7 +564,7 @@ func (_mock *MockDomainsAPI) DomainsUpdateDomain(ctx context.Context, teamId flo } var r0 ApiDomainsUpdateDomainRequest - if returnFunc, ok := ret.Get(0).(func(context.Context, float32, string) ApiDomainsUpdateDomainRequest); ok { + if returnFunc, ok := ret.Get(0).(func(context.Context, int, string) ApiDomainsUpdateDomainRequest); ok { r0 = returnFunc(ctx, teamId, domainName) } else { r0 = ret.Get(0).(ApiDomainsUpdateDomainRequest) @@ -579,21 +579,21 @@ type MockDomainsAPI_DomainsUpdateDomain_Call struct { // DomainsUpdateDomain is a helper method to define mock.On call // - ctx context.Context -// - teamId float32 +// - teamId int // - domainName string func (_e *MockDomainsAPI_Expecter) DomainsUpdateDomain(ctx any, teamId any, domainName any) *MockDomainsAPI_DomainsUpdateDomain_Call { return &MockDomainsAPI_DomainsUpdateDomain_Call{Call: _e.mock.On("DomainsUpdateDomain", ctx, teamId, domainName)} } -func (_c *MockDomainsAPI_DomainsUpdateDomain_Call) Run(run func(ctx context.Context, teamId float32, domainName string)) *MockDomainsAPI_DomainsUpdateDomain_Call { +func (_c *MockDomainsAPI_DomainsUpdateDomain_Call) Run(run func(ctx context.Context, teamId int, domainName string)) *MockDomainsAPI_DomainsUpdateDomain_Call { _c.Call.Run(func(args mock.Arguments) { var arg0 context.Context if args[0] != nil { arg0 = args[0].(context.Context) } - var arg1 float32 + var arg1 int if args[1] != nil { - arg1 = args[1].(float32) + arg1 = args[1].(int) } var arg2 string if args[2] != nil { @@ -613,7 +613,7 @@ func (_c *MockDomainsAPI_DomainsUpdateDomain_Call) Return(apiDomainsUpdateDomain return _c } -func (_c *MockDomainsAPI_DomainsUpdateDomain_Call) RunAndReturn(run func(ctx context.Context, teamId float32, domainName string) ApiDomainsUpdateDomainRequest) *MockDomainsAPI_DomainsUpdateDomain_Call { +func (_c *MockDomainsAPI_DomainsUpdateDomain_Call) RunAndReturn(run func(ctx context.Context, teamId int, domainName string) ApiDomainsUpdateDomainRequest) *MockDomainsAPI_DomainsUpdateDomain_Call { _c.Call.Return(run) return _c } @@ -689,7 +689,7 @@ func (_c *MockDomainsAPI_DomainsUpdateDomainExecute_Call) RunAndReturn(run func( } // DomainsUpdateWorkspaceConnections provides a mock function for the type MockDomainsAPI -func (_mock *MockDomainsAPI) DomainsUpdateWorkspaceConnections(ctx context.Context, teamId float32, domainName string) ApiDomainsUpdateWorkspaceConnectionsRequest { +func (_mock *MockDomainsAPI) DomainsUpdateWorkspaceConnections(ctx context.Context, teamId int, domainName string) ApiDomainsUpdateWorkspaceConnectionsRequest { ret := _mock.Called(ctx, teamId, domainName) if len(ret) == 0 { @@ -697,7 +697,7 @@ func (_mock *MockDomainsAPI) DomainsUpdateWorkspaceConnections(ctx context.Conte } var r0 ApiDomainsUpdateWorkspaceConnectionsRequest - if returnFunc, ok := ret.Get(0).(func(context.Context, float32, string) ApiDomainsUpdateWorkspaceConnectionsRequest); ok { + if returnFunc, ok := ret.Get(0).(func(context.Context, int, string) ApiDomainsUpdateWorkspaceConnectionsRequest); ok { r0 = returnFunc(ctx, teamId, domainName) } else { r0 = ret.Get(0).(ApiDomainsUpdateWorkspaceConnectionsRequest) @@ -712,21 +712,21 @@ type MockDomainsAPI_DomainsUpdateWorkspaceConnections_Call struct { // DomainsUpdateWorkspaceConnections is a helper method to define mock.On call // - ctx context.Context -// - teamId float32 +// - teamId int // - domainName string func (_e *MockDomainsAPI_Expecter) DomainsUpdateWorkspaceConnections(ctx any, teamId any, domainName any) *MockDomainsAPI_DomainsUpdateWorkspaceConnections_Call { return &MockDomainsAPI_DomainsUpdateWorkspaceConnections_Call{Call: _e.mock.On("DomainsUpdateWorkspaceConnections", ctx, teamId, domainName)} } -func (_c *MockDomainsAPI_DomainsUpdateWorkspaceConnections_Call) Run(run func(ctx context.Context, teamId float32, domainName string)) *MockDomainsAPI_DomainsUpdateWorkspaceConnections_Call { +func (_c *MockDomainsAPI_DomainsUpdateWorkspaceConnections_Call) Run(run func(ctx context.Context, teamId int, domainName string)) *MockDomainsAPI_DomainsUpdateWorkspaceConnections_Call { _c.Call.Run(func(args mock.Arguments) { var arg0 context.Context if args[0] != nil { arg0 = args[0].(context.Context) } - var arg1 float32 + var arg1 int if args[1] != nil { - arg1 = args[1].(float32) + arg1 = args[1].(int) } var arg2 string if args[2] != nil { @@ -746,7 +746,7 @@ func (_c *MockDomainsAPI_DomainsUpdateWorkspaceConnections_Call) Return(apiDomai return _c } -func (_c *MockDomainsAPI_DomainsUpdateWorkspaceConnections_Call) RunAndReturn(run func(ctx context.Context, teamId float32, domainName string) ApiDomainsUpdateWorkspaceConnectionsRequest) *MockDomainsAPI_DomainsUpdateWorkspaceConnections_Call { +func (_c *MockDomainsAPI_DomainsUpdateWorkspaceConnections_Call) RunAndReturn(run func(ctx context.Context, teamId int, domainName string) ApiDomainsUpdateWorkspaceConnectionsRequest) *MockDomainsAPI_DomainsUpdateWorkspaceConnections_Call { _c.Call.Return(run) return _c } @@ -822,7 +822,7 @@ func (_c *MockDomainsAPI_DomainsUpdateWorkspaceConnectionsExecute_Call) RunAndRe } // DomainsVerifyDomain provides a mock function for the type MockDomainsAPI -func (_mock *MockDomainsAPI) DomainsVerifyDomain(ctx context.Context, teamId float32, domainName string) ApiDomainsVerifyDomainRequest { +func (_mock *MockDomainsAPI) DomainsVerifyDomain(ctx context.Context, teamId int, domainName string) ApiDomainsVerifyDomainRequest { ret := _mock.Called(ctx, teamId, domainName) if len(ret) == 0 { @@ -830,7 +830,7 @@ func (_mock *MockDomainsAPI) DomainsVerifyDomain(ctx context.Context, teamId flo } var r0 ApiDomainsVerifyDomainRequest - if returnFunc, ok := ret.Get(0).(func(context.Context, float32, string) ApiDomainsVerifyDomainRequest); ok { + if returnFunc, ok := ret.Get(0).(func(context.Context, int, string) ApiDomainsVerifyDomainRequest); ok { r0 = returnFunc(ctx, teamId, domainName) } else { r0 = ret.Get(0).(ApiDomainsVerifyDomainRequest) @@ -845,21 +845,21 @@ type MockDomainsAPI_DomainsVerifyDomain_Call struct { // DomainsVerifyDomain is a helper method to define mock.On call // - ctx context.Context -// - teamId float32 +// - teamId int // - domainName string func (_e *MockDomainsAPI_Expecter) DomainsVerifyDomain(ctx any, teamId any, domainName any) *MockDomainsAPI_DomainsVerifyDomain_Call { return &MockDomainsAPI_DomainsVerifyDomain_Call{Call: _e.mock.On("DomainsVerifyDomain", ctx, teamId, domainName)} } -func (_c *MockDomainsAPI_DomainsVerifyDomain_Call) Run(run func(ctx context.Context, teamId float32, domainName string)) *MockDomainsAPI_DomainsVerifyDomain_Call { +func (_c *MockDomainsAPI_DomainsVerifyDomain_Call) Run(run func(ctx context.Context, teamId int, domainName string)) *MockDomainsAPI_DomainsVerifyDomain_Call { _c.Call.Run(func(args mock.Arguments) { var arg0 context.Context if args[0] != nil { arg0 = args[0].(context.Context) } - var arg1 float32 + var arg1 int if args[1] != nil { - arg1 = args[1].(float32) + arg1 = args[1].(int) } var arg2 string if args[2] != nil { @@ -879,7 +879,7 @@ func (_c *MockDomainsAPI_DomainsVerifyDomain_Call) Return(apiDomainsVerifyDomain return _c } -func (_c *MockDomainsAPI_DomainsVerifyDomain_Call) RunAndReturn(run func(ctx context.Context, teamId float32, domainName string) ApiDomainsVerifyDomainRequest) *MockDomainsAPI_DomainsVerifyDomain_Call { +func (_c *MockDomainsAPI_DomainsVerifyDomain_Call) RunAndReturn(run func(ctx context.Context, teamId int, domainName string) ApiDomainsVerifyDomainRequest) *MockDomainsAPI_DomainsVerifyDomain_Call { _c.Call.Return(run) return _c } @@ -2760,7 +2760,7 @@ func (_c *MockOrganizationsAPI_OrganizationsAddOrgMemberExecute_Call) RunAndRetu } // OrganizationsChangeOrgRole provides a mock function for the type MockOrganizationsAPI -func (_mock *MockOrganizationsAPI) OrganizationsChangeOrgRole(ctx context.Context, organizationId string, userId float32) ApiOrganizationsChangeOrgRoleRequest { +func (_mock *MockOrganizationsAPI) OrganizationsChangeOrgRole(ctx context.Context, organizationId string, userId int) ApiOrganizationsChangeOrgRoleRequest { ret := _mock.Called(ctx, organizationId, userId) if len(ret) == 0 { @@ -2768,7 +2768,7 @@ func (_mock *MockOrganizationsAPI) OrganizationsChangeOrgRole(ctx context.Contex } var r0 ApiOrganizationsChangeOrgRoleRequest - if returnFunc, ok := ret.Get(0).(func(context.Context, string, float32) ApiOrganizationsChangeOrgRoleRequest); ok { + if returnFunc, ok := ret.Get(0).(func(context.Context, string, int) ApiOrganizationsChangeOrgRoleRequest); ok { r0 = returnFunc(ctx, organizationId, userId) } else { r0 = ret.Get(0).(ApiOrganizationsChangeOrgRoleRequest) @@ -2784,12 +2784,12 @@ type MockOrganizationsAPI_OrganizationsChangeOrgRole_Call struct { // OrganizationsChangeOrgRole is a helper method to define mock.On call // - ctx context.Context // - organizationId string -// - userId float32 +// - userId int func (_e *MockOrganizationsAPI_Expecter) OrganizationsChangeOrgRole(ctx any, organizationId any, userId any) *MockOrganizationsAPI_OrganizationsChangeOrgRole_Call { return &MockOrganizationsAPI_OrganizationsChangeOrgRole_Call{Call: _e.mock.On("OrganizationsChangeOrgRole", ctx, organizationId, userId)} } -func (_c *MockOrganizationsAPI_OrganizationsChangeOrgRole_Call) Run(run func(ctx context.Context, organizationId string, userId float32)) *MockOrganizationsAPI_OrganizationsChangeOrgRole_Call { +func (_c *MockOrganizationsAPI_OrganizationsChangeOrgRole_Call) Run(run func(ctx context.Context, organizationId string, userId int)) *MockOrganizationsAPI_OrganizationsChangeOrgRole_Call { _c.Call.Run(func(args mock.Arguments) { var arg0 context.Context if args[0] != nil { @@ -2799,9 +2799,9 @@ func (_c *MockOrganizationsAPI_OrganizationsChangeOrgRole_Call) Run(run func(ctx if args[1] != nil { arg1 = args[1].(string) } - var arg2 float32 + var arg2 int if args[2] != nil { - arg2 = args[2].(float32) + arg2 = args[2].(int) } run( arg0, @@ -2817,7 +2817,7 @@ func (_c *MockOrganizationsAPI_OrganizationsChangeOrgRole_Call) Return(apiOrgani return _c } -func (_c *MockOrganizationsAPI_OrganizationsChangeOrgRole_Call) RunAndReturn(run func(ctx context.Context, organizationId string, userId float32) ApiOrganizationsChangeOrgRoleRequest) *MockOrganizationsAPI_OrganizationsChangeOrgRole_Call { +func (_c *MockOrganizationsAPI_OrganizationsChangeOrgRole_Call) RunAndReturn(run func(ctx context.Context, organizationId string, userId int) ApiOrganizationsChangeOrgRoleRequest) *MockOrganizationsAPI_OrganizationsChangeOrgRole_Call { _c.Call.Return(run) return _c } @@ -3260,7 +3260,7 @@ func (_c *MockOrganizationsAPI_OrganizationsListOrganizationsExecute_Call) RunAn } // OrganizationsRemoveOrgMember provides a mock function for the type MockOrganizationsAPI -func (_mock *MockOrganizationsAPI) OrganizationsRemoveOrgMember(ctx context.Context, organizationId string, userId float32) ApiOrganizationsRemoveOrgMemberRequest { +func (_mock *MockOrganizationsAPI) OrganizationsRemoveOrgMember(ctx context.Context, organizationId string, userId int) ApiOrganizationsRemoveOrgMemberRequest { ret := _mock.Called(ctx, organizationId, userId) if len(ret) == 0 { @@ -3268,7 +3268,7 @@ func (_mock *MockOrganizationsAPI) OrganizationsRemoveOrgMember(ctx context.Cont } var r0 ApiOrganizationsRemoveOrgMemberRequest - if returnFunc, ok := ret.Get(0).(func(context.Context, string, float32) ApiOrganizationsRemoveOrgMemberRequest); ok { + if returnFunc, ok := ret.Get(0).(func(context.Context, string, int) ApiOrganizationsRemoveOrgMemberRequest); ok { r0 = returnFunc(ctx, organizationId, userId) } else { r0 = ret.Get(0).(ApiOrganizationsRemoveOrgMemberRequest) @@ -3284,12 +3284,12 @@ type MockOrganizationsAPI_OrganizationsRemoveOrgMember_Call struct { // OrganizationsRemoveOrgMember is a helper method to define mock.On call // - ctx context.Context // - organizationId string -// - userId float32 +// - userId int func (_e *MockOrganizationsAPI_Expecter) OrganizationsRemoveOrgMember(ctx any, organizationId any, userId any) *MockOrganizationsAPI_OrganizationsRemoveOrgMember_Call { return &MockOrganizationsAPI_OrganizationsRemoveOrgMember_Call{Call: _e.mock.On("OrganizationsRemoveOrgMember", ctx, organizationId, userId)} } -func (_c *MockOrganizationsAPI_OrganizationsRemoveOrgMember_Call) Run(run func(ctx context.Context, organizationId string, userId float32)) *MockOrganizationsAPI_OrganizationsRemoveOrgMember_Call { +func (_c *MockOrganizationsAPI_OrganizationsRemoveOrgMember_Call) Run(run func(ctx context.Context, organizationId string, userId int)) *MockOrganizationsAPI_OrganizationsRemoveOrgMember_Call { _c.Call.Run(func(args mock.Arguments) { var arg0 context.Context if args[0] != nil { @@ -3299,9 +3299,9 @@ func (_c *MockOrganizationsAPI_OrganizationsRemoveOrgMember_Call) Run(run func(c if args[1] != nil { arg1 = args[1].(string) } - var arg2 float32 + var arg2 int if args[2] != nil { - arg2 = args[2].(float32) + arg2 = args[2].(int) } run( arg0, @@ -3317,7 +3317,7 @@ func (_c *MockOrganizationsAPI_OrganizationsRemoveOrgMember_Call) Return(apiOrga return _c } -func (_c *MockOrganizationsAPI_OrganizationsRemoveOrgMember_Call) RunAndReturn(run func(ctx context.Context, organizationId string, userId float32) ApiOrganizationsRemoveOrgMemberRequest) *MockOrganizationsAPI_OrganizationsRemoveOrgMember_Call { +func (_c *MockOrganizationsAPI_OrganizationsRemoveOrgMember_Call) RunAndReturn(run func(ctx context.Context, organizationId string, userId int) ApiOrganizationsRemoveOrgMemberRequest) *MockOrganizationsAPI_OrganizationsRemoveOrgMember_Call { _c.Call.Return(run) return _c } @@ -3412,7 +3412,7 @@ func (_m *MockTeamsAPI) EXPECT() *MockTeamsAPI_Expecter { } // TeamsChangeRole provides a mock function for the type MockTeamsAPI -func (_mock *MockTeamsAPI) TeamsChangeRole(ctx context.Context, teamId float32, userId float32) ApiTeamsChangeRoleRequest { +func (_mock *MockTeamsAPI) TeamsChangeRole(ctx context.Context, teamId int, userId int) ApiTeamsChangeRoleRequest { ret := _mock.Called(ctx, teamId, userId) if len(ret) == 0 { @@ -3420,7 +3420,7 @@ func (_mock *MockTeamsAPI) TeamsChangeRole(ctx context.Context, teamId float32, } var r0 ApiTeamsChangeRoleRequest - if returnFunc, ok := ret.Get(0).(func(context.Context, float32, float32) ApiTeamsChangeRoleRequest); ok { + if returnFunc, ok := ret.Get(0).(func(context.Context, int, int) ApiTeamsChangeRoleRequest); ok { r0 = returnFunc(ctx, teamId, userId) } else { r0 = ret.Get(0).(ApiTeamsChangeRoleRequest) @@ -3435,25 +3435,25 @@ type MockTeamsAPI_TeamsChangeRole_Call struct { // TeamsChangeRole is a helper method to define mock.On call // - ctx context.Context -// - teamId float32 -// - userId float32 +// - teamId int +// - userId int func (_e *MockTeamsAPI_Expecter) TeamsChangeRole(ctx any, teamId any, userId any) *MockTeamsAPI_TeamsChangeRole_Call { return &MockTeamsAPI_TeamsChangeRole_Call{Call: _e.mock.On("TeamsChangeRole", ctx, teamId, userId)} } -func (_c *MockTeamsAPI_TeamsChangeRole_Call) Run(run func(ctx context.Context, teamId float32, userId float32)) *MockTeamsAPI_TeamsChangeRole_Call { +func (_c *MockTeamsAPI_TeamsChangeRole_Call) Run(run func(ctx context.Context, teamId int, userId int)) *MockTeamsAPI_TeamsChangeRole_Call { _c.Call.Run(func(args mock.Arguments) { var arg0 context.Context if args[0] != nil { arg0 = args[0].(context.Context) } - var arg1 float32 + var arg1 int if args[1] != nil { - arg1 = args[1].(float32) + arg1 = args[1].(int) } - var arg2 float32 + var arg2 int if args[2] != nil { - arg2 = args[2].(float32) + arg2 = args[2].(int) } run( arg0, @@ -3469,7 +3469,7 @@ func (_c *MockTeamsAPI_TeamsChangeRole_Call) Return(apiTeamsChangeRoleRequest Ap return _c } -func (_c *MockTeamsAPI_TeamsChangeRole_Call) RunAndReturn(run func(ctx context.Context, teamId float32, userId float32) ApiTeamsChangeRoleRequest) *MockTeamsAPI_TeamsChangeRole_Call { +func (_c *MockTeamsAPI_TeamsChangeRole_Call) RunAndReturn(run func(ctx context.Context, teamId int, userId int) ApiTeamsChangeRoleRequest) *MockTeamsAPI_TeamsChangeRole_Call { _c.Call.Return(run) return _c } @@ -3658,7 +3658,7 @@ func (_c *MockTeamsAPI_TeamsCreateTeamExecute_Call) RunAndReturn(run func(r ApiT } // TeamsDeleteTeam provides a mock function for the type MockTeamsAPI -func (_mock *MockTeamsAPI) TeamsDeleteTeam(ctx context.Context, teamId float32) ApiTeamsDeleteTeamRequest { +func (_mock *MockTeamsAPI) TeamsDeleteTeam(ctx context.Context, teamId int) ApiTeamsDeleteTeamRequest { ret := _mock.Called(ctx, teamId) if len(ret) == 0 { @@ -3666,7 +3666,7 @@ func (_mock *MockTeamsAPI) TeamsDeleteTeam(ctx context.Context, teamId float32) } var r0 ApiTeamsDeleteTeamRequest - if returnFunc, ok := ret.Get(0).(func(context.Context, float32) ApiTeamsDeleteTeamRequest); ok { + if returnFunc, ok := ret.Get(0).(func(context.Context, int) ApiTeamsDeleteTeamRequest); ok { r0 = returnFunc(ctx, teamId) } else { r0 = ret.Get(0).(ApiTeamsDeleteTeamRequest) @@ -3681,20 +3681,20 @@ type MockTeamsAPI_TeamsDeleteTeam_Call struct { // TeamsDeleteTeam is a helper method to define mock.On call // - ctx context.Context -// - teamId float32 +// - teamId int func (_e *MockTeamsAPI_Expecter) TeamsDeleteTeam(ctx any, teamId any) *MockTeamsAPI_TeamsDeleteTeam_Call { return &MockTeamsAPI_TeamsDeleteTeam_Call{Call: _e.mock.On("TeamsDeleteTeam", ctx, teamId)} } -func (_c *MockTeamsAPI_TeamsDeleteTeam_Call) Run(run func(ctx context.Context, teamId float32)) *MockTeamsAPI_TeamsDeleteTeam_Call { +func (_c *MockTeamsAPI_TeamsDeleteTeam_Call) Run(run func(ctx context.Context, teamId int)) *MockTeamsAPI_TeamsDeleteTeam_Call { _c.Call.Run(func(args mock.Arguments) { var arg0 context.Context if args[0] != nil { arg0 = args[0].(context.Context) } - var arg1 float32 + var arg1 int if args[1] != nil { - arg1 = args[1].(float32) + arg1 = args[1].(int) } run( arg0, @@ -3709,7 +3709,7 @@ func (_c *MockTeamsAPI_TeamsDeleteTeam_Call) Return(apiTeamsDeleteTeamRequest Ap return _c } -func (_c *MockTeamsAPI_TeamsDeleteTeam_Call) RunAndReturn(run func(ctx context.Context, teamId float32) ApiTeamsDeleteTeamRequest) *MockTeamsAPI_TeamsDeleteTeam_Call { +func (_c *MockTeamsAPI_TeamsDeleteTeam_Call) RunAndReturn(run func(ctx context.Context, teamId int) ApiTeamsDeleteTeamRequest) *MockTeamsAPI_TeamsDeleteTeam_Call { _c.Call.Return(run) return _c } @@ -3777,7 +3777,7 @@ func (_c *MockTeamsAPI_TeamsDeleteTeamExecute_Call) RunAndReturn(run func(r ApiT } // TeamsGetTeam provides a mock function for the type MockTeamsAPI -func (_mock *MockTeamsAPI) TeamsGetTeam(ctx context.Context, teamId float32) ApiTeamsGetTeamRequest { +func (_mock *MockTeamsAPI) TeamsGetTeam(ctx context.Context, teamId int) ApiTeamsGetTeamRequest { ret := _mock.Called(ctx, teamId) if len(ret) == 0 { @@ -3785,7 +3785,7 @@ func (_mock *MockTeamsAPI) TeamsGetTeam(ctx context.Context, teamId float32) Api } var r0 ApiTeamsGetTeamRequest - if returnFunc, ok := ret.Get(0).(func(context.Context, float32) ApiTeamsGetTeamRequest); ok { + if returnFunc, ok := ret.Get(0).(func(context.Context, int) ApiTeamsGetTeamRequest); ok { r0 = returnFunc(ctx, teamId) } else { r0 = ret.Get(0).(ApiTeamsGetTeamRequest) @@ -3800,20 +3800,20 @@ type MockTeamsAPI_TeamsGetTeam_Call struct { // TeamsGetTeam is a helper method to define mock.On call // - ctx context.Context -// - teamId float32 +// - teamId int func (_e *MockTeamsAPI_Expecter) TeamsGetTeam(ctx any, teamId any) *MockTeamsAPI_TeamsGetTeam_Call { return &MockTeamsAPI_TeamsGetTeam_Call{Call: _e.mock.On("TeamsGetTeam", ctx, teamId)} } -func (_c *MockTeamsAPI_TeamsGetTeam_Call) Run(run func(ctx context.Context, teamId float32)) *MockTeamsAPI_TeamsGetTeam_Call { +func (_c *MockTeamsAPI_TeamsGetTeam_Call) Run(run func(ctx context.Context, teamId int)) *MockTeamsAPI_TeamsGetTeam_Call { _c.Call.Run(func(args mock.Arguments) { var arg0 context.Context if args[0] != nil { arg0 = args[0].(context.Context) } - var arg1 float32 + var arg1 int if args[1] != nil { - arg1 = args[1].(float32) + arg1 = args[1].(int) } run( arg0, @@ -3828,7 +3828,7 @@ func (_c *MockTeamsAPI_TeamsGetTeam_Call) Return(apiTeamsGetTeamRequest ApiTeams return _c } -func (_c *MockTeamsAPI_TeamsGetTeam_Call) RunAndReturn(run func(ctx context.Context, teamId float32) ApiTeamsGetTeamRequest) *MockTeamsAPI_TeamsGetTeam_Call { +func (_c *MockTeamsAPI_TeamsGetTeam_Call) RunAndReturn(run func(ctx context.Context, teamId int) ApiTeamsGetTeamRequest) *MockTeamsAPI_TeamsGetTeam_Call { _c.Call.Return(run) return _c } @@ -3904,7 +3904,7 @@ func (_c *MockTeamsAPI_TeamsGetTeamExecute_Call) RunAndReturn(run func(r ApiTeam } // TeamsInviteMember provides a mock function for the type MockTeamsAPI -func (_mock *MockTeamsAPI) TeamsInviteMember(ctx context.Context, teamId float32) ApiTeamsInviteMemberRequest { +func (_mock *MockTeamsAPI) TeamsInviteMember(ctx context.Context, teamId int) ApiTeamsInviteMemberRequest { ret := _mock.Called(ctx, teamId) if len(ret) == 0 { @@ -3912,7 +3912,7 @@ func (_mock *MockTeamsAPI) TeamsInviteMember(ctx context.Context, teamId float32 } var r0 ApiTeamsInviteMemberRequest - if returnFunc, ok := ret.Get(0).(func(context.Context, float32) ApiTeamsInviteMemberRequest); ok { + if returnFunc, ok := ret.Get(0).(func(context.Context, int) ApiTeamsInviteMemberRequest); ok { r0 = returnFunc(ctx, teamId) } else { r0 = ret.Get(0).(ApiTeamsInviteMemberRequest) @@ -3927,20 +3927,20 @@ type MockTeamsAPI_TeamsInviteMember_Call struct { // TeamsInviteMember is a helper method to define mock.On call // - ctx context.Context -// - teamId float32 +// - teamId int func (_e *MockTeamsAPI_Expecter) TeamsInviteMember(ctx any, teamId any) *MockTeamsAPI_TeamsInviteMember_Call { return &MockTeamsAPI_TeamsInviteMember_Call{Call: _e.mock.On("TeamsInviteMember", ctx, teamId)} } -func (_c *MockTeamsAPI_TeamsInviteMember_Call) Run(run func(ctx context.Context, teamId float32)) *MockTeamsAPI_TeamsInviteMember_Call { +func (_c *MockTeamsAPI_TeamsInviteMember_Call) Run(run func(ctx context.Context, teamId int)) *MockTeamsAPI_TeamsInviteMember_Call { _c.Call.Run(func(args mock.Arguments) { var arg0 context.Context if args[0] != nil { arg0 = args[0].(context.Context) } - var arg1 float32 + var arg1 int if args[1] != nil { - arg1 = args[1].(float32) + arg1 = args[1].(int) } run( arg0, @@ -3955,7 +3955,7 @@ func (_c *MockTeamsAPI_TeamsInviteMember_Call) Return(apiTeamsInviteMemberReques return _c } -func (_c *MockTeamsAPI_TeamsInviteMember_Call) RunAndReturn(run func(ctx context.Context, teamId float32) ApiTeamsInviteMemberRequest) *MockTeamsAPI_TeamsInviteMember_Call { +func (_c *MockTeamsAPI_TeamsInviteMember_Call) RunAndReturn(run func(ctx context.Context, teamId int) ApiTeamsInviteMemberRequest) *MockTeamsAPI_TeamsInviteMember_Call { _c.Call.Return(run) return _c } @@ -4023,7 +4023,7 @@ func (_c *MockTeamsAPI_TeamsInviteMemberExecute_Call) RunAndReturn(run func(r Ap } // TeamsListMembers provides a mock function for the type MockTeamsAPI -func (_mock *MockTeamsAPI) TeamsListMembers(ctx context.Context, teamId float32) ApiTeamsListMembersRequest { +func (_mock *MockTeamsAPI) TeamsListMembers(ctx context.Context, teamId int) ApiTeamsListMembersRequest { ret := _mock.Called(ctx, teamId) if len(ret) == 0 { @@ -4031,7 +4031,7 @@ func (_mock *MockTeamsAPI) TeamsListMembers(ctx context.Context, teamId float32) } var r0 ApiTeamsListMembersRequest - if returnFunc, ok := ret.Get(0).(func(context.Context, float32) ApiTeamsListMembersRequest); ok { + if returnFunc, ok := ret.Get(0).(func(context.Context, int) ApiTeamsListMembersRequest); ok { r0 = returnFunc(ctx, teamId) } else { r0 = ret.Get(0).(ApiTeamsListMembersRequest) @@ -4046,20 +4046,20 @@ type MockTeamsAPI_TeamsListMembers_Call struct { // TeamsListMembers is a helper method to define mock.On call // - ctx context.Context -// - teamId float32 +// - teamId int func (_e *MockTeamsAPI_Expecter) TeamsListMembers(ctx any, teamId any) *MockTeamsAPI_TeamsListMembers_Call { return &MockTeamsAPI_TeamsListMembers_Call{Call: _e.mock.On("TeamsListMembers", ctx, teamId)} } -func (_c *MockTeamsAPI_TeamsListMembers_Call) Run(run func(ctx context.Context, teamId float32)) *MockTeamsAPI_TeamsListMembers_Call { +func (_c *MockTeamsAPI_TeamsListMembers_Call) Run(run func(ctx context.Context, teamId int)) *MockTeamsAPI_TeamsListMembers_Call { _c.Call.Run(func(args mock.Arguments) { var arg0 context.Context if args[0] != nil { arg0 = args[0].(context.Context) } - var arg1 float32 + var arg1 int if args[1] != nil { - arg1 = args[1].(float32) + arg1 = args[1].(int) } run( arg0, @@ -4074,7 +4074,7 @@ func (_c *MockTeamsAPI_TeamsListMembers_Call) Return(apiTeamsListMembersRequest return _c } -func (_c *MockTeamsAPI_TeamsListMembers_Call) RunAndReturn(run func(ctx context.Context, teamId float32) ApiTeamsListMembersRequest) *MockTeamsAPI_TeamsListMembers_Call { +func (_c *MockTeamsAPI_TeamsListMembers_Call) RunAndReturn(run func(ctx context.Context, teamId int) ApiTeamsListMembersRequest) *MockTeamsAPI_TeamsListMembers_Call { _c.Call.Return(run) return _c } @@ -4271,7 +4271,7 @@ func (_c *MockTeamsAPI_TeamsListTeamsExecute_Call) RunAndReturn(run func(r ApiTe } // TeamsMigrateTeamToOrg provides a mock function for the type MockTeamsAPI -func (_mock *MockTeamsAPI) TeamsMigrateTeamToOrg(ctx context.Context, teamId float32) ApiTeamsMigrateTeamToOrgRequest { +func (_mock *MockTeamsAPI) TeamsMigrateTeamToOrg(ctx context.Context, teamId int) ApiTeamsMigrateTeamToOrgRequest { ret := _mock.Called(ctx, teamId) if len(ret) == 0 { @@ -4279,7 +4279,7 @@ func (_mock *MockTeamsAPI) TeamsMigrateTeamToOrg(ctx context.Context, teamId flo } var r0 ApiTeamsMigrateTeamToOrgRequest - if returnFunc, ok := ret.Get(0).(func(context.Context, float32) ApiTeamsMigrateTeamToOrgRequest); ok { + if returnFunc, ok := ret.Get(0).(func(context.Context, int) ApiTeamsMigrateTeamToOrgRequest); ok { r0 = returnFunc(ctx, teamId) } else { r0 = ret.Get(0).(ApiTeamsMigrateTeamToOrgRequest) @@ -4294,20 +4294,20 @@ type MockTeamsAPI_TeamsMigrateTeamToOrg_Call struct { // TeamsMigrateTeamToOrg is a helper method to define mock.On call // - ctx context.Context -// - teamId float32 +// - teamId int func (_e *MockTeamsAPI_Expecter) TeamsMigrateTeamToOrg(ctx any, teamId any) *MockTeamsAPI_TeamsMigrateTeamToOrg_Call { return &MockTeamsAPI_TeamsMigrateTeamToOrg_Call{Call: _e.mock.On("TeamsMigrateTeamToOrg", ctx, teamId)} } -func (_c *MockTeamsAPI_TeamsMigrateTeamToOrg_Call) Run(run func(ctx context.Context, teamId float32)) *MockTeamsAPI_TeamsMigrateTeamToOrg_Call { +func (_c *MockTeamsAPI_TeamsMigrateTeamToOrg_Call) Run(run func(ctx context.Context, teamId int)) *MockTeamsAPI_TeamsMigrateTeamToOrg_Call { _c.Call.Run(func(args mock.Arguments) { var arg0 context.Context if args[0] != nil { arg0 = args[0].(context.Context) } - var arg1 float32 + var arg1 int if args[1] != nil { - arg1 = args[1].(float32) + arg1 = args[1].(int) } run( arg0, @@ -4322,7 +4322,7 @@ func (_c *MockTeamsAPI_TeamsMigrateTeamToOrg_Call) Return(apiTeamsMigrateTeamToO return _c } -func (_c *MockTeamsAPI_TeamsMigrateTeamToOrg_Call) RunAndReturn(run func(ctx context.Context, teamId float32) ApiTeamsMigrateTeamToOrgRequest) *MockTeamsAPI_TeamsMigrateTeamToOrg_Call { +func (_c *MockTeamsAPI_TeamsMigrateTeamToOrg_Call) RunAndReturn(run func(ctx context.Context, teamId int) ApiTeamsMigrateTeamToOrgRequest) *MockTeamsAPI_TeamsMigrateTeamToOrg_Call { _c.Call.Return(run) return _c } @@ -4390,7 +4390,7 @@ func (_c *MockTeamsAPI_TeamsMigrateTeamToOrgExecute_Call) RunAndReturn(run func( } // TeamsRemoveMember provides a mock function for the type MockTeamsAPI -func (_mock *MockTeamsAPI) TeamsRemoveMember(ctx context.Context, teamId float32, userId float32) ApiTeamsRemoveMemberRequest { +func (_mock *MockTeamsAPI) TeamsRemoveMember(ctx context.Context, teamId int, userId int) ApiTeamsRemoveMemberRequest { ret := _mock.Called(ctx, teamId, userId) if len(ret) == 0 { @@ -4398,7 +4398,7 @@ func (_mock *MockTeamsAPI) TeamsRemoveMember(ctx context.Context, teamId float32 } var r0 ApiTeamsRemoveMemberRequest - if returnFunc, ok := ret.Get(0).(func(context.Context, float32, float32) ApiTeamsRemoveMemberRequest); ok { + if returnFunc, ok := ret.Get(0).(func(context.Context, int, int) ApiTeamsRemoveMemberRequest); ok { r0 = returnFunc(ctx, teamId, userId) } else { r0 = ret.Get(0).(ApiTeamsRemoveMemberRequest) @@ -4413,25 +4413,25 @@ type MockTeamsAPI_TeamsRemoveMember_Call struct { // TeamsRemoveMember is a helper method to define mock.On call // - ctx context.Context -// - teamId float32 -// - userId float32 +// - teamId int +// - userId int func (_e *MockTeamsAPI_Expecter) TeamsRemoveMember(ctx any, teamId any, userId any) *MockTeamsAPI_TeamsRemoveMember_Call { return &MockTeamsAPI_TeamsRemoveMember_Call{Call: _e.mock.On("TeamsRemoveMember", ctx, teamId, userId)} } -func (_c *MockTeamsAPI_TeamsRemoveMember_Call) Run(run func(ctx context.Context, teamId float32, userId float32)) *MockTeamsAPI_TeamsRemoveMember_Call { +func (_c *MockTeamsAPI_TeamsRemoveMember_Call) Run(run func(ctx context.Context, teamId int, userId int)) *MockTeamsAPI_TeamsRemoveMember_Call { _c.Call.Run(func(args mock.Arguments) { var arg0 context.Context if args[0] != nil { arg0 = args[0].(context.Context) } - var arg1 float32 + var arg1 int if args[1] != nil { - arg1 = args[1].(float32) + arg1 = args[1].(int) } - var arg2 float32 + var arg2 int if args[2] != nil { - arg2 = args[2].(float32) + arg2 = args[2].(int) } run( arg0, @@ -4447,7 +4447,7 @@ func (_c *MockTeamsAPI_TeamsRemoveMember_Call) Return(apiTeamsRemoveMemberReques return _c } -func (_c *MockTeamsAPI_TeamsRemoveMember_Call) RunAndReturn(run func(ctx context.Context, teamId float32, userId float32) ApiTeamsRemoveMemberRequest) *MockTeamsAPI_TeamsRemoveMember_Call { +func (_c *MockTeamsAPI_TeamsRemoveMember_Call) RunAndReturn(run func(ctx context.Context, teamId int, userId int) ApiTeamsRemoveMemberRequest) *MockTeamsAPI_TeamsRemoveMember_Call { _c.Call.Return(run) return _c } @@ -4542,7 +4542,7 @@ func (_m *MockUsageAPI) EXPECT() *MockUsageAPI_Expecter { } // UsageGetLandscapeServiceEvents provides a mock function for the type MockUsageAPI -func (_mock *MockUsageAPI) UsageGetLandscapeServiceEvents(ctx context.Context, teamId float32, resourceId string) ApiUsageGetLandscapeServiceEventsRequest { +func (_mock *MockUsageAPI) UsageGetLandscapeServiceEvents(ctx context.Context, teamId int, resourceId string) ApiUsageGetLandscapeServiceEventsRequest { ret := _mock.Called(ctx, teamId, resourceId) if len(ret) == 0 { @@ -4550,7 +4550,7 @@ func (_mock *MockUsageAPI) UsageGetLandscapeServiceEvents(ctx context.Context, t } var r0 ApiUsageGetLandscapeServiceEventsRequest - if returnFunc, ok := ret.Get(0).(func(context.Context, float32, string) ApiUsageGetLandscapeServiceEventsRequest); ok { + if returnFunc, ok := ret.Get(0).(func(context.Context, int, string) ApiUsageGetLandscapeServiceEventsRequest); ok { r0 = returnFunc(ctx, teamId, resourceId) } else { r0 = ret.Get(0).(ApiUsageGetLandscapeServiceEventsRequest) @@ -4565,21 +4565,21 @@ type MockUsageAPI_UsageGetLandscapeServiceEvents_Call struct { // UsageGetLandscapeServiceEvents is a helper method to define mock.On call // - ctx context.Context -// - teamId float32 +// - teamId int // - resourceId string func (_e *MockUsageAPI_Expecter) UsageGetLandscapeServiceEvents(ctx any, teamId any, resourceId any) *MockUsageAPI_UsageGetLandscapeServiceEvents_Call { return &MockUsageAPI_UsageGetLandscapeServiceEvents_Call{Call: _e.mock.On("UsageGetLandscapeServiceEvents", ctx, teamId, resourceId)} } -func (_c *MockUsageAPI_UsageGetLandscapeServiceEvents_Call) Run(run func(ctx context.Context, teamId float32, resourceId string)) *MockUsageAPI_UsageGetLandscapeServiceEvents_Call { +func (_c *MockUsageAPI_UsageGetLandscapeServiceEvents_Call) Run(run func(ctx context.Context, teamId int, resourceId string)) *MockUsageAPI_UsageGetLandscapeServiceEvents_Call { _c.Call.Run(func(args mock.Arguments) { var arg0 context.Context if args[0] != nil { arg0 = args[0].(context.Context) } - var arg1 float32 + var arg1 int if args[1] != nil { - arg1 = args[1].(float32) + arg1 = args[1].(int) } var arg2 string if args[2] != nil { @@ -4599,7 +4599,7 @@ func (_c *MockUsageAPI_UsageGetLandscapeServiceEvents_Call) Return(apiUsageGetLa return _c } -func (_c *MockUsageAPI_UsageGetLandscapeServiceEvents_Call) RunAndReturn(run func(ctx context.Context, teamId float32, resourceId string) ApiUsageGetLandscapeServiceEventsRequest) *MockUsageAPI_UsageGetLandscapeServiceEvents_Call { +func (_c *MockUsageAPI_UsageGetLandscapeServiceEvents_Call) RunAndReturn(run func(ctx context.Context, teamId int, resourceId string) ApiUsageGetLandscapeServiceEventsRequest) *MockUsageAPI_UsageGetLandscapeServiceEvents_Call { _c.Call.Return(run) return _c } @@ -4675,7 +4675,7 @@ func (_c *MockUsageAPI_UsageGetLandscapeServiceEventsExecute_Call) RunAndReturn( } // UsageGetUsageSummaryLandscape provides a mock function for the type MockUsageAPI -func (_mock *MockUsageAPI) UsageGetUsageSummaryLandscape(ctx context.Context, teamId float32) ApiUsageGetUsageSummaryLandscapeRequest { +func (_mock *MockUsageAPI) UsageGetUsageSummaryLandscape(ctx context.Context, teamId int) ApiUsageGetUsageSummaryLandscapeRequest { ret := _mock.Called(ctx, teamId) if len(ret) == 0 { @@ -4683,7 +4683,7 @@ func (_mock *MockUsageAPI) UsageGetUsageSummaryLandscape(ctx context.Context, te } var r0 ApiUsageGetUsageSummaryLandscapeRequest - if returnFunc, ok := ret.Get(0).(func(context.Context, float32) ApiUsageGetUsageSummaryLandscapeRequest); ok { + if returnFunc, ok := ret.Get(0).(func(context.Context, int) ApiUsageGetUsageSummaryLandscapeRequest); ok { r0 = returnFunc(ctx, teamId) } else { r0 = ret.Get(0).(ApiUsageGetUsageSummaryLandscapeRequest) @@ -4698,20 +4698,20 @@ type MockUsageAPI_UsageGetUsageSummaryLandscape_Call struct { // UsageGetUsageSummaryLandscape is a helper method to define mock.On call // - ctx context.Context -// - teamId float32 +// - teamId int func (_e *MockUsageAPI_Expecter) UsageGetUsageSummaryLandscape(ctx any, teamId any) *MockUsageAPI_UsageGetUsageSummaryLandscape_Call { return &MockUsageAPI_UsageGetUsageSummaryLandscape_Call{Call: _e.mock.On("UsageGetUsageSummaryLandscape", ctx, teamId)} } -func (_c *MockUsageAPI_UsageGetUsageSummaryLandscape_Call) Run(run func(ctx context.Context, teamId float32)) *MockUsageAPI_UsageGetUsageSummaryLandscape_Call { +func (_c *MockUsageAPI_UsageGetUsageSummaryLandscape_Call) Run(run func(ctx context.Context, teamId int)) *MockUsageAPI_UsageGetUsageSummaryLandscape_Call { _c.Call.Run(func(args mock.Arguments) { var arg0 context.Context if args[0] != nil { arg0 = args[0].(context.Context) } - var arg1 float32 + var arg1 int if args[1] != nil { - arg1 = args[1].(float32) + arg1 = args[1].(int) } run( arg0, @@ -4726,7 +4726,7 @@ func (_c *MockUsageAPI_UsageGetUsageSummaryLandscape_Call) Return(apiUsageGetUsa return _c } -func (_c *MockUsageAPI_UsageGetUsageSummaryLandscape_Call) RunAndReturn(run func(ctx context.Context, teamId float32) ApiUsageGetUsageSummaryLandscapeRequest) *MockUsageAPI_UsageGetUsageSummaryLandscape_Call { +func (_c *MockUsageAPI_UsageGetUsageSummaryLandscape_Call) RunAndReturn(run func(ctx context.Context, teamId int) ApiUsageGetUsageSummaryLandscapeRequest) *MockUsageAPI_UsageGetUsageSummaryLandscape_Call { _c.Call.Return(run) return _c } @@ -4828,49 +4828,809 @@ func (_m *MockVaultAPI) EXPECT() *MockVaultAPI_Expecter { return &MockVaultAPI_Expecter{mock: &_m.Mock} } +// VaultCreateSharedVault provides a mock function for the type MockVaultAPI +func (_mock *MockVaultAPI) VaultCreateSharedVault(ctx context.Context, teamId int) ApiVaultCreateSharedVaultRequest { + ret := _mock.Called(ctx, teamId) + + if len(ret) == 0 { + panic("no return value specified for VaultCreateSharedVault") + } + + var r0 ApiVaultCreateSharedVaultRequest + if returnFunc, ok := ret.Get(0).(func(context.Context, int) ApiVaultCreateSharedVaultRequest); ok { + r0 = returnFunc(ctx, teamId) + } else { + r0 = ret.Get(0).(ApiVaultCreateSharedVaultRequest) + } + return r0 +} + +// MockVaultAPI_VaultCreateSharedVault_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'VaultCreateSharedVault' +type MockVaultAPI_VaultCreateSharedVault_Call struct { + *mock.Call +} + +// VaultCreateSharedVault is a helper method to define mock.On call +// - ctx context.Context +// - teamId int +func (_e *MockVaultAPI_Expecter) VaultCreateSharedVault(ctx any, teamId any) *MockVaultAPI_VaultCreateSharedVault_Call { + return &MockVaultAPI_VaultCreateSharedVault_Call{Call: _e.mock.On("VaultCreateSharedVault", ctx, teamId)} +} + +func (_c *MockVaultAPI_VaultCreateSharedVault_Call) Run(run func(ctx context.Context, teamId int)) *MockVaultAPI_VaultCreateSharedVault_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 int + if args[1] != nil { + arg1 = args[1].(int) + } + run( + arg0, + arg1, + ) + }) + return _c +} + +func (_c *MockVaultAPI_VaultCreateSharedVault_Call) Return(apiVaultCreateSharedVaultRequest ApiVaultCreateSharedVaultRequest) *MockVaultAPI_VaultCreateSharedVault_Call { + _c.Call.Return(apiVaultCreateSharedVaultRequest) + return _c +} + +func (_c *MockVaultAPI_VaultCreateSharedVault_Call) RunAndReturn(run func(ctx context.Context, teamId int) ApiVaultCreateSharedVaultRequest) *MockVaultAPI_VaultCreateSharedVault_Call { + _c.Call.Return(run) + return _c +} + +// VaultCreateSharedVaultExecute provides a mock function for the type MockVaultAPI +func (_mock *MockVaultAPI) VaultCreateSharedVaultExecute(r ApiVaultCreateSharedVaultRequest) (*http.Response, error) { + ret := _mock.Called(r) + + if len(ret) == 0 { + panic("no return value specified for VaultCreateSharedVaultExecute") + } + + var r0 *http.Response + var r1 error + if returnFunc, ok := ret.Get(0).(func(ApiVaultCreateSharedVaultRequest) (*http.Response, error)); ok { + return returnFunc(r) + } + if returnFunc, ok := ret.Get(0).(func(ApiVaultCreateSharedVaultRequest) *http.Response); ok { + r0 = returnFunc(r) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*http.Response) + } + } + if returnFunc, ok := ret.Get(1).(func(ApiVaultCreateSharedVaultRequest) error); ok { + r1 = returnFunc(r) + } else { + r1 = ret.Error(1) + } + return r0, r1 +} + +// MockVaultAPI_VaultCreateSharedVaultExecute_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'VaultCreateSharedVaultExecute' +type MockVaultAPI_VaultCreateSharedVaultExecute_Call struct { + *mock.Call +} + +// VaultCreateSharedVaultExecute is a helper method to define mock.On call +// - r ApiVaultCreateSharedVaultRequest +func (_e *MockVaultAPI_Expecter) VaultCreateSharedVaultExecute(r any) *MockVaultAPI_VaultCreateSharedVaultExecute_Call { + return &MockVaultAPI_VaultCreateSharedVaultExecute_Call{Call: _e.mock.On("VaultCreateSharedVaultExecute", r)} +} + +func (_c *MockVaultAPI_VaultCreateSharedVaultExecute_Call) Run(run func(r ApiVaultCreateSharedVaultRequest)) *MockVaultAPI_VaultCreateSharedVaultExecute_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 ApiVaultCreateSharedVaultRequest + if args[0] != nil { + arg0 = args[0].(ApiVaultCreateSharedVaultRequest) + } + run( + arg0, + ) + }) + return _c +} + +func (_c *MockVaultAPI_VaultCreateSharedVaultExecute_Call) Return(response *http.Response, err error) *MockVaultAPI_VaultCreateSharedVaultExecute_Call { + _c.Call.Return(response, err) + return _c +} + +func (_c *MockVaultAPI_VaultCreateSharedVaultExecute_Call) RunAndReturn(run func(r ApiVaultCreateSharedVaultRequest) (*http.Response, error)) *MockVaultAPI_VaultCreateSharedVaultExecute_Call { + _c.Call.Return(run) + return _c +} + +// VaultDeleteSharedSecrets provides a mock function for the type MockVaultAPI +func (_mock *MockVaultAPI) VaultDeleteSharedSecrets(ctx context.Context, teamId int, vaultName string) ApiVaultDeleteSharedSecretsRequest { + ret := _mock.Called(ctx, teamId, vaultName) + + if len(ret) == 0 { + panic("no return value specified for VaultDeleteSharedSecrets") + } + + var r0 ApiVaultDeleteSharedSecretsRequest + if returnFunc, ok := ret.Get(0).(func(context.Context, int, string) ApiVaultDeleteSharedSecretsRequest); ok { + r0 = returnFunc(ctx, teamId, vaultName) + } else { + r0 = ret.Get(0).(ApiVaultDeleteSharedSecretsRequest) + } + return r0 +} + +// MockVaultAPI_VaultDeleteSharedSecrets_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'VaultDeleteSharedSecrets' +type MockVaultAPI_VaultDeleteSharedSecrets_Call struct { + *mock.Call +} + +// VaultDeleteSharedSecrets is a helper method to define mock.On call +// - ctx context.Context +// - teamId int +// - vaultName string +func (_e *MockVaultAPI_Expecter) VaultDeleteSharedSecrets(ctx any, teamId any, vaultName any) *MockVaultAPI_VaultDeleteSharedSecrets_Call { + return &MockVaultAPI_VaultDeleteSharedSecrets_Call{Call: _e.mock.On("VaultDeleteSharedSecrets", ctx, teamId, vaultName)} +} + +func (_c *MockVaultAPI_VaultDeleteSharedSecrets_Call) Run(run func(ctx context.Context, teamId int, vaultName string)) *MockVaultAPI_VaultDeleteSharedSecrets_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 int + if args[1] != nil { + arg1 = args[1].(int) + } + var arg2 string + if args[2] != nil { + arg2 = args[2].(string) + } + run( + arg0, + arg1, + arg2, + ) + }) + return _c +} + +func (_c *MockVaultAPI_VaultDeleteSharedSecrets_Call) Return(apiVaultDeleteSharedSecretsRequest ApiVaultDeleteSharedSecretsRequest) *MockVaultAPI_VaultDeleteSharedSecrets_Call { + _c.Call.Return(apiVaultDeleteSharedSecretsRequest) + return _c +} + +func (_c *MockVaultAPI_VaultDeleteSharedSecrets_Call) RunAndReturn(run func(ctx context.Context, teamId int, vaultName string) ApiVaultDeleteSharedSecretsRequest) *MockVaultAPI_VaultDeleteSharedSecrets_Call { + _c.Call.Return(run) + return _c +} + +// VaultDeleteSharedSecretsExecute provides a mock function for the type MockVaultAPI +func (_mock *MockVaultAPI) VaultDeleteSharedSecretsExecute(r ApiVaultDeleteSharedSecretsRequest) (*http.Response, error) { + ret := _mock.Called(r) + + if len(ret) == 0 { + panic("no return value specified for VaultDeleteSharedSecretsExecute") + } + + var r0 *http.Response + var r1 error + if returnFunc, ok := ret.Get(0).(func(ApiVaultDeleteSharedSecretsRequest) (*http.Response, error)); ok { + return returnFunc(r) + } + if returnFunc, ok := ret.Get(0).(func(ApiVaultDeleteSharedSecretsRequest) *http.Response); ok { + r0 = returnFunc(r) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*http.Response) + } + } + if returnFunc, ok := ret.Get(1).(func(ApiVaultDeleteSharedSecretsRequest) error); ok { + r1 = returnFunc(r) + } else { + r1 = ret.Error(1) + } + return r0, r1 +} + +// MockVaultAPI_VaultDeleteSharedSecretsExecute_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'VaultDeleteSharedSecretsExecute' +type MockVaultAPI_VaultDeleteSharedSecretsExecute_Call struct { + *mock.Call +} + +// VaultDeleteSharedSecretsExecute is a helper method to define mock.On call +// - r ApiVaultDeleteSharedSecretsRequest +func (_e *MockVaultAPI_Expecter) VaultDeleteSharedSecretsExecute(r any) *MockVaultAPI_VaultDeleteSharedSecretsExecute_Call { + return &MockVaultAPI_VaultDeleteSharedSecretsExecute_Call{Call: _e.mock.On("VaultDeleteSharedSecretsExecute", r)} +} + +func (_c *MockVaultAPI_VaultDeleteSharedSecretsExecute_Call) Run(run func(r ApiVaultDeleteSharedSecretsRequest)) *MockVaultAPI_VaultDeleteSharedSecretsExecute_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 ApiVaultDeleteSharedSecretsRequest + if args[0] != nil { + arg0 = args[0].(ApiVaultDeleteSharedSecretsRequest) + } + run( + arg0, + ) + }) + return _c +} + +func (_c *MockVaultAPI_VaultDeleteSharedSecretsExecute_Call) Return(response *http.Response, err error) *MockVaultAPI_VaultDeleteSharedSecretsExecute_Call { + _c.Call.Return(response, err) + return _c +} + +func (_c *MockVaultAPI_VaultDeleteSharedSecretsExecute_Call) RunAndReturn(run func(r ApiVaultDeleteSharedSecretsRequest) (*http.Response, error)) *MockVaultAPI_VaultDeleteSharedSecretsExecute_Call { + _c.Call.Return(run) + return _c +} + +// VaultDeleteSharedVault provides a mock function for the type MockVaultAPI +func (_mock *MockVaultAPI) VaultDeleteSharedVault(ctx context.Context, teamId int, vaultName string) ApiVaultDeleteSharedVaultRequest { + ret := _mock.Called(ctx, teamId, vaultName) + + if len(ret) == 0 { + panic("no return value specified for VaultDeleteSharedVault") + } + + var r0 ApiVaultDeleteSharedVaultRequest + if returnFunc, ok := ret.Get(0).(func(context.Context, int, string) ApiVaultDeleteSharedVaultRequest); ok { + r0 = returnFunc(ctx, teamId, vaultName) + } else { + r0 = ret.Get(0).(ApiVaultDeleteSharedVaultRequest) + } + return r0 +} + +// MockVaultAPI_VaultDeleteSharedVault_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'VaultDeleteSharedVault' +type MockVaultAPI_VaultDeleteSharedVault_Call struct { + *mock.Call +} + +// VaultDeleteSharedVault is a helper method to define mock.On call +// - ctx context.Context +// - teamId int +// - vaultName string +func (_e *MockVaultAPI_Expecter) VaultDeleteSharedVault(ctx any, teamId any, vaultName any) *MockVaultAPI_VaultDeleteSharedVault_Call { + return &MockVaultAPI_VaultDeleteSharedVault_Call{Call: _e.mock.On("VaultDeleteSharedVault", ctx, teamId, vaultName)} +} + +func (_c *MockVaultAPI_VaultDeleteSharedVault_Call) Run(run func(ctx context.Context, teamId int, vaultName string)) *MockVaultAPI_VaultDeleteSharedVault_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 int + if args[1] != nil { + arg1 = args[1].(int) + } + var arg2 string + if args[2] != nil { + arg2 = args[2].(string) + } + run( + arg0, + arg1, + arg2, + ) + }) + return _c +} + +func (_c *MockVaultAPI_VaultDeleteSharedVault_Call) Return(apiVaultDeleteSharedVaultRequest ApiVaultDeleteSharedVaultRequest) *MockVaultAPI_VaultDeleteSharedVault_Call { + _c.Call.Return(apiVaultDeleteSharedVaultRequest) + return _c +} + +func (_c *MockVaultAPI_VaultDeleteSharedVault_Call) RunAndReturn(run func(ctx context.Context, teamId int, vaultName string) ApiVaultDeleteSharedVaultRequest) *MockVaultAPI_VaultDeleteSharedVault_Call { + _c.Call.Return(run) + return _c +} + +// VaultDeleteSharedVaultExecute provides a mock function for the type MockVaultAPI +func (_mock *MockVaultAPI) VaultDeleteSharedVaultExecute(r ApiVaultDeleteSharedVaultRequest) (*http.Response, error) { + ret := _mock.Called(r) + + if len(ret) == 0 { + panic("no return value specified for VaultDeleteSharedVaultExecute") + } + + var r0 *http.Response + var r1 error + if returnFunc, ok := ret.Get(0).(func(ApiVaultDeleteSharedVaultRequest) (*http.Response, error)); ok { + return returnFunc(r) + } + if returnFunc, ok := ret.Get(0).(func(ApiVaultDeleteSharedVaultRequest) *http.Response); ok { + r0 = returnFunc(r) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*http.Response) + } + } + if returnFunc, ok := ret.Get(1).(func(ApiVaultDeleteSharedVaultRequest) error); ok { + r1 = returnFunc(r) + } else { + r1 = ret.Error(1) + } + return r0, r1 +} + +// MockVaultAPI_VaultDeleteSharedVaultExecute_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'VaultDeleteSharedVaultExecute' +type MockVaultAPI_VaultDeleteSharedVaultExecute_Call struct { + *mock.Call +} + +// VaultDeleteSharedVaultExecute is a helper method to define mock.On call +// - r ApiVaultDeleteSharedVaultRequest +func (_e *MockVaultAPI_Expecter) VaultDeleteSharedVaultExecute(r any) *MockVaultAPI_VaultDeleteSharedVaultExecute_Call { + return &MockVaultAPI_VaultDeleteSharedVaultExecute_Call{Call: _e.mock.On("VaultDeleteSharedVaultExecute", r)} +} + +func (_c *MockVaultAPI_VaultDeleteSharedVaultExecute_Call) Run(run func(r ApiVaultDeleteSharedVaultRequest)) *MockVaultAPI_VaultDeleteSharedVaultExecute_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 ApiVaultDeleteSharedVaultRequest + if args[0] != nil { + arg0 = args[0].(ApiVaultDeleteSharedVaultRequest) + } + run( + arg0, + ) + }) + return _c +} + +func (_c *MockVaultAPI_VaultDeleteSharedVaultExecute_Call) Return(response *http.Response, err error) *MockVaultAPI_VaultDeleteSharedVaultExecute_Call { + _c.Call.Return(response, err) + return _c +} + +func (_c *MockVaultAPI_VaultDeleteSharedVaultExecute_Call) RunAndReturn(run func(r ApiVaultDeleteSharedVaultRequest) (*http.Response, error)) *MockVaultAPI_VaultDeleteSharedVaultExecute_Call { + _c.Call.Return(run) + return _c +} + // VaultDeleteWorkspaceSecrets provides a mock function for the type MockVaultAPI -func (_mock *MockVaultAPI) VaultDeleteWorkspaceSecrets(ctx context.Context, teamId float32, workspaceId float32) ApiVaultDeleteWorkspaceSecretsRequest { +func (_mock *MockVaultAPI) VaultDeleteWorkspaceSecrets(ctx context.Context, teamId int, workspaceId int) ApiVaultDeleteWorkspaceSecretsRequest { + ret := _mock.Called(ctx, teamId, workspaceId) + + if len(ret) == 0 { + panic("no return value specified for VaultDeleteWorkspaceSecrets") + } + + var r0 ApiVaultDeleteWorkspaceSecretsRequest + if returnFunc, ok := ret.Get(0).(func(context.Context, int, int) ApiVaultDeleteWorkspaceSecretsRequest); ok { + r0 = returnFunc(ctx, teamId, workspaceId) + } else { + r0 = ret.Get(0).(ApiVaultDeleteWorkspaceSecretsRequest) + } + return r0 +} + +// MockVaultAPI_VaultDeleteWorkspaceSecrets_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'VaultDeleteWorkspaceSecrets' +type MockVaultAPI_VaultDeleteWorkspaceSecrets_Call struct { + *mock.Call +} + +// VaultDeleteWorkspaceSecrets is a helper method to define mock.On call +// - ctx context.Context +// - teamId int +// - workspaceId int +func (_e *MockVaultAPI_Expecter) VaultDeleteWorkspaceSecrets(ctx any, teamId any, workspaceId any) *MockVaultAPI_VaultDeleteWorkspaceSecrets_Call { + return &MockVaultAPI_VaultDeleteWorkspaceSecrets_Call{Call: _e.mock.On("VaultDeleteWorkspaceSecrets", ctx, teamId, workspaceId)} +} + +func (_c *MockVaultAPI_VaultDeleteWorkspaceSecrets_Call) Run(run func(ctx context.Context, teamId int, workspaceId int)) *MockVaultAPI_VaultDeleteWorkspaceSecrets_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 int + if args[1] != nil { + arg1 = args[1].(int) + } + var arg2 int + if args[2] != nil { + arg2 = args[2].(int) + } + run( + arg0, + arg1, + arg2, + ) + }) + return _c +} + +func (_c *MockVaultAPI_VaultDeleteWorkspaceSecrets_Call) Return(apiVaultDeleteWorkspaceSecretsRequest ApiVaultDeleteWorkspaceSecretsRequest) *MockVaultAPI_VaultDeleteWorkspaceSecrets_Call { + _c.Call.Return(apiVaultDeleteWorkspaceSecretsRequest) + return _c +} + +func (_c *MockVaultAPI_VaultDeleteWorkspaceSecrets_Call) RunAndReturn(run func(ctx context.Context, teamId int, workspaceId int) ApiVaultDeleteWorkspaceSecretsRequest) *MockVaultAPI_VaultDeleteWorkspaceSecrets_Call { + _c.Call.Return(run) + return _c +} + +// VaultDeleteWorkspaceSecretsExecute provides a mock function for the type MockVaultAPI +func (_mock *MockVaultAPI) VaultDeleteWorkspaceSecretsExecute(r ApiVaultDeleteWorkspaceSecretsRequest) (*http.Response, error) { + ret := _mock.Called(r) + + if len(ret) == 0 { + panic("no return value specified for VaultDeleteWorkspaceSecretsExecute") + } + + var r0 *http.Response + var r1 error + if returnFunc, ok := ret.Get(0).(func(ApiVaultDeleteWorkspaceSecretsRequest) (*http.Response, error)); ok { + return returnFunc(r) + } + if returnFunc, ok := ret.Get(0).(func(ApiVaultDeleteWorkspaceSecretsRequest) *http.Response); ok { + r0 = returnFunc(r) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*http.Response) + } + } + if returnFunc, ok := ret.Get(1).(func(ApiVaultDeleteWorkspaceSecretsRequest) error); ok { + r1 = returnFunc(r) + } else { + r1 = ret.Error(1) + } + return r0, r1 +} + +// MockVaultAPI_VaultDeleteWorkspaceSecretsExecute_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'VaultDeleteWorkspaceSecretsExecute' +type MockVaultAPI_VaultDeleteWorkspaceSecretsExecute_Call struct { + *mock.Call +} + +// VaultDeleteWorkspaceSecretsExecute is a helper method to define mock.On call +// - r ApiVaultDeleteWorkspaceSecretsRequest +func (_e *MockVaultAPI_Expecter) VaultDeleteWorkspaceSecretsExecute(r any) *MockVaultAPI_VaultDeleteWorkspaceSecretsExecute_Call { + return &MockVaultAPI_VaultDeleteWorkspaceSecretsExecute_Call{Call: _e.mock.On("VaultDeleteWorkspaceSecretsExecute", r)} +} + +func (_c *MockVaultAPI_VaultDeleteWorkspaceSecretsExecute_Call) Run(run func(r ApiVaultDeleteWorkspaceSecretsRequest)) *MockVaultAPI_VaultDeleteWorkspaceSecretsExecute_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 ApiVaultDeleteWorkspaceSecretsRequest + if args[0] != nil { + arg0 = args[0].(ApiVaultDeleteWorkspaceSecretsRequest) + } + run( + arg0, + ) + }) + return _c +} + +func (_c *MockVaultAPI_VaultDeleteWorkspaceSecretsExecute_Call) Return(response *http.Response, err error) *MockVaultAPI_VaultDeleteWorkspaceSecretsExecute_Call { + _c.Call.Return(response, err) + return _c +} + +func (_c *MockVaultAPI_VaultDeleteWorkspaceSecretsExecute_Call) RunAndReturn(run func(r ApiVaultDeleteWorkspaceSecretsRequest) (*http.Response, error)) *MockVaultAPI_VaultDeleteWorkspaceSecretsExecute_Call { + _c.Call.Return(run) + return _c +} + +// VaultGenerateSecrets provides a mock function for the type MockVaultAPI +func (_mock *MockVaultAPI) VaultGenerateSecrets(ctx context.Context, teamId int, workspaceId int) ApiVaultGenerateSecretsRequest { ret := _mock.Called(ctx, teamId, workspaceId) if len(ret) == 0 { - panic("no return value specified for VaultDeleteWorkspaceSecrets") + panic("no return value specified for VaultGenerateSecrets") + } + + var r0 ApiVaultGenerateSecretsRequest + if returnFunc, ok := ret.Get(0).(func(context.Context, int, int) ApiVaultGenerateSecretsRequest); ok { + r0 = returnFunc(ctx, teamId, workspaceId) + } else { + r0 = ret.Get(0).(ApiVaultGenerateSecretsRequest) + } + return r0 +} + +// MockVaultAPI_VaultGenerateSecrets_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'VaultGenerateSecrets' +type MockVaultAPI_VaultGenerateSecrets_Call struct { + *mock.Call +} + +// VaultGenerateSecrets is a helper method to define mock.On call +// - ctx context.Context +// - teamId int +// - workspaceId int +func (_e *MockVaultAPI_Expecter) VaultGenerateSecrets(ctx any, teamId any, workspaceId any) *MockVaultAPI_VaultGenerateSecrets_Call { + return &MockVaultAPI_VaultGenerateSecrets_Call{Call: _e.mock.On("VaultGenerateSecrets", ctx, teamId, workspaceId)} +} + +func (_c *MockVaultAPI_VaultGenerateSecrets_Call) Run(run func(ctx context.Context, teamId int, workspaceId int)) *MockVaultAPI_VaultGenerateSecrets_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 int + if args[1] != nil { + arg1 = args[1].(int) + } + var arg2 int + if args[2] != nil { + arg2 = args[2].(int) + } + run( + arg0, + arg1, + arg2, + ) + }) + return _c +} + +func (_c *MockVaultAPI_VaultGenerateSecrets_Call) Return(apiVaultGenerateSecretsRequest ApiVaultGenerateSecretsRequest) *MockVaultAPI_VaultGenerateSecrets_Call { + _c.Call.Return(apiVaultGenerateSecretsRequest) + return _c +} + +func (_c *MockVaultAPI_VaultGenerateSecrets_Call) RunAndReturn(run func(ctx context.Context, teamId int, workspaceId int) ApiVaultGenerateSecretsRequest) *MockVaultAPI_VaultGenerateSecrets_Call { + _c.Call.Return(run) + return _c +} + +// VaultGenerateSecretsExecute provides a mock function for the type MockVaultAPI +func (_mock *MockVaultAPI) VaultGenerateSecretsExecute(r ApiVaultGenerateSecretsRequest) (map[string]interface{}, *http.Response, error) { + ret := _mock.Called(r) + + if len(ret) == 0 { + panic("no return value specified for VaultGenerateSecretsExecute") + } + + var r0 map[string]interface{} + var r1 *http.Response + var r2 error + if returnFunc, ok := ret.Get(0).(func(ApiVaultGenerateSecretsRequest) (map[string]interface{}, *http.Response, error)); ok { + return returnFunc(r) + } + if returnFunc, ok := ret.Get(0).(func(ApiVaultGenerateSecretsRequest) map[string]interface{}); ok { + r0 = returnFunc(r) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(map[string]interface{}) + } + } + if returnFunc, ok := ret.Get(1).(func(ApiVaultGenerateSecretsRequest) *http.Response); ok { + r1 = returnFunc(r) + } else { + if ret.Get(1) != nil { + r1 = ret.Get(1).(*http.Response) + } + } + if returnFunc, ok := ret.Get(2).(func(ApiVaultGenerateSecretsRequest) error); ok { + r2 = returnFunc(r) + } else { + r2 = ret.Error(2) + } + return r0, r1, r2 +} + +// MockVaultAPI_VaultGenerateSecretsExecute_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'VaultGenerateSecretsExecute' +type MockVaultAPI_VaultGenerateSecretsExecute_Call struct { + *mock.Call +} + +// VaultGenerateSecretsExecute is a helper method to define mock.On call +// - r ApiVaultGenerateSecretsRequest +func (_e *MockVaultAPI_Expecter) VaultGenerateSecretsExecute(r any) *MockVaultAPI_VaultGenerateSecretsExecute_Call { + return &MockVaultAPI_VaultGenerateSecretsExecute_Call{Call: _e.mock.On("VaultGenerateSecretsExecute", r)} +} + +func (_c *MockVaultAPI_VaultGenerateSecretsExecute_Call) Run(run func(r ApiVaultGenerateSecretsRequest)) *MockVaultAPI_VaultGenerateSecretsExecute_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 ApiVaultGenerateSecretsRequest + if args[0] != nil { + arg0 = args[0].(ApiVaultGenerateSecretsRequest) + } + run( + arg0, + ) + }) + return _c +} + +func (_c *MockVaultAPI_VaultGenerateSecretsExecute_Call) Return(stringToIfaceVal map[string]interface{}, response *http.Response, err error) *MockVaultAPI_VaultGenerateSecretsExecute_Call { + _c.Call.Return(stringToIfaceVal, response, err) + return _c +} + +func (_c *MockVaultAPI_VaultGenerateSecretsExecute_Call) RunAndReturn(run func(r ApiVaultGenerateSecretsRequest) (map[string]interface{}, *http.Response, error)) *MockVaultAPI_VaultGenerateSecretsExecute_Call { + _c.Call.Return(run) + return _c +} + +// VaultGenerateSharedSecrets provides a mock function for the type MockVaultAPI +func (_mock *MockVaultAPI) VaultGenerateSharedSecrets(ctx context.Context, teamId int, vaultName string) ApiVaultGenerateSharedSecretsRequest { + ret := _mock.Called(ctx, teamId, vaultName) + + if len(ret) == 0 { + panic("no return value specified for VaultGenerateSharedSecrets") + } + + var r0 ApiVaultGenerateSharedSecretsRequest + if returnFunc, ok := ret.Get(0).(func(context.Context, int, string) ApiVaultGenerateSharedSecretsRequest); ok { + r0 = returnFunc(ctx, teamId, vaultName) + } else { + r0 = ret.Get(0).(ApiVaultGenerateSharedSecretsRequest) + } + return r0 +} + +// MockVaultAPI_VaultGenerateSharedSecrets_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'VaultGenerateSharedSecrets' +type MockVaultAPI_VaultGenerateSharedSecrets_Call struct { + *mock.Call +} + +// VaultGenerateSharedSecrets is a helper method to define mock.On call +// - ctx context.Context +// - teamId int +// - vaultName string +func (_e *MockVaultAPI_Expecter) VaultGenerateSharedSecrets(ctx any, teamId any, vaultName any) *MockVaultAPI_VaultGenerateSharedSecrets_Call { + return &MockVaultAPI_VaultGenerateSharedSecrets_Call{Call: _e.mock.On("VaultGenerateSharedSecrets", ctx, teamId, vaultName)} +} + +func (_c *MockVaultAPI_VaultGenerateSharedSecrets_Call) Run(run func(ctx context.Context, teamId int, vaultName string)) *MockVaultAPI_VaultGenerateSharedSecrets_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 int + if args[1] != nil { + arg1 = args[1].(int) + } + var arg2 string + if args[2] != nil { + arg2 = args[2].(string) + } + run( + arg0, + arg1, + arg2, + ) + }) + return _c +} + +func (_c *MockVaultAPI_VaultGenerateSharedSecrets_Call) Return(apiVaultGenerateSharedSecretsRequest ApiVaultGenerateSharedSecretsRequest) *MockVaultAPI_VaultGenerateSharedSecrets_Call { + _c.Call.Return(apiVaultGenerateSharedSecretsRequest) + return _c +} + +func (_c *MockVaultAPI_VaultGenerateSharedSecrets_Call) RunAndReturn(run func(ctx context.Context, teamId int, vaultName string) ApiVaultGenerateSharedSecretsRequest) *MockVaultAPI_VaultGenerateSharedSecrets_Call { + _c.Call.Return(run) + return _c +} + +// VaultGenerateSharedSecretsExecute provides a mock function for the type MockVaultAPI +func (_mock *MockVaultAPI) VaultGenerateSharedSecretsExecute(r ApiVaultGenerateSharedSecretsRequest) (map[string]interface{}, *http.Response, error) { + ret := _mock.Called(r) + + if len(ret) == 0 { + panic("no return value specified for VaultGenerateSharedSecretsExecute") } - var r0 ApiVaultDeleteWorkspaceSecretsRequest - if returnFunc, ok := ret.Get(0).(func(context.Context, float32, float32) ApiVaultDeleteWorkspaceSecretsRequest); ok { - r0 = returnFunc(ctx, teamId, workspaceId) + var r0 map[string]interface{} + var r1 *http.Response + var r2 error + if returnFunc, ok := ret.Get(0).(func(ApiVaultGenerateSharedSecretsRequest) (map[string]interface{}, *http.Response, error)); ok { + return returnFunc(r) + } + if returnFunc, ok := ret.Get(0).(func(ApiVaultGenerateSharedSecretsRequest) map[string]interface{}); ok { + r0 = returnFunc(r) } else { - r0 = ret.Get(0).(ApiVaultDeleteWorkspaceSecretsRequest) + if ret.Get(0) != nil { + r0 = ret.Get(0).(map[string]interface{}) + } + } + if returnFunc, ok := ret.Get(1).(func(ApiVaultGenerateSharedSecretsRequest) *http.Response); ok { + r1 = returnFunc(r) + } else { + if ret.Get(1) != nil { + r1 = ret.Get(1).(*http.Response) + } + } + if returnFunc, ok := ret.Get(2).(func(ApiVaultGenerateSharedSecretsRequest) error); ok { + r2 = returnFunc(r) + } else { + r2 = ret.Error(2) + } + return r0, r1, r2 +} + +// MockVaultAPI_VaultGenerateSharedSecretsExecute_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'VaultGenerateSharedSecretsExecute' +type MockVaultAPI_VaultGenerateSharedSecretsExecute_Call struct { + *mock.Call +} + +// VaultGenerateSharedSecretsExecute is a helper method to define mock.On call +// - r ApiVaultGenerateSharedSecretsRequest +func (_e *MockVaultAPI_Expecter) VaultGenerateSharedSecretsExecute(r any) *MockVaultAPI_VaultGenerateSharedSecretsExecute_Call { + return &MockVaultAPI_VaultGenerateSharedSecretsExecute_Call{Call: _e.mock.On("VaultGenerateSharedSecretsExecute", r)} +} + +func (_c *MockVaultAPI_VaultGenerateSharedSecretsExecute_Call) Run(run func(r ApiVaultGenerateSharedSecretsRequest)) *MockVaultAPI_VaultGenerateSharedSecretsExecute_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 ApiVaultGenerateSharedSecretsRequest + if args[0] != nil { + arg0 = args[0].(ApiVaultGenerateSharedSecretsRequest) + } + run( + arg0, + ) + }) + return _c +} + +func (_c *MockVaultAPI_VaultGenerateSharedSecretsExecute_Call) Return(stringToIfaceVal map[string]interface{}, response *http.Response, err error) *MockVaultAPI_VaultGenerateSharedSecretsExecute_Call { + _c.Call.Return(stringToIfaceVal, response, err) + return _c +} + +func (_c *MockVaultAPI_VaultGenerateSharedSecretsExecute_Call) RunAndReturn(run func(r ApiVaultGenerateSharedSecretsRequest) (map[string]interface{}, *http.Response, error)) *MockVaultAPI_VaultGenerateSharedSecretsExecute_Call { + _c.Call.Return(run) + return _c +} + +// VaultListSharedSecretKeys provides a mock function for the type MockVaultAPI +func (_mock *MockVaultAPI) VaultListSharedSecretKeys(ctx context.Context, teamId int, vaultName string) ApiVaultListSharedSecretKeysRequest { + ret := _mock.Called(ctx, teamId, vaultName) + + if len(ret) == 0 { + panic("no return value specified for VaultListSharedSecretKeys") + } + + var r0 ApiVaultListSharedSecretKeysRequest + if returnFunc, ok := ret.Get(0).(func(context.Context, int, string) ApiVaultListSharedSecretKeysRequest); ok { + r0 = returnFunc(ctx, teamId, vaultName) + } else { + r0 = ret.Get(0).(ApiVaultListSharedSecretKeysRequest) } return r0 } -// MockVaultAPI_VaultDeleteWorkspaceSecrets_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'VaultDeleteWorkspaceSecrets' -type MockVaultAPI_VaultDeleteWorkspaceSecrets_Call struct { +// MockVaultAPI_VaultListSharedSecretKeys_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'VaultListSharedSecretKeys' +type MockVaultAPI_VaultListSharedSecretKeys_Call struct { *mock.Call } -// VaultDeleteWorkspaceSecrets is a helper method to define mock.On call +// VaultListSharedSecretKeys is a helper method to define mock.On call // - ctx context.Context -// - teamId float32 -// - workspaceId float32 -func (_e *MockVaultAPI_Expecter) VaultDeleteWorkspaceSecrets(ctx any, teamId any, workspaceId any) *MockVaultAPI_VaultDeleteWorkspaceSecrets_Call { - return &MockVaultAPI_VaultDeleteWorkspaceSecrets_Call{Call: _e.mock.On("VaultDeleteWorkspaceSecrets", ctx, teamId, workspaceId)} +// - teamId int +// - vaultName string +func (_e *MockVaultAPI_Expecter) VaultListSharedSecretKeys(ctx any, teamId any, vaultName any) *MockVaultAPI_VaultListSharedSecretKeys_Call { + return &MockVaultAPI_VaultListSharedSecretKeys_Call{Call: _e.mock.On("VaultListSharedSecretKeys", ctx, teamId, vaultName)} } -func (_c *MockVaultAPI_VaultDeleteWorkspaceSecrets_Call) Run(run func(ctx context.Context, teamId float32, workspaceId float32)) *MockVaultAPI_VaultDeleteWorkspaceSecrets_Call { +func (_c *MockVaultAPI_VaultListSharedSecretKeys_Call) Run(run func(ctx context.Context, teamId int, vaultName string)) *MockVaultAPI_VaultListSharedSecretKeys_Call { _c.Call.Run(func(args mock.Arguments) { var arg0 context.Context if args[0] != nil { arg0 = args[0].(context.Context) } - var arg1 float32 + var arg1 int if args[1] != nil { - arg1 = args[1].(float32) + arg1 = args[1].(int) } - var arg2 float32 + var arg2 string if args[2] != nil { - arg2 = args[2].(float32) + arg2 = args[2].(string) } run( arg0, @@ -4881,60 +5641,68 @@ func (_c *MockVaultAPI_VaultDeleteWorkspaceSecrets_Call) Run(run func(ctx contex return _c } -func (_c *MockVaultAPI_VaultDeleteWorkspaceSecrets_Call) Return(apiVaultDeleteWorkspaceSecretsRequest ApiVaultDeleteWorkspaceSecretsRequest) *MockVaultAPI_VaultDeleteWorkspaceSecrets_Call { - _c.Call.Return(apiVaultDeleteWorkspaceSecretsRequest) +func (_c *MockVaultAPI_VaultListSharedSecretKeys_Call) Return(apiVaultListSharedSecretKeysRequest ApiVaultListSharedSecretKeysRequest) *MockVaultAPI_VaultListSharedSecretKeys_Call { + _c.Call.Return(apiVaultListSharedSecretKeysRequest) return _c } -func (_c *MockVaultAPI_VaultDeleteWorkspaceSecrets_Call) RunAndReturn(run func(ctx context.Context, teamId float32, workspaceId float32) ApiVaultDeleteWorkspaceSecretsRequest) *MockVaultAPI_VaultDeleteWorkspaceSecrets_Call { +func (_c *MockVaultAPI_VaultListSharedSecretKeys_Call) RunAndReturn(run func(ctx context.Context, teamId int, vaultName string) ApiVaultListSharedSecretKeysRequest) *MockVaultAPI_VaultListSharedSecretKeys_Call { _c.Call.Return(run) return _c } -// VaultDeleteWorkspaceSecretsExecute provides a mock function for the type MockVaultAPI -func (_mock *MockVaultAPI) VaultDeleteWorkspaceSecretsExecute(r ApiVaultDeleteWorkspaceSecretsRequest) (*http.Response, error) { +// VaultListSharedSecretKeysExecute provides a mock function for the type MockVaultAPI +func (_mock *MockVaultAPI) VaultListSharedSecretKeysExecute(r ApiVaultListSharedSecretKeysRequest) ([]string, *http.Response, error) { ret := _mock.Called(r) if len(ret) == 0 { - panic("no return value specified for VaultDeleteWorkspaceSecretsExecute") + panic("no return value specified for VaultListSharedSecretKeysExecute") } - var r0 *http.Response - var r1 error - if returnFunc, ok := ret.Get(0).(func(ApiVaultDeleteWorkspaceSecretsRequest) (*http.Response, error)); ok { + var r0 []string + var r1 *http.Response + var r2 error + if returnFunc, ok := ret.Get(0).(func(ApiVaultListSharedSecretKeysRequest) ([]string, *http.Response, error)); ok { return returnFunc(r) } - if returnFunc, ok := ret.Get(0).(func(ApiVaultDeleteWorkspaceSecretsRequest) *http.Response); ok { + if returnFunc, ok := ret.Get(0).(func(ApiVaultListSharedSecretKeysRequest) []string); ok { r0 = returnFunc(r) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(*http.Response) + r0 = ret.Get(0).([]string) } } - if returnFunc, ok := ret.Get(1).(func(ApiVaultDeleteWorkspaceSecretsRequest) error); ok { + if returnFunc, ok := ret.Get(1).(func(ApiVaultListSharedSecretKeysRequest) *http.Response); ok { r1 = returnFunc(r) } else { - r1 = ret.Error(1) + if ret.Get(1) != nil { + r1 = ret.Get(1).(*http.Response) + } } - return r0, r1 + if returnFunc, ok := ret.Get(2).(func(ApiVaultListSharedSecretKeysRequest) error); ok { + r2 = returnFunc(r) + } else { + r2 = ret.Error(2) + } + return r0, r1, r2 } -// MockVaultAPI_VaultDeleteWorkspaceSecretsExecute_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'VaultDeleteWorkspaceSecretsExecute' -type MockVaultAPI_VaultDeleteWorkspaceSecretsExecute_Call struct { +// MockVaultAPI_VaultListSharedSecretKeysExecute_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'VaultListSharedSecretKeysExecute' +type MockVaultAPI_VaultListSharedSecretKeysExecute_Call struct { *mock.Call } -// VaultDeleteWorkspaceSecretsExecute is a helper method to define mock.On call -// - r ApiVaultDeleteWorkspaceSecretsRequest -func (_e *MockVaultAPI_Expecter) VaultDeleteWorkspaceSecretsExecute(r any) *MockVaultAPI_VaultDeleteWorkspaceSecretsExecute_Call { - return &MockVaultAPI_VaultDeleteWorkspaceSecretsExecute_Call{Call: _e.mock.On("VaultDeleteWorkspaceSecretsExecute", r)} +// VaultListSharedSecretKeysExecute is a helper method to define mock.On call +// - r ApiVaultListSharedSecretKeysRequest +func (_e *MockVaultAPI_Expecter) VaultListSharedSecretKeysExecute(r any) *MockVaultAPI_VaultListSharedSecretKeysExecute_Call { + return &MockVaultAPI_VaultListSharedSecretKeysExecute_Call{Call: _e.mock.On("VaultListSharedSecretKeysExecute", r)} } -func (_c *MockVaultAPI_VaultDeleteWorkspaceSecretsExecute_Call) Run(run func(r ApiVaultDeleteWorkspaceSecretsRequest)) *MockVaultAPI_VaultDeleteWorkspaceSecretsExecute_Call { +func (_c *MockVaultAPI_VaultListSharedSecretKeysExecute_Call) Run(run func(r ApiVaultListSharedSecretKeysRequest)) *MockVaultAPI_VaultListSharedSecretKeysExecute_Call { _c.Call.Run(func(args mock.Arguments) { - var arg0 ApiVaultDeleteWorkspaceSecretsRequest + var arg0 ApiVaultListSharedSecretKeysRequest if args[0] != nil { - arg0 = args[0].(ApiVaultDeleteWorkspaceSecretsRequest) + arg0 = args[0].(ApiVaultListSharedSecretKeysRequest) } run( arg0, @@ -4943,108 +5711,102 @@ func (_c *MockVaultAPI_VaultDeleteWorkspaceSecretsExecute_Call) Run(run func(r A return _c } -func (_c *MockVaultAPI_VaultDeleteWorkspaceSecretsExecute_Call) Return(response *http.Response, err error) *MockVaultAPI_VaultDeleteWorkspaceSecretsExecute_Call { - _c.Call.Return(response, err) +func (_c *MockVaultAPI_VaultListSharedSecretKeysExecute_Call) Return(strings []string, response *http.Response, err error) *MockVaultAPI_VaultListSharedSecretKeysExecute_Call { + _c.Call.Return(strings, response, err) return _c } -func (_c *MockVaultAPI_VaultDeleteWorkspaceSecretsExecute_Call) RunAndReturn(run func(r ApiVaultDeleteWorkspaceSecretsRequest) (*http.Response, error)) *MockVaultAPI_VaultDeleteWorkspaceSecretsExecute_Call { +func (_c *MockVaultAPI_VaultListSharedSecretKeysExecute_Call) RunAndReturn(run func(r ApiVaultListSharedSecretKeysRequest) ([]string, *http.Response, error)) *MockVaultAPI_VaultListSharedSecretKeysExecute_Call { _c.Call.Return(run) return _c } -// VaultGenerateSecrets provides a mock function for the type MockVaultAPI -func (_mock *MockVaultAPI) VaultGenerateSecrets(ctx context.Context, teamId float32, workspaceId float32) ApiVaultGenerateSecretsRequest { - ret := _mock.Called(ctx, teamId, workspaceId) +// VaultListSharedVaults provides a mock function for the type MockVaultAPI +func (_mock *MockVaultAPI) VaultListSharedVaults(ctx context.Context, teamId int) ApiVaultListSharedVaultsRequest { + ret := _mock.Called(ctx, teamId) if len(ret) == 0 { - panic("no return value specified for VaultGenerateSecrets") + panic("no return value specified for VaultListSharedVaults") } - var r0 ApiVaultGenerateSecretsRequest - if returnFunc, ok := ret.Get(0).(func(context.Context, float32, float32) ApiVaultGenerateSecretsRequest); ok { - r0 = returnFunc(ctx, teamId, workspaceId) + var r0 ApiVaultListSharedVaultsRequest + if returnFunc, ok := ret.Get(0).(func(context.Context, int) ApiVaultListSharedVaultsRequest); ok { + r0 = returnFunc(ctx, teamId) } else { - r0 = ret.Get(0).(ApiVaultGenerateSecretsRequest) + r0 = ret.Get(0).(ApiVaultListSharedVaultsRequest) } return r0 } -// MockVaultAPI_VaultGenerateSecrets_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'VaultGenerateSecrets' -type MockVaultAPI_VaultGenerateSecrets_Call struct { +// MockVaultAPI_VaultListSharedVaults_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'VaultListSharedVaults' +type MockVaultAPI_VaultListSharedVaults_Call struct { *mock.Call } -// VaultGenerateSecrets is a helper method to define mock.On call +// VaultListSharedVaults is a helper method to define mock.On call // - ctx context.Context -// - teamId float32 -// - workspaceId float32 -func (_e *MockVaultAPI_Expecter) VaultGenerateSecrets(ctx any, teamId any, workspaceId any) *MockVaultAPI_VaultGenerateSecrets_Call { - return &MockVaultAPI_VaultGenerateSecrets_Call{Call: _e.mock.On("VaultGenerateSecrets", ctx, teamId, workspaceId)} +// - teamId int +func (_e *MockVaultAPI_Expecter) VaultListSharedVaults(ctx any, teamId any) *MockVaultAPI_VaultListSharedVaults_Call { + return &MockVaultAPI_VaultListSharedVaults_Call{Call: _e.mock.On("VaultListSharedVaults", ctx, teamId)} } -func (_c *MockVaultAPI_VaultGenerateSecrets_Call) Run(run func(ctx context.Context, teamId float32, workspaceId float32)) *MockVaultAPI_VaultGenerateSecrets_Call { +func (_c *MockVaultAPI_VaultListSharedVaults_Call) Run(run func(ctx context.Context, teamId int)) *MockVaultAPI_VaultListSharedVaults_Call { _c.Call.Run(func(args mock.Arguments) { var arg0 context.Context if args[0] != nil { arg0 = args[0].(context.Context) } - var arg1 float32 + var arg1 int if args[1] != nil { - arg1 = args[1].(float32) - } - var arg2 float32 - if args[2] != nil { - arg2 = args[2].(float32) + arg1 = args[1].(int) } run( arg0, arg1, - arg2, ) }) return _c } -func (_c *MockVaultAPI_VaultGenerateSecrets_Call) Return(apiVaultGenerateSecretsRequest ApiVaultGenerateSecretsRequest) *MockVaultAPI_VaultGenerateSecrets_Call { - _c.Call.Return(apiVaultGenerateSecretsRequest) +func (_c *MockVaultAPI_VaultListSharedVaults_Call) Return(apiVaultListSharedVaultsRequest ApiVaultListSharedVaultsRequest) *MockVaultAPI_VaultListSharedVaults_Call { + _c.Call.Return(apiVaultListSharedVaultsRequest) return _c } -func (_c *MockVaultAPI_VaultGenerateSecrets_Call) RunAndReturn(run func(ctx context.Context, teamId float32, workspaceId float32) ApiVaultGenerateSecretsRequest) *MockVaultAPI_VaultGenerateSecrets_Call { +func (_c *MockVaultAPI_VaultListSharedVaults_Call) RunAndReturn(run func(ctx context.Context, teamId int) ApiVaultListSharedVaultsRequest) *MockVaultAPI_VaultListSharedVaults_Call { _c.Call.Return(run) return _c } -// VaultGenerateSecretsExecute provides a mock function for the type MockVaultAPI -func (_mock *MockVaultAPI) VaultGenerateSecretsExecute(r ApiVaultGenerateSecretsRequest) (map[string]interface{}, *http.Response, error) { +// VaultListSharedVaultsExecute provides a mock function for the type MockVaultAPI +func (_mock *MockVaultAPI) VaultListSharedVaultsExecute(r ApiVaultListSharedVaultsRequest) ([]string, *http.Response, error) { ret := _mock.Called(r) if len(ret) == 0 { - panic("no return value specified for VaultGenerateSecretsExecute") + panic("no return value specified for VaultListSharedVaultsExecute") } - var r0 map[string]interface{} + var r0 []string var r1 *http.Response var r2 error - if returnFunc, ok := ret.Get(0).(func(ApiVaultGenerateSecretsRequest) (map[string]interface{}, *http.Response, error)); ok { + if returnFunc, ok := ret.Get(0).(func(ApiVaultListSharedVaultsRequest) ([]string, *http.Response, error)); ok { return returnFunc(r) } - if returnFunc, ok := ret.Get(0).(func(ApiVaultGenerateSecretsRequest) map[string]interface{}); ok { + if returnFunc, ok := ret.Get(0).(func(ApiVaultListSharedVaultsRequest) []string); ok { r0 = returnFunc(r) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(map[string]interface{}) + r0 = ret.Get(0).([]string) } } - if returnFunc, ok := ret.Get(1).(func(ApiVaultGenerateSecretsRequest) *http.Response); ok { + if returnFunc, ok := ret.Get(1).(func(ApiVaultListSharedVaultsRequest) *http.Response); ok { r1 = returnFunc(r) } else { if ret.Get(1) != nil { r1 = ret.Get(1).(*http.Response) } } - if returnFunc, ok := ret.Get(2).(func(ApiVaultGenerateSecretsRequest) error); ok { + if returnFunc, ok := ret.Get(2).(func(ApiVaultListSharedVaultsRequest) error); ok { r2 = returnFunc(r) } else { r2 = ret.Error(2) @@ -5052,22 +5814,22 @@ func (_mock *MockVaultAPI) VaultGenerateSecretsExecute(r ApiVaultGenerateSecrets return r0, r1, r2 } -// MockVaultAPI_VaultGenerateSecretsExecute_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'VaultGenerateSecretsExecute' -type MockVaultAPI_VaultGenerateSecretsExecute_Call struct { +// MockVaultAPI_VaultListSharedVaultsExecute_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'VaultListSharedVaultsExecute' +type MockVaultAPI_VaultListSharedVaultsExecute_Call struct { *mock.Call } -// VaultGenerateSecretsExecute is a helper method to define mock.On call -// - r ApiVaultGenerateSecretsRequest -func (_e *MockVaultAPI_Expecter) VaultGenerateSecretsExecute(r any) *MockVaultAPI_VaultGenerateSecretsExecute_Call { - return &MockVaultAPI_VaultGenerateSecretsExecute_Call{Call: _e.mock.On("VaultGenerateSecretsExecute", r)} +// VaultListSharedVaultsExecute is a helper method to define mock.On call +// - r ApiVaultListSharedVaultsRequest +func (_e *MockVaultAPI_Expecter) VaultListSharedVaultsExecute(r any) *MockVaultAPI_VaultListSharedVaultsExecute_Call { + return &MockVaultAPI_VaultListSharedVaultsExecute_Call{Call: _e.mock.On("VaultListSharedVaultsExecute", r)} } -func (_c *MockVaultAPI_VaultGenerateSecretsExecute_Call) Run(run func(r ApiVaultGenerateSecretsRequest)) *MockVaultAPI_VaultGenerateSecretsExecute_Call { +func (_c *MockVaultAPI_VaultListSharedVaultsExecute_Call) Run(run func(r ApiVaultListSharedVaultsRequest)) *MockVaultAPI_VaultListSharedVaultsExecute_Call { _c.Call.Run(func(args mock.Arguments) { - var arg0 ApiVaultGenerateSecretsRequest + var arg0 ApiVaultListSharedVaultsRequest if args[0] != nil { - arg0 = args[0].(ApiVaultGenerateSecretsRequest) + arg0 = args[0].(ApiVaultListSharedVaultsRequest) } run( arg0, @@ -5076,18 +5838,18 @@ func (_c *MockVaultAPI_VaultGenerateSecretsExecute_Call) Run(run func(r ApiVault return _c } -func (_c *MockVaultAPI_VaultGenerateSecretsExecute_Call) Return(stringToIfaceVal map[string]interface{}, response *http.Response, err error) *MockVaultAPI_VaultGenerateSecretsExecute_Call { - _c.Call.Return(stringToIfaceVal, response, err) +func (_c *MockVaultAPI_VaultListSharedVaultsExecute_Call) Return(strings []string, response *http.Response, err error) *MockVaultAPI_VaultListSharedVaultsExecute_Call { + _c.Call.Return(strings, response, err) return _c } -func (_c *MockVaultAPI_VaultGenerateSecretsExecute_Call) RunAndReturn(run func(r ApiVaultGenerateSecretsRequest) (map[string]interface{}, *http.Response, error)) *MockVaultAPI_VaultGenerateSecretsExecute_Call { +func (_c *MockVaultAPI_VaultListSharedVaultsExecute_Call) RunAndReturn(run func(r ApiVaultListSharedVaultsRequest) ([]string, *http.Response, error)) *MockVaultAPI_VaultListSharedVaultsExecute_Call { _c.Call.Return(run) return _c } // VaultListWorkspaceSecrets provides a mock function for the type MockVaultAPI -func (_mock *MockVaultAPI) VaultListWorkspaceSecrets(ctx context.Context, teamId float32, workspaceId float32) ApiVaultListWorkspaceSecretsRequest { +func (_mock *MockVaultAPI) VaultListWorkspaceSecrets(ctx context.Context, teamId int, workspaceId int) ApiVaultListWorkspaceSecretsRequest { ret := _mock.Called(ctx, teamId, workspaceId) if len(ret) == 0 { @@ -5095,7 +5857,7 @@ func (_mock *MockVaultAPI) VaultListWorkspaceSecrets(ctx context.Context, teamId } var r0 ApiVaultListWorkspaceSecretsRequest - if returnFunc, ok := ret.Get(0).(func(context.Context, float32, float32) ApiVaultListWorkspaceSecretsRequest); ok { + if returnFunc, ok := ret.Get(0).(func(context.Context, int, int) ApiVaultListWorkspaceSecretsRequest); ok { r0 = returnFunc(ctx, teamId, workspaceId) } else { r0 = ret.Get(0).(ApiVaultListWorkspaceSecretsRequest) @@ -5110,25 +5872,25 @@ type MockVaultAPI_VaultListWorkspaceSecrets_Call struct { // VaultListWorkspaceSecrets is a helper method to define mock.On call // - ctx context.Context -// - teamId float32 -// - workspaceId float32 +// - teamId int +// - workspaceId int func (_e *MockVaultAPI_Expecter) VaultListWorkspaceSecrets(ctx any, teamId any, workspaceId any) *MockVaultAPI_VaultListWorkspaceSecrets_Call { return &MockVaultAPI_VaultListWorkspaceSecrets_Call{Call: _e.mock.On("VaultListWorkspaceSecrets", ctx, teamId, workspaceId)} } -func (_c *MockVaultAPI_VaultListWorkspaceSecrets_Call) Run(run func(ctx context.Context, teamId float32, workspaceId float32)) *MockVaultAPI_VaultListWorkspaceSecrets_Call { +func (_c *MockVaultAPI_VaultListWorkspaceSecrets_Call) Run(run func(ctx context.Context, teamId int, workspaceId int)) *MockVaultAPI_VaultListWorkspaceSecrets_Call { _c.Call.Run(func(args mock.Arguments) { var arg0 context.Context if args[0] != nil { arg0 = args[0].(context.Context) } - var arg1 float32 + var arg1 int if args[1] != nil { - arg1 = args[1].(float32) + arg1 = args[1].(int) } - var arg2 float32 + var arg2 int if args[2] != nil { - arg2 = args[2].(float32) + arg2 = args[2].(int) } run( arg0, @@ -5144,7 +5906,7 @@ func (_c *MockVaultAPI_VaultListWorkspaceSecrets_Call) Return(apiVaultListWorksp return _c } -func (_c *MockVaultAPI_VaultListWorkspaceSecrets_Call) RunAndReturn(run func(ctx context.Context, teamId float32, workspaceId float32) ApiVaultListWorkspaceSecretsRequest) *MockVaultAPI_VaultListWorkspaceSecrets_Call { +func (_c *MockVaultAPI_VaultListWorkspaceSecrets_Call) RunAndReturn(run func(ctx context.Context, teamId int, workspaceId int) ApiVaultListWorkspaceSecretsRequest) *MockVaultAPI_VaultListWorkspaceSecrets_Call { _c.Call.Return(run) return _c } @@ -5219,8 +5981,141 @@ func (_c *MockVaultAPI_VaultListWorkspaceSecretsExecute_Call) RunAndReturn(run f return _c } +// VaultStoreSharedSecrets provides a mock function for the type MockVaultAPI +func (_mock *MockVaultAPI) VaultStoreSharedSecrets(ctx context.Context, teamId int, vaultName string) ApiVaultStoreSharedSecretsRequest { + ret := _mock.Called(ctx, teamId, vaultName) + + if len(ret) == 0 { + panic("no return value specified for VaultStoreSharedSecrets") + } + + var r0 ApiVaultStoreSharedSecretsRequest + if returnFunc, ok := ret.Get(0).(func(context.Context, int, string) ApiVaultStoreSharedSecretsRequest); ok { + r0 = returnFunc(ctx, teamId, vaultName) + } else { + r0 = ret.Get(0).(ApiVaultStoreSharedSecretsRequest) + } + return r0 +} + +// MockVaultAPI_VaultStoreSharedSecrets_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'VaultStoreSharedSecrets' +type MockVaultAPI_VaultStoreSharedSecrets_Call struct { + *mock.Call +} + +// VaultStoreSharedSecrets is a helper method to define mock.On call +// - ctx context.Context +// - teamId int +// - vaultName string +func (_e *MockVaultAPI_Expecter) VaultStoreSharedSecrets(ctx any, teamId any, vaultName any) *MockVaultAPI_VaultStoreSharedSecrets_Call { + return &MockVaultAPI_VaultStoreSharedSecrets_Call{Call: _e.mock.On("VaultStoreSharedSecrets", ctx, teamId, vaultName)} +} + +func (_c *MockVaultAPI_VaultStoreSharedSecrets_Call) Run(run func(ctx context.Context, teamId int, vaultName string)) *MockVaultAPI_VaultStoreSharedSecrets_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 int + if args[1] != nil { + arg1 = args[1].(int) + } + var arg2 string + if args[2] != nil { + arg2 = args[2].(string) + } + run( + arg0, + arg1, + arg2, + ) + }) + return _c +} + +func (_c *MockVaultAPI_VaultStoreSharedSecrets_Call) Return(apiVaultStoreSharedSecretsRequest ApiVaultStoreSharedSecretsRequest) *MockVaultAPI_VaultStoreSharedSecrets_Call { + _c.Call.Return(apiVaultStoreSharedSecretsRequest) + return _c +} + +func (_c *MockVaultAPI_VaultStoreSharedSecrets_Call) RunAndReturn(run func(ctx context.Context, teamId int, vaultName string) ApiVaultStoreSharedSecretsRequest) *MockVaultAPI_VaultStoreSharedSecrets_Call { + _c.Call.Return(run) + return _c +} + +// VaultStoreSharedSecretsExecute provides a mock function for the type MockVaultAPI +func (_mock *MockVaultAPI) VaultStoreSharedSecretsExecute(r ApiVaultStoreSharedSecretsRequest) (map[string]interface{}, *http.Response, error) { + ret := _mock.Called(r) + + if len(ret) == 0 { + panic("no return value specified for VaultStoreSharedSecretsExecute") + } + + var r0 map[string]interface{} + var r1 *http.Response + var r2 error + if returnFunc, ok := ret.Get(0).(func(ApiVaultStoreSharedSecretsRequest) (map[string]interface{}, *http.Response, error)); ok { + return returnFunc(r) + } + if returnFunc, ok := ret.Get(0).(func(ApiVaultStoreSharedSecretsRequest) map[string]interface{}); ok { + r0 = returnFunc(r) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(map[string]interface{}) + } + } + if returnFunc, ok := ret.Get(1).(func(ApiVaultStoreSharedSecretsRequest) *http.Response); ok { + r1 = returnFunc(r) + } else { + if ret.Get(1) != nil { + r1 = ret.Get(1).(*http.Response) + } + } + if returnFunc, ok := ret.Get(2).(func(ApiVaultStoreSharedSecretsRequest) error); ok { + r2 = returnFunc(r) + } else { + r2 = ret.Error(2) + } + return r0, r1, r2 +} + +// MockVaultAPI_VaultStoreSharedSecretsExecute_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'VaultStoreSharedSecretsExecute' +type MockVaultAPI_VaultStoreSharedSecretsExecute_Call struct { + *mock.Call +} + +// VaultStoreSharedSecretsExecute is a helper method to define mock.On call +// - r ApiVaultStoreSharedSecretsRequest +func (_e *MockVaultAPI_Expecter) VaultStoreSharedSecretsExecute(r any) *MockVaultAPI_VaultStoreSharedSecretsExecute_Call { + return &MockVaultAPI_VaultStoreSharedSecretsExecute_Call{Call: _e.mock.On("VaultStoreSharedSecretsExecute", r)} +} + +func (_c *MockVaultAPI_VaultStoreSharedSecretsExecute_Call) Run(run func(r ApiVaultStoreSharedSecretsRequest)) *MockVaultAPI_VaultStoreSharedSecretsExecute_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 ApiVaultStoreSharedSecretsRequest + if args[0] != nil { + arg0 = args[0].(ApiVaultStoreSharedSecretsRequest) + } + run( + arg0, + ) + }) + return _c +} + +func (_c *MockVaultAPI_VaultStoreSharedSecretsExecute_Call) Return(stringToIfaceVal map[string]interface{}, response *http.Response, err error) *MockVaultAPI_VaultStoreSharedSecretsExecute_Call { + _c.Call.Return(stringToIfaceVal, response, err) + return _c +} + +func (_c *MockVaultAPI_VaultStoreSharedSecretsExecute_Call) RunAndReturn(run func(r ApiVaultStoreSharedSecretsRequest) (map[string]interface{}, *http.Response, error)) *MockVaultAPI_VaultStoreSharedSecretsExecute_Call { + _c.Call.Return(run) + return _c +} + // VaultStoreWorkspaceSecrets provides a mock function for the type MockVaultAPI -func (_mock *MockVaultAPI) VaultStoreWorkspaceSecrets(ctx context.Context, teamId float32, workspaceId float32) ApiVaultStoreWorkspaceSecretsRequest { +func (_mock *MockVaultAPI) VaultStoreWorkspaceSecrets(ctx context.Context, teamId int, workspaceId int) ApiVaultStoreWorkspaceSecretsRequest { ret := _mock.Called(ctx, teamId, workspaceId) if len(ret) == 0 { @@ -5228,7 +6123,7 @@ func (_mock *MockVaultAPI) VaultStoreWorkspaceSecrets(ctx context.Context, teamI } var r0 ApiVaultStoreWorkspaceSecretsRequest - if returnFunc, ok := ret.Get(0).(func(context.Context, float32, float32) ApiVaultStoreWorkspaceSecretsRequest); ok { + if returnFunc, ok := ret.Get(0).(func(context.Context, int, int) ApiVaultStoreWorkspaceSecretsRequest); ok { r0 = returnFunc(ctx, teamId, workspaceId) } else { r0 = ret.Get(0).(ApiVaultStoreWorkspaceSecretsRequest) @@ -5243,25 +6138,25 @@ type MockVaultAPI_VaultStoreWorkspaceSecrets_Call struct { // VaultStoreWorkspaceSecrets is a helper method to define mock.On call // - ctx context.Context -// - teamId float32 -// - workspaceId float32 +// - teamId int +// - workspaceId int func (_e *MockVaultAPI_Expecter) VaultStoreWorkspaceSecrets(ctx any, teamId any, workspaceId any) *MockVaultAPI_VaultStoreWorkspaceSecrets_Call { return &MockVaultAPI_VaultStoreWorkspaceSecrets_Call{Call: _e.mock.On("VaultStoreWorkspaceSecrets", ctx, teamId, workspaceId)} } -func (_c *MockVaultAPI_VaultStoreWorkspaceSecrets_Call) Run(run func(ctx context.Context, teamId float32, workspaceId float32)) *MockVaultAPI_VaultStoreWorkspaceSecrets_Call { +func (_c *MockVaultAPI_VaultStoreWorkspaceSecrets_Call) Run(run func(ctx context.Context, teamId int, workspaceId int)) *MockVaultAPI_VaultStoreWorkspaceSecrets_Call { _c.Call.Run(func(args mock.Arguments) { var arg0 context.Context if args[0] != nil { arg0 = args[0].(context.Context) } - var arg1 float32 + var arg1 int if args[1] != nil { - arg1 = args[1].(float32) + arg1 = args[1].(int) } - var arg2 float32 + var arg2 int if args[2] != nil { - arg2 = args[2].(float32) + arg2 = args[2].(int) } run( arg0, @@ -5277,7 +6172,7 @@ func (_c *MockVaultAPI_VaultStoreWorkspaceSecrets_Call) Return(apiVaultStoreWork return _c } -func (_c *MockVaultAPI_VaultStoreWorkspaceSecrets_Call) RunAndReturn(run func(ctx context.Context, teamId float32, workspaceId float32) ApiVaultStoreWorkspaceSecretsRequest) *MockVaultAPI_VaultStoreWorkspaceSecrets_Call { +func (_c *MockVaultAPI_VaultStoreWorkspaceSecrets_Call) RunAndReturn(run func(ctx context.Context, teamId int, workspaceId int) ApiVaultStoreWorkspaceSecretsRequest) *MockVaultAPI_VaultStoreWorkspaceSecrets_Call { _c.Call.Return(run) return _c } @@ -5501,7 +6396,7 @@ func (_c *MockWorkspacesAPI_WorkspacesCreateWorkspaceExecute_Call) RunAndReturn( } // WorkspacesDeleteEnvVar provides a mock function for the type MockWorkspacesAPI -func (_mock *MockWorkspacesAPI) WorkspacesDeleteEnvVar(ctx context.Context, workspaceId float32) ApiWorkspacesDeleteEnvVarRequest { +func (_mock *MockWorkspacesAPI) WorkspacesDeleteEnvVar(ctx context.Context, workspaceId int) ApiWorkspacesDeleteEnvVarRequest { ret := _mock.Called(ctx, workspaceId) if len(ret) == 0 { @@ -5509,7 +6404,7 @@ func (_mock *MockWorkspacesAPI) WorkspacesDeleteEnvVar(ctx context.Context, work } var r0 ApiWorkspacesDeleteEnvVarRequest - if returnFunc, ok := ret.Get(0).(func(context.Context, float32) ApiWorkspacesDeleteEnvVarRequest); ok { + if returnFunc, ok := ret.Get(0).(func(context.Context, int) ApiWorkspacesDeleteEnvVarRequest); ok { r0 = returnFunc(ctx, workspaceId) } else { r0 = ret.Get(0).(ApiWorkspacesDeleteEnvVarRequest) @@ -5524,20 +6419,20 @@ type MockWorkspacesAPI_WorkspacesDeleteEnvVar_Call struct { // WorkspacesDeleteEnvVar is a helper method to define mock.On call // - ctx context.Context -// - workspaceId float32 +// - workspaceId int func (_e *MockWorkspacesAPI_Expecter) WorkspacesDeleteEnvVar(ctx any, workspaceId any) *MockWorkspacesAPI_WorkspacesDeleteEnvVar_Call { return &MockWorkspacesAPI_WorkspacesDeleteEnvVar_Call{Call: _e.mock.On("WorkspacesDeleteEnvVar", ctx, workspaceId)} } -func (_c *MockWorkspacesAPI_WorkspacesDeleteEnvVar_Call) Run(run func(ctx context.Context, workspaceId float32)) *MockWorkspacesAPI_WorkspacesDeleteEnvVar_Call { +func (_c *MockWorkspacesAPI_WorkspacesDeleteEnvVar_Call) Run(run func(ctx context.Context, workspaceId int)) *MockWorkspacesAPI_WorkspacesDeleteEnvVar_Call { _c.Call.Run(func(args mock.Arguments) { var arg0 context.Context if args[0] != nil { arg0 = args[0].(context.Context) } - var arg1 float32 + var arg1 int if args[1] != nil { - arg1 = args[1].(float32) + arg1 = args[1].(int) } run( arg0, @@ -5552,7 +6447,7 @@ func (_c *MockWorkspacesAPI_WorkspacesDeleteEnvVar_Call) Return(apiWorkspacesDel return _c } -func (_c *MockWorkspacesAPI_WorkspacesDeleteEnvVar_Call) RunAndReturn(run func(ctx context.Context, workspaceId float32) ApiWorkspacesDeleteEnvVarRequest) *MockWorkspacesAPI_WorkspacesDeleteEnvVar_Call { +func (_c *MockWorkspacesAPI_WorkspacesDeleteEnvVar_Call) RunAndReturn(run func(ctx context.Context, workspaceId int) ApiWorkspacesDeleteEnvVarRequest) *MockWorkspacesAPI_WorkspacesDeleteEnvVar_Call { _c.Call.Return(run) return _c } @@ -5620,7 +6515,7 @@ func (_c *MockWorkspacesAPI_WorkspacesDeleteEnvVarExecute_Call) RunAndReturn(run } // WorkspacesDeleteWorkspace provides a mock function for the type MockWorkspacesAPI -func (_mock *MockWorkspacesAPI) WorkspacesDeleteWorkspace(ctx context.Context, workspaceId float32) ApiWorkspacesDeleteWorkspaceRequest { +func (_mock *MockWorkspacesAPI) WorkspacesDeleteWorkspace(ctx context.Context, workspaceId int) ApiWorkspacesDeleteWorkspaceRequest { ret := _mock.Called(ctx, workspaceId) if len(ret) == 0 { @@ -5628,7 +6523,7 @@ func (_mock *MockWorkspacesAPI) WorkspacesDeleteWorkspace(ctx context.Context, w } var r0 ApiWorkspacesDeleteWorkspaceRequest - if returnFunc, ok := ret.Get(0).(func(context.Context, float32) ApiWorkspacesDeleteWorkspaceRequest); ok { + if returnFunc, ok := ret.Get(0).(func(context.Context, int) ApiWorkspacesDeleteWorkspaceRequest); ok { r0 = returnFunc(ctx, workspaceId) } else { r0 = ret.Get(0).(ApiWorkspacesDeleteWorkspaceRequest) @@ -5643,20 +6538,20 @@ type MockWorkspacesAPI_WorkspacesDeleteWorkspace_Call struct { // WorkspacesDeleteWorkspace is a helper method to define mock.On call // - ctx context.Context -// - workspaceId float32 +// - workspaceId int func (_e *MockWorkspacesAPI_Expecter) WorkspacesDeleteWorkspace(ctx any, workspaceId any) *MockWorkspacesAPI_WorkspacesDeleteWorkspace_Call { return &MockWorkspacesAPI_WorkspacesDeleteWorkspace_Call{Call: _e.mock.On("WorkspacesDeleteWorkspace", ctx, workspaceId)} } -func (_c *MockWorkspacesAPI_WorkspacesDeleteWorkspace_Call) Run(run func(ctx context.Context, workspaceId float32)) *MockWorkspacesAPI_WorkspacesDeleteWorkspace_Call { +func (_c *MockWorkspacesAPI_WorkspacesDeleteWorkspace_Call) Run(run func(ctx context.Context, workspaceId int)) *MockWorkspacesAPI_WorkspacesDeleteWorkspace_Call { _c.Call.Run(func(args mock.Arguments) { var arg0 context.Context if args[0] != nil { arg0 = args[0].(context.Context) } - var arg1 float32 + var arg1 int if args[1] != nil { - arg1 = args[1].(float32) + arg1 = args[1].(int) } run( arg0, @@ -5671,7 +6566,7 @@ func (_c *MockWorkspacesAPI_WorkspacesDeleteWorkspace_Call) Return(apiWorkspaces return _c } -func (_c *MockWorkspacesAPI_WorkspacesDeleteWorkspace_Call) RunAndReturn(run func(ctx context.Context, workspaceId float32) ApiWorkspacesDeleteWorkspaceRequest) *MockWorkspacesAPI_WorkspacesDeleteWorkspace_Call { +func (_c *MockWorkspacesAPI_WorkspacesDeleteWorkspace_Call) RunAndReturn(run func(ctx context.Context, workspaceId int) ApiWorkspacesDeleteWorkspaceRequest) *MockWorkspacesAPI_WorkspacesDeleteWorkspace_Call { _c.Call.Return(run) return _c } @@ -5739,7 +6634,7 @@ func (_c *MockWorkspacesAPI_WorkspacesDeleteWorkspaceExecute_Call) RunAndReturn( } // WorkspacesDeployLandscape provides a mock function for the type MockWorkspacesAPI -func (_mock *MockWorkspacesAPI) WorkspacesDeployLandscape(ctx context.Context, workspaceId float32) ApiWorkspacesDeployLandscapeRequest { +func (_mock *MockWorkspacesAPI) WorkspacesDeployLandscape(ctx context.Context, workspaceId int) ApiWorkspacesDeployLandscapeRequest { ret := _mock.Called(ctx, workspaceId) if len(ret) == 0 { @@ -5747,7 +6642,7 @@ func (_mock *MockWorkspacesAPI) WorkspacesDeployLandscape(ctx context.Context, w } var r0 ApiWorkspacesDeployLandscapeRequest - if returnFunc, ok := ret.Get(0).(func(context.Context, float32) ApiWorkspacesDeployLandscapeRequest); ok { + if returnFunc, ok := ret.Get(0).(func(context.Context, int) ApiWorkspacesDeployLandscapeRequest); ok { r0 = returnFunc(ctx, workspaceId) } else { r0 = ret.Get(0).(ApiWorkspacesDeployLandscapeRequest) @@ -5762,20 +6657,20 @@ type MockWorkspacesAPI_WorkspacesDeployLandscape_Call struct { // WorkspacesDeployLandscape is a helper method to define mock.On call // - ctx context.Context -// - workspaceId float32 +// - workspaceId int func (_e *MockWorkspacesAPI_Expecter) WorkspacesDeployLandscape(ctx any, workspaceId any) *MockWorkspacesAPI_WorkspacesDeployLandscape_Call { return &MockWorkspacesAPI_WorkspacesDeployLandscape_Call{Call: _e.mock.On("WorkspacesDeployLandscape", ctx, workspaceId)} } -func (_c *MockWorkspacesAPI_WorkspacesDeployLandscape_Call) Run(run func(ctx context.Context, workspaceId float32)) *MockWorkspacesAPI_WorkspacesDeployLandscape_Call { +func (_c *MockWorkspacesAPI_WorkspacesDeployLandscape_Call) Run(run func(ctx context.Context, workspaceId int)) *MockWorkspacesAPI_WorkspacesDeployLandscape_Call { _c.Call.Run(func(args mock.Arguments) { var arg0 context.Context if args[0] != nil { arg0 = args[0].(context.Context) } - var arg1 float32 + var arg1 int if args[1] != nil { - arg1 = args[1].(float32) + arg1 = args[1].(int) } run( arg0, @@ -5790,13 +6685,13 @@ func (_c *MockWorkspacesAPI_WorkspacesDeployLandscape_Call) Return(apiWorkspaces return _c } -func (_c *MockWorkspacesAPI_WorkspacesDeployLandscape_Call) RunAndReturn(run func(ctx context.Context, workspaceId float32) ApiWorkspacesDeployLandscapeRequest) *MockWorkspacesAPI_WorkspacesDeployLandscape_Call { +func (_c *MockWorkspacesAPI_WorkspacesDeployLandscape_Call) RunAndReturn(run func(ctx context.Context, workspaceId int) ApiWorkspacesDeployLandscapeRequest) *MockWorkspacesAPI_WorkspacesDeployLandscape_Call { _c.Call.Return(run) return _c } // WorkspacesDeployLandscape1 provides a mock function for the type MockWorkspacesAPI -func (_mock *MockWorkspacesAPI) WorkspacesDeployLandscape1(ctx context.Context, workspaceId float32, profile string) ApiWorkspacesDeployLandscape1Request { +func (_mock *MockWorkspacesAPI) WorkspacesDeployLandscape1(ctx context.Context, workspaceId int, profile string) ApiWorkspacesDeployLandscape1Request { ret := _mock.Called(ctx, workspaceId, profile) if len(ret) == 0 { @@ -5804,7 +6699,7 @@ func (_mock *MockWorkspacesAPI) WorkspacesDeployLandscape1(ctx context.Context, } var r0 ApiWorkspacesDeployLandscape1Request - if returnFunc, ok := ret.Get(0).(func(context.Context, float32, string) ApiWorkspacesDeployLandscape1Request); ok { + if returnFunc, ok := ret.Get(0).(func(context.Context, int, string) ApiWorkspacesDeployLandscape1Request); ok { r0 = returnFunc(ctx, workspaceId, profile) } else { r0 = ret.Get(0).(ApiWorkspacesDeployLandscape1Request) @@ -5819,21 +6714,21 @@ type MockWorkspacesAPI_WorkspacesDeployLandscape1_Call struct { // WorkspacesDeployLandscape1 is a helper method to define mock.On call // - ctx context.Context -// - workspaceId float32 +// - workspaceId int // - profile string func (_e *MockWorkspacesAPI_Expecter) WorkspacesDeployLandscape1(ctx any, workspaceId any, profile any) *MockWorkspacesAPI_WorkspacesDeployLandscape1_Call { return &MockWorkspacesAPI_WorkspacesDeployLandscape1_Call{Call: _e.mock.On("WorkspacesDeployLandscape1", ctx, workspaceId, profile)} } -func (_c *MockWorkspacesAPI_WorkspacesDeployLandscape1_Call) Run(run func(ctx context.Context, workspaceId float32, profile string)) *MockWorkspacesAPI_WorkspacesDeployLandscape1_Call { +func (_c *MockWorkspacesAPI_WorkspacesDeployLandscape1_Call) Run(run func(ctx context.Context, workspaceId int, profile string)) *MockWorkspacesAPI_WorkspacesDeployLandscape1_Call { _c.Call.Run(func(args mock.Arguments) { var arg0 context.Context if args[0] != nil { arg0 = args[0].(context.Context) } - var arg1 float32 + var arg1 int if args[1] != nil { - arg1 = args[1].(float32) + arg1 = args[1].(int) } var arg2 string if args[2] != nil { @@ -5853,7 +6748,7 @@ func (_c *MockWorkspacesAPI_WorkspacesDeployLandscape1_Call) Return(apiWorkspace return _c } -func (_c *MockWorkspacesAPI_WorkspacesDeployLandscape1_Call) RunAndReturn(run func(ctx context.Context, workspaceId float32, profile string) ApiWorkspacesDeployLandscape1Request) *MockWorkspacesAPI_WorkspacesDeployLandscape1_Call { +func (_c *MockWorkspacesAPI_WorkspacesDeployLandscape1_Call) RunAndReturn(run func(ctx context.Context, workspaceId int, profile string) ApiWorkspacesDeployLandscape1Request) *MockWorkspacesAPI_WorkspacesDeployLandscape1_Call { _c.Call.Return(run) return _c } @@ -5983,7 +6878,7 @@ func (_c *MockWorkspacesAPI_WorkspacesDeployLandscapeExecute_Call) RunAndReturn( } // WorkspacesExecuteCommand provides a mock function for the type MockWorkspacesAPI -func (_mock *MockWorkspacesAPI) WorkspacesExecuteCommand(ctx context.Context, workspaceId float32) ApiWorkspacesExecuteCommandRequest { +func (_mock *MockWorkspacesAPI) WorkspacesExecuteCommand(ctx context.Context, workspaceId int) ApiWorkspacesExecuteCommandRequest { ret := _mock.Called(ctx, workspaceId) if len(ret) == 0 { @@ -5991,7 +6886,7 @@ func (_mock *MockWorkspacesAPI) WorkspacesExecuteCommand(ctx context.Context, wo } var r0 ApiWorkspacesExecuteCommandRequest - if returnFunc, ok := ret.Get(0).(func(context.Context, float32) ApiWorkspacesExecuteCommandRequest); ok { + if returnFunc, ok := ret.Get(0).(func(context.Context, int) ApiWorkspacesExecuteCommandRequest); ok { r0 = returnFunc(ctx, workspaceId) } else { r0 = ret.Get(0).(ApiWorkspacesExecuteCommandRequest) @@ -6006,20 +6901,20 @@ type MockWorkspacesAPI_WorkspacesExecuteCommand_Call struct { // WorkspacesExecuteCommand is a helper method to define mock.On call // - ctx context.Context -// - workspaceId float32 +// - workspaceId int func (_e *MockWorkspacesAPI_Expecter) WorkspacesExecuteCommand(ctx any, workspaceId any) *MockWorkspacesAPI_WorkspacesExecuteCommand_Call { return &MockWorkspacesAPI_WorkspacesExecuteCommand_Call{Call: _e.mock.On("WorkspacesExecuteCommand", ctx, workspaceId)} } -func (_c *MockWorkspacesAPI_WorkspacesExecuteCommand_Call) Run(run func(ctx context.Context, workspaceId float32)) *MockWorkspacesAPI_WorkspacesExecuteCommand_Call { +func (_c *MockWorkspacesAPI_WorkspacesExecuteCommand_Call) Run(run func(ctx context.Context, workspaceId int)) *MockWorkspacesAPI_WorkspacesExecuteCommand_Call { _c.Call.Run(func(args mock.Arguments) { var arg0 context.Context if args[0] != nil { arg0 = args[0].(context.Context) } - var arg1 float32 + var arg1 int if args[1] != nil { - arg1 = args[1].(float32) + arg1 = args[1].(int) } run( arg0, @@ -6034,7 +6929,7 @@ func (_c *MockWorkspacesAPI_WorkspacesExecuteCommand_Call) Return(apiWorkspacesE return _c } -func (_c *MockWorkspacesAPI_WorkspacesExecuteCommand_Call) RunAndReturn(run func(ctx context.Context, workspaceId float32) ApiWorkspacesExecuteCommandRequest) *MockWorkspacesAPI_WorkspacesExecuteCommand_Call { +func (_c *MockWorkspacesAPI_WorkspacesExecuteCommand_Call) RunAndReturn(run func(ctx context.Context, workspaceId int) ApiWorkspacesExecuteCommandRequest) *MockWorkspacesAPI_WorkspacesExecuteCommand_Call { _c.Call.Return(run) return _c } @@ -6110,7 +7005,7 @@ func (_c *MockWorkspacesAPI_WorkspacesExecuteCommandExecute_Call) RunAndReturn(r } // WorkspacesGetWorkspace provides a mock function for the type MockWorkspacesAPI -func (_mock *MockWorkspacesAPI) WorkspacesGetWorkspace(ctx context.Context, workspaceId float32) ApiWorkspacesGetWorkspaceRequest { +func (_mock *MockWorkspacesAPI) WorkspacesGetWorkspace(ctx context.Context, workspaceId int) ApiWorkspacesGetWorkspaceRequest { ret := _mock.Called(ctx, workspaceId) if len(ret) == 0 { @@ -6118,7 +7013,7 @@ func (_mock *MockWorkspacesAPI) WorkspacesGetWorkspace(ctx context.Context, work } var r0 ApiWorkspacesGetWorkspaceRequest - if returnFunc, ok := ret.Get(0).(func(context.Context, float32) ApiWorkspacesGetWorkspaceRequest); ok { + if returnFunc, ok := ret.Get(0).(func(context.Context, int) ApiWorkspacesGetWorkspaceRequest); ok { r0 = returnFunc(ctx, workspaceId) } else { r0 = ret.Get(0).(ApiWorkspacesGetWorkspaceRequest) @@ -6133,20 +7028,20 @@ type MockWorkspacesAPI_WorkspacesGetWorkspace_Call struct { // WorkspacesGetWorkspace is a helper method to define mock.On call // - ctx context.Context -// - workspaceId float32 +// - workspaceId int func (_e *MockWorkspacesAPI_Expecter) WorkspacesGetWorkspace(ctx any, workspaceId any) *MockWorkspacesAPI_WorkspacesGetWorkspace_Call { return &MockWorkspacesAPI_WorkspacesGetWorkspace_Call{Call: _e.mock.On("WorkspacesGetWorkspace", ctx, workspaceId)} } -func (_c *MockWorkspacesAPI_WorkspacesGetWorkspace_Call) Run(run func(ctx context.Context, workspaceId float32)) *MockWorkspacesAPI_WorkspacesGetWorkspace_Call { +func (_c *MockWorkspacesAPI_WorkspacesGetWorkspace_Call) Run(run func(ctx context.Context, workspaceId int)) *MockWorkspacesAPI_WorkspacesGetWorkspace_Call { _c.Call.Run(func(args mock.Arguments) { var arg0 context.Context if args[0] != nil { arg0 = args[0].(context.Context) } - var arg1 float32 + var arg1 int if args[1] != nil { - arg1 = args[1].(float32) + arg1 = args[1].(int) } run( arg0, @@ -6161,7 +7056,7 @@ func (_c *MockWorkspacesAPI_WorkspacesGetWorkspace_Call) Return(apiWorkspacesGet return _c } -func (_c *MockWorkspacesAPI_WorkspacesGetWorkspace_Call) RunAndReturn(run func(ctx context.Context, workspaceId float32) ApiWorkspacesGetWorkspaceRequest) *MockWorkspacesAPI_WorkspacesGetWorkspace_Call { +func (_c *MockWorkspacesAPI_WorkspacesGetWorkspace_Call) RunAndReturn(run func(ctx context.Context, workspaceId int) ApiWorkspacesGetWorkspaceRequest) *MockWorkspacesAPI_WorkspacesGetWorkspace_Call { _c.Call.Return(run) return _c } @@ -6237,7 +7132,7 @@ func (_c *MockWorkspacesAPI_WorkspacesGetWorkspaceExecute_Call) RunAndReturn(run } // WorkspacesGetWorkspaceStatus provides a mock function for the type MockWorkspacesAPI -func (_mock *MockWorkspacesAPI) WorkspacesGetWorkspaceStatus(ctx context.Context, workspaceId float32) ApiWorkspacesGetWorkspaceStatusRequest { +func (_mock *MockWorkspacesAPI) WorkspacesGetWorkspaceStatus(ctx context.Context, workspaceId int) ApiWorkspacesGetWorkspaceStatusRequest { ret := _mock.Called(ctx, workspaceId) if len(ret) == 0 { @@ -6245,7 +7140,7 @@ func (_mock *MockWorkspacesAPI) WorkspacesGetWorkspaceStatus(ctx context.Context } var r0 ApiWorkspacesGetWorkspaceStatusRequest - if returnFunc, ok := ret.Get(0).(func(context.Context, float32) ApiWorkspacesGetWorkspaceStatusRequest); ok { + if returnFunc, ok := ret.Get(0).(func(context.Context, int) ApiWorkspacesGetWorkspaceStatusRequest); ok { r0 = returnFunc(ctx, workspaceId) } else { r0 = ret.Get(0).(ApiWorkspacesGetWorkspaceStatusRequest) @@ -6260,20 +7155,20 @@ type MockWorkspacesAPI_WorkspacesGetWorkspaceStatus_Call struct { // WorkspacesGetWorkspaceStatus is a helper method to define mock.On call // - ctx context.Context -// - workspaceId float32 +// - workspaceId int func (_e *MockWorkspacesAPI_Expecter) WorkspacesGetWorkspaceStatus(ctx any, workspaceId any) *MockWorkspacesAPI_WorkspacesGetWorkspaceStatus_Call { return &MockWorkspacesAPI_WorkspacesGetWorkspaceStatus_Call{Call: _e.mock.On("WorkspacesGetWorkspaceStatus", ctx, workspaceId)} } -func (_c *MockWorkspacesAPI_WorkspacesGetWorkspaceStatus_Call) Run(run func(ctx context.Context, workspaceId float32)) *MockWorkspacesAPI_WorkspacesGetWorkspaceStatus_Call { +func (_c *MockWorkspacesAPI_WorkspacesGetWorkspaceStatus_Call) Run(run func(ctx context.Context, workspaceId int)) *MockWorkspacesAPI_WorkspacesGetWorkspaceStatus_Call { _c.Call.Run(func(args mock.Arguments) { var arg0 context.Context if args[0] != nil { arg0 = args[0].(context.Context) } - var arg1 float32 + var arg1 int if args[1] != nil { - arg1 = args[1].(float32) + arg1 = args[1].(int) } run( arg0, @@ -6288,7 +7183,7 @@ func (_c *MockWorkspacesAPI_WorkspacesGetWorkspaceStatus_Call) Return(apiWorkspa return _c } -func (_c *MockWorkspacesAPI_WorkspacesGetWorkspaceStatus_Call) RunAndReturn(run func(ctx context.Context, workspaceId float32) ApiWorkspacesGetWorkspaceStatusRequest) *MockWorkspacesAPI_WorkspacesGetWorkspaceStatus_Call { +func (_c *MockWorkspacesAPI_WorkspacesGetWorkspaceStatus_Call) RunAndReturn(run func(ctx context.Context, workspaceId int) ApiWorkspacesGetWorkspaceStatusRequest) *MockWorkspacesAPI_WorkspacesGetWorkspaceStatus_Call { _c.Call.Return(run) return _c } @@ -6364,7 +7259,7 @@ func (_c *MockWorkspacesAPI_WorkspacesGetWorkspaceStatusExecute_Call) RunAndRetu } // WorkspacesGitHead provides a mock function for the type MockWorkspacesAPI -func (_mock *MockWorkspacesAPI) WorkspacesGitHead(ctx context.Context, workspaceId float32) ApiWorkspacesGitHeadRequest { +func (_mock *MockWorkspacesAPI) WorkspacesGitHead(ctx context.Context, workspaceId int) ApiWorkspacesGitHeadRequest { ret := _mock.Called(ctx, workspaceId) if len(ret) == 0 { @@ -6372,7 +7267,7 @@ func (_mock *MockWorkspacesAPI) WorkspacesGitHead(ctx context.Context, workspace } var r0 ApiWorkspacesGitHeadRequest - if returnFunc, ok := ret.Get(0).(func(context.Context, float32) ApiWorkspacesGitHeadRequest); ok { + if returnFunc, ok := ret.Get(0).(func(context.Context, int) ApiWorkspacesGitHeadRequest); ok { r0 = returnFunc(ctx, workspaceId) } else { r0 = ret.Get(0).(ApiWorkspacesGitHeadRequest) @@ -6387,20 +7282,20 @@ type MockWorkspacesAPI_WorkspacesGitHead_Call struct { // WorkspacesGitHead is a helper method to define mock.On call // - ctx context.Context -// - workspaceId float32 +// - workspaceId int func (_e *MockWorkspacesAPI_Expecter) WorkspacesGitHead(ctx any, workspaceId any) *MockWorkspacesAPI_WorkspacesGitHead_Call { return &MockWorkspacesAPI_WorkspacesGitHead_Call{Call: _e.mock.On("WorkspacesGitHead", ctx, workspaceId)} } -func (_c *MockWorkspacesAPI_WorkspacesGitHead_Call) Run(run func(ctx context.Context, workspaceId float32)) *MockWorkspacesAPI_WorkspacesGitHead_Call { +func (_c *MockWorkspacesAPI_WorkspacesGitHead_Call) Run(run func(ctx context.Context, workspaceId int)) *MockWorkspacesAPI_WorkspacesGitHead_Call { _c.Call.Run(func(args mock.Arguments) { var arg0 context.Context if args[0] != nil { arg0 = args[0].(context.Context) } - var arg1 float32 + var arg1 int if args[1] != nil { - arg1 = args[1].(float32) + arg1 = args[1].(int) } run( arg0, @@ -6415,7 +7310,7 @@ func (_c *MockWorkspacesAPI_WorkspacesGitHead_Call) Return(apiWorkspacesGitHeadR return _c } -func (_c *MockWorkspacesAPI_WorkspacesGitHead_Call) RunAndReturn(run func(ctx context.Context, workspaceId float32) ApiWorkspacesGitHeadRequest) *MockWorkspacesAPI_WorkspacesGitHead_Call { +func (_c *MockWorkspacesAPI_WorkspacesGitHead_Call) RunAndReturn(run func(ctx context.Context, workspaceId int) ApiWorkspacesGitHeadRequest) *MockWorkspacesAPI_WorkspacesGitHead_Call { _c.Call.Return(run) return _c } @@ -6491,7 +7386,7 @@ func (_c *MockWorkspacesAPI_WorkspacesGitHeadExecute_Call) RunAndReturn(run func } // WorkspacesGitPull provides a mock function for the type MockWorkspacesAPI -func (_mock *MockWorkspacesAPI) WorkspacesGitPull(ctx context.Context, workspaceId float32) ApiWorkspacesGitPullRequest { +func (_mock *MockWorkspacesAPI) WorkspacesGitPull(ctx context.Context, workspaceId int) ApiWorkspacesGitPullRequest { ret := _mock.Called(ctx, workspaceId) if len(ret) == 0 { @@ -6499,7 +7394,7 @@ func (_mock *MockWorkspacesAPI) WorkspacesGitPull(ctx context.Context, workspace } var r0 ApiWorkspacesGitPullRequest - if returnFunc, ok := ret.Get(0).(func(context.Context, float32) ApiWorkspacesGitPullRequest); ok { + if returnFunc, ok := ret.Get(0).(func(context.Context, int) ApiWorkspacesGitPullRequest); ok { r0 = returnFunc(ctx, workspaceId) } else { r0 = ret.Get(0).(ApiWorkspacesGitPullRequest) @@ -6514,20 +7409,20 @@ type MockWorkspacesAPI_WorkspacesGitPull_Call struct { // WorkspacesGitPull is a helper method to define mock.On call // - ctx context.Context -// - workspaceId float32 +// - workspaceId int func (_e *MockWorkspacesAPI_Expecter) WorkspacesGitPull(ctx any, workspaceId any) *MockWorkspacesAPI_WorkspacesGitPull_Call { return &MockWorkspacesAPI_WorkspacesGitPull_Call{Call: _e.mock.On("WorkspacesGitPull", ctx, workspaceId)} } -func (_c *MockWorkspacesAPI_WorkspacesGitPull_Call) Run(run func(ctx context.Context, workspaceId float32)) *MockWorkspacesAPI_WorkspacesGitPull_Call { +func (_c *MockWorkspacesAPI_WorkspacesGitPull_Call) Run(run func(ctx context.Context, workspaceId int)) *MockWorkspacesAPI_WorkspacesGitPull_Call { _c.Call.Run(func(args mock.Arguments) { var arg0 context.Context if args[0] != nil { arg0 = args[0].(context.Context) } - var arg1 float32 + var arg1 int if args[1] != nil { - arg1 = args[1].(float32) + arg1 = args[1].(int) } run( arg0, @@ -6542,13 +7437,13 @@ func (_c *MockWorkspacesAPI_WorkspacesGitPull_Call) Return(apiWorkspacesGitPullR return _c } -func (_c *MockWorkspacesAPI_WorkspacesGitPull_Call) RunAndReturn(run func(ctx context.Context, workspaceId float32) ApiWorkspacesGitPullRequest) *MockWorkspacesAPI_WorkspacesGitPull_Call { +func (_c *MockWorkspacesAPI_WorkspacesGitPull_Call) RunAndReturn(run func(ctx context.Context, workspaceId int) ApiWorkspacesGitPullRequest) *MockWorkspacesAPI_WorkspacesGitPull_Call { _c.Call.Return(run) return _c } // WorkspacesGitPull1 provides a mock function for the type MockWorkspacesAPI -func (_mock *MockWorkspacesAPI) WorkspacesGitPull1(ctx context.Context, workspaceId float32, remote string) ApiWorkspacesGitPull1Request { +func (_mock *MockWorkspacesAPI) WorkspacesGitPull1(ctx context.Context, workspaceId int, remote string) ApiWorkspacesGitPull1Request { ret := _mock.Called(ctx, workspaceId, remote) if len(ret) == 0 { @@ -6556,7 +7451,7 @@ func (_mock *MockWorkspacesAPI) WorkspacesGitPull1(ctx context.Context, workspac } var r0 ApiWorkspacesGitPull1Request - if returnFunc, ok := ret.Get(0).(func(context.Context, float32, string) ApiWorkspacesGitPull1Request); ok { + if returnFunc, ok := ret.Get(0).(func(context.Context, int, string) ApiWorkspacesGitPull1Request); ok { r0 = returnFunc(ctx, workspaceId, remote) } else { r0 = ret.Get(0).(ApiWorkspacesGitPull1Request) @@ -6571,21 +7466,21 @@ type MockWorkspacesAPI_WorkspacesGitPull1_Call struct { // WorkspacesGitPull1 is a helper method to define mock.On call // - ctx context.Context -// - workspaceId float32 +// - workspaceId int // - remote string func (_e *MockWorkspacesAPI_Expecter) WorkspacesGitPull1(ctx any, workspaceId any, remote any) *MockWorkspacesAPI_WorkspacesGitPull1_Call { return &MockWorkspacesAPI_WorkspacesGitPull1_Call{Call: _e.mock.On("WorkspacesGitPull1", ctx, workspaceId, remote)} } -func (_c *MockWorkspacesAPI_WorkspacesGitPull1_Call) Run(run func(ctx context.Context, workspaceId float32, remote string)) *MockWorkspacesAPI_WorkspacesGitPull1_Call { +func (_c *MockWorkspacesAPI_WorkspacesGitPull1_Call) Run(run func(ctx context.Context, workspaceId int, remote string)) *MockWorkspacesAPI_WorkspacesGitPull1_Call { _c.Call.Run(func(args mock.Arguments) { var arg0 context.Context if args[0] != nil { arg0 = args[0].(context.Context) } - var arg1 float32 + var arg1 int if args[1] != nil { - arg1 = args[1].(float32) + arg1 = args[1].(int) } var arg2 string if args[2] != nil { @@ -6605,7 +7500,7 @@ func (_c *MockWorkspacesAPI_WorkspacesGitPull1_Call) Return(apiWorkspacesGitPull return _c } -func (_c *MockWorkspacesAPI_WorkspacesGitPull1_Call) RunAndReturn(run func(ctx context.Context, workspaceId float32, remote string) ApiWorkspacesGitPull1Request) *MockWorkspacesAPI_WorkspacesGitPull1_Call { +func (_c *MockWorkspacesAPI_WorkspacesGitPull1_Call) RunAndReturn(run func(ctx context.Context, workspaceId int, remote string) ApiWorkspacesGitPull1Request) *MockWorkspacesAPI_WorkspacesGitPull1_Call { _c.Call.Return(run) return _c } @@ -6673,7 +7568,7 @@ func (_c *MockWorkspacesAPI_WorkspacesGitPull1Execute_Call) RunAndReturn(run fun } // WorkspacesGitPull2 provides a mock function for the type MockWorkspacesAPI -func (_mock *MockWorkspacesAPI) WorkspacesGitPull2(ctx context.Context, workspaceId float32, remote string, branch string) ApiWorkspacesGitPull2Request { +func (_mock *MockWorkspacesAPI) WorkspacesGitPull2(ctx context.Context, workspaceId int, remote string, branch string) ApiWorkspacesGitPull2Request { ret := _mock.Called(ctx, workspaceId, remote, branch) if len(ret) == 0 { @@ -6681,7 +7576,7 @@ func (_mock *MockWorkspacesAPI) WorkspacesGitPull2(ctx context.Context, workspac } var r0 ApiWorkspacesGitPull2Request - if returnFunc, ok := ret.Get(0).(func(context.Context, float32, string, string) ApiWorkspacesGitPull2Request); ok { + if returnFunc, ok := ret.Get(0).(func(context.Context, int, string, string) ApiWorkspacesGitPull2Request); ok { r0 = returnFunc(ctx, workspaceId, remote, branch) } else { r0 = ret.Get(0).(ApiWorkspacesGitPull2Request) @@ -6696,22 +7591,22 @@ type MockWorkspacesAPI_WorkspacesGitPull2_Call struct { // WorkspacesGitPull2 is a helper method to define mock.On call // - ctx context.Context -// - workspaceId float32 +// - workspaceId int // - remote string // - branch string func (_e *MockWorkspacesAPI_Expecter) WorkspacesGitPull2(ctx any, workspaceId any, remote any, branch any) *MockWorkspacesAPI_WorkspacesGitPull2_Call { return &MockWorkspacesAPI_WorkspacesGitPull2_Call{Call: _e.mock.On("WorkspacesGitPull2", ctx, workspaceId, remote, branch)} } -func (_c *MockWorkspacesAPI_WorkspacesGitPull2_Call) Run(run func(ctx context.Context, workspaceId float32, remote string, branch string)) *MockWorkspacesAPI_WorkspacesGitPull2_Call { +func (_c *MockWorkspacesAPI_WorkspacesGitPull2_Call) Run(run func(ctx context.Context, workspaceId int, remote string, branch string)) *MockWorkspacesAPI_WorkspacesGitPull2_Call { _c.Call.Run(func(args mock.Arguments) { var arg0 context.Context if args[0] != nil { arg0 = args[0].(context.Context) } - var arg1 float32 + var arg1 int if args[1] != nil { - arg1 = args[1].(float32) + arg1 = args[1].(int) } var arg2 string if args[2] != nil { @@ -6736,7 +7631,7 @@ func (_c *MockWorkspacesAPI_WorkspacesGitPull2_Call) Return(apiWorkspacesGitPull return _c } -func (_c *MockWorkspacesAPI_WorkspacesGitPull2_Call) RunAndReturn(run func(ctx context.Context, workspaceId float32, remote string, branch string) ApiWorkspacesGitPull2Request) *MockWorkspacesAPI_WorkspacesGitPull2_Call { +func (_c *MockWorkspacesAPI_WorkspacesGitPull2_Call) RunAndReturn(run func(ctx context.Context, workspaceId int, remote string, branch string) ApiWorkspacesGitPull2Request) *MockWorkspacesAPI_WorkspacesGitPull2_Call { _c.Call.Return(run) return _c } @@ -6866,7 +7761,7 @@ func (_c *MockWorkspacesAPI_WorkspacesGitPullExecute_Call) RunAndReturn(run func } // WorkspacesListEnvVars provides a mock function for the type MockWorkspacesAPI -func (_mock *MockWorkspacesAPI) WorkspacesListEnvVars(ctx context.Context, workspaceId float32) ApiWorkspacesListEnvVarsRequest { +func (_mock *MockWorkspacesAPI) WorkspacesListEnvVars(ctx context.Context, workspaceId int) ApiWorkspacesListEnvVarsRequest { ret := _mock.Called(ctx, workspaceId) if len(ret) == 0 { @@ -6874,7 +7769,7 @@ func (_mock *MockWorkspacesAPI) WorkspacesListEnvVars(ctx context.Context, works } var r0 ApiWorkspacesListEnvVarsRequest - if returnFunc, ok := ret.Get(0).(func(context.Context, float32) ApiWorkspacesListEnvVarsRequest); ok { + if returnFunc, ok := ret.Get(0).(func(context.Context, int) ApiWorkspacesListEnvVarsRequest); ok { r0 = returnFunc(ctx, workspaceId) } else { r0 = ret.Get(0).(ApiWorkspacesListEnvVarsRequest) @@ -6889,20 +7784,20 @@ type MockWorkspacesAPI_WorkspacesListEnvVars_Call struct { // WorkspacesListEnvVars is a helper method to define mock.On call // - ctx context.Context -// - workspaceId float32 +// - workspaceId int func (_e *MockWorkspacesAPI_Expecter) WorkspacesListEnvVars(ctx any, workspaceId any) *MockWorkspacesAPI_WorkspacesListEnvVars_Call { return &MockWorkspacesAPI_WorkspacesListEnvVars_Call{Call: _e.mock.On("WorkspacesListEnvVars", ctx, workspaceId)} } -func (_c *MockWorkspacesAPI_WorkspacesListEnvVars_Call) Run(run func(ctx context.Context, workspaceId float32)) *MockWorkspacesAPI_WorkspacesListEnvVars_Call { +func (_c *MockWorkspacesAPI_WorkspacesListEnvVars_Call) Run(run func(ctx context.Context, workspaceId int)) *MockWorkspacesAPI_WorkspacesListEnvVars_Call { _c.Call.Run(func(args mock.Arguments) { var arg0 context.Context if args[0] != nil { arg0 = args[0].(context.Context) } - var arg1 float32 + var arg1 int if args[1] != nil { - arg1 = args[1].(float32) + arg1 = args[1].(int) } run( arg0, @@ -6917,7 +7812,7 @@ func (_c *MockWorkspacesAPI_WorkspacesListEnvVars_Call) Return(apiWorkspacesList return _c } -func (_c *MockWorkspacesAPI_WorkspacesListEnvVars_Call) RunAndReturn(run func(ctx context.Context, workspaceId float32) ApiWorkspacesListEnvVarsRequest) *MockWorkspacesAPI_WorkspacesListEnvVars_Call { +func (_c *MockWorkspacesAPI_WorkspacesListEnvVars_Call) RunAndReturn(run func(ctx context.Context, workspaceId int) ApiWorkspacesListEnvVarsRequest) *MockWorkspacesAPI_WorkspacesListEnvVars_Call { _c.Call.Return(run) return _c } @@ -6993,7 +7888,7 @@ func (_c *MockWorkspacesAPI_WorkspacesListEnvVarsExecute_Call) RunAndReturn(run } // WorkspacesListWorkspaces provides a mock function for the type MockWorkspacesAPI -func (_mock *MockWorkspacesAPI) WorkspacesListWorkspaces(ctx context.Context, teamId float32) ApiWorkspacesListWorkspacesRequest { +func (_mock *MockWorkspacesAPI) WorkspacesListWorkspaces(ctx context.Context, teamId int) ApiWorkspacesListWorkspacesRequest { ret := _mock.Called(ctx, teamId) if len(ret) == 0 { @@ -7001,7 +7896,7 @@ func (_mock *MockWorkspacesAPI) WorkspacesListWorkspaces(ctx context.Context, te } var r0 ApiWorkspacesListWorkspacesRequest - if returnFunc, ok := ret.Get(0).(func(context.Context, float32) ApiWorkspacesListWorkspacesRequest); ok { + if returnFunc, ok := ret.Get(0).(func(context.Context, int) ApiWorkspacesListWorkspacesRequest); ok { r0 = returnFunc(ctx, teamId) } else { r0 = ret.Get(0).(ApiWorkspacesListWorkspacesRequest) @@ -7016,20 +7911,20 @@ type MockWorkspacesAPI_WorkspacesListWorkspaces_Call struct { // WorkspacesListWorkspaces is a helper method to define mock.On call // - ctx context.Context -// - teamId float32 +// - teamId int func (_e *MockWorkspacesAPI_Expecter) WorkspacesListWorkspaces(ctx any, teamId any) *MockWorkspacesAPI_WorkspacesListWorkspaces_Call { return &MockWorkspacesAPI_WorkspacesListWorkspaces_Call{Call: _e.mock.On("WorkspacesListWorkspaces", ctx, teamId)} } -func (_c *MockWorkspacesAPI_WorkspacesListWorkspaces_Call) Run(run func(ctx context.Context, teamId float32)) *MockWorkspacesAPI_WorkspacesListWorkspaces_Call { +func (_c *MockWorkspacesAPI_WorkspacesListWorkspaces_Call) Run(run func(ctx context.Context, teamId int)) *MockWorkspacesAPI_WorkspacesListWorkspaces_Call { _c.Call.Run(func(args mock.Arguments) { var arg0 context.Context if args[0] != nil { arg0 = args[0].(context.Context) } - var arg1 float32 + var arg1 int if args[1] != nil { - arg1 = args[1].(float32) + arg1 = args[1].(int) } run( arg0, @@ -7044,7 +7939,7 @@ func (_c *MockWorkspacesAPI_WorkspacesListWorkspaces_Call) Return(apiWorkspacesL return _c } -func (_c *MockWorkspacesAPI_WorkspacesListWorkspaces_Call) RunAndReturn(run func(ctx context.Context, teamId float32) ApiWorkspacesListWorkspacesRequest) *MockWorkspacesAPI_WorkspacesListWorkspaces_Call { +func (_c *MockWorkspacesAPI_WorkspacesListWorkspaces_Call) RunAndReturn(run func(ctx context.Context, teamId int) ApiWorkspacesListWorkspacesRequest) *MockWorkspacesAPI_WorkspacesListWorkspaces_Call { _c.Call.Return(run) return _c } @@ -7120,7 +8015,7 @@ func (_c *MockWorkspacesAPI_WorkspacesListWorkspacesExecute_Call) RunAndReturn(r } // WorkspacesLogs provides a mock function for the type MockWorkspacesAPI -func (_mock *MockWorkspacesAPI) WorkspacesLogs(ctx context.Context, workspaceId float32, stage string, step float32) ApiWorkspacesLogsRequest { +func (_mock *MockWorkspacesAPI) WorkspacesLogs(ctx context.Context, workspaceId int, stage string, step int) ApiWorkspacesLogsRequest { ret := _mock.Called(ctx, workspaceId, stage, step) if len(ret) == 0 { @@ -7128,7 +8023,7 @@ func (_mock *MockWorkspacesAPI) WorkspacesLogs(ctx context.Context, workspaceId } var r0 ApiWorkspacesLogsRequest - if returnFunc, ok := ret.Get(0).(func(context.Context, float32, string, float32) ApiWorkspacesLogsRequest); ok { + if returnFunc, ok := ret.Get(0).(func(context.Context, int, string, int) ApiWorkspacesLogsRequest); ok { r0 = returnFunc(ctx, workspaceId, stage, step) } else { r0 = ret.Get(0).(ApiWorkspacesLogsRequest) @@ -7143,30 +8038,30 @@ type MockWorkspacesAPI_WorkspacesLogs_Call struct { // WorkspacesLogs is a helper method to define mock.On call // - ctx context.Context -// - workspaceId float32 +// - workspaceId int // - stage string -// - step float32 +// - step int func (_e *MockWorkspacesAPI_Expecter) WorkspacesLogs(ctx any, workspaceId any, stage any, step any) *MockWorkspacesAPI_WorkspacesLogs_Call { return &MockWorkspacesAPI_WorkspacesLogs_Call{Call: _e.mock.On("WorkspacesLogs", ctx, workspaceId, stage, step)} } -func (_c *MockWorkspacesAPI_WorkspacesLogs_Call) Run(run func(ctx context.Context, workspaceId float32, stage string, step float32)) *MockWorkspacesAPI_WorkspacesLogs_Call { +func (_c *MockWorkspacesAPI_WorkspacesLogs_Call) Run(run func(ctx context.Context, workspaceId int, stage string, step int)) *MockWorkspacesAPI_WorkspacesLogs_Call { _c.Call.Run(func(args mock.Arguments) { var arg0 context.Context if args[0] != nil { arg0 = args[0].(context.Context) } - var arg1 float32 + var arg1 int if args[1] != nil { - arg1 = args[1].(float32) + arg1 = args[1].(int) } var arg2 string if args[2] != nil { arg2 = args[2].(string) } - var arg3 float32 + var arg3 int if args[3] != nil { - arg3 = args[3].(float32) + arg3 = args[3].(int) } run( arg0, @@ -7183,7 +8078,7 @@ func (_c *MockWorkspacesAPI_WorkspacesLogs_Call) Return(apiWorkspacesLogsRequest return _c } -func (_c *MockWorkspacesAPI_WorkspacesLogs_Call) RunAndReturn(run func(ctx context.Context, workspaceId float32, stage string, step float32) ApiWorkspacesLogsRequest) *MockWorkspacesAPI_WorkspacesLogs_Call { +func (_c *MockWorkspacesAPI_WorkspacesLogs_Call) RunAndReturn(run func(ctx context.Context, workspaceId int, stage string, step int) ApiWorkspacesLogsRequest) *MockWorkspacesAPI_WorkspacesLogs_Call { _c.Call.Return(run) return _c } @@ -7259,7 +8154,7 @@ func (_c *MockWorkspacesAPI_WorkspacesLogsExecute_Call) RunAndReturn(run func(r } // WorkspacesPipelineStatus provides a mock function for the type MockWorkspacesAPI -func (_mock *MockWorkspacesAPI) WorkspacesPipelineStatus(ctx context.Context, workspaceId float32, stage string) ApiWorkspacesPipelineStatusRequest { +func (_mock *MockWorkspacesAPI) WorkspacesPipelineStatus(ctx context.Context, workspaceId int, stage string) ApiWorkspacesPipelineStatusRequest { ret := _mock.Called(ctx, workspaceId, stage) if len(ret) == 0 { @@ -7267,7 +8162,7 @@ func (_mock *MockWorkspacesAPI) WorkspacesPipelineStatus(ctx context.Context, wo } var r0 ApiWorkspacesPipelineStatusRequest - if returnFunc, ok := ret.Get(0).(func(context.Context, float32, string) ApiWorkspacesPipelineStatusRequest); ok { + if returnFunc, ok := ret.Get(0).(func(context.Context, int, string) ApiWorkspacesPipelineStatusRequest); ok { r0 = returnFunc(ctx, workspaceId, stage) } else { r0 = ret.Get(0).(ApiWorkspacesPipelineStatusRequest) @@ -7282,21 +8177,21 @@ type MockWorkspacesAPI_WorkspacesPipelineStatus_Call struct { // WorkspacesPipelineStatus is a helper method to define mock.On call // - ctx context.Context -// - workspaceId float32 +// - workspaceId int // - stage string func (_e *MockWorkspacesAPI_Expecter) WorkspacesPipelineStatus(ctx any, workspaceId any, stage any) *MockWorkspacesAPI_WorkspacesPipelineStatus_Call { return &MockWorkspacesAPI_WorkspacesPipelineStatus_Call{Call: _e.mock.On("WorkspacesPipelineStatus", ctx, workspaceId, stage)} } -func (_c *MockWorkspacesAPI_WorkspacesPipelineStatus_Call) Run(run func(ctx context.Context, workspaceId float32, stage string)) *MockWorkspacesAPI_WorkspacesPipelineStatus_Call { +func (_c *MockWorkspacesAPI_WorkspacesPipelineStatus_Call) Run(run func(ctx context.Context, workspaceId int, stage string)) *MockWorkspacesAPI_WorkspacesPipelineStatus_Call { _c.Call.Run(func(args mock.Arguments) { var arg0 context.Context if args[0] != nil { arg0 = args[0].(context.Context) } - var arg1 float32 + var arg1 int if args[1] != nil { - arg1 = args[1].(float32) + arg1 = args[1].(int) } var arg2 string if args[2] != nil { @@ -7316,7 +8211,7 @@ func (_c *MockWorkspacesAPI_WorkspacesPipelineStatus_Call) Return(apiWorkspacesP return _c } -func (_c *MockWorkspacesAPI_WorkspacesPipelineStatus_Call) RunAndReturn(run func(ctx context.Context, workspaceId float32, stage string) ApiWorkspacesPipelineStatusRequest) *MockWorkspacesAPI_WorkspacesPipelineStatus_Call { +func (_c *MockWorkspacesAPI_WorkspacesPipelineStatus_Call) RunAndReturn(run func(ctx context.Context, workspaceId int, stage string) ApiWorkspacesPipelineStatusRequest) *MockWorkspacesAPI_WorkspacesPipelineStatus_Call { _c.Call.Return(run) return _c } @@ -7392,7 +8287,7 @@ func (_c *MockWorkspacesAPI_WorkspacesPipelineStatusExecute_Call) RunAndReturn(r } // WorkspacesReplicaLogs provides a mock function for the type MockWorkspacesAPI -func (_mock *MockWorkspacesAPI) WorkspacesReplicaLogs(ctx context.Context, workspaceId float32, step float32, replica string) ApiWorkspacesReplicaLogsRequest { +func (_mock *MockWorkspacesAPI) WorkspacesReplicaLogs(ctx context.Context, workspaceId int, step int, replica string) ApiWorkspacesReplicaLogsRequest { ret := _mock.Called(ctx, workspaceId, step, replica) if len(ret) == 0 { @@ -7400,7 +8295,7 @@ func (_mock *MockWorkspacesAPI) WorkspacesReplicaLogs(ctx context.Context, works } var r0 ApiWorkspacesReplicaLogsRequest - if returnFunc, ok := ret.Get(0).(func(context.Context, float32, float32, string) ApiWorkspacesReplicaLogsRequest); ok { + if returnFunc, ok := ret.Get(0).(func(context.Context, int, int, string) ApiWorkspacesReplicaLogsRequest); ok { r0 = returnFunc(ctx, workspaceId, step, replica) } else { r0 = ret.Get(0).(ApiWorkspacesReplicaLogsRequest) @@ -7415,26 +8310,26 @@ type MockWorkspacesAPI_WorkspacesReplicaLogs_Call struct { // WorkspacesReplicaLogs is a helper method to define mock.On call // - ctx context.Context -// - workspaceId float32 -// - step float32 +// - workspaceId int +// - step int // - replica string func (_e *MockWorkspacesAPI_Expecter) WorkspacesReplicaLogs(ctx any, workspaceId any, step any, replica any) *MockWorkspacesAPI_WorkspacesReplicaLogs_Call { return &MockWorkspacesAPI_WorkspacesReplicaLogs_Call{Call: _e.mock.On("WorkspacesReplicaLogs", ctx, workspaceId, step, replica)} } -func (_c *MockWorkspacesAPI_WorkspacesReplicaLogs_Call) Run(run func(ctx context.Context, workspaceId float32, step float32, replica string)) *MockWorkspacesAPI_WorkspacesReplicaLogs_Call { +func (_c *MockWorkspacesAPI_WorkspacesReplicaLogs_Call) Run(run func(ctx context.Context, workspaceId int, step int, replica string)) *MockWorkspacesAPI_WorkspacesReplicaLogs_Call { _c.Call.Run(func(args mock.Arguments) { var arg0 context.Context if args[0] != nil { arg0 = args[0].(context.Context) } - var arg1 float32 + var arg1 int if args[1] != nil { - arg1 = args[1].(float32) + arg1 = args[1].(int) } - var arg2 float32 + var arg2 int if args[2] != nil { - arg2 = args[2].(float32) + arg2 = args[2].(int) } var arg3 string if args[3] != nil { @@ -7455,7 +8350,7 @@ func (_c *MockWorkspacesAPI_WorkspacesReplicaLogs_Call) Return(apiWorkspacesRepl return _c } -func (_c *MockWorkspacesAPI_WorkspacesReplicaLogs_Call) RunAndReturn(run func(ctx context.Context, workspaceId float32, step float32, replica string) ApiWorkspacesReplicaLogsRequest) *MockWorkspacesAPI_WorkspacesReplicaLogs_Call { +func (_c *MockWorkspacesAPI_WorkspacesReplicaLogs_Call) RunAndReturn(run func(ctx context.Context, workspaceId int, step int, replica string) ApiWorkspacesReplicaLogsRequest) *MockWorkspacesAPI_WorkspacesReplicaLogs_Call { _c.Call.Return(run) return _c } @@ -7531,7 +8426,7 @@ func (_c *MockWorkspacesAPI_WorkspacesReplicaLogsExecute_Call) RunAndReturn(run } // WorkspacesScaleLandscapeServices provides a mock function for the type MockWorkspacesAPI -func (_mock *MockWorkspacesAPI) WorkspacesScaleLandscapeServices(ctx context.Context, workspaceId float32) ApiWorkspacesScaleLandscapeServicesRequest { +func (_mock *MockWorkspacesAPI) WorkspacesScaleLandscapeServices(ctx context.Context, workspaceId int) ApiWorkspacesScaleLandscapeServicesRequest { ret := _mock.Called(ctx, workspaceId) if len(ret) == 0 { @@ -7539,7 +8434,7 @@ func (_mock *MockWorkspacesAPI) WorkspacesScaleLandscapeServices(ctx context.Con } var r0 ApiWorkspacesScaleLandscapeServicesRequest - if returnFunc, ok := ret.Get(0).(func(context.Context, float32) ApiWorkspacesScaleLandscapeServicesRequest); ok { + if returnFunc, ok := ret.Get(0).(func(context.Context, int) ApiWorkspacesScaleLandscapeServicesRequest); ok { r0 = returnFunc(ctx, workspaceId) } else { r0 = ret.Get(0).(ApiWorkspacesScaleLandscapeServicesRequest) @@ -7554,20 +8449,20 @@ type MockWorkspacesAPI_WorkspacesScaleLandscapeServices_Call struct { // WorkspacesScaleLandscapeServices is a helper method to define mock.On call // - ctx context.Context -// - workspaceId float32 +// - workspaceId int func (_e *MockWorkspacesAPI_Expecter) WorkspacesScaleLandscapeServices(ctx any, workspaceId any) *MockWorkspacesAPI_WorkspacesScaleLandscapeServices_Call { return &MockWorkspacesAPI_WorkspacesScaleLandscapeServices_Call{Call: _e.mock.On("WorkspacesScaleLandscapeServices", ctx, workspaceId)} } -func (_c *MockWorkspacesAPI_WorkspacesScaleLandscapeServices_Call) Run(run func(ctx context.Context, workspaceId float32)) *MockWorkspacesAPI_WorkspacesScaleLandscapeServices_Call { +func (_c *MockWorkspacesAPI_WorkspacesScaleLandscapeServices_Call) Run(run func(ctx context.Context, workspaceId int)) *MockWorkspacesAPI_WorkspacesScaleLandscapeServices_Call { _c.Call.Run(func(args mock.Arguments) { var arg0 context.Context if args[0] != nil { arg0 = args[0].(context.Context) } - var arg1 float32 + var arg1 int if args[1] != nil { - arg1 = args[1].(float32) + arg1 = args[1].(int) } run( arg0, @@ -7582,7 +8477,7 @@ func (_c *MockWorkspacesAPI_WorkspacesScaleLandscapeServices_Call) Return(apiWor return _c } -func (_c *MockWorkspacesAPI_WorkspacesScaleLandscapeServices_Call) RunAndReturn(run func(ctx context.Context, workspaceId float32) ApiWorkspacesScaleLandscapeServicesRequest) *MockWorkspacesAPI_WorkspacesScaleLandscapeServices_Call { +func (_c *MockWorkspacesAPI_WorkspacesScaleLandscapeServices_Call) RunAndReturn(run func(ctx context.Context, workspaceId int) ApiWorkspacesScaleLandscapeServicesRequest) *MockWorkspacesAPI_WorkspacesScaleLandscapeServices_Call { _c.Call.Return(run) return _c } @@ -7650,7 +8545,7 @@ func (_c *MockWorkspacesAPI_WorkspacesScaleLandscapeServicesExecute_Call) RunAnd } // WorkspacesServerLogs provides a mock function for the type MockWorkspacesAPI -func (_mock *MockWorkspacesAPI) WorkspacesServerLogs(ctx context.Context, workspaceId float32, step float32, server string) ApiWorkspacesServerLogsRequest { +func (_mock *MockWorkspacesAPI) WorkspacesServerLogs(ctx context.Context, workspaceId int, step int, server string) ApiWorkspacesServerLogsRequest { ret := _mock.Called(ctx, workspaceId, step, server) if len(ret) == 0 { @@ -7658,7 +8553,7 @@ func (_mock *MockWorkspacesAPI) WorkspacesServerLogs(ctx context.Context, worksp } var r0 ApiWorkspacesServerLogsRequest - if returnFunc, ok := ret.Get(0).(func(context.Context, float32, float32, string) ApiWorkspacesServerLogsRequest); ok { + if returnFunc, ok := ret.Get(0).(func(context.Context, int, int, string) ApiWorkspacesServerLogsRequest); ok { r0 = returnFunc(ctx, workspaceId, step, server) } else { r0 = ret.Get(0).(ApiWorkspacesServerLogsRequest) @@ -7673,26 +8568,26 @@ type MockWorkspacesAPI_WorkspacesServerLogs_Call struct { // WorkspacesServerLogs is a helper method to define mock.On call // - ctx context.Context -// - workspaceId float32 -// - step float32 +// - workspaceId int +// - step int // - server string func (_e *MockWorkspacesAPI_Expecter) WorkspacesServerLogs(ctx any, workspaceId any, step any, server any) *MockWorkspacesAPI_WorkspacesServerLogs_Call { return &MockWorkspacesAPI_WorkspacesServerLogs_Call{Call: _e.mock.On("WorkspacesServerLogs", ctx, workspaceId, step, server)} } -func (_c *MockWorkspacesAPI_WorkspacesServerLogs_Call) Run(run func(ctx context.Context, workspaceId float32, step float32, server string)) *MockWorkspacesAPI_WorkspacesServerLogs_Call { +func (_c *MockWorkspacesAPI_WorkspacesServerLogs_Call) Run(run func(ctx context.Context, workspaceId int, step int, server string)) *MockWorkspacesAPI_WorkspacesServerLogs_Call { _c.Call.Run(func(args mock.Arguments) { var arg0 context.Context if args[0] != nil { arg0 = args[0].(context.Context) } - var arg1 float32 + var arg1 int if args[1] != nil { - arg1 = args[1].(float32) + arg1 = args[1].(int) } - var arg2 float32 + var arg2 int if args[2] != nil { - arg2 = args[2].(float32) + arg2 = args[2].(int) } var arg3 string if args[3] != nil { @@ -7713,7 +8608,7 @@ func (_c *MockWorkspacesAPI_WorkspacesServerLogs_Call) Return(apiWorkspacesServe return _c } -func (_c *MockWorkspacesAPI_WorkspacesServerLogs_Call) RunAndReturn(run func(ctx context.Context, workspaceId float32, step float32, server string) ApiWorkspacesServerLogsRequest) *MockWorkspacesAPI_WorkspacesServerLogs_Call { +func (_c *MockWorkspacesAPI_WorkspacesServerLogs_Call) RunAndReturn(run func(ctx context.Context, workspaceId int, step int, server string) ApiWorkspacesServerLogsRequest) *MockWorkspacesAPI_WorkspacesServerLogs_Call { _c.Call.Return(run) return _c } @@ -7789,7 +8684,7 @@ func (_c *MockWorkspacesAPI_WorkspacesServerLogsExecute_Call) RunAndReturn(run f } // WorkspacesSetEnvVar provides a mock function for the type MockWorkspacesAPI -func (_mock *MockWorkspacesAPI) WorkspacesSetEnvVar(ctx context.Context, workspaceId float32) ApiWorkspacesSetEnvVarRequest { +func (_mock *MockWorkspacesAPI) WorkspacesSetEnvVar(ctx context.Context, workspaceId int) ApiWorkspacesSetEnvVarRequest { ret := _mock.Called(ctx, workspaceId) if len(ret) == 0 { @@ -7797,7 +8692,7 @@ func (_mock *MockWorkspacesAPI) WorkspacesSetEnvVar(ctx context.Context, workspa } var r0 ApiWorkspacesSetEnvVarRequest - if returnFunc, ok := ret.Get(0).(func(context.Context, float32) ApiWorkspacesSetEnvVarRequest); ok { + if returnFunc, ok := ret.Get(0).(func(context.Context, int) ApiWorkspacesSetEnvVarRequest); ok { r0 = returnFunc(ctx, workspaceId) } else { r0 = ret.Get(0).(ApiWorkspacesSetEnvVarRequest) @@ -7812,20 +8707,20 @@ type MockWorkspacesAPI_WorkspacesSetEnvVar_Call struct { // WorkspacesSetEnvVar is a helper method to define mock.On call // - ctx context.Context -// - workspaceId float32 +// - workspaceId int func (_e *MockWorkspacesAPI_Expecter) WorkspacesSetEnvVar(ctx any, workspaceId any) *MockWorkspacesAPI_WorkspacesSetEnvVar_Call { return &MockWorkspacesAPI_WorkspacesSetEnvVar_Call{Call: _e.mock.On("WorkspacesSetEnvVar", ctx, workspaceId)} } -func (_c *MockWorkspacesAPI_WorkspacesSetEnvVar_Call) Run(run func(ctx context.Context, workspaceId float32)) *MockWorkspacesAPI_WorkspacesSetEnvVar_Call { +func (_c *MockWorkspacesAPI_WorkspacesSetEnvVar_Call) Run(run func(ctx context.Context, workspaceId int)) *MockWorkspacesAPI_WorkspacesSetEnvVar_Call { _c.Call.Run(func(args mock.Arguments) { var arg0 context.Context if args[0] != nil { arg0 = args[0].(context.Context) } - var arg1 float32 + var arg1 int if args[1] != nil { - arg1 = args[1].(float32) + arg1 = args[1].(int) } run( arg0, @@ -7840,7 +8735,7 @@ func (_c *MockWorkspacesAPI_WorkspacesSetEnvVar_Call) Return(apiWorkspacesSetEnv return _c } -func (_c *MockWorkspacesAPI_WorkspacesSetEnvVar_Call) RunAndReturn(run func(ctx context.Context, workspaceId float32) ApiWorkspacesSetEnvVarRequest) *MockWorkspacesAPI_WorkspacesSetEnvVar_Call { +func (_c *MockWorkspacesAPI_WorkspacesSetEnvVar_Call) RunAndReturn(run func(ctx context.Context, workspaceId int) ApiWorkspacesSetEnvVarRequest) *MockWorkspacesAPI_WorkspacesSetEnvVar_Call { _c.Call.Return(run) return _c } @@ -7908,7 +8803,7 @@ func (_c *MockWorkspacesAPI_WorkspacesSetEnvVarExecute_Call) RunAndReturn(run fu } // WorkspacesStartPipelineStage provides a mock function for the type MockWorkspacesAPI -func (_mock *MockWorkspacesAPI) WorkspacesStartPipelineStage(ctx context.Context, workspaceId float32, stage string) ApiWorkspacesStartPipelineStageRequest { +func (_mock *MockWorkspacesAPI) WorkspacesStartPipelineStage(ctx context.Context, workspaceId int, stage string) ApiWorkspacesStartPipelineStageRequest { ret := _mock.Called(ctx, workspaceId, stage) if len(ret) == 0 { @@ -7916,7 +8811,7 @@ func (_mock *MockWorkspacesAPI) WorkspacesStartPipelineStage(ctx context.Context } var r0 ApiWorkspacesStartPipelineStageRequest - if returnFunc, ok := ret.Get(0).(func(context.Context, float32, string) ApiWorkspacesStartPipelineStageRequest); ok { + if returnFunc, ok := ret.Get(0).(func(context.Context, int, string) ApiWorkspacesStartPipelineStageRequest); ok { r0 = returnFunc(ctx, workspaceId, stage) } else { r0 = ret.Get(0).(ApiWorkspacesStartPipelineStageRequest) @@ -7931,21 +8826,21 @@ type MockWorkspacesAPI_WorkspacesStartPipelineStage_Call struct { // WorkspacesStartPipelineStage is a helper method to define mock.On call // - ctx context.Context -// - workspaceId float32 +// - workspaceId int // - stage string func (_e *MockWorkspacesAPI_Expecter) WorkspacesStartPipelineStage(ctx any, workspaceId any, stage any) *MockWorkspacesAPI_WorkspacesStartPipelineStage_Call { return &MockWorkspacesAPI_WorkspacesStartPipelineStage_Call{Call: _e.mock.On("WorkspacesStartPipelineStage", ctx, workspaceId, stage)} } -func (_c *MockWorkspacesAPI_WorkspacesStartPipelineStage_Call) Run(run func(ctx context.Context, workspaceId float32, stage string)) *MockWorkspacesAPI_WorkspacesStartPipelineStage_Call { +func (_c *MockWorkspacesAPI_WorkspacesStartPipelineStage_Call) Run(run func(ctx context.Context, workspaceId int, stage string)) *MockWorkspacesAPI_WorkspacesStartPipelineStage_Call { _c.Call.Run(func(args mock.Arguments) { var arg0 context.Context if args[0] != nil { arg0 = args[0].(context.Context) } - var arg1 float32 + var arg1 int if args[1] != nil { - arg1 = args[1].(float32) + arg1 = args[1].(int) } var arg2 string if args[2] != nil { @@ -7965,13 +8860,13 @@ func (_c *MockWorkspacesAPI_WorkspacesStartPipelineStage_Call) Return(apiWorkspa return _c } -func (_c *MockWorkspacesAPI_WorkspacesStartPipelineStage_Call) RunAndReturn(run func(ctx context.Context, workspaceId float32, stage string) ApiWorkspacesStartPipelineStageRequest) *MockWorkspacesAPI_WorkspacesStartPipelineStage_Call { +func (_c *MockWorkspacesAPI_WorkspacesStartPipelineStage_Call) RunAndReturn(run func(ctx context.Context, workspaceId int, stage string) ApiWorkspacesStartPipelineStageRequest) *MockWorkspacesAPI_WorkspacesStartPipelineStage_Call { _c.Call.Return(run) return _c } // WorkspacesStartPipelineStage1 provides a mock function for the type MockWorkspacesAPI -func (_mock *MockWorkspacesAPI) WorkspacesStartPipelineStage1(ctx context.Context, workspaceId float32, stage string, profile string) ApiWorkspacesStartPipelineStage1Request { +func (_mock *MockWorkspacesAPI) WorkspacesStartPipelineStage1(ctx context.Context, workspaceId int, stage string, profile string) ApiWorkspacesStartPipelineStage1Request { ret := _mock.Called(ctx, workspaceId, stage, profile) if len(ret) == 0 { @@ -7979,7 +8874,7 @@ func (_mock *MockWorkspacesAPI) WorkspacesStartPipelineStage1(ctx context.Contex } var r0 ApiWorkspacesStartPipelineStage1Request - if returnFunc, ok := ret.Get(0).(func(context.Context, float32, string, string) ApiWorkspacesStartPipelineStage1Request); ok { + if returnFunc, ok := ret.Get(0).(func(context.Context, int, string, string) ApiWorkspacesStartPipelineStage1Request); ok { r0 = returnFunc(ctx, workspaceId, stage, profile) } else { r0 = ret.Get(0).(ApiWorkspacesStartPipelineStage1Request) @@ -7994,22 +8889,22 @@ type MockWorkspacesAPI_WorkspacesStartPipelineStage1_Call struct { // WorkspacesStartPipelineStage1 is a helper method to define mock.On call // - ctx context.Context -// - workspaceId float32 +// - workspaceId int // - stage string // - profile string func (_e *MockWorkspacesAPI_Expecter) WorkspacesStartPipelineStage1(ctx any, workspaceId any, stage any, profile any) *MockWorkspacesAPI_WorkspacesStartPipelineStage1_Call { return &MockWorkspacesAPI_WorkspacesStartPipelineStage1_Call{Call: _e.mock.On("WorkspacesStartPipelineStage1", ctx, workspaceId, stage, profile)} } -func (_c *MockWorkspacesAPI_WorkspacesStartPipelineStage1_Call) Run(run func(ctx context.Context, workspaceId float32, stage string, profile string)) *MockWorkspacesAPI_WorkspacesStartPipelineStage1_Call { +func (_c *MockWorkspacesAPI_WorkspacesStartPipelineStage1_Call) Run(run func(ctx context.Context, workspaceId int, stage string, profile string)) *MockWorkspacesAPI_WorkspacesStartPipelineStage1_Call { _c.Call.Run(func(args mock.Arguments) { var arg0 context.Context if args[0] != nil { arg0 = args[0].(context.Context) } - var arg1 float32 + var arg1 int if args[1] != nil { - arg1 = args[1].(float32) + arg1 = args[1].(int) } var arg2 string if args[2] != nil { @@ -8034,7 +8929,7 @@ func (_c *MockWorkspacesAPI_WorkspacesStartPipelineStage1_Call) Return(apiWorksp return _c } -func (_c *MockWorkspacesAPI_WorkspacesStartPipelineStage1_Call) RunAndReturn(run func(ctx context.Context, workspaceId float32, stage string, profile string) ApiWorkspacesStartPipelineStage1Request) *MockWorkspacesAPI_WorkspacesStartPipelineStage1_Call { +func (_c *MockWorkspacesAPI_WorkspacesStartPipelineStage1_Call) RunAndReturn(run func(ctx context.Context, workspaceId int, stage string, profile string) ApiWorkspacesStartPipelineStage1Request) *MockWorkspacesAPI_WorkspacesStartPipelineStage1_Call { _c.Call.Return(run) return _c } @@ -8164,7 +9059,7 @@ func (_c *MockWorkspacesAPI_WorkspacesStartPipelineStageExecute_Call) RunAndRetu } // WorkspacesStopPipelineStage provides a mock function for the type MockWorkspacesAPI -func (_mock *MockWorkspacesAPI) WorkspacesStopPipelineStage(ctx context.Context, workspaceId float32, stage string) ApiWorkspacesStopPipelineStageRequest { +func (_mock *MockWorkspacesAPI) WorkspacesStopPipelineStage(ctx context.Context, workspaceId int, stage string) ApiWorkspacesStopPipelineStageRequest { ret := _mock.Called(ctx, workspaceId, stage) if len(ret) == 0 { @@ -8172,7 +9067,7 @@ func (_mock *MockWorkspacesAPI) WorkspacesStopPipelineStage(ctx context.Context, } var r0 ApiWorkspacesStopPipelineStageRequest - if returnFunc, ok := ret.Get(0).(func(context.Context, float32, string) ApiWorkspacesStopPipelineStageRequest); ok { + if returnFunc, ok := ret.Get(0).(func(context.Context, int, string) ApiWorkspacesStopPipelineStageRequest); ok { r0 = returnFunc(ctx, workspaceId, stage) } else { r0 = ret.Get(0).(ApiWorkspacesStopPipelineStageRequest) @@ -8187,21 +9082,21 @@ type MockWorkspacesAPI_WorkspacesStopPipelineStage_Call struct { // WorkspacesStopPipelineStage is a helper method to define mock.On call // - ctx context.Context -// - workspaceId float32 +// - workspaceId int // - stage string func (_e *MockWorkspacesAPI_Expecter) WorkspacesStopPipelineStage(ctx any, workspaceId any, stage any) *MockWorkspacesAPI_WorkspacesStopPipelineStage_Call { return &MockWorkspacesAPI_WorkspacesStopPipelineStage_Call{Call: _e.mock.On("WorkspacesStopPipelineStage", ctx, workspaceId, stage)} } -func (_c *MockWorkspacesAPI_WorkspacesStopPipelineStage_Call) Run(run func(ctx context.Context, workspaceId float32, stage string)) *MockWorkspacesAPI_WorkspacesStopPipelineStage_Call { +func (_c *MockWorkspacesAPI_WorkspacesStopPipelineStage_Call) Run(run func(ctx context.Context, workspaceId int, stage string)) *MockWorkspacesAPI_WorkspacesStopPipelineStage_Call { _c.Call.Run(func(args mock.Arguments) { var arg0 context.Context if args[0] != nil { arg0 = args[0].(context.Context) } - var arg1 float32 + var arg1 int if args[1] != nil { - arg1 = args[1].(float32) + arg1 = args[1].(int) } var arg2 string if args[2] != nil { @@ -8221,7 +9116,7 @@ func (_c *MockWorkspacesAPI_WorkspacesStopPipelineStage_Call) Return(apiWorkspac return _c } -func (_c *MockWorkspacesAPI_WorkspacesStopPipelineStage_Call) RunAndReturn(run func(ctx context.Context, workspaceId float32, stage string) ApiWorkspacesStopPipelineStageRequest) *MockWorkspacesAPI_WorkspacesStopPipelineStage_Call { +func (_c *MockWorkspacesAPI_WorkspacesStopPipelineStage_Call) RunAndReturn(run func(ctx context.Context, workspaceId int, stage string) ApiWorkspacesStopPipelineStageRequest) *MockWorkspacesAPI_WorkspacesStopPipelineStage_Call { _c.Call.Return(run) return _c } @@ -8289,7 +9184,7 @@ func (_c *MockWorkspacesAPI_WorkspacesStopPipelineStageExecute_Call) RunAndRetur } // WorkspacesTeardownLandscape provides a mock function for the type MockWorkspacesAPI -func (_mock *MockWorkspacesAPI) WorkspacesTeardownLandscape(ctx context.Context, workspaceId float32) ApiWorkspacesTeardownLandscapeRequest { +func (_mock *MockWorkspacesAPI) WorkspacesTeardownLandscape(ctx context.Context, workspaceId int) ApiWorkspacesTeardownLandscapeRequest { ret := _mock.Called(ctx, workspaceId) if len(ret) == 0 { @@ -8297,7 +9192,7 @@ func (_mock *MockWorkspacesAPI) WorkspacesTeardownLandscape(ctx context.Context, } var r0 ApiWorkspacesTeardownLandscapeRequest - if returnFunc, ok := ret.Get(0).(func(context.Context, float32) ApiWorkspacesTeardownLandscapeRequest); ok { + if returnFunc, ok := ret.Get(0).(func(context.Context, int) ApiWorkspacesTeardownLandscapeRequest); ok { r0 = returnFunc(ctx, workspaceId) } else { r0 = ret.Get(0).(ApiWorkspacesTeardownLandscapeRequest) @@ -8312,20 +9207,20 @@ type MockWorkspacesAPI_WorkspacesTeardownLandscape_Call struct { // WorkspacesTeardownLandscape is a helper method to define mock.On call // - ctx context.Context -// - workspaceId float32 +// - workspaceId int func (_e *MockWorkspacesAPI_Expecter) WorkspacesTeardownLandscape(ctx any, workspaceId any) *MockWorkspacesAPI_WorkspacesTeardownLandscape_Call { return &MockWorkspacesAPI_WorkspacesTeardownLandscape_Call{Call: _e.mock.On("WorkspacesTeardownLandscape", ctx, workspaceId)} } -func (_c *MockWorkspacesAPI_WorkspacesTeardownLandscape_Call) Run(run func(ctx context.Context, workspaceId float32)) *MockWorkspacesAPI_WorkspacesTeardownLandscape_Call { +func (_c *MockWorkspacesAPI_WorkspacesTeardownLandscape_Call) Run(run func(ctx context.Context, workspaceId int)) *MockWorkspacesAPI_WorkspacesTeardownLandscape_Call { _c.Call.Run(func(args mock.Arguments) { var arg0 context.Context if args[0] != nil { arg0 = args[0].(context.Context) } - var arg1 float32 + var arg1 int if args[1] != nil { - arg1 = args[1].(float32) + arg1 = args[1].(int) } run( arg0, @@ -8340,7 +9235,7 @@ func (_c *MockWorkspacesAPI_WorkspacesTeardownLandscape_Call) Return(apiWorkspac return _c } -func (_c *MockWorkspacesAPI_WorkspacesTeardownLandscape_Call) RunAndReturn(run func(ctx context.Context, workspaceId float32) ApiWorkspacesTeardownLandscapeRequest) *MockWorkspacesAPI_WorkspacesTeardownLandscape_Call { +func (_c *MockWorkspacesAPI_WorkspacesTeardownLandscape_Call) RunAndReturn(run func(ctx context.Context, workspaceId int) ApiWorkspacesTeardownLandscapeRequest) *MockWorkspacesAPI_WorkspacesTeardownLandscape_Call { _c.Call.Return(run) return _c } @@ -8408,7 +9303,7 @@ func (_c *MockWorkspacesAPI_WorkspacesTeardownLandscapeExecute_Call) RunAndRetur } // WorkspacesUpdateWorkspace provides a mock function for the type MockWorkspacesAPI -func (_mock *MockWorkspacesAPI) WorkspacesUpdateWorkspace(ctx context.Context, workspaceId float32) ApiWorkspacesUpdateWorkspaceRequest { +func (_mock *MockWorkspacesAPI) WorkspacesUpdateWorkspace(ctx context.Context, workspaceId int) ApiWorkspacesUpdateWorkspaceRequest { ret := _mock.Called(ctx, workspaceId) if len(ret) == 0 { @@ -8416,7 +9311,7 @@ func (_mock *MockWorkspacesAPI) WorkspacesUpdateWorkspace(ctx context.Context, w } var r0 ApiWorkspacesUpdateWorkspaceRequest - if returnFunc, ok := ret.Get(0).(func(context.Context, float32) ApiWorkspacesUpdateWorkspaceRequest); ok { + if returnFunc, ok := ret.Get(0).(func(context.Context, int) ApiWorkspacesUpdateWorkspaceRequest); ok { r0 = returnFunc(ctx, workspaceId) } else { r0 = ret.Get(0).(ApiWorkspacesUpdateWorkspaceRequest) @@ -8431,20 +9326,20 @@ type MockWorkspacesAPI_WorkspacesUpdateWorkspace_Call struct { // WorkspacesUpdateWorkspace is a helper method to define mock.On call // - ctx context.Context -// - workspaceId float32 +// - workspaceId int func (_e *MockWorkspacesAPI_Expecter) WorkspacesUpdateWorkspace(ctx any, workspaceId any) *MockWorkspacesAPI_WorkspacesUpdateWorkspace_Call { return &MockWorkspacesAPI_WorkspacesUpdateWorkspace_Call{Call: _e.mock.On("WorkspacesUpdateWorkspace", ctx, workspaceId)} } -func (_c *MockWorkspacesAPI_WorkspacesUpdateWorkspace_Call) Run(run func(ctx context.Context, workspaceId float32)) *MockWorkspacesAPI_WorkspacesUpdateWorkspace_Call { +func (_c *MockWorkspacesAPI_WorkspacesUpdateWorkspace_Call) Run(run func(ctx context.Context, workspaceId int)) *MockWorkspacesAPI_WorkspacesUpdateWorkspace_Call { _c.Call.Run(func(args mock.Arguments) { var arg0 context.Context if args[0] != nil { arg0 = args[0].(context.Context) } - var arg1 float32 + var arg1 int if args[1] != nil { - arg1 = args[1].(float32) + arg1 = args[1].(int) } run( arg0, @@ -8459,7 +9354,7 @@ func (_c *MockWorkspacesAPI_WorkspacesUpdateWorkspace_Call) Return(apiWorkspaces return _c } -func (_c *MockWorkspacesAPI_WorkspacesUpdateWorkspace_Call) RunAndReturn(run func(ctx context.Context, workspaceId float32) ApiWorkspacesUpdateWorkspaceRequest) *MockWorkspacesAPI_WorkspacesUpdateWorkspace_Call { +func (_c *MockWorkspacesAPI_WorkspacesUpdateWorkspace_Call) RunAndReturn(run func(ctx context.Context, workspaceId int) ApiWorkspacesUpdateWorkspaceRequest) *MockWorkspacesAPI_WorkspacesUpdateWorkspace_Call { _c.Call.Return(run) return _c } diff --git a/api/openapi_client/model_managed_services_create_request.go b/api/openapi_client/model_managed_services_create_request.go index a5cd15f5..6e6a1a26 100644 --- a/api/openapi_client/model_managed_services_create_request.go +++ b/api/openapi_client/model_managed_services_create_request.go @@ -30,6 +30,8 @@ type ManagedServicesCreateRequest struct { RecoverFrom *ManagedServicesCreateRequestRecoverFrom `json:"recoverFrom,omitempty"` Secrets map[string]interface{} `json:"secrets"` TeamId int `json:"teamId"` + // A semantic version number + Version *string `json:"version,omitempty"` } type _ManagedServicesCreateRequest ManagedServicesCreateRequest @@ -265,6 +267,38 @@ func (o *ManagedServicesCreateRequest) SetTeamId(v int) { o.TeamId = v } +// GetVersion returns the Version field value if set, zero value otherwise. +func (o *ManagedServicesCreateRequest) GetVersion() string { + if o == nil || IsNil(o.Version) { + var ret string + return ret + } + return *o.Version +} + +// GetVersionOk returns a tuple with the Version field value if set, nil otherwise +// and a boolean to check if the value has been set. +func (o *ManagedServicesCreateRequest) GetVersionOk() (*string, bool) { + if o == nil || IsNil(o.Version) { + return nil, false + } + return o.Version, true +} + +// HasVersion returns a boolean if a field has been set. +func (o *ManagedServicesCreateRequest) HasVersion() bool { + if o != nil && !IsNil(o.Version) { + return true + } + + return false +} + +// SetVersion gets a reference to the given string and assigns it to the Version field. +func (o *ManagedServicesCreateRequest) SetVersion(v string) { + o.Version = &v +} + func (o ManagedServicesCreateRequest) MarshalJSON() ([]byte, error) { toSerialize, err := o.ToMap() if err != nil { @@ -287,6 +321,9 @@ func (o ManagedServicesCreateRequest) ToMap() (map[string]interface{}, error) { } toSerialize["secrets"] = o.Secrets toSerialize["teamId"] = o.TeamId + if !IsNil(o.Version) { + toSerialize["version"] = o.Version + } return toSerialize, nil } diff --git a/api/openapi_client/model_managed_services_list_200_response_inner.go b/api/openapi_client/model_managed_services_list_200_response_inner.go index b5376389..1c59df23 100644 --- a/api/openapi_client/model_managed_services_list_200_response_inner.go +++ b/api/openapi_client/model_managed_services_list_200_response_inner.go @@ -34,6 +34,8 @@ type ManagedServicesList200ResponseInner struct { Config map[string]interface{} `json:"config"` RecentEvents []ManagedServicesList200ResponseInnerRecentEventsInner `json:"recentEvents,omitempty"` Status ManagedServicesList200ResponseInnerStatus `json:"status"` + // A semantic version number + Version *string `json:"version,omitempty"` } type _ManagedServicesList200ResponseInner ManagedServicesList200ResponseInner @@ -312,6 +314,38 @@ func (o *ManagedServicesList200ResponseInner) SetStatus(v ManagedServicesList200 o.Status = v } +// GetVersion returns the Version field value if set, zero value otherwise. +func (o *ManagedServicesList200ResponseInner) GetVersion() string { + if o == nil || IsNil(o.Version) { + var ret string + return ret + } + return *o.Version +} + +// GetVersionOk returns a tuple with the Version field value if set, nil otherwise +// and a boolean to check if the value has been set. +func (o *ManagedServicesList200ResponseInner) GetVersionOk() (*string, bool) { + if o == nil || IsNil(o.Version) { + return nil, false + } + return o.Version, true +} + +// HasVersion returns a boolean if a field has been set. +func (o *ManagedServicesList200ResponseInner) HasVersion() bool { + if o != nil && !IsNil(o.Version) { + return true + } + + return false +} + +// SetVersion gets a reference to the given string and assigns it to the Version field. +func (o *ManagedServicesList200ResponseInner) SetVersion(v string) { + o.Version = &v +} + func (o ManagedServicesList200ResponseInner) MarshalJSON() ([]byte, error) { toSerialize, err := o.ToMap() if err != nil { @@ -334,6 +368,9 @@ func (o ManagedServicesList200ResponseInner) ToMap() (map[string]interface{}, er toSerialize["recentEvents"] = o.RecentEvents } toSerialize["status"] = o.Status + if !IsNil(o.Version) { + toSerialize["version"] = o.Version + } return toSerialize, nil } diff --git a/api/openapi_client/model_managed_services_update_request.go b/api/openapi_client/model_managed_services_update_request.go index 44c23f19..fc632fb1 100644 --- a/api/openapi_client/model_managed_services_update_request.go +++ b/api/openapi_client/model_managed_services_update_request.go @@ -20,13 +20,14 @@ var _ MappedNullable = &ManagedServicesUpdateRequest{} // ManagedServicesUpdateRequest struct for ManagedServicesUpdateRequest type ManagedServicesUpdateRequest struct { - Backups *ManagedServicesUpdateRequestBackups `json:"backups,omitempty"` - Config map[string]interface{} `json:"config,omitempty"` - Secrets map[string]interface{} `json:"secrets,omitempty"` - Name *string `json:"name,omitempty"` - Pause *bool `json:"pause,omitempty"` - Plan *ManagedServicesList200ResponseInnerPlan `json:"plan,omitempty"` - Versions *map[string]ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue `json:"versions,omitempty"` + Backups *ManagedServicesUpdateRequestBackups `json:"backups,omitempty"` + Config map[string]interface{} `json:"config,omitempty"` + Secrets map[string]interface{} `json:"secrets,omitempty"` + Name *string `json:"name,omitempty"` + Pause *bool `json:"pause,omitempty"` + Plan *ManagedServicesList200ResponseInnerPlan `json:"plan,omitempty"` + // A semantic version number + Version *string `json:"version,omitempty"` } // NewManagedServicesUpdateRequest instantiates a new ManagedServicesUpdateRequest object @@ -238,36 +239,36 @@ func (o *ManagedServicesUpdateRequest) SetPlan(v ManagedServicesList200ResponseI o.Plan = &v } -// GetVersions returns the Versions field value if set, zero value otherwise. -func (o *ManagedServicesUpdateRequest) GetVersions() map[string]ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue { - if o == nil || IsNil(o.Versions) { - var ret map[string]ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue +// GetVersion returns the Version field value if set, zero value otherwise. +func (o *ManagedServicesUpdateRequest) GetVersion() string { + if o == nil || IsNil(o.Version) { + var ret string return ret } - return *o.Versions + return *o.Version } -// GetVersionsOk returns a tuple with the Versions field value if set, nil otherwise +// GetVersionOk returns a tuple with the Version field value if set, nil otherwise // and a boolean to check if the value has been set. -func (o *ManagedServicesUpdateRequest) GetVersionsOk() (*map[string]ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue, bool) { - if o == nil || IsNil(o.Versions) { +func (o *ManagedServicesUpdateRequest) GetVersionOk() (*string, bool) { + if o == nil || IsNil(o.Version) { return nil, false } - return o.Versions, true + return o.Version, true } -// HasVersions returns a boolean if a field has been set. -func (o *ManagedServicesUpdateRequest) HasVersions() bool { - if o != nil && !IsNil(o.Versions) { +// HasVersion returns a boolean if a field has been set. +func (o *ManagedServicesUpdateRequest) HasVersion() bool { + if o != nil && !IsNil(o.Version) { return true } return false } -// SetVersions gets a reference to the given map[string]ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue and assigns it to the Versions field. -func (o *ManagedServicesUpdateRequest) SetVersions(v map[string]ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue) { - o.Versions = &v +// SetVersion gets a reference to the given string and assigns it to the Version field. +func (o *ManagedServicesUpdateRequest) SetVersion(v string) { + o.Version = &v } func (o ManagedServicesUpdateRequest) MarshalJSON() ([]byte, error) { @@ -298,8 +299,8 @@ func (o ManagedServicesUpdateRequest) ToMap() (map[string]interface{}, error) { if !IsNil(o.Plan) { toSerialize["plan"] = o.Plan } - if !IsNil(o.Versions) { - toSerialize["versions"] = o.Versions + if !IsNil(o.Version) { + toSerialize["version"] = o.Version } return toSerialize, nil } diff --git a/api/openapi_client/model_vault_create_shared_vault_request.go b/api/openapi_client/model_vault_create_shared_vault_request.go new file mode 100644 index 00000000..da9ed573 --- /dev/null +++ b/api/openapi_client/model_vault_create_shared_vault_request.go @@ -0,0 +1,158 @@ +// Copyright (c) Codesphere Inc. +// SPDX-License-Identifier: Apache-2.0 + +/* +Codesphere Public API + +API version: 0.1.0 +*/ + +// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. + +package openapi_client + +import ( + "bytes" + "encoding/json" + "fmt" +) + +// checks if the VaultCreateSharedVaultRequest type satisfies the MappedNullable interface at compile time +var _ MappedNullable = &VaultCreateSharedVaultRequest{} + +// VaultCreateSharedVaultRequest struct for VaultCreateSharedVaultRequest +type VaultCreateSharedVaultRequest struct { + // The name of the shared vault. + Name string `json:"name"` +} + +type _VaultCreateSharedVaultRequest VaultCreateSharedVaultRequest + +// NewVaultCreateSharedVaultRequest instantiates a new VaultCreateSharedVaultRequest object +// This constructor will assign default values to properties that have it defined, +// and makes sure properties required by API are set, but the set of arguments +// will change when the set of required properties is changed +func NewVaultCreateSharedVaultRequest(name string) *VaultCreateSharedVaultRequest { + this := VaultCreateSharedVaultRequest{} + this.Name = name + return &this +} + +// NewVaultCreateSharedVaultRequestWithDefaults instantiates a new VaultCreateSharedVaultRequest object +// This constructor will only assign default values to properties that have it defined, +// but it doesn't guarantee that properties required by API are set +func NewVaultCreateSharedVaultRequestWithDefaults() *VaultCreateSharedVaultRequest { + this := VaultCreateSharedVaultRequest{} + return &this +} + +// GetName returns the Name field value +func (o *VaultCreateSharedVaultRequest) GetName() string { + if o == nil { + var ret string + return ret + } + + return o.Name +} + +// GetNameOk returns a tuple with the Name field value +// and a boolean to check if the value has been set. +func (o *VaultCreateSharedVaultRequest) GetNameOk() (*string, bool) { + if o == nil { + return nil, false + } + return &o.Name, true +} + +// SetName sets field value +func (o *VaultCreateSharedVaultRequest) SetName(v string) { + o.Name = v +} + +func (o VaultCreateSharedVaultRequest) MarshalJSON() ([]byte, error) { + toSerialize, err := o.ToMap() + if err != nil { + return []byte{}, err + } + return json.Marshal(toSerialize) +} + +func (o VaultCreateSharedVaultRequest) ToMap() (map[string]interface{}, error) { + toSerialize := map[string]interface{}{} + toSerialize["name"] = o.Name + return toSerialize, nil +} + +func (o *VaultCreateSharedVaultRequest) UnmarshalJSON(data []byte) (err error) { + // This validates that all required properties are included in the JSON object + // by unmarshalling the object into a generic map with string keys and checking + // that every required field exists as a key in the generic map. + requiredProperties := []string{ + "name", + } + + allProperties := make(map[string]interface{}) + + err = json.Unmarshal(data, &allProperties) + + if err != nil { + return err + } + + for _, requiredProperty := range requiredProperties { + if _, exists := allProperties[requiredProperty]; !exists { + return fmt.Errorf("no value given for required property %v", requiredProperty) + } + } + + varVaultCreateSharedVaultRequest := _VaultCreateSharedVaultRequest{} + + decoder := json.NewDecoder(bytes.NewReader(data)) + //decoder.DisallowUnknownFields() + err = decoder.Decode(&varVaultCreateSharedVaultRequest) + + if err != nil { + return err + } + + *o = VaultCreateSharedVaultRequest(varVaultCreateSharedVaultRequest) + + return err +} + +type NullableVaultCreateSharedVaultRequest struct { + value *VaultCreateSharedVaultRequest + isSet bool +} + +func (v NullableVaultCreateSharedVaultRequest) Get() *VaultCreateSharedVaultRequest { + return v.value +} + +func (v *NullableVaultCreateSharedVaultRequest) Set(val *VaultCreateSharedVaultRequest) { + v.value = val + v.isSet = true +} + +func (v NullableVaultCreateSharedVaultRequest) IsSet() bool { + return v.isSet +} + +func (v *NullableVaultCreateSharedVaultRequest) Unset() { + v.value = nil + v.isSet = false +} + +func NewNullableVaultCreateSharedVaultRequest(val *VaultCreateSharedVaultRequest) *NullableVaultCreateSharedVaultRequest { + return &NullableVaultCreateSharedVaultRequest{value: val, isSet: true} +} + +func (v NullableVaultCreateSharedVaultRequest) MarshalJSON() ([]byte, error) { + return json.Marshal(v.value) +} + +func (v *NullableVaultCreateSharedVaultRequest) UnmarshalJSON(src []byte) error { + v.isSet = true + return json.Unmarshal(src, &v.value) +} diff --git a/api/team.go b/api/team.go index 66edc95f..285f4214 100644 --- a/api/team.go +++ b/api/team.go @@ -58,7 +58,7 @@ func (c *Client) ListTeams(orgId string) ([]Team, error) { } func (c *Client) GetTeam(teamId int) (*Team, error) { - team, r, err := c.api.TeamsAPI.TeamsGetTeam(c.ctx, float32(teamId)).Execute() + team, r, err := c.api.TeamsAPI.TeamsGetTeam(c.ctx, teamId).Execute() if err != nil { return nil, cserrors.FormatAPIError(r, err) } @@ -101,12 +101,12 @@ func (c *Client) createOrgTeam(orgId string, name string, dc int) (*Team, error) } func (c *Client) DeleteTeam(orgId string, teamId int) error { - r, err := c.api.TeamsAPI.TeamsDeleteTeam(c.ctx, float32(teamId)).Execute() + r, err := c.api.TeamsAPI.TeamsDeleteTeam(c.ctx, teamId).Execute() return cserrors.FormatAPIError(r, err) } func (c *Client) AddTeamMember(teamId int, email string, role int) error { - r, err := c.api.TeamsAPI.TeamsInviteMember(c.ctx, float32(teamId)). + r, err := c.api.TeamsAPI.TeamsInviteMember(c.ctx, teamId). TeamsInviteMemberRequest(openapi_client.TeamsInviteMemberRequest{ UserEmail: email, Role: role, @@ -118,7 +118,7 @@ func (c *Client) AddTeamMember(teamId int, email string, role int) error { } func (c *Client) RemoveTeamMember(teamId int, userId int) error { - r, err := c.api.TeamsAPI.TeamsRemoveMember(c.ctx, float32(teamId), float32(userId)).Execute() + r, err := c.api.TeamsAPI.TeamsRemoveMember(c.ctx, teamId, userId).Execute() if err != nil { return cserrors.FormatAPIError(r, err) } diff --git a/api/usage.go b/api/usage.go index 89c00a29..50c49694 100644 --- a/api/usage.go +++ b/api/usage.go @@ -11,7 +11,7 @@ import ( ) func (c *Client) GetLandscapeServiceEvents(teamId int, resourceId string, beginDate, endDate time.Time, limit, offset int) (*openapi_client.UsageGetLandscapeServiceEvents200Response, error) { - req := c.api.UsageAPI.UsageGetLandscapeServiceEvents(c.ctx, float32(teamId), resourceId). + req := c.api.UsageAPI.UsageGetLandscapeServiceEvents(c.ctx, teamId, resourceId). BeginDate(beginDate). EndDate(endDate) if limit > 0 { @@ -25,7 +25,7 @@ func (c *Client) GetLandscapeServiceEvents(teamId int, resourceId string, beginD } func (c *Client) GetUsageSummaryLandscape(teamId int, beginDate, endDate time.Time, limit, offset int) (*openapi_client.UsageGetUsageSummaryLandscape200Response, error) { - req := c.api.UsageAPI.UsageGetUsageSummaryLandscape(c.ctx, float32(teamId)). + req := c.api.UsageAPI.UsageGetUsageSummaryLandscape(c.ctx, teamId). BeginDate(beginDate). EndDate(endDate) if limit > 0 { diff --git a/api/workspace.go b/api/workspace.go index 396c31be..cfe9edec 100644 --- a/api/workspace.go +++ b/api/workspace.go @@ -13,12 +13,12 @@ import ( ) func (c *Client) ListWorkspaces(teamId int) ([]Workspace, error) { - workspaces, r, err := c.api.WorkspacesAPI.WorkspacesListWorkspaces(c.ctx, float32(teamId)).Execute() + workspaces, r, err := c.api.WorkspacesAPI.WorkspacesListWorkspaces(c.ctx, teamId).Execute() return workspaces, errors.FormatAPIError(r, err) } func (c *Client) GetWorkspace(workspaceId int) (Workspace, error) { - workspace, r, err := c.api.WorkspacesAPI.WorkspacesGetWorkspace(c.ctx, float32(workspaceId)).Execute() + workspace, r, err := c.api.WorkspacesAPI.WorkspacesGetWorkspace(c.ctx, workspaceId).Execute() if workspace != nil { return *workspace, errors.FormatAPIError(r, err) @@ -27,12 +27,12 @@ func (c *Client) GetWorkspace(workspaceId int) (Workspace, error) { } func (c *Client) DeleteWorkspace(workspaceId int) error { - r, err := c.api.WorkspacesAPI.WorkspacesDeleteWorkspace(c.ctx, float32(workspaceId)).Execute() + r, err := c.api.WorkspacesAPI.WorkspacesDeleteWorkspace(c.ctx, workspaceId).Execute() return errors.FormatAPIError(r, err) } func (c *Client) WorkspaceStatus(workspaceId int) (*WorkspaceStatus, error) { - status, r, err := c.api.WorkspacesAPI.WorkspacesGetWorkspaceStatus(c.ctx, float32(workspaceId)).Execute() + status, r, err := c.api.WorkspacesAPI.WorkspacesGetWorkspaceStatus(c.ctx, workspaceId).Execute() return status, errors.FormatAPIError(r, err) } @@ -50,7 +50,7 @@ func (c *Client) SetEnvVarOnWorkspace(workspaceId int, envVars map[string]string }) } - req := c.api.WorkspacesAPI.WorkspacesSetEnvVar(c.ctx, float32(workspaceId)). + req := c.api.WorkspacesAPI.WorkspacesSetEnvVar(c.ctx, workspaceId). WorkspacesCreateWorkspaceRequestEnvInner(vars) r, err := c.api.WorkspacesAPI.WorkspacesSetEnvVarExecute(req) return errors.FormatAPIError(r, err) @@ -68,7 +68,7 @@ func (c *Client) ExecCommand(workspaceId int, command string, workdir string, en Env: &env, } - req := c.api.WorkspacesAPI.WorkspacesExecuteCommand(c.ctx, float32(workspaceId)).WorkspacesExecuteCommandRequest(cmd) + req := c.api.WorkspacesAPI.WorkspacesExecuteCommand(c.ctx, workspaceId).WorkspacesExecuteCommandRequest(cmd) res, r, err := req.Execute() if err != nil { @@ -82,28 +82,28 @@ func (c *Client) ExecCommand(workspaceId int, command string, workdir string, en func (c *Client) DeployLandscape(wsId int, profile string) error { if profile == "ci.yml" || profile == "" { - req := c.api.WorkspacesAPI.WorkspacesDeployLandscape(c.ctx, float32(wsId)) + req := c.api.WorkspacesAPI.WorkspacesDeployLandscape(c.ctx, wsId) r, err := req.Execute() return errors.FormatAPIError(r, err) } - req := c.api.WorkspacesAPI.WorkspacesDeployLandscape1(c.ctx, float32(wsId), profile) + req := c.api.WorkspacesAPI.WorkspacesDeployLandscape1(c.ctx, wsId, profile) r, err := req.Execute() return errors.FormatAPIError(r, err) } func (c *Client) StartPipelineStage(wsId int, profile string, stage string) error { if profile == "ci.yml" || profile == "" { - req := c.api.WorkspacesAPI.WorkspacesStartPipelineStage(c.ctx, float32(wsId), stage) + req := c.api.WorkspacesAPI.WorkspacesStartPipelineStage(c.ctx, wsId, stage) r, err := req.Execute() return errors.FormatAPIError(r, err) } - req := c.api.WorkspacesAPI.WorkspacesStartPipelineStage1(c.ctx, float32(wsId), stage, profile) + req := c.api.WorkspacesAPI.WorkspacesStartPipelineStage1(c.ctx, wsId, stage, profile) r, err := req.Execute() return errors.FormatAPIError(r, err) } func (c *Client) GetPipelineState(wsId int, stage string) ([]PipelineStatus, error) { - req := c.api.WorkspacesAPI.WorkspacesPipelineStatus(c.ctx, float32(wsId), stage) + req := c.api.WorkspacesAPI.WorkspacesPipelineStatus(c.ctx, wsId, stage) res, r, err := req.Execute() return res, errors.FormatAPIError(r, err) } @@ -111,7 +111,7 @@ func (c *Client) GetPipelineState(wsId int, stage string) ([]PipelineStatus, err // ScaleWorkspace sets the number of replicas for a workspace. // For on-demand workspaces, setting replicas to 1 wakes up the workspace. func (c *Client) ScaleWorkspace(wsId int, replicas int) error { - req := c.api.WorkspacesAPI.WorkspacesUpdateWorkspace(c.ctx, float32(wsId)). + req := c.api.WorkspacesAPI.WorkspacesUpdateWorkspace(c.ctx, wsId). WorkspacesUpdateWorkspaceRequest(openapi_client.WorkspacesUpdateWorkspaceRequest{ Replicas: &replicas, }) @@ -122,7 +122,7 @@ func (c *Client) ScaleWorkspace(wsId int, replicas int) error { // ScaleLandscapeServices scales landscape services by name. // The services map contains service name -> replica count. func (c *Client) ScaleLandscapeServices(wsId int, services map[string]int) error { - req := c.api.WorkspacesAPI.WorkspacesScaleLandscapeServices(c.ctx, float32(wsId)). + req := c.api.WorkspacesAPI.WorkspacesScaleLandscapeServices(c.ctx, wsId). RequestBody(services) resp, err := req.Execute() return errors.FormatAPIError(resp, err) @@ -223,27 +223,27 @@ func (client Client) DeployWorkspace(args DeployWorkspaceArgs) (*Workspace, erro func (c Client) GitPull(workspaceId int, remote string, branch string) error { if remote == "" { - req := c.api.WorkspacesAPI.WorkspacesGitPull(c.ctx, float32(workspaceId)) + req := c.api.WorkspacesAPI.WorkspacesGitPull(c.ctx, workspaceId) r, err := req.Execute() return errors.FormatAPIError(r, err) } - req := c.api.WorkspacesAPI.WorkspacesGitPull2(c.ctx, float32(workspaceId), remote, branch) + req := c.api.WorkspacesAPI.WorkspacesGitPull2(c.ctx, workspaceId, remote, branch) r, err := req.Execute() return errors.FormatAPIError(r, err) } func (c *Client) GetLogsOfStage(workspaceId int, stage string, step int) (*openapi_client.WorkspacesLogs200Response, error) { - resp, r, err := c.api.WorkspacesAPI.WorkspacesLogs(c.ctx, float32(workspaceId), stage, float32(step)).Execute() + resp, r, err := c.api.WorkspacesAPI.WorkspacesLogs(c.ctx, workspaceId, stage, step).Execute() return resp, errors.FormatAPIError(r, err) } func (c *Client) GetLogsOfReplica(workspaceId int, step int, replica string) (*openapi_client.WorkspacesReplicaLogs200Response, error) { - resp, r, err := c.api.WorkspacesAPI.WorkspacesReplicaLogs(c.ctx, float32(workspaceId), float32(step), replica).Execute() + resp, r, err := c.api.WorkspacesAPI.WorkspacesReplicaLogs(c.ctx, workspaceId, step, replica).Execute() return resp, errors.FormatAPIError(r, err) } func (c *Client) GetLogsOfServer(workspaceId int, step int, server string) (*openapi_client.WorkspacesServerLogs200Response, error) { - resp, r, err := c.api.WorkspacesAPI.WorkspacesServerLogs(c.ctx, float32(workspaceId), float32(step), server).Execute() + resp, r, err := c.api.WorkspacesAPI.WorkspacesServerLogs(c.ctx, workspaceId, step, server).Execute() return resp, errors.FormatAPIError(r, err) } diff --git a/api/workspace_test.go b/api/workspace_test.go index e631c5a1..5491a53f 100644 --- a/api/workspace_test.go +++ b/api/workspace_test.go @@ -30,7 +30,7 @@ func mockTime() *api.MockTime { } func mockWorkspaceStatus(wsApiMock *openapi_client.MockWorkspacesAPI, workspaceId int, isRunning ...bool) { - wsApiMock.EXPECT().WorkspacesGetWorkspaceStatus(mock.Anything, float32(workspaceId)). + wsApiMock.EXPECT().WorkspacesGetWorkspaceStatus(mock.Anything, workspaceId). Return(openapi_client.ApiWorkspacesGetWorkspaceStatusRequest{ApiService: wsApiMock}) for _, running := range isRunning { wsApiMock.EXPECT().WorkspacesGetWorkspaceStatusExecute(mock.Anything).Once().Return(&api.WorkspaceStatus{ @@ -64,7 +64,7 @@ var _ = Describe("Workspace", func() { } teamId := 42 - wsApiMock.EXPECT().WorkspacesListWorkspaces(mock.Anything, float32(teamId)). + wsApiMock.EXPECT().WorkspacesListWorkspaces(mock.Anything, teamId). Return(openapi_client.ApiWorkspacesListWorkspacesRequest{ApiService: wsApiMock}) wsApiMock.EXPECT().WorkspacesListWorkspacesExecute(mock.Anything).Return(expectedWorkspaces, nil, nil) workspaces, err := client.ListWorkspaces(teamId) @@ -105,7 +105,7 @@ var _ = Describe("Workspace", func() { }) Context("GitPull", func() { It("sends request to pull without remote and origin", func() { - wsApiMock.EXPECT().WorkspacesGitPull(mock.Anything, float32(ws.Id)). + wsApiMock.EXPECT().WorkspacesGitPull(mock.Anything, ws.Id). Return(openapi_client.ApiWorkspacesGitPullRequest{ ApiService: wsApiMock, }) @@ -117,7 +117,7 @@ var _ = Describe("Workspace", func() { }) It("sends request to pull with remote and origin when specified", func() { - wsApiMock.EXPECT().WorkspacesGitPull2(mock.Anything, float32(ws.Id), "origin", "my-branch"). + wsApiMock.EXPECT().WorkspacesGitPull2(mock.Anything, ws.Id, "origin", "my-branch"). Return(openapi_client.ApiWorkspacesGitPull2Request{ ApiService: wsApiMock, }) @@ -148,7 +148,7 @@ var _ = Describe("Workspace", func() { }) It("Calls SetEnvVar endpoint when env vars are set", func() { - wsApiMock.EXPECT().WorkspacesSetEnvVar(mock.Anything, float32(0)). + wsApiMock.EXPECT().WorkspacesSetEnvVar(mock.Anything, 0). Return(openapi_client.ApiWorkspacesSetEnvVarRequest{ApiService: wsApiMock}) wsApiMock.EXPECT().WorkspacesSetEnvVarExecute(mock.Anything).Return(nil, nil).Once() @@ -252,7 +252,7 @@ var _ = Describe("Workspace", func() { wsApiMock.EXPECT().WorkspacesCreateWorkspaceExecute(mock.Anything).Return(&ws, nil, nil) envErr := fmt.Errorf("codesphere API returned error 500 (Internal Server Error): failed to set env") - wsApiMock.EXPECT().WorkspacesSetEnvVar(mock.Anything, float32(0)). + wsApiMock.EXPECT().WorkspacesSetEnvVar(mock.Anything, 0). Return(openapi_client.ApiWorkspacesSetEnvVarRequest{ApiService: wsApiMock}) wsApiMock.EXPECT().WorkspacesSetEnvVarExecute(mock.Anything).Return(nil, envErr).Once() From f70d39ae98d3a912c76eafceb9eef44312f01b02 Mon Sep 17 00:00:00 2001 From: DerBurri <7892993+DerBurri@users.noreply.github.com> Date: Wed, 1 Jul 2026 07:35:06 +0000 Subject: [PATCH 40/61] chore(docs): Auto-update docs and licenses Signed-off-by: DerBurri <7892993+DerBurri@users.noreply.github.com> Signed-off-by: Maximilian --- docs/cs_team_create.md | 4 ++-- docs/cs_team_member_remove.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/cs_team_create.md b/docs/cs_team_create.md index d2b30167..d43b8d0b 100644 --- a/docs/cs_team_create.md +++ b/docs/cs_team_create.md @@ -14,10 +14,10 @@ cs team create [flags] ``` # Create a team in a specific datacenter -$ cs team member add -d -n +$ cs team create -d -n # Create a team in a specific datacenter within an organization -$ cs team member add -d -n -O +$ cs team create -d -n -O ``` ### Options diff --git a/docs/cs_team_member_remove.md b/docs/cs_team_member_remove.md index 7d335c37..21276b0e 100644 --- a/docs/cs_team_member_remove.md +++ b/docs/cs_team_member_remove.md @@ -4,9 +4,9 @@ Remove team member ### Synopsis -Remove team member from a team. +Remove member from a team. -To add a member to a team within an organization, the CS_ORG_ID environment variable or the -O/--org flag must be set. +To remove a member from a team within an organization, the CS_ORG_ID environment variable or the -O/--org flag must be set. ``` cs team member remove [flags] From fc8c8239de134a9d50d19df15ee745f8efec2d1b Mon Sep 17 00:00:00 2001 From: Maximilian Date: Wed, 1 Jul 2026 10:32:34 +0200 Subject: [PATCH 41/61] made team name required Signed-off-by: Maximilian --- cli/cmd/team_create.go | 1 + 1 file changed, 1 insertion(+) diff --git a/cli/cmd/team_create.go b/cli/cmd/team_create.go index 7f016e02..e1336638 100644 --- a/cli/cmd/team_create.go +++ b/cli/cmd/team_create.go @@ -41,6 +41,7 @@ func AddCreateTeamCmd(team *cobra.Command, opts *GlobalOptions) { } t.cmd.RunE = t.RunE t.cmd.Flags().StringVarP(&t.Opts.Name, "name", "n", "", "Team name") + _ = t.cmd.MarkFlagRequired("name") t.cmd.Flags().IntVarP(&t.Opts.DcId, "dc-id", "d", 0, "Data center ID") AddCmd(team, t.cmd) } From 30cee231bbb6cabbc5bf0540422c376a3bbe114b Mon Sep 17 00:00:00 2001 From: Maximilian Date: Wed, 1 Jul 2026 10:32:53 +0200 Subject: [PATCH 42/61] checked if team is nil for getteam Signed-off-by: Maximilian --- api/team.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/api/team.go b/api/team.go index 285f4214..89790d07 100644 --- a/api/team.go +++ b/api/team.go @@ -62,6 +62,9 @@ func (c *Client) GetTeam(teamId int) (*Team, error) { if err != nil { return nil, cserrors.FormatAPIError(r, err) } + if team == nil { + return nil, cserrors.NotFound("team not found") + } return ConvertToTeam(team), nil } From a1f5e5c90d225ddfe36a2737e0ec014ecc4bf43c Mon Sep 17 00:00:00 2001 From: Maximilian Date: Wed, 1 Jul 2026 10:42:20 +0200 Subject: [PATCH 43/61] removed orgID from remove team because not necessary for api Signed-off-by: Maximilian --- api/team.go | 2 +- cli/cmd/client.go | 2 +- cli/cmd/mocks.go | 26 ++++++++++---------------- cli/cmd/team_remove.go | 10 ++-------- cli/cmd/team_remove_test.go | 7 ++----- mcp-server/team.go | 2 +- 6 files changed, 17 insertions(+), 32 deletions(-) diff --git a/api/team.go b/api/team.go index 89790d07..ac13b0c0 100644 --- a/api/team.go +++ b/api/team.go @@ -103,7 +103,7 @@ func (c *Client) createOrgTeam(orgId string, name string, dc int) (*Team, error) return ConvertToTeam(team), nil } -func (c *Client) DeleteTeam(orgId string, teamId int) error { +func (c *Client) DeleteTeam(teamId int) error { r, err := c.api.TeamsAPI.TeamsDeleteTeam(c.ctx, teamId).Execute() return cserrors.FormatAPIError(r, err) } diff --git a/cli/cmd/client.go b/cli/cmd/client.go index e26af1a1..6a51ed9c 100644 --- a/cli/cmd/client.go +++ b/cli/cmd/client.go @@ -35,7 +35,7 @@ type Client interface { GitPull(wsId int, remote string, branch string) error DeployLandscape(wsId int, profile string) error CreateTeam(orgId string, name string, dcId int) (*api.Team, error) - DeleteTeam(orgId string, teamId int) error + DeleteTeam(teamId int) error AddTeamMember(teamId int, email string, role int) error RemoveTeamMember(teamId int, userId int) error } diff --git a/cli/cmd/mocks.go b/cli/cmd/mocks.go index a6f96508..89b01835 100644 --- a/cli/cmd/mocks.go +++ b/cli/cmd/mocks.go @@ -177,16 +177,16 @@ func (_c *MockClient_CreateTeam_Call) RunAndReturn(run func(orgId string, name s } // DeleteTeam provides a mock function for the type MockClient -func (_mock *MockClient) DeleteTeam(orgId string, teamId int) error { - ret := _mock.Called(orgId, teamId) +func (_mock *MockClient) DeleteTeam(teamId int) error { + ret := _mock.Called(teamId) if len(ret) == 0 { panic("no return value specified for DeleteTeam") } var r0 error - if returnFunc, ok := ret.Get(0).(func(string, int) error); ok { - r0 = returnFunc(orgId, teamId) + if returnFunc, ok := ret.Get(0).(func(int) error); ok { + r0 = returnFunc(teamId) } else { r0 = ret.Error(0) } @@ -199,25 +199,19 @@ type MockClient_DeleteTeam_Call struct { } // DeleteTeam is a helper method to define mock.On call -// - orgId string // - teamId int -func (_e *MockClient_Expecter) DeleteTeam(orgId any, teamId any) *MockClient_DeleteTeam_Call { - return &MockClient_DeleteTeam_Call{Call: _e.mock.On("DeleteTeam", orgId, teamId)} +func (_e *MockClient_Expecter) DeleteTeam(teamId any) *MockClient_DeleteTeam_Call { + return &MockClient_DeleteTeam_Call{Call: _e.mock.On("DeleteTeam", teamId)} } -func (_c *MockClient_DeleteTeam_Call) Run(run func(orgId string, teamId int)) *MockClient_DeleteTeam_Call { +func (_c *MockClient_DeleteTeam_Call) Run(run func(teamId int)) *MockClient_DeleteTeam_Call { _c.Call.Run(func(args mock.Arguments) { - var arg0 string + var arg0 int if args[0] != nil { - arg0 = args[0].(string) - } - var arg1 int - if args[1] != nil { - arg1 = args[1].(int) + arg0 = args[0].(int) } run( arg0, - arg1, ) }) return _c @@ -228,7 +222,7 @@ func (_c *MockClient_DeleteTeam_Call) Return(err error) *MockClient_DeleteTeam_C return _c } -func (_c *MockClient_DeleteTeam_Call) RunAndReturn(run func(orgId string, teamId int) error) *MockClient_DeleteTeam_Call { +func (_c *MockClient_DeleteTeam_Call) RunAndReturn(run func(teamId int) error) *MockClient_DeleteTeam_Call { _c.Call.Return(run) return _c } diff --git a/cli/cmd/team_remove.go b/cli/cmd/team_remove.go index 704a042b..3bc0f54c 100644 --- a/cli/cmd/team_remove.go +++ b/cli/cmd/team_remove.go @@ -28,8 +28,7 @@ func AddRemoveTeamCmd(team *cobra.Command, opts *GlobalOptions) { Short: "Remove team", Long: `Remove a team from Codesphere or an Organization`, Example: io.FormatExampleCommands("team remove", []io.Example{ - {Cmd: "-t ", Desc: "Remove a team that does not belong to an Organization"}, - {Cmd: "-O -t ", Desc: "Remove a team that does belong to an Organization"}, + {Cmd: "-t ", Desc: "Remove a team"}, }), }, Opts: RemoveTeamOpts{ @@ -47,17 +46,12 @@ func (c *RemoveTeamCmd) RunE(_ *cobra.Command, args []string) error { return fmt.Errorf("failed to create Codespehre client: %w", err) } - orgId, err := c.Opts.GetOrgId() - if err != nil { - return err - } - teamId, err := c.Opts.GetTeamId() if err != nil { return errors.New("team ID not set, use -t or CS_TEAM_ID to set it") } - err = client.DeleteTeam(orgId, teamId) + err = client.DeleteTeam(teamId) if err != nil { return fmt.Errorf("failed to delete team: %w", err) } diff --git a/cli/cmd/team_remove_test.go b/cli/cmd/team_remove_test.go index a30b44fb..8a8fefc0 100644 --- a/cli/cmd/team_remove_test.go +++ b/cli/cmd/team_remove_test.go @@ -43,16 +43,14 @@ var _ = Describe("RemoveTeam", func() { Context("RunE execution flow", func() { It("should successfully remove a team", func() { - mockEnv.EXPECT().GetOrgId().Return("").Once() - mockClient.EXPECT().DeleteTeam("", teamId).Return(nil).Once() + mockClient.EXPECT().DeleteTeam(teamId).Return(nil).Once() err := c.RunE(nil, []string{}) Expect(err).ToNot(HaveOccurred()) }) It("should fail when the token is not allowed to remove a team", func() { - mockEnv.EXPECT().GetOrgId().Return("").Once() - mockClient.EXPECT().DeleteTeam("", teamId).Return(errors.New("failed")).Once() + mockClient.EXPECT().DeleteTeam(teamId).Return(errors.New("failed")).Once() err := c.RunE(nil, []string{}) Expect(err).To(HaveOccurred()) @@ -71,7 +69,6 @@ var _ = Describe("RemoveTeam", func() { It("should fail when team ID is unavailable", func() { c.Opts.TeamId = -1 - mockEnv.EXPECT().GetOrgId().Return("").Once() mockEnv.EXPECT().GetTeamId().Return(-1, errors.New("CS_TEAM_ID env var required, but not set")).Once() err := c.RunE(nil, []string{}) diff --git a/mcp-server/team.go b/mcp-server/team.go index 5f2f7707..0d8a5284 100644 --- a/mcp-server/team.go +++ b/mcp-server/team.go @@ -67,7 +67,7 @@ func RegisterTeamTools(server *mcp.Server, client *api.Client) { Name: "delete_team", Description: "Delete a team by ID", }, func(ctx context.Context, req *mcp.CallToolRequest, args DeleteTeamArgs) (*mcp.CallToolResult, any, error) { - err := client.DeleteTeam(args.OrgId, args.TeamId) + err := client.DeleteTeam(args.TeamId) if err != nil { return &mcp.CallToolResult{IsError: true}, nil, err } From 9d6afe5e2da57593626c144d53d6d46d023602df Mon Sep 17 00:00:00 2001 From: Maximilian Date: Wed, 1 Jul 2026 11:23:28 +0200 Subject: [PATCH 44/61] add list team member function add wrapper for team conversion to allow non hardcoded value of role in the missing field Signed-off-by: Maximilian --- api/team.go | 23 ++++++- api/types.go | 85 ++++++++++++++++++++---- cli/cmd/client.go | 1 + cli/cmd/list_teams.go | 6 +- cli/cmd/mocks.go | 70 ++++++++++++++++++-- cli/cmd/team.go | 1 + cli/cmd/team_list_members.go | 90 ++++++++++++++++++++++++++ cli/cmd/team_list_members_test.go | 103 ++++++++++++++++++++++++++++++ 8 files changed, 361 insertions(+), 18 deletions(-) create mode 100644 cli/cmd/team_list_members.go create mode 100644 cli/cmd/team_list_members_test.go diff --git a/api/team.go b/api/team.go index ac13b0c0..5c80ba7e 100644 --- a/api/team.go +++ b/api/team.go @@ -53,8 +53,15 @@ func (c *Client) ListTeams(orgId string) ([]Team, error) { return res, nil } - teams, r, err := c.api.TeamsAPI.TeamsListTeams(c.ctx).Execute() - return teams, cserrors.FormatAPIError(r, err) + apiTeams, r, err := c.api.TeamsAPI.TeamsListTeams(c.ctx).Execute() + if err != nil { + return nil, cserrors.FormatAPIError(r, err) + } + res := make([]Team, len(apiTeams)) + for i, t := range apiTeams { + res[i] = *ConvertFromListTeams(t) + } + return res, nil } func (c *Client) GetTeam(teamId int) (*Team, error) { @@ -127,3 +134,15 @@ func (c *Client) RemoveTeamMember(teamId int, userId int) error { } return nil } + +func (c *Client) ListTeamMembers(teamId int) ([]TeamMember, error) { + members, r, err := c.api.TeamsAPI.TeamsListMembers(c.ctx, teamId).Execute() + if err != nil { + return nil, cserrors.FormatAPIError(r, err) + } + res := make([]TeamMember, len(members)) + for i, m := range members { + res[i] = ConvertToTeamMember(m) + } + return res, nil +} diff --git a/api/types.go b/api/types.go index b6be6d7b..8a1c7194 100644 --- a/api/types.go +++ b/api/types.go @@ -9,8 +9,23 @@ import ( openapi "github.com/codesphere-cloud/cs-go/api/openapi_client" ) +type OpenAPITeam = openapi.TeamsGetTeam200Response +type OpenAPIListTeam = openapi.TeamsListTeams200ResponseInner +type OpenAPIOrgTeam = openapi.OrganizationsListOrgTeams200ResponseInner +type OpenAPITeamMember = openapi.TeamsListMembers200ResponseInner + type DataCenter = openapi.MetadataGetDatacenters200ResponseInner -type Team = openapi.TeamsListTeams200ResponseInner +type Team struct { + Id int `json:"id"` + DefaultDataCenterId int `json:"defaultDataCenterId"` + Name string `json:"name"` + Description *string `json:"description,omitempty"` + AvatarId *string `json:"avatarId,omitempty"` + AvatarUrl *string `json:"avatarUrl,omitempty"` + IsFirst *bool `json:"isFirst,omitempty"` + OrganizationId *string `json:"organizationId,omitempty"` + Role *int `json:"role,omitempty"` +} type Domain = openapi.DomainsGetDomain200Response type DomainVerificationStatus = openapi.DomainsGetDomain200ResponseDomainVerificationStatus type UpdateDomainArgs = openapi.DomainsUpdateDomainRequest @@ -24,8 +39,33 @@ type WorkspacePlan = openapi.MetadataGetWorkspacePlans200ResponseInner type PipelineStatus = openapi.WorkspacesPipelineStatus200ResponseInner -// TODO: remove the conversion once the api is fixed -func ConvertToTeam(t *openapi.TeamsGetTeam200Response) *Team { +type TeamMember struct { + UserId int `json:"userId"` + TeamId int `json:"teamId"` + Role int `json:"role"` + Pending bool `json:"pending"` + CreatedAt time.Time `json:"createdAt"` + Name *string `json:"name,omitempty"` + Email *string `json:"email,omitempty"` + AvatarUrl *string `json:"avatarUrl,omitempty"` + DeletedAt *time.Time `json:"deletedAt,omitempty"` +} + +func ConvertToTeam(t *OpenAPITeam) *Team { + return &Team{ + Id: t.Id, + DefaultDataCenterId: t.DefaultDataCenterId, + Name: t.Name, + Description: nullableStringToPtr(t.Description), + AvatarId: nullableStringToPtr(t.AvatarId), + AvatarUrl: nullableStringToPtr(t.AvatarUrl), + IsFirst: t.IsFirst, + OrganizationId: t.OrganizationId, + Role: nil, // GetTeam API does not return role + } +} + +func ConvertOrgTeamToTeam(t OpenAPIOrgTeam, orgId string) *Team { return &Team{ Id: t.Id, DefaultDataCenterId: t.DefaultDataCenterId, @@ -34,22 +74,45 @@ func ConvertToTeam(t *openapi.TeamsGetTeam200Response) *Team { AvatarId: t.AvatarId, AvatarUrl: t.AvatarUrl, IsFirst: t.IsFirst, - - Role: 0, + OrganizationId: &orgId, + Role: nil, // Org teams API does not return role } } -func ConvertOrgTeamToTeam(t openapi.OrganizationsListOrgTeams200ResponseInner, orgId string) *Team { +func ConvertFromListTeams(t OpenAPIListTeam) *Team { + role := t.Role return &Team{ Id: t.Id, DefaultDataCenterId: t.DefaultDataCenterId, Name: t.Name, - Description: *openapi.NewNullableString(t.Description), - AvatarId: *openapi.NewNullableString(t.AvatarId), - AvatarUrl: *openapi.NewNullableString(t.AvatarUrl), + Description: nullableStringToPtr(t.Description), + AvatarId: nullableStringToPtr(t.AvatarId), + AvatarUrl: nullableStringToPtr(t.AvatarUrl), IsFirst: t.IsFirst, - OrganizationId: &orgId, - Role: 0, // Default to admin role if not specified by org API + OrganizationId: t.OrganizationId, + Role: &role, + } +} + +func nullableStringToPtr(ns openapi.NullableString) *string { + if ns.IsSet() && ns.Get() != nil { + v := *ns.Get() + return &v + } + return nil +} + +func ConvertToTeamMember(t OpenAPITeamMember) TeamMember { + return TeamMember{ + UserId: t.UserId, + TeamId: t.TeamId, + Role: t.Role, + Pending: t.Pending, + CreatedAt: t.CreatedAt, + Name: nullableStringToPtr(t.Name), + Email: nullableStringToPtr(t.Email), + AvatarUrl: nullableStringToPtr(t.AvatarUrl), + DeletedAt: t.DeletedAt, } } diff --git a/cli/cmd/client.go b/cli/cmd/client.go index 6a51ed9c..49c91431 100644 --- a/cli/cmd/client.go +++ b/cli/cmd/client.go @@ -38,6 +38,7 @@ type Client interface { DeleteTeam(teamId int) error AddTeamMember(teamId int, email string, role int) error RemoveTeamMember(teamId int, userId int) error + ListTeamMembers(teamId int) ([]api.TeamMember, error) } // CommandExecutor abstracts command execution for testing diff --git a/cli/cmd/list_teams.go b/cli/cmd/list_teams.go index 812a2840..26afeb75 100644 --- a/cli/cmd/list_teams.go +++ b/cli/cmd/list_teams.go @@ -58,7 +58,11 @@ func (l *ListTeamsCmd) RunE(_ *cobra.Command, args []string) (err error) { if team.IsFirst != nil && *team.IsFirst { first = "*" } - t.AppendRow(table.Row{first, team.Id, team.Name, cs.GetRoleName(int(team.Role)), team.DefaultDataCenterId}) + roleName := "N/A" + if team.Role != nil { + roleName = cs.GetRoleName(*team.Role) + } + t.AppendRow(table.Row{first, team.Id, team.Name, roleName, team.DefaultDataCenterId}) } t.Render() diff --git a/cli/cmd/mocks.go b/cli/cmd/mocks.go index 89b01835..9e1abcbd 100644 --- a/cli/cmd/mocks.go +++ b/cli/cmd/mocks.go @@ -166,8 +166,8 @@ func (_c *MockClient_CreateTeam_Call) Run(run func(orgId string, name string, dc return _c } -func (_c *MockClient_CreateTeam_Call) Return(v *api.Team, err error) *MockClient_CreateTeam_Call { - _c.Call.Return(v, err) +func (_c *MockClient_CreateTeam_Call) Return(team *api.Team, err error) *MockClient_CreateTeam_Call { + _c.Call.Return(team, err) return _c } @@ -782,6 +782,68 @@ func (_c *MockClient_ListOrganizations_Call) RunAndReturn(run func() ([]api.Orga return _c } +// ListTeamMembers provides a mock function for the type MockClient +func (_mock *MockClient) ListTeamMembers(teamId int) ([]api.TeamMember, error) { + ret := _mock.Called(teamId) + + if len(ret) == 0 { + panic("no return value specified for ListTeamMembers") + } + + var r0 []api.TeamMember + var r1 error + if returnFunc, ok := ret.Get(0).(func(int) ([]api.TeamMember, error)); ok { + return returnFunc(teamId) + } + if returnFunc, ok := ret.Get(0).(func(int) []api.TeamMember); ok { + r0 = returnFunc(teamId) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).([]api.TeamMember) + } + } + if returnFunc, ok := ret.Get(1).(func(int) error); ok { + r1 = returnFunc(teamId) + } else { + r1 = ret.Error(1) + } + return r0, r1 +} + +// MockClient_ListTeamMembers_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ListTeamMembers' +type MockClient_ListTeamMembers_Call struct { + *mock.Call +} + +// ListTeamMembers is a helper method to define mock.On call +// - teamId int +func (_e *MockClient_Expecter) ListTeamMembers(teamId any) *MockClient_ListTeamMembers_Call { + return &MockClient_ListTeamMembers_Call{Call: _e.mock.On("ListTeamMembers", teamId)} +} + +func (_c *MockClient_ListTeamMembers_Call) Run(run func(teamId int)) *MockClient_ListTeamMembers_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 int + if args[0] != nil { + arg0 = args[0].(int) + } + run( + arg0, + ) + }) + return _c +} + +func (_c *MockClient_ListTeamMembers_Call) Return(teamMembers []api.TeamMember, err error) *MockClient_ListTeamMembers_Call { + _c.Call.Return(teamMembers, err) + return _c +} + +func (_c *MockClient_ListTeamMembers_Call) RunAndReturn(run func(teamId int) ([]api.TeamMember, error)) *MockClient_ListTeamMembers_Call { + _c.Call.Return(run) + return _c +} + // ListTeams provides a mock function for the type MockClient func (_mock *MockClient) ListTeams(orgId string) ([]api.Team, error) { ret := _mock.Called(orgId) @@ -834,8 +896,8 @@ func (_c *MockClient_ListTeams_Call) Run(run func(orgId string)) *MockClient_Lis return _c } -func (_c *MockClient_ListTeams_Call) Return(vs []api.Team, err error) *MockClient_ListTeams_Call { - _c.Call.Return(vs, err) +func (_c *MockClient_ListTeams_Call) Return(teams []api.Team, err error) *MockClient_ListTeams_Call { + _c.Call.Return(teams, err) return _c } diff --git a/cli/cmd/team.go b/cli/cmd/team.go index d6d0c951..2cf58a24 100644 --- a/cli/cmd/team.go +++ b/cli/cmd/team.go @@ -35,6 +35,7 @@ func AddMemberCmd(t *cobra.Command, opts *GlobalOptions) { AddAddTeamMemberCmd(memberCmd, opts) AddRemoveTeamMemberCmd(memberCmd, opts) + AddListTeamMembersCmd(memberCmd, opts) t.AddCommand(memberCmd) } diff --git a/cli/cmd/team_list_members.go b/cli/cmd/team_list_members.go new file mode 100644 index 00000000..c1cb461a --- /dev/null +++ b/cli/cmd/team_list_members.go @@ -0,0 +1,90 @@ +// Copyright (c) Codesphere Inc. +// SPDX-License-Identifier: Apache-2.0 + +package cmd + +import ( + "fmt" + + "github.com/codesphere-cloud/cs-go/pkg/cs" + "github.com/codesphere-cloud/cs-go/pkg/io" + "github.com/jedib0t/go-pretty/v6/table" + "github.com/spf13/cobra" +) + +type ListTeamMembersCmd struct { + cmd *cobra.Command + Opts ListTeamMembersOpts + ClientFactory func(GlobalOptions) (Client, error) +} + +type ListTeamMembersOpts struct { + *GlobalOptions + OutputFormat OutputFormat +} + +func AddListTeamMembersCmd(team *cobra.Command, opts *GlobalOptions) { + l := ListTeamMembersCmd{ + cmd: &cobra.Command{ + Use: "list", + Short: "List team members", + Long: `List all members of a team`, + Example: io.FormatExampleCommands("team member list", []io.Example{ + {Cmd: "-t ", Desc: "List all members of a team"}, + {Cmd: "-t -o json", Desc: "List all members of a team in JSON format"}, + }), + }, + Opts: ListTeamMembersOpts{ + GlobalOptions: opts, + }, + ClientFactory: NewClient, + } + l.cmd.RunE = l.RunE + l.cmd.Flags().StringVarP((*string)(&l.Opts.OutputFormat), "output", "o", "table", "Output format (table, json, yaml)") + AddCmd(team, l.cmd) +} + +func (l *ListTeamMembersCmd) RunE(_ *cobra.Command, args []string) error { + client, err := l.ClientFactory(*l.Opts.GlobalOptions) + if err != nil { + return fmt.Errorf("failed to create Codesphere client: %w", err) + } + + teamId, err := l.Opts.GetTeamId() + if err != nil { + return err + } + + return l.ListTeamMembers(client, teamId) +} + +func (l *ListTeamMembersCmd) ListTeamMembers(client Client, teamId int) error { + members, err := client.ListTeamMembers(teamId) + if err != nil { + return fmt.Errorf("failed to list team members: %w", err) + } + + switch l.Opts.OutputFormat { + case OutputFormatJSON: + return io.PrintJSON(members) + case OutputFormatYAML: + return io.PrintYAML(members) + } + + t := io.GetTableWriter() + t.AppendHeader(table.Row{"User ID", "Name", "Email", "Role", "Pending"}) + for _, m := range members { + name := "" + if m.Name != nil { + name = *m.Name + } + email := "" + if m.Email != nil { + email = *m.Email + } + t.AppendRow(table.Row{m.UserId, name, email, cs.GetRoleName(m.Role), m.Pending}) + } + t.Render() + + return nil +} diff --git a/cli/cmd/team_list_members_test.go b/cli/cmd/team_list_members_test.go new file mode 100644 index 00000000..0c665f3c --- /dev/null +++ b/cli/cmd/team_list_members_test.go @@ -0,0 +1,103 @@ +// Copyright (c) Codesphere Inc. +// SPDX-License-Identifier: Apache-2.0 + +package cmd_test + +import ( + "errors" + "time" + + "github.com/codesphere-cloud/cs-go/api" + "github.com/codesphere-cloud/cs-go/cli/cmd" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" +) + +var _ = Describe("ListTeamMembers", func() { + var ( + mockEnv *cmd.MockEnv + mockClient *cmd.MockClient + l *cmd.ListTeamMembersCmd + teamId int + ) + + BeforeEach(func() { + mockClient = cmd.NewMockClient(GinkgoT()) + mockEnv = cmd.NewMockEnv(GinkgoT()) + teamId = 42 + l = &cmd.ListTeamMembersCmd{ + Opts: cmd.ListTeamMembersOpts{ + GlobalOptions: &cmd.GlobalOptions{ + Env: mockEnv, + TeamId: teamId, + }, + }, + ClientFactory: func(opts cmd.GlobalOptions) (cmd.Client, error) { + return mockClient, nil + }, + } + }) + + AfterEach(func() { + mockEnv.AssertExpectations(GinkgoT()) + mockClient.AssertExpectations(GinkgoT()) + }) + + Context("ListTeamMembers", func() { + It("should successfully list team members", func() { + name := "Test User" + email := "test@example.com" + expectedMembers := []api.TeamMember{ + { + UserId: 1, + TeamId: teamId, + Role: 0, + Pending: false, + CreatedAt: time.Now(), + Name: &name, + Email: &email, + }, + } + mockClient.EXPECT().ListTeamMembers(teamId).Return(expectedMembers, nil).Once() + + err := l.ListTeamMembers(mockClient, teamId) + Expect(err).ToNot(HaveOccurred()) + }) + + It("should return error when API call fails", func() { + mockClient.EXPECT().ListTeamMembers(teamId).Return(nil, errors.New("api error")).Once() + + err := l.ListTeamMembers(mockClient, teamId) + Expect(err).To(HaveOccurred()) + Expect(err.Error()).To(ContainSubstring("failed to list team members: api error")) + }) + }) + + Context("RunE execution flow", func() { + It("should successfully run the command", func() { + mockClient.EXPECT().ListTeamMembers(teamId).Return([]api.TeamMember{}, nil).Once() + + err := l.RunE(nil, []string{}) + Expect(err).ToNot(HaveOccurred()) + }) + + It("should fail when client creation fails", func() { + l.ClientFactory = func(opts cmd.GlobalOptions) (cmd.Client, error) { + return nil, errors.New("client init failed") + } + + err := l.RunE(nil, []string{}) + Expect(err).To(HaveOccurred()) + Expect(err.Error()).To(ContainSubstring("failed to create Codesphere client: client init failed")) + }) + + It("should fail when team ID is unavailable", func() { + l.Opts.GlobalOptions.TeamId = -1 + mockEnv.EXPECT().GetTeamId().Return(-1, errors.New("CS_TEAM_ID env var required, but not set")).Once() + + err := l.RunE(nil, []string{}) + Expect(err).To(HaveOccurred()) + Expect(err.Error()).To(Equal("CS_TEAM_ID env var required, but not set")) + }) + }) +}) From 082473482ff605a7d522597a4f5725b85e0e4f28 Mon Sep 17 00:00:00 2001 From: DerBurri <7892993+DerBurri@users.noreply.github.com> Date: Wed, 1 Jul 2026 08:44:06 +0000 Subject: [PATCH 45/61] chore(docs): Auto-update docs and licenses Signed-off-by: DerBurri <7892993+DerBurri@users.noreply.github.com> Signed-off-by: Maximilian --- docs/cs_team_remove.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/docs/cs_team_remove.md b/docs/cs_team_remove.md index 8df8a85c..87b38e7d 100644 --- a/docs/cs_team_remove.md +++ b/docs/cs_team_remove.md @@ -13,11 +13,8 @@ cs team remove [flags] ### Examples ``` -# Remove a team that does not belong to an Organization +# Remove a team $ cs team remove -t - -# Remove a team that does belong to an Organization -$ cs team remove -O -t ``` ### Options From c6524f8ac99feb117302320128ce72c1343f0af5 Mon Sep 17 00:00:00 2001 From: Maximilian Date: Wed, 1 Jul 2026 12:23:28 +0200 Subject: [PATCH 46/61] chore: regenerate mocks to resolve conflicts Signed-off-by: Maximilian --- api/openapi_client/mocks.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/api/openapi_client/mocks.go b/api/openapi_client/mocks.go index 3bc5b0ab..d22d5f13 100644 --- a/api/openapi_client/mocks.go +++ b/api/openapi_client/mocks.go @@ -1367,9 +1367,9 @@ type MockManagedServicesAPI_ManagedServicesDeleteProvider_Call struct { // ManagedServicesDeleteProvider is a helper method to define mock.On call // - ctx context.Context // - name string -// - version string -func (_e *MockManagedServicesAPI_Expecter) ManagedServicesDeleteProvider(ctx interface{}, name interface{}, version interface{}) *MockManagedServicesAPI_ManagedServicesDeleteProvider_Call { - return &MockManagedServicesAPI_ManagedServicesDeleteProvider_Call{Call: _e.mock.On("ManagedServicesDeleteProvider", ctx, name, version)} +// - schemaVersion string +func (_e *MockManagedServicesAPI_Expecter) ManagedServicesDeleteProvider(ctx any, name any, schemaVersion any) *MockManagedServicesAPI_ManagedServicesDeleteProvider_Call { + return &MockManagedServicesAPI_ManagedServicesDeleteProvider_Call{Call: _e.mock.On("ManagedServicesDeleteProvider", ctx, name, schemaVersion)} } func (_c *MockManagedServicesAPI_ManagedServicesDeleteProvider_Call) Run(run func(ctx context.Context, name string, schemaVersion string)) *MockManagedServicesAPI_ManagedServicesDeleteProvider_Call { @@ -2115,9 +2115,9 @@ type MockManagedServicesAPI_ManagedServicesUpdateProvider_Call struct { // ManagedServicesUpdateProvider is a helper method to define mock.On call // - ctx context.Context // - name string -// - version string -func (_e *MockManagedServicesAPI_Expecter) ManagedServicesUpdateProvider(ctx interface{}, name interface{}, version interface{}) *MockManagedServicesAPI_ManagedServicesUpdateProvider_Call { - return &MockManagedServicesAPI_ManagedServicesUpdateProvider_Call{Call: _e.mock.On("ManagedServicesUpdateProvider", ctx, name, version)} +// - schemaVersion string +func (_e *MockManagedServicesAPI_Expecter) ManagedServicesUpdateProvider(ctx any, name any, schemaVersion any) *MockManagedServicesAPI_ManagedServicesUpdateProvider_Call { + return &MockManagedServicesAPI_ManagedServicesUpdateProvider_Call{Call: _e.mock.On("ManagedServicesUpdateProvider", ctx, name, schemaVersion)} } func (_c *MockManagedServicesAPI_ManagedServicesUpdateProvider_Call) Run(run func(ctx context.Context, name string, schemaVersion string)) *MockManagedServicesAPI_ManagedServicesUpdateProvider_Call { From 00652fed5d46827542fbfea125c0ebe7eed07bb0 Mon Sep 17 00:00:00 2001 From: Maximilian Date: Wed, 1 Jul 2026 12:35:16 +0200 Subject: [PATCH 47/61] fix: update uuid dependency to correct version Signed-off-by: Maximilian --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 2f0760ca..55d79046 100644 --- a/go.mod +++ b/go.mod @@ -6,6 +6,7 @@ require ( github.com/creativeprojects/go-selfupdate v1.5.2 github.com/go-git/go-billy/v5 v5.9.0 github.com/go-git/go-git/v5 v5.19.1 + github.com/google/uuid v1.6.0 github.com/jedib0t/go-pretty/v6 v6.8.2 github.com/modelcontextprotocol/go-sdk v1.6.1 github.com/onsi/ginkgo/v2 v2.32.0 @@ -255,7 +256,6 @@ require ( github.com/google/ko v0.19.1 // indirect github.com/google/rpmpack v0.7.1 // indirect github.com/google/s2a-go v0.1.9 // indirect - github.com/google/uuid v1.6.0 // indirect github.com/google/wire v0.7.0 // indirect github.com/googleapis/enterprise-certificate-proxy v0.3.16 // indirect github.com/googleapis/gax-go/v2 v2.22.0 // indirect From f70614cc22b02e44f1a9672203a715d7acaad60c Mon Sep 17 00:00:00 2001 From: Simon Herrmann Date: Tue, 16 Jun 2026 15:15:03 +0200 Subject: [PATCH 48/61] Codesphere MCP server (#272) * feat: add first draft cs mcp server * fix: add cs-mcp to gitignore * fix: fix env var names in readme * update: clean up workspace structs * update: add mcp server to the main cs-go cli * update: remove mcp readme, add long mcp cmd description, remove old build related stuff * update: update file name of the main mcp file * chore(docs): Auto-update docs and licenses Signed-off-by: siherrmann <25087590+siherrmann@users.noreply.github.com> * fix: fix dependency error * fix: fix dependecy issue --------- Signed-off-by: siherrmann <25087590+siherrmann@users.noreply.github.com> Co-authored-by: siherrmann <25087590+siherrmann@users.noreply.github.com> Signed-off-by: Maximilian --- api/openapi_client/mocks.go | 138 ++++++++++++++++++------------------ 1 file changed, 69 insertions(+), 69 deletions(-) diff --git a/api/openapi_client/mocks.go b/api/openapi_client/mocks.go index d22d5f13..260b4666 100644 --- a/api/openapi_client/mocks.go +++ b/api/openapi_client/mocks.go @@ -452,8 +452,8 @@ type MockDomainsAPI_DomainsListDomains_Call struct { // DomainsListDomains is a helper method to define mock.On call // - ctx context.Context -// - teamId int -func (_e *MockDomainsAPI_Expecter) DomainsListDomains(ctx any, teamId any) *MockDomainsAPI_DomainsListDomains_Call { +// - teamId float32 +func (_e *MockDomainsAPI_Expecter) DomainsListDomains(ctx interface{}, teamId interface{}) *MockDomainsAPI_DomainsListDomains_Call { return &MockDomainsAPI_DomainsListDomains_Call{Call: _e.mock.On("DomainsListDomains", ctx, teamId)} } @@ -1367,9 +1367,9 @@ type MockManagedServicesAPI_ManagedServicesDeleteProvider_Call struct { // ManagedServicesDeleteProvider is a helper method to define mock.On call // - ctx context.Context // - name string -// - schemaVersion string -func (_e *MockManagedServicesAPI_Expecter) ManagedServicesDeleteProvider(ctx any, name any, schemaVersion any) *MockManagedServicesAPI_ManagedServicesDeleteProvider_Call { - return &MockManagedServicesAPI_ManagedServicesDeleteProvider_Call{Call: _e.mock.On("ManagedServicesDeleteProvider", ctx, name, schemaVersion)} +// - version string +func (_e *MockManagedServicesAPI_Expecter) ManagedServicesDeleteProvider(ctx interface{}, name interface{}, version interface{}) *MockManagedServicesAPI_ManagedServicesDeleteProvider_Call { + return &MockManagedServicesAPI_ManagedServicesDeleteProvider_Call{Call: _e.mock.On("ManagedServicesDeleteProvider", ctx, name, version)} } func (_c *MockManagedServicesAPI_ManagedServicesDeleteProvider_Call) Run(run func(ctx context.Context, name string, schemaVersion string)) *MockManagedServicesAPI_ManagedServicesDeleteProvider_Call { @@ -2115,9 +2115,9 @@ type MockManagedServicesAPI_ManagedServicesUpdateProvider_Call struct { // ManagedServicesUpdateProvider is a helper method to define mock.On call // - ctx context.Context // - name string -// - schemaVersion string -func (_e *MockManagedServicesAPI_Expecter) ManagedServicesUpdateProvider(ctx any, name any, schemaVersion any) *MockManagedServicesAPI_ManagedServicesUpdateProvider_Call { - return &MockManagedServicesAPI_ManagedServicesUpdateProvider_Call{Call: _e.mock.On("ManagedServicesUpdateProvider", ctx, name, schemaVersion)} +// - version string +func (_e *MockManagedServicesAPI_Expecter) ManagedServicesUpdateProvider(ctx interface{}, name interface{}, version interface{}) *MockManagedServicesAPI_ManagedServicesUpdateProvider_Call { + return &MockManagedServicesAPI_ManagedServicesUpdateProvider_Call{Call: _e.mock.On("ManagedServicesUpdateProvider", ctx, name, version)} } func (_c *MockManagedServicesAPI_ManagedServicesUpdateProvider_Call) Run(run func(ctx context.Context, name string, schemaVersion string)) *MockManagedServicesAPI_ManagedServicesUpdateProvider_Call { @@ -2784,8 +2784,8 @@ type MockOrganizationsAPI_OrganizationsChangeOrgRole_Call struct { // OrganizationsChangeOrgRole is a helper method to define mock.On call // - ctx context.Context // - organizationId string -// - userId int -func (_e *MockOrganizationsAPI_Expecter) OrganizationsChangeOrgRole(ctx any, organizationId any, userId any) *MockOrganizationsAPI_OrganizationsChangeOrgRole_Call { +// - userId float32 +func (_e *MockOrganizationsAPI_Expecter) OrganizationsChangeOrgRole(ctx interface{}, organizationId interface{}, userId interface{}) *MockOrganizationsAPI_OrganizationsChangeOrgRole_Call { return &MockOrganizationsAPI_OrganizationsChangeOrgRole_Call{Call: _e.mock.On("OrganizationsChangeOrgRole", ctx, organizationId, userId)} } @@ -3284,8 +3284,8 @@ type MockOrganizationsAPI_OrganizationsRemoveOrgMember_Call struct { // OrganizationsRemoveOrgMember is a helper method to define mock.On call // - ctx context.Context // - organizationId string -// - userId int -func (_e *MockOrganizationsAPI_Expecter) OrganizationsRemoveOrgMember(ctx any, organizationId any, userId any) *MockOrganizationsAPI_OrganizationsRemoveOrgMember_Call { +// - userId float32 +func (_e *MockOrganizationsAPI_Expecter) OrganizationsRemoveOrgMember(ctx interface{}, organizationId interface{}, userId interface{}) *MockOrganizationsAPI_OrganizationsRemoveOrgMember_Call { return &MockOrganizationsAPI_OrganizationsRemoveOrgMember_Call{Call: _e.mock.On("OrganizationsRemoveOrgMember", ctx, organizationId, userId)} } @@ -3435,9 +3435,9 @@ type MockTeamsAPI_TeamsChangeRole_Call struct { // TeamsChangeRole is a helper method to define mock.On call // - ctx context.Context -// - teamId int -// - userId int -func (_e *MockTeamsAPI_Expecter) TeamsChangeRole(ctx any, teamId any, userId any) *MockTeamsAPI_TeamsChangeRole_Call { +// - teamId float32 +// - userId float32 +func (_e *MockTeamsAPI_Expecter) TeamsChangeRole(ctx interface{}, teamId interface{}, userId interface{}) *MockTeamsAPI_TeamsChangeRole_Call { return &MockTeamsAPI_TeamsChangeRole_Call{Call: _e.mock.On("TeamsChangeRole", ctx, teamId, userId)} } @@ -3681,8 +3681,8 @@ type MockTeamsAPI_TeamsDeleteTeam_Call struct { // TeamsDeleteTeam is a helper method to define mock.On call // - ctx context.Context -// - teamId int -func (_e *MockTeamsAPI_Expecter) TeamsDeleteTeam(ctx any, teamId any) *MockTeamsAPI_TeamsDeleteTeam_Call { +// - teamId float32 +func (_e *MockTeamsAPI_Expecter) TeamsDeleteTeam(ctx interface{}, teamId interface{}) *MockTeamsAPI_TeamsDeleteTeam_Call { return &MockTeamsAPI_TeamsDeleteTeam_Call{Call: _e.mock.On("TeamsDeleteTeam", ctx, teamId)} } @@ -3800,8 +3800,8 @@ type MockTeamsAPI_TeamsGetTeam_Call struct { // TeamsGetTeam is a helper method to define mock.On call // - ctx context.Context -// - teamId int -func (_e *MockTeamsAPI_Expecter) TeamsGetTeam(ctx any, teamId any) *MockTeamsAPI_TeamsGetTeam_Call { +// - teamId float32 +func (_e *MockTeamsAPI_Expecter) TeamsGetTeam(ctx interface{}, teamId interface{}) *MockTeamsAPI_TeamsGetTeam_Call { return &MockTeamsAPI_TeamsGetTeam_Call{Call: _e.mock.On("TeamsGetTeam", ctx, teamId)} } @@ -3927,8 +3927,8 @@ type MockTeamsAPI_TeamsInviteMember_Call struct { // TeamsInviteMember is a helper method to define mock.On call // - ctx context.Context -// - teamId int -func (_e *MockTeamsAPI_Expecter) TeamsInviteMember(ctx any, teamId any) *MockTeamsAPI_TeamsInviteMember_Call { +// - teamId float32 +func (_e *MockTeamsAPI_Expecter) TeamsInviteMember(ctx interface{}, teamId interface{}) *MockTeamsAPI_TeamsInviteMember_Call { return &MockTeamsAPI_TeamsInviteMember_Call{Call: _e.mock.On("TeamsInviteMember", ctx, teamId)} } @@ -4046,8 +4046,8 @@ type MockTeamsAPI_TeamsListMembers_Call struct { // TeamsListMembers is a helper method to define mock.On call // - ctx context.Context -// - teamId int -func (_e *MockTeamsAPI_Expecter) TeamsListMembers(ctx any, teamId any) *MockTeamsAPI_TeamsListMembers_Call { +// - teamId float32 +func (_e *MockTeamsAPI_Expecter) TeamsListMembers(ctx interface{}, teamId interface{}) *MockTeamsAPI_TeamsListMembers_Call { return &MockTeamsAPI_TeamsListMembers_Call{Call: _e.mock.On("TeamsListMembers", ctx, teamId)} } @@ -4294,8 +4294,8 @@ type MockTeamsAPI_TeamsMigrateTeamToOrg_Call struct { // TeamsMigrateTeamToOrg is a helper method to define mock.On call // - ctx context.Context -// - teamId int -func (_e *MockTeamsAPI_Expecter) TeamsMigrateTeamToOrg(ctx any, teamId any) *MockTeamsAPI_TeamsMigrateTeamToOrg_Call { +// - teamId float32 +func (_e *MockTeamsAPI_Expecter) TeamsMigrateTeamToOrg(ctx interface{}, teamId interface{}) *MockTeamsAPI_TeamsMigrateTeamToOrg_Call { return &MockTeamsAPI_TeamsMigrateTeamToOrg_Call{Call: _e.mock.On("TeamsMigrateTeamToOrg", ctx, teamId)} } @@ -4413,9 +4413,9 @@ type MockTeamsAPI_TeamsRemoveMember_Call struct { // TeamsRemoveMember is a helper method to define mock.On call // - ctx context.Context -// - teamId int -// - userId int -func (_e *MockTeamsAPI_Expecter) TeamsRemoveMember(ctx any, teamId any, userId any) *MockTeamsAPI_TeamsRemoveMember_Call { +// - teamId float32 +// - userId float32 +func (_e *MockTeamsAPI_Expecter) TeamsRemoveMember(ctx interface{}, teamId interface{}, userId interface{}) *MockTeamsAPI_TeamsRemoveMember_Call { return &MockTeamsAPI_TeamsRemoveMember_Call{Call: _e.mock.On("TeamsRemoveMember", ctx, teamId, userId)} } @@ -4698,8 +4698,8 @@ type MockUsageAPI_UsageGetUsageSummaryLandscape_Call struct { // UsageGetUsageSummaryLandscape is a helper method to define mock.On call // - ctx context.Context -// - teamId int -func (_e *MockUsageAPI_Expecter) UsageGetUsageSummaryLandscape(ctx any, teamId any) *MockUsageAPI_UsageGetUsageSummaryLandscape_Call { +// - teamId float32 +func (_e *MockUsageAPI_Expecter) UsageGetUsageSummaryLandscape(ctx interface{}, teamId interface{}) *MockUsageAPI_UsageGetUsageSummaryLandscape_Call { return &MockUsageAPI_UsageGetUsageSummaryLandscape_Call{Call: _e.mock.On("UsageGetUsageSummaryLandscape", ctx, teamId)} } @@ -5221,9 +5221,9 @@ type MockVaultAPI_VaultDeleteWorkspaceSecrets_Call struct { // VaultDeleteWorkspaceSecrets is a helper method to define mock.On call // - ctx context.Context -// - teamId int -// - workspaceId int -func (_e *MockVaultAPI_Expecter) VaultDeleteWorkspaceSecrets(ctx any, teamId any, workspaceId any) *MockVaultAPI_VaultDeleteWorkspaceSecrets_Call { +// - teamId float32 +// - workspaceId float32 +func (_e *MockVaultAPI_Expecter) VaultDeleteWorkspaceSecrets(ctx interface{}, teamId interface{}, workspaceId interface{}) *MockVaultAPI_VaultDeleteWorkspaceSecrets_Call { return &MockVaultAPI_VaultDeleteWorkspaceSecrets_Call{Call: _e.mock.On("VaultDeleteWorkspaceSecrets", ctx, teamId, workspaceId)} } @@ -5872,9 +5872,9 @@ type MockVaultAPI_VaultListWorkspaceSecrets_Call struct { // VaultListWorkspaceSecrets is a helper method to define mock.On call // - ctx context.Context -// - teamId int -// - workspaceId int -func (_e *MockVaultAPI_Expecter) VaultListWorkspaceSecrets(ctx any, teamId any, workspaceId any) *MockVaultAPI_VaultListWorkspaceSecrets_Call { +// - teamId float32 +// - workspaceId float32 +func (_e *MockVaultAPI_Expecter) VaultListWorkspaceSecrets(ctx interface{}, teamId interface{}, workspaceId interface{}) *MockVaultAPI_VaultListWorkspaceSecrets_Call { return &MockVaultAPI_VaultListWorkspaceSecrets_Call{Call: _e.mock.On("VaultListWorkspaceSecrets", ctx, teamId, workspaceId)} } @@ -6138,9 +6138,9 @@ type MockVaultAPI_VaultStoreWorkspaceSecrets_Call struct { // VaultStoreWorkspaceSecrets is a helper method to define mock.On call // - ctx context.Context -// - teamId int -// - workspaceId int -func (_e *MockVaultAPI_Expecter) VaultStoreWorkspaceSecrets(ctx any, teamId any, workspaceId any) *MockVaultAPI_VaultStoreWorkspaceSecrets_Call { +// - teamId float32 +// - workspaceId float32 +func (_e *MockVaultAPI_Expecter) VaultStoreWorkspaceSecrets(ctx interface{}, teamId interface{}, workspaceId interface{}) *MockVaultAPI_VaultStoreWorkspaceSecrets_Call { return &MockVaultAPI_VaultStoreWorkspaceSecrets_Call{Call: _e.mock.On("VaultStoreWorkspaceSecrets", ctx, teamId, workspaceId)} } @@ -6419,8 +6419,8 @@ type MockWorkspacesAPI_WorkspacesDeleteEnvVar_Call struct { // WorkspacesDeleteEnvVar is a helper method to define mock.On call // - ctx context.Context -// - workspaceId int -func (_e *MockWorkspacesAPI_Expecter) WorkspacesDeleteEnvVar(ctx any, workspaceId any) *MockWorkspacesAPI_WorkspacesDeleteEnvVar_Call { +// - workspaceId float32 +func (_e *MockWorkspacesAPI_Expecter) WorkspacesDeleteEnvVar(ctx interface{}, workspaceId interface{}) *MockWorkspacesAPI_WorkspacesDeleteEnvVar_Call { return &MockWorkspacesAPI_WorkspacesDeleteEnvVar_Call{Call: _e.mock.On("WorkspacesDeleteEnvVar", ctx, workspaceId)} } @@ -6538,8 +6538,8 @@ type MockWorkspacesAPI_WorkspacesDeleteWorkspace_Call struct { // WorkspacesDeleteWorkspace is a helper method to define mock.On call // - ctx context.Context -// - workspaceId int -func (_e *MockWorkspacesAPI_Expecter) WorkspacesDeleteWorkspace(ctx any, workspaceId any) *MockWorkspacesAPI_WorkspacesDeleteWorkspace_Call { +// - workspaceId float32 +func (_e *MockWorkspacesAPI_Expecter) WorkspacesDeleteWorkspace(ctx interface{}, workspaceId interface{}) *MockWorkspacesAPI_WorkspacesDeleteWorkspace_Call { return &MockWorkspacesAPI_WorkspacesDeleteWorkspace_Call{Call: _e.mock.On("WorkspacesDeleteWorkspace", ctx, workspaceId)} } @@ -6657,8 +6657,8 @@ type MockWorkspacesAPI_WorkspacesDeployLandscape_Call struct { // WorkspacesDeployLandscape is a helper method to define mock.On call // - ctx context.Context -// - workspaceId int -func (_e *MockWorkspacesAPI_Expecter) WorkspacesDeployLandscape(ctx any, workspaceId any) *MockWorkspacesAPI_WorkspacesDeployLandscape_Call { +// - workspaceId float32 +func (_e *MockWorkspacesAPI_Expecter) WorkspacesDeployLandscape(ctx interface{}, workspaceId interface{}) *MockWorkspacesAPI_WorkspacesDeployLandscape_Call { return &MockWorkspacesAPI_WorkspacesDeployLandscape_Call{Call: _e.mock.On("WorkspacesDeployLandscape", ctx, workspaceId)} } @@ -6901,8 +6901,8 @@ type MockWorkspacesAPI_WorkspacesExecuteCommand_Call struct { // WorkspacesExecuteCommand is a helper method to define mock.On call // - ctx context.Context -// - workspaceId int -func (_e *MockWorkspacesAPI_Expecter) WorkspacesExecuteCommand(ctx any, workspaceId any) *MockWorkspacesAPI_WorkspacesExecuteCommand_Call { +// - workspaceId float32 +func (_e *MockWorkspacesAPI_Expecter) WorkspacesExecuteCommand(ctx interface{}, workspaceId interface{}) *MockWorkspacesAPI_WorkspacesExecuteCommand_Call { return &MockWorkspacesAPI_WorkspacesExecuteCommand_Call{Call: _e.mock.On("WorkspacesExecuteCommand", ctx, workspaceId)} } @@ -7028,8 +7028,8 @@ type MockWorkspacesAPI_WorkspacesGetWorkspace_Call struct { // WorkspacesGetWorkspace is a helper method to define mock.On call // - ctx context.Context -// - workspaceId int -func (_e *MockWorkspacesAPI_Expecter) WorkspacesGetWorkspace(ctx any, workspaceId any) *MockWorkspacesAPI_WorkspacesGetWorkspace_Call { +// - workspaceId float32 +func (_e *MockWorkspacesAPI_Expecter) WorkspacesGetWorkspace(ctx interface{}, workspaceId interface{}) *MockWorkspacesAPI_WorkspacesGetWorkspace_Call { return &MockWorkspacesAPI_WorkspacesGetWorkspace_Call{Call: _e.mock.On("WorkspacesGetWorkspace", ctx, workspaceId)} } @@ -7155,8 +7155,8 @@ type MockWorkspacesAPI_WorkspacesGetWorkspaceStatus_Call struct { // WorkspacesGetWorkspaceStatus is a helper method to define mock.On call // - ctx context.Context -// - workspaceId int -func (_e *MockWorkspacesAPI_Expecter) WorkspacesGetWorkspaceStatus(ctx any, workspaceId any) *MockWorkspacesAPI_WorkspacesGetWorkspaceStatus_Call { +// - workspaceId float32 +func (_e *MockWorkspacesAPI_Expecter) WorkspacesGetWorkspaceStatus(ctx interface{}, workspaceId interface{}) *MockWorkspacesAPI_WorkspacesGetWorkspaceStatus_Call { return &MockWorkspacesAPI_WorkspacesGetWorkspaceStatus_Call{Call: _e.mock.On("WorkspacesGetWorkspaceStatus", ctx, workspaceId)} } @@ -7282,8 +7282,8 @@ type MockWorkspacesAPI_WorkspacesGitHead_Call struct { // WorkspacesGitHead is a helper method to define mock.On call // - ctx context.Context -// - workspaceId int -func (_e *MockWorkspacesAPI_Expecter) WorkspacesGitHead(ctx any, workspaceId any) *MockWorkspacesAPI_WorkspacesGitHead_Call { +// - workspaceId float32 +func (_e *MockWorkspacesAPI_Expecter) WorkspacesGitHead(ctx interface{}, workspaceId interface{}) *MockWorkspacesAPI_WorkspacesGitHead_Call { return &MockWorkspacesAPI_WorkspacesGitHead_Call{Call: _e.mock.On("WorkspacesGitHead", ctx, workspaceId)} } @@ -7409,8 +7409,8 @@ type MockWorkspacesAPI_WorkspacesGitPull_Call struct { // WorkspacesGitPull is a helper method to define mock.On call // - ctx context.Context -// - workspaceId int -func (_e *MockWorkspacesAPI_Expecter) WorkspacesGitPull(ctx any, workspaceId any) *MockWorkspacesAPI_WorkspacesGitPull_Call { +// - workspaceId float32 +func (_e *MockWorkspacesAPI_Expecter) WorkspacesGitPull(ctx interface{}, workspaceId interface{}) *MockWorkspacesAPI_WorkspacesGitPull_Call { return &MockWorkspacesAPI_WorkspacesGitPull_Call{Call: _e.mock.On("WorkspacesGitPull", ctx, workspaceId)} } @@ -7784,8 +7784,8 @@ type MockWorkspacesAPI_WorkspacesListEnvVars_Call struct { // WorkspacesListEnvVars is a helper method to define mock.On call // - ctx context.Context -// - workspaceId int -func (_e *MockWorkspacesAPI_Expecter) WorkspacesListEnvVars(ctx any, workspaceId any) *MockWorkspacesAPI_WorkspacesListEnvVars_Call { +// - workspaceId float32 +func (_e *MockWorkspacesAPI_Expecter) WorkspacesListEnvVars(ctx interface{}, workspaceId interface{}) *MockWorkspacesAPI_WorkspacesListEnvVars_Call { return &MockWorkspacesAPI_WorkspacesListEnvVars_Call{Call: _e.mock.On("WorkspacesListEnvVars", ctx, workspaceId)} } @@ -7911,8 +7911,8 @@ type MockWorkspacesAPI_WorkspacesListWorkspaces_Call struct { // WorkspacesListWorkspaces is a helper method to define mock.On call // - ctx context.Context -// - teamId int -func (_e *MockWorkspacesAPI_Expecter) WorkspacesListWorkspaces(ctx any, teamId any) *MockWorkspacesAPI_WorkspacesListWorkspaces_Call { +// - teamId float32 +func (_e *MockWorkspacesAPI_Expecter) WorkspacesListWorkspaces(ctx interface{}, teamId interface{}) *MockWorkspacesAPI_WorkspacesListWorkspaces_Call { return &MockWorkspacesAPI_WorkspacesListWorkspaces_Call{Call: _e.mock.On("WorkspacesListWorkspaces", ctx, teamId)} } @@ -8040,8 +8040,8 @@ type MockWorkspacesAPI_WorkspacesLogs_Call struct { // - ctx context.Context // - workspaceId int // - stage string -// - step int -func (_e *MockWorkspacesAPI_Expecter) WorkspacesLogs(ctx any, workspaceId any, stage any, step any) *MockWorkspacesAPI_WorkspacesLogs_Call { +// - step float32 +func (_e *MockWorkspacesAPI_Expecter) WorkspacesLogs(ctx interface{}, workspaceId interface{}, stage interface{}, step interface{}) *MockWorkspacesAPI_WorkspacesLogs_Call { return &MockWorkspacesAPI_WorkspacesLogs_Call{Call: _e.mock.On("WorkspacesLogs", ctx, workspaceId, stage, step)} } @@ -8449,8 +8449,8 @@ type MockWorkspacesAPI_WorkspacesScaleLandscapeServices_Call struct { // WorkspacesScaleLandscapeServices is a helper method to define mock.On call // - ctx context.Context -// - workspaceId int -func (_e *MockWorkspacesAPI_Expecter) WorkspacesScaleLandscapeServices(ctx any, workspaceId any) *MockWorkspacesAPI_WorkspacesScaleLandscapeServices_Call { +// - workspaceId float32 +func (_e *MockWorkspacesAPI_Expecter) WorkspacesScaleLandscapeServices(ctx interface{}, workspaceId interface{}) *MockWorkspacesAPI_WorkspacesScaleLandscapeServices_Call { return &MockWorkspacesAPI_WorkspacesScaleLandscapeServices_Call{Call: _e.mock.On("WorkspacesScaleLandscapeServices", ctx, workspaceId)} } @@ -8707,8 +8707,8 @@ type MockWorkspacesAPI_WorkspacesSetEnvVar_Call struct { // WorkspacesSetEnvVar is a helper method to define mock.On call // - ctx context.Context -// - workspaceId int -func (_e *MockWorkspacesAPI_Expecter) WorkspacesSetEnvVar(ctx any, workspaceId any) *MockWorkspacesAPI_WorkspacesSetEnvVar_Call { +// - workspaceId float32 +func (_e *MockWorkspacesAPI_Expecter) WorkspacesSetEnvVar(ctx interface{}, workspaceId interface{}) *MockWorkspacesAPI_WorkspacesSetEnvVar_Call { return &MockWorkspacesAPI_WorkspacesSetEnvVar_Call{Call: _e.mock.On("WorkspacesSetEnvVar", ctx, workspaceId)} } @@ -9207,8 +9207,8 @@ type MockWorkspacesAPI_WorkspacesTeardownLandscape_Call struct { // WorkspacesTeardownLandscape is a helper method to define mock.On call // - ctx context.Context -// - workspaceId int -func (_e *MockWorkspacesAPI_Expecter) WorkspacesTeardownLandscape(ctx any, workspaceId any) *MockWorkspacesAPI_WorkspacesTeardownLandscape_Call { +// - workspaceId float32 +func (_e *MockWorkspacesAPI_Expecter) WorkspacesTeardownLandscape(ctx interface{}, workspaceId interface{}) *MockWorkspacesAPI_WorkspacesTeardownLandscape_Call { return &MockWorkspacesAPI_WorkspacesTeardownLandscape_Call{Call: _e.mock.On("WorkspacesTeardownLandscape", ctx, workspaceId)} } @@ -9326,8 +9326,8 @@ type MockWorkspacesAPI_WorkspacesUpdateWorkspace_Call struct { // WorkspacesUpdateWorkspace is a helper method to define mock.On call // - ctx context.Context -// - workspaceId int -func (_e *MockWorkspacesAPI_Expecter) WorkspacesUpdateWorkspace(ctx any, workspaceId any) *MockWorkspacesAPI_WorkspacesUpdateWorkspace_Call { +// - workspaceId float32 +func (_e *MockWorkspacesAPI_Expecter) WorkspacesUpdateWorkspace(ctx interface{}, workspaceId interface{}) *MockWorkspacesAPI_WorkspacesUpdateWorkspace_Call { return &MockWorkspacesAPI_WorkspacesUpdateWorkspace_Call{Call: _e.mock.On("WorkspacesUpdateWorkspace", ctx, workspaceId)} } From 093281934788d054769837efcd49c942473646bb Mon Sep 17 00:00:00 2001 From: Maximilian Date: Wed, 1 Jul 2026 13:03:38 +0200 Subject: [PATCH 49/61] fix: remove explicit embedded struct selector to resolve QF1008 Signed-off-by: Maximilian --- cli/cmd/team_list_members_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/cmd/team_list_members_test.go b/cli/cmd/team_list_members_test.go index 0c665f3c..84443388 100644 --- a/cli/cmd/team_list_members_test.go +++ b/cli/cmd/team_list_members_test.go @@ -92,7 +92,7 @@ var _ = Describe("ListTeamMembers", func() { }) It("should fail when team ID is unavailable", func() { - l.Opts.GlobalOptions.TeamId = -1 + l.Opts.TeamId = -1 mockEnv.EXPECT().GetTeamId().Return(-1, errors.New("CS_TEAM_ID env var required, but not set")).Once() err := l.RunE(nil, []string{}) From 0c58e0f7a1aac65503632a80427e969a68ce77a1 Mon Sep 17 00:00:00 2001 From: Maximilian Date: Mon, 6 Jul 2026 16:27:51 +0200 Subject: [PATCH 50/61] refac: removed unused TeamIdByName function Signed-off-by: Maximilian --- api/team.go | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/api/team.go b/api/team.go index 5c80ba7e..ae8ee6dc 100644 --- a/api/team.go +++ b/api/team.go @@ -4,41 +4,10 @@ package api import ( - "fmt" - cserrors "github.com/codesphere-cloud/cs-go/api/errors" "github.com/codesphere-cloud/cs-go/api/openapi_client" ) -// Fetches the team for a given team name. -// If the name is ambigous an error is thrown. -// -// Returns [NotFound] if no plan with the given Id could be found -// Returns [Duplicated] if no plan with the given Id could be found -func (client *Client) TeamIdByName(name string) (Team, error) { - teams, err := client.ListTeams("") - if err != nil { - return Team{}, err - } - - matchingTeams := []Team{} - for _, t := range teams { - if t.Name == name { - matchingTeams = append(matchingTeams, t) - } - } - - if len(matchingTeams) == 0 { - return Team{}, cserrors.NotFound(fmt.Sprintf("no team with name %s found", name)) - } - - if len(matchingTeams) > 1 { - return Team{}, cserrors.Duplicated(fmt.Sprintf("multiple teams (%v) with the name %s found.", matchingTeams, name)) - } - - return matchingTeams[0], nil -} - func (c *Client) ListTeams(orgId string) ([]Team, error) { if orgId != "" { teams, r, err := c.api.OrganizationsAPI.OrganizationsListOrgTeams(c.ctx, orgId).Execute() From b98620c9fff11f7579c0aff964753a578b873ef4 Mon Sep 17 00:00:00 2001 From: Maximilian Date: Mon, 6 Jul 2026 16:29:58 +0200 Subject: [PATCH 51/61] feat{TeamIdBy/Name} Added filtering for the TeamIdByName for the orgID s new parameter Signed-off-by: Maximilian --- api/team.go | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/api/team.go b/api/team.go index ae8ee6dc..b9bc017c 100644 --- a/api/team.go +++ b/api/team.go @@ -4,10 +4,41 @@ package api import ( + "fmt" + cserrors "github.com/codesphere-cloud/cs-go/api/errors" "github.com/codesphere-cloud/cs-go/api/openapi_client" ) +// Fetches the team for a given team name. +// If the name is ambigous an error is thrown. +// +// Returns [NotFound] if no team with the given Id could be found +// Returns [Duplicated] if no team with the given Id could be found +func (client *Client) TeamIdByName(name string, orgId string) (Team, error) { + teams, err := client.ListTeams(orgId) + if err != nil { + return Team{}, err + } + + matchingTeams := []Team{} + for _, t := range teams { + if t.Name == name { + matchingTeams = append(matchingTeams, t) + } + } + + if len(matchingTeams) == 0 { + return Team{}, cserrors.NotFound(fmt.Sprintf("no team with name %s found", name)) + } + + if len(matchingTeams) > 1 { + return Team{}, cserrors.Duplicated(fmt.Sprintf("multiple teams (%v) with the name %s found.", matchingTeams, name)) + } + + return matchingTeams[0], nil +} + func (c *Client) ListTeams(orgId string) ([]Team, error) { if orgId != "" { teams, r, err := c.api.OrganizationsAPI.OrganizationsListOrgTeams(c.ctx, orgId).Execute() From c518513ecec75b32c27c77bcf0b767bcf8f16063 Mon Sep 17 00:00:00 2001 From: DerBurri <7892993+DerBurri@users.noreply.github.com> Date: Wed, 1 Jul 2026 11:06:56 +0000 Subject: [PATCH 52/61] chore(docs): Auto-update docs and licenses Signed-off-by: DerBurri <7892993+DerBurri@users.noreply.github.com> Signed-off-by: Maximilian --- NOTICE | 4 +-- docs/cs_mcp.md | 50 ------------------------------------- docs/cs_team_member.md | 1 + docs/cs_team_member_list.md | 43 +++++++++++++++++++++++++++++++ pkg/tmpl/NOTICE | 4 +-- 5 files changed, 48 insertions(+), 54 deletions(-) create mode 100644 docs/cs_team_member_list.md diff --git a/NOTICE b/NOTICE index eebf7c08..7ef9d38d 100644 --- a/NOTICE +++ b/NOTICE @@ -197,9 +197,9 @@ License URL: https://github.com/jbenet/go-context/blob/d14ea06fba99/LICENSE ---------- Module: github.com/jedib0t/go-pretty/v6 -Version: v6.8.1 +Version: v6.8.2 License: MIT -License URL: https://github.com/jedib0t/go-pretty/blob/v6.8.1/LICENSE +License URL: https://github.com/jedib0t/go-pretty/blob/v6.8.2/LICENSE ---------- Module: github.com/json-iterator/go diff --git a/docs/cs_mcp.md b/docs/cs_mcp.md index 7f1e4272..c63b82c5 100644 --- a/docs/cs_mcp.md +++ b/docs/cs_mcp.md @@ -49,53 +49,3 @@ cs mcp [flags] * [cs](cs.md) - The Codesphere CLI -## cs mcp - -Runs the MCP server for Codesphere - -### Synopsis - -Runs the Model Context Protocol (MCP) server for Codesphere. - -The Codesphere MCP (Model Context Protocol) Server allows you to interact with your Codesphere workspaces and teams directly from within MCP-compatible AI assistants. -Add the Codesphere MCP Server to your MCP client configuration settings. -Example configuration: -{ -"mcpServers": { -"codesphere": { -"command": "cs", -"args": [ -"mcp" -], -"env": { -"CS_TOKEN": "your-api-token-here", -"CS_API": "https://codesphere.com/api" -} -} -} -} - - -``` -cs mcp [flags] -``` - -### Options - -``` - -h, --help help for mcp -``` - -### Options inherited from parent commands - -``` - -a, --api string URL of Codesphere API (can also be CS_API) - -t, --team int Team ID (relevant for some commands, can also be CS_TEAM_ID) (default -1) - -v, --verbose Verbose output - -w, --workspace int Workspace ID (relevant for some commands, can also be CS_WORKSPACE_ID) (default -1) -``` - -### SEE ALSO - -* [cs](cs.md) - The Codesphere CLI - diff --git a/docs/cs_team_member.md b/docs/cs_team_member.md index a5960a22..1a14a2e6 100644 --- a/docs/cs_team_member.md +++ b/docs/cs_team_member.md @@ -22,5 +22,6 @@ Manage team members * [cs team](cs_team.md) - Manage Team * [cs team member add](cs_team_member_add.md) - Add team member +* [cs team member list](cs_team_member_list.md) - List team members * [cs team member remove](cs_team_member_remove.md) - Remove team member diff --git a/docs/cs_team_member_list.md b/docs/cs_team_member_list.md new file mode 100644 index 00000000..d143768a --- /dev/null +++ b/docs/cs_team_member_list.md @@ -0,0 +1,43 @@ +## cs team member list + +List team members + +### Synopsis + +List all members of a team + +``` +cs team member list [flags] +``` + +### Examples + +``` +# List all members of a team +$ cs team member list -t + +# List all members of a team in JSON format +$ cs team member list -t -o json +``` + +### Options + +``` + -h, --help help for list + -o, --output string Output format (table, json, yaml) (default "table") +``` + +### Options inherited from parent commands + +``` + -a, --api string URL of Codesphere API (can also be CS_API) + -O, --org string Organization ID (relevant for some commands) + -t, --team int Team ID (relevant for some commands, can also be CS_TEAM_ID) (default -1) + -v, --verbose Verbose output + -w, --workspace int Workspace ID (relevant for some commands, can also be CS_WORKSPACE_ID) (default -1) +``` + +### SEE ALSO + +* [cs team member](cs_team_member.md) - Manage team members + diff --git a/pkg/tmpl/NOTICE b/pkg/tmpl/NOTICE index f2ca0ef5..d3444d50 100644 --- a/pkg/tmpl/NOTICE +++ b/pkg/tmpl/NOTICE @@ -197,9 +197,9 @@ License URL: https://github.com/jbenet/go-context/blob/d14ea06fba99/LICENSE ---------- Module: github.com/jedib0t/go-pretty/v6 -Version: v6.8.1 +Version: v6.8.2 License: MIT -License URL: https://github.com/jedib0t/go-pretty/blob/v6.8.1/LICENSE +License URL: https://github.com/jedib0t/go-pretty/blob/v6.8.2/LICENSE ---------- Module: github.com/json-iterator/go From 972b7eebfe0667cc588dd1a293bd7c89532fcdbc Mon Sep 17 00:00:00 2001 From: Maximilian Date: Mon, 6 Jul 2026 16:42:47 +0200 Subject: [PATCH 53/61] fix: add check for orgID and provide different message for team creation Signed-off-by: Maximilian --- cli/cmd/team_create.go | 6 +++++- cli/cmd/team_create_test.go | 41 +++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/cli/cmd/team_create.go b/cli/cmd/team_create.go index e1336638..7b1a8997 100644 --- a/cli/cmd/team_create.go +++ b/cli/cmd/team_create.go @@ -62,7 +62,11 @@ func (c *CreateTeamCmd) RunE(_ *cobra.Command, args []string) error { return err } - fmt.Printf("Team created: %+v in Organization: %+v\n", createdTeam.Id, orgId) + if orgId != "" { + fmt.Printf("Team created: %+v in Organization: %+v\n", createdTeam.Id, orgId) + } else { + fmt.Printf("Team created: %+v\n", createdTeam.Id) + } return nil } diff --git a/cli/cmd/team_create_test.go b/cli/cmd/team_create_test.go index 6083bd24..8a781a6e 100644 --- a/cli/cmd/team_create_test.go +++ b/cli/cmd/team_create_test.go @@ -4,7 +4,10 @@ package cmd_test import ( + "bytes" "fmt" + "io" + "os" "github.com/codesphere-cloud/cs-go/api" "github.com/codesphere-cloud/cs-go/cli/cmd" @@ -74,8 +77,46 @@ var _ = Describe("CreateTeam", func() { } mockClient.EXPECT().CreateTeam(orgId, teamName, dcId).Return(&expectedTeam, nil).Once() + oldStdout := os.Stdout + r, w, _ := os.Pipe() + os.Stdout = w + + err := c.RunE(nil, []string{}) + Expect(err).ToNot(HaveOccurred()) + + w.Close() + var buf bytes.Buffer + _, _ = io.Copy(&buf, r) + os.Stdout = oldStdout + + Expect(buf.String()).To(ContainSubstring(fmt.Sprintf("Team created: %v in Organization: %v\n", teamId, orgId))) + }) + + It("should successfully create a team and print the correct message when no organization ID is provided", func() { + c.Opts.OrgId = "" // Ensure flag is empty + mockEnv.EXPECT().GetOrgId().Return("").Once() + + expectedTeam := api.Team{ + Id: teamId, + Name: teamName, + DefaultDataCenterId: dcId, + } + mockClient.EXPECT().CreateTeam("", teamName, dcId).Return(&expectedTeam, nil).Once() + + oldStdout := os.Stdout + r, w, _ := os.Pipe() + os.Stdout = w + err := c.RunE(nil, []string{}) Expect(err).ToNot(HaveOccurred()) + + w.Close() + var buf bytes.Buffer + _, _ = io.Copy(&buf, r) + os.Stdout = oldStdout + + Expect(buf.String()).To(ContainSubstring(fmt.Sprintf("Team created: %v\n", teamId))) + Expect(buf.String()).ToNot(ContainSubstring("in Organization")) }) }) From 719e93410edfcb04b4f8fd4c41161b6b129fa245 Mon Sep 17 00:00:00 2001 From: Maximilian Date: Mon, 6 Jul 2026 17:09:33 +0200 Subject: [PATCH 54/61] fix: correct spelling of "Codesphere" in error messages across team removal commands and tests Signed-off-by: Maximilian --- cli/cmd/team_add_member.go | 14 ++++---- cli/cmd/team_add_member_test.go | 51 ++++++++++++++++++++++-------- cli/cmd/team_list_members_test.go | 2 +- cli/cmd/team_remove.go | 2 +- cli/cmd/team_remove_member.go | 2 +- cli/cmd/team_remove_member_test.go | 2 +- cli/cmd/team_remove_test.go | 2 +- pkg/cs/util.go | 10 ++++-- 8 files changed, 57 insertions(+), 28 deletions(-) diff --git a/cli/cmd/team_add_member.go b/cli/cmd/team_add_member.go index 33e38f05..0c86476b 100644 --- a/cli/cmd/team_add_member.go +++ b/cli/cmd/team_add_member.go @@ -22,7 +22,7 @@ type AddTeamMemberCmd struct { type AddTeamMemberOpts struct { *GlobalOptions Email string - Role int + Role cs.TeamRole TeamId int } @@ -36,7 +36,7 @@ func AddAddTeamMemberCmd(team *cobra.Command, opts *GlobalOptions) { To add a member to a team within an organization, the CS_ORG_ID environment variable or the -O/--org flag must be set.`), Example: io.FormatExampleCommands("team member add", []io.Example{ {Cmd: "-t -e user@example.com -r 1", Desc: "Add a user to a team as a member"}, - {Cmd: "-t -e admin@example.com -r 0", Desc: "Add a user to a team as an admin"}, + {Cmd: "-t -e admin@example.com -r -1", Desc: "Add a user to a team as an admin"}, {Cmd: "-O -t -e user@example.com -r 1", Desc: "Add a user to a team within an organization"}, }), }, @@ -48,7 +48,7 @@ func AddAddTeamMemberCmd(team *cobra.Command, opts *GlobalOptions) { t.cmd.RunE = t.RunE t.cmd.Flags().StringVarP(&t.Opts.Email, "email", "e", "", "Team member email") _ = t.cmd.MarkFlagRequired("email") - t.cmd.Flags().IntVarP(&t.Opts.Role, "role", "r", int(cs.RoleAdmin), "Team member role 0=admin, 1=member") + t.cmd.Flags().IntVarP((*int)(&t.Opts.Role), "role", "r", int(cs.RoleMember), "Team member role 1=member, -1=admin") AddCmd(team, t.cmd) } @@ -68,7 +68,7 @@ func (c *AddTeamMemberCmd) RunE(_ *cobra.Command, args []string) error { } -func (c *AddTeamMemberCmd) AddTeamMember(client Client, teamId int, email string, role int) error { +func (c *AddTeamMemberCmd) AddTeamMember(client Client, teamId int, email string, role cs.TeamRole) error { if email == "" { return errors.New("email cannot be empty") } @@ -77,11 +77,11 @@ func (c *AddTeamMemberCmd) AddTeamMember(client Client, teamId int, email string return fmt.Errorf("invalid email address: %w", err) } - if !cs.TeamRole(role).IsValid() { - return errors.New("invalid role: must be 0 for admin or 1 for member") + if !role.IsValid() { + return errors.New("invalid role: must be 1 for member or -1 for admin") } - err := client.AddTeamMember(teamId, email, role) + err := client.AddTeamMember(teamId, email, int(role)) if err != nil { return fmt.Errorf("failed to add member to team: %w", err) } diff --git a/cli/cmd/team_add_member_test.go b/cli/cmd/team_add_member_test.go index 34be9459..b2b72bfe 100644 --- a/cli/cmd/team_add_member_test.go +++ b/cli/cmd/team_add_member_test.go @@ -7,6 +7,7 @@ import ( "errors" "github.com/codesphere-cloud/cs-go/cli/cmd" + "github.com/codesphere-cloud/cs-go/pkg/cs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) @@ -17,7 +18,7 @@ var _ = Describe("AddTeamMember", func() { mockClient *cmd.MockClient c *cmd.AddTeamMemberCmd teamId int - dcId int + role cs.TeamRole email string ) @@ -26,7 +27,7 @@ var _ = Describe("AddTeamMember", func() { mockEnv = cmd.NewMockEnv(GinkgoT()) teamId = 42 email = "test@test.com" - dcId = 1 // Default data center ID for testing + role = cs.RoleMember c = &cmd.AddTeamMemberCmd{ Opts: cmd.AddTeamMemberOpts{ GlobalOptions: &cmd.GlobalOptions{ @@ -36,6 +37,7 @@ var _ = Describe("AddTeamMember", func() { }, Email: email, TeamId: teamId, + Role: -1, }, ClientFactory: func(opts cmd.GlobalOptions) (cmd.Client, error) { return mockClient, nil @@ -52,7 +54,7 @@ var _ = Describe("AddTeamMember", func() { Context("Validation", func() { It("should fail if the mail is empty", func() { - err := c.AddTeamMember(mockClient, teamId, "", dcId) + err := c.AddTeamMember(mockClient, teamId, "", role) Expect(err).To(HaveOccurred()) Expect(err.Error()).To(Equal("email cannot be empty")) @@ -60,30 +62,46 @@ var _ = Describe("AddTeamMember", func() { It("should fail if the email is invalid", func() { - err := c.AddTeamMember(mockClient, teamId, "invalid-email", dcId) + err := c.AddTeamMember(mockClient, teamId, "invalid-email", role) Expect(err).To(HaveOccurred()) Expect(err.Error()).To(ContainSubstring("invalid email address")) }) - It("should fail if the role is invalid", func() { - err := c.AddTeamMember(mockClient, teamId, "user@example.com", 2) + It("should fail if the role is invalid (e.g. 3)", func() { + err := c.AddTeamMember(mockClient, teamId, "user@example.com", 3) Expect(err).To(HaveOccurred()) - Expect(err.Error()).To(Equal("invalid role: must be 0 for admin or 1 for member")) + Expect(err.Error()).To(Equal("invalid role: must be 1 for member or -1 for admin")) + }) + + It("should fail if the role is 0", func() { + err := c.AddTeamMember(mockClient, teamId, "user@example.com", 0) + + Expect(err).To(HaveOccurred()) + Expect(err.Error()).To(Equal("invalid role: must be 1 for member or -1 for admin")) }) }) Context("RunE execution flow", func() { - It("should successfully add a member to a team", func() { - mockClient.EXPECT().AddTeamMember(teamId, email, 0).Return(nil).Once() + It("should successfully add a member to a team with role -1 (admin)", func() { + c.Opts.Role = -1 + mockClient.EXPECT().AddTeamMember(teamId, email, -1).Return(nil).Once() + + err := c.RunE(nil, []string{}) + Expect(err).ToNot(HaveOccurred()) + }) + + It("should successfully add a member to a team with role 1 (member)", func() { + c.Opts.Role = 1 + mockClient.EXPECT().AddTeamMember(teamId, email, 1).Return(nil).Once() err := c.RunE(nil, []string{}) Expect(err).ToNot(HaveOccurred()) }) It("should fail when the token is not allowed to add a member", func() { - mockClient.EXPECT().AddTeamMember(teamId, email, 0).Return(errors.New("failed")).Once() + mockClient.EXPECT().AddTeamMember(teamId, email, -1).Return(errors.New("failed")).Once() err := c.RunE(nil, []string{}) Expect(err).To(HaveOccurred()) @@ -123,11 +141,18 @@ var _ = Describe("AddTeamMember", func() { Expect(err.Error()).To(ContainSubstring("invalid email address")) }) - It("should fail when role is invalid", func() { - c.Opts.Role = 2 + It("should fail when role is invalid (e.g. 3)", func() { + c.Opts.Role = 3 + err := c.RunE(nil, []string{}) + Expect(err).To(HaveOccurred()) + Expect(err.Error()).To(Equal("invalid role: must be 1 for member or -1 for admin")) + }) + + It("should fail when role is 0", func() { + c.Opts.Role = 0 err := c.RunE(nil, []string{}) Expect(err).To(HaveOccurred()) - Expect(err.Error()).To(Equal("invalid role: must be 0 for admin or 1 for member")) + Expect(err.Error()).To(Equal("invalid role: must be 1 for member or -1 for admin")) }) }) diff --git a/cli/cmd/team_list_members_test.go b/cli/cmd/team_list_members_test.go index 84443388..487226f0 100644 --- a/cli/cmd/team_list_members_test.go +++ b/cli/cmd/team_list_members_test.go @@ -51,7 +51,7 @@ var _ = Describe("ListTeamMembers", func() { { UserId: 1, TeamId: teamId, - Role: 0, + Role: -1, Pending: false, CreatedAt: time.Now(), Name: &name, diff --git a/cli/cmd/team_remove.go b/cli/cmd/team_remove.go index 3bc0f54c..9cd281b9 100644 --- a/cli/cmd/team_remove.go +++ b/cli/cmd/team_remove.go @@ -43,7 +43,7 @@ func AddRemoveTeamCmd(team *cobra.Command, opts *GlobalOptions) { func (c *RemoveTeamCmd) RunE(_ *cobra.Command, args []string) error { client, err := c.ClientFactory(*c.Opts.GlobalOptions) if err != nil { - return fmt.Errorf("failed to create Codespehre client: %w", err) + return fmt.Errorf("failed to create Codesphere client: %w", err) } teamId, err := c.Opts.GetTeamId() diff --git a/cli/cmd/team_remove_member.go b/cli/cmd/team_remove_member.go index 3b16cd51..2e9de216 100644 --- a/cli/cmd/team_remove_member.go +++ b/cli/cmd/team_remove_member.go @@ -49,7 +49,7 @@ func AddRemoveTeamMemberCmd(team *cobra.Command, opts *GlobalOptions) { func (c *RemoveTeamMemberCmd) RunE(_ *cobra.Command, args []string) error { client, err := c.ClientFactory(*c.Opts.GlobalOptions) if err != nil { - return fmt.Errorf("failed to create Codespehre client: %w", err) + return fmt.Errorf("failed to create Codesphere client: %w", err) } teamId, err := c.Opts.GetTeamId() diff --git a/cli/cmd/team_remove_member_test.go b/cli/cmd/team_remove_member_test.go index 04735aed..defcae0b 100644 --- a/cli/cmd/team_remove_member_test.go +++ b/cli/cmd/team_remove_member_test.go @@ -76,7 +76,7 @@ var _ = Describe("RemoveTeamMember", func() { err := c.RunE(nil, []string{}) Expect(err).To(HaveOccurred()) - Expect(err.Error()).To(ContainSubstring("failed to create Codespehre client: client init failed")) + Expect(err.Error()).To(ContainSubstring("failed to create Codesphere client: client init failed")) }) It("should fail when team ID is unavailable", func() { diff --git a/cli/cmd/team_remove_test.go b/cli/cmd/team_remove_test.go index 8a8fefc0..6265fc15 100644 --- a/cli/cmd/team_remove_test.go +++ b/cli/cmd/team_remove_test.go @@ -64,7 +64,7 @@ var _ = Describe("RemoveTeam", func() { err := c.RunE(nil, []string{}) Expect(err).To(HaveOccurred()) - Expect(err.Error()).To(ContainSubstring("failed to create Codespehre client: client init failed")) + Expect(err.Error()).To(ContainSubstring("failed to create Codesphere client: client init failed")) }) It("should fail when team ID is unavailable", func() { diff --git a/pkg/cs/util.go b/pkg/cs/util.go index 0b1f3d99..85930497 100644 --- a/pkg/cs/util.go +++ b/pkg/cs/util.go @@ -74,8 +74,8 @@ func SetAuthoriziationHeader(req *http.Request) error { type TeamRole int const ( - RoleAdmin TeamRole = 0 RoleMember TeamRole = 1 + RoleAdmin TeamRole = -1 ) func (r TeamRole) IsValid() bool { @@ -83,10 +83,14 @@ func (r TeamRole) IsValid() bool { } func (r TeamRole) String() string { - if r == RoleMember { + switch r { + case RoleMember: return "Member" + case RoleAdmin, 0: + return "Admin" + default: + return "Unknown" } - return "Admin" } func GetRoleName(role int) string { From 8a27168290d39ce253a37ccc399373ecf8d05c09 Mon Sep 17 00:00:00 2001 From: Maximilian Date: Mon, 6 Jul 2026 17:14:29 +0200 Subject: [PATCH 55/61] fix: remove extra space in example command for adding team member within an organization Signed-off-by: Maximilian --- cli/cmd/team_add_member.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/cmd/team_add_member.go b/cli/cmd/team_add_member.go index 0c86476b..1ec46b5d 100644 --- a/cli/cmd/team_add_member.go +++ b/cli/cmd/team_add_member.go @@ -37,7 +37,7 @@ func AddAddTeamMemberCmd(team *cobra.Command, opts *GlobalOptions) { Example: io.FormatExampleCommands("team member add", []io.Example{ {Cmd: "-t -e user@example.com -r 1", Desc: "Add a user to a team as a member"}, {Cmd: "-t -e admin@example.com -r -1", Desc: "Add a user to a team as an admin"}, - {Cmd: "-O -t -e user@example.com -r 1", Desc: "Add a user to a team within an organization"}, + {Cmd: "-O -t -e user@example.com -r 1", Desc: "Add a user to a team within an organization"}, }), }, Opts: AddTeamMemberOpts{ From df882c7849d2244055c9abaf6392db2af31a3529 Mon Sep 17 00:00:00 2001 From: Maximilian Date: Mon, 6 Jul 2026 17:22:18 +0200 Subject: [PATCH 56/61] fix: update parameter types from float32 to int in mock API methods Signed-off-by: Maximilian --- api/openapi_client/mocks.go | 138 ++++++++++++++++++------------------ 1 file changed, 69 insertions(+), 69 deletions(-) diff --git a/api/openapi_client/mocks.go b/api/openapi_client/mocks.go index 260b4666..d22d5f13 100644 --- a/api/openapi_client/mocks.go +++ b/api/openapi_client/mocks.go @@ -452,8 +452,8 @@ type MockDomainsAPI_DomainsListDomains_Call struct { // DomainsListDomains is a helper method to define mock.On call // - ctx context.Context -// - teamId float32 -func (_e *MockDomainsAPI_Expecter) DomainsListDomains(ctx interface{}, teamId interface{}) *MockDomainsAPI_DomainsListDomains_Call { +// - teamId int +func (_e *MockDomainsAPI_Expecter) DomainsListDomains(ctx any, teamId any) *MockDomainsAPI_DomainsListDomains_Call { return &MockDomainsAPI_DomainsListDomains_Call{Call: _e.mock.On("DomainsListDomains", ctx, teamId)} } @@ -1367,9 +1367,9 @@ type MockManagedServicesAPI_ManagedServicesDeleteProvider_Call struct { // ManagedServicesDeleteProvider is a helper method to define mock.On call // - ctx context.Context // - name string -// - version string -func (_e *MockManagedServicesAPI_Expecter) ManagedServicesDeleteProvider(ctx interface{}, name interface{}, version interface{}) *MockManagedServicesAPI_ManagedServicesDeleteProvider_Call { - return &MockManagedServicesAPI_ManagedServicesDeleteProvider_Call{Call: _e.mock.On("ManagedServicesDeleteProvider", ctx, name, version)} +// - schemaVersion string +func (_e *MockManagedServicesAPI_Expecter) ManagedServicesDeleteProvider(ctx any, name any, schemaVersion any) *MockManagedServicesAPI_ManagedServicesDeleteProvider_Call { + return &MockManagedServicesAPI_ManagedServicesDeleteProvider_Call{Call: _e.mock.On("ManagedServicesDeleteProvider", ctx, name, schemaVersion)} } func (_c *MockManagedServicesAPI_ManagedServicesDeleteProvider_Call) Run(run func(ctx context.Context, name string, schemaVersion string)) *MockManagedServicesAPI_ManagedServicesDeleteProvider_Call { @@ -2115,9 +2115,9 @@ type MockManagedServicesAPI_ManagedServicesUpdateProvider_Call struct { // ManagedServicesUpdateProvider is a helper method to define mock.On call // - ctx context.Context // - name string -// - version string -func (_e *MockManagedServicesAPI_Expecter) ManagedServicesUpdateProvider(ctx interface{}, name interface{}, version interface{}) *MockManagedServicesAPI_ManagedServicesUpdateProvider_Call { - return &MockManagedServicesAPI_ManagedServicesUpdateProvider_Call{Call: _e.mock.On("ManagedServicesUpdateProvider", ctx, name, version)} +// - schemaVersion string +func (_e *MockManagedServicesAPI_Expecter) ManagedServicesUpdateProvider(ctx any, name any, schemaVersion any) *MockManagedServicesAPI_ManagedServicesUpdateProvider_Call { + return &MockManagedServicesAPI_ManagedServicesUpdateProvider_Call{Call: _e.mock.On("ManagedServicesUpdateProvider", ctx, name, schemaVersion)} } func (_c *MockManagedServicesAPI_ManagedServicesUpdateProvider_Call) Run(run func(ctx context.Context, name string, schemaVersion string)) *MockManagedServicesAPI_ManagedServicesUpdateProvider_Call { @@ -2784,8 +2784,8 @@ type MockOrganizationsAPI_OrganizationsChangeOrgRole_Call struct { // OrganizationsChangeOrgRole is a helper method to define mock.On call // - ctx context.Context // - organizationId string -// - userId float32 -func (_e *MockOrganizationsAPI_Expecter) OrganizationsChangeOrgRole(ctx interface{}, organizationId interface{}, userId interface{}) *MockOrganizationsAPI_OrganizationsChangeOrgRole_Call { +// - userId int +func (_e *MockOrganizationsAPI_Expecter) OrganizationsChangeOrgRole(ctx any, organizationId any, userId any) *MockOrganizationsAPI_OrganizationsChangeOrgRole_Call { return &MockOrganizationsAPI_OrganizationsChangeOrgRole_Call{Call: _e.mock.On("OrganizationsChangeOrgRole", ctx, organizationId, userId)} } @@ -3284,8 +3284,8 @@ type MockOrganizationsAPI_OrganizationsRemoveOrgMember_Call struct { // OrganizationsRemoveOrgMember is a helper method to define mock.On call // - ctx context.Context // - organizationId string -// - userId float32 -func (_e *MockOrganizationsAPI_Expecter) OrganizationsRemoveOrgMember(ctx interface{}, organizationId interface{}, userId interface{}) *MockOrganizationsAPI_OrganizationsRemoveOrgMember_Call { +// - userId int +func (_e *MockOrganizationsAPI_Expecter) OrganizationsRemoveOrgMember(ctx any, organizationId any, userId any) *MockOrganizationsAPI_OrganizationsRemoveOrgMember_Call { return &MockOrganizationsAPI_OrganizationsRemoveOrgMember_Call{Call: _e.mock.On("OrganizationsRemoveOrgMember", ctx, organizationId, userId)} } @@ -3435,9 +3435,9 @@ type MockTeamsAPI_TeamsChangeRole_Call struct { // TeamsChangeRole is a helper method to define mock.On call // - ctx context.Context -// - teamId float32 -// - userId float32 -func (_e *MockTeamsAPI_Expecter) TeamsChangeRole(ctx interface{}, teamId interface{}, userId interface{}) *MockTeamsAPI_TeamsChangeRole_Call { +// - teamId int +// - userId int +func (_e *MockTeamsAPI_Expecter) TeamsChangeRole(ctx any, teamId any, userId any) *MockTeamsAPI_TeamsChangeRole_Call { return &MockTeamsAPI_TeamsChangeRole_Call{Call: _e.mock.On("TeamsChangeRole", ctx, teamId, userId)} } @@ -3681,8 +3681,8 @@ type MockTeamsAPI_TeamsDeleteTeam_Call struct { // TeamsDeleteTeam is a helper method to define mock.On call // - ctx context.Context -// - teamId float32 -func (_e *MockTeamsAPI_Expecter) TeamsDeleteTeam(ctx interface{}, teamId interface{}) *MockTeamsAPI_TeamsDeleteTeam_Call { +// - teamId int +func (_e *MockTeamsAPI_Expecter) TeamsDeleteTeam(ctx any, teamId any) *MockTeamsAPI_TeamsDeleteTeam_Call { return &MockTeamsAPI_TeamsDeleteTeam_Call{Call: _e.mock.On("TeamsDeleteTeam", ctx, teamId)} } @@ -3800,8 +3800,8 @@ type MockTeamsAPI_TeamsGetTeam_Call struct { // TeamsGetTeam is a helper method to define mock.On call // - ctx context.Context -// - teamId float32 -func (_e *MockTeamsAPI_Expecter) TeamsGetTeam(ctx interface{}, teamId interface{}) *MockTeamsAPI_TeamsGetTeam_Call { +// - teamId int +func (_e *MockTeamsAPI_Expecter) TeamsGetTeam(ctx any, teamId any) *MockTeamsAPI_TeamsGetTeam_Call { return &MockTeamsAPI_TeamsGetTeam_Call{Call: _e.mock.On("TeamsGetTeam", ctx, teamId)} } @@ -3927,8 +3927,8 @@ type MockTeamsAPI_TeamsInviteMember_Call struct { // TeamsInviteMember is a helper method to define mock.On call // - ctx context.Context -// - teamId float32 -func (_e *MockTeamsAPI_Expecter) TeamsInviteMember(ctx interface{}, teamId interface{}) *MockTeamsAPI_TeamsInviteMember_Call { +// - teamId int +func (_e *MockTeamsAPI_Expecter) TeamsInviteMember(ctx any, teamId any) *MockTeamsAPI_TeamsInviteMember_Call { return &MockTeamsAPI_TeamsInviteMember_Call{Call: _e.mock.On("TeamsInviteMember", ctx, teamId)} } @@ -4046,8 +4046,8 @@ type MockTeamsAPI_TeamsListMembers_Call struct { // TeamsListMembers is a helper method to define mock.On call // - ctx context.Context -// - teamId float32 -func (_e *MockTeamsAPI_Expecter) TeamsListMembers(ctx interface{}, teamId interface{}) *MockTeamsAPI_TeamsListMembers_Call { +// - teamId int +func (_e *MockTeamsAPI_Expecter) TeamsListMembers(ctx any, teamId any) *MockTeamsAPI_TeamsListMembers_Call { return &MockTeamsAPI_TeamsListMembers_Call{Call: _e.mock.On("TeamsListMembers", ctx, teamId)} } @@ -4294,8 +4294,8 @@ type MockTeamsAPI_TeamsMigrateTeamToOrg_Call struct { // TeamsMigrateTeamToOrg is a helper method to define mock.On call // - ctx context.Context -// - teamId float32 -func (_e *MockTeamsAPI_Expecter) TeamsMigrateTeamToOrg(ctx interface{}, teamId interface{}) *MockTeamsAPI_TeamsMigrateTeamToOrg_Call { +// - teamId int +func (_e *MockTeamsAPI_Expecter) TeamsMigrateTeamToOrg(ctx any, teamId any) *MockTeamsAPI_TeamsMigrateTeamToOrg_Call { return &MockTeamsAPI_TeamsMigrateTeamToOrg_Call{Call: _e.mock.On("TeamsMigrateTeamToOrg", ctx, teamId)} } @@ -4413,9 +4413,9 @@ type MockTeamsAPI_TeamsRemoveMember_Call struct { // TeamsRemoveMember is a helper method to define mock.On call // - ctx context.Context -// - teamId float32 -// - userId float32 -func (_e *MockTeamsAPI_Expecter) TeamsRemoveMember(ctx interface{}, teamId interface{}, userId interface{}) *MockTeamsAPI_TeamsRemoveMember_Call { +// - teamId int +// - userId int +func (_e *MockTeamsAPI_Expecter) TeamsRemoveMember(ctx any, teamId any, userId any) *MockTeamsAPI_TeamsRemoveMember_Call { return &MockTeamsAPI_TeamsRemoveMember_Call{Call: _e.mock.On("TeamsRemoveMember", ctx, teamId, userId)} } @@ -4698,8 +4698,8 @@ type MockUsageAPI_UsageGetUsageSummaryLandscape_Call struct { // UsageGetUsageSummaryLandscape is a helper method to define mock.On call // - ctx context.Context -// - teamId float32 -func (_e *MockUsageAPI_Expecter) UsageGetUsageSummaryLandscape(ctx interface{}, teamId interface{}) *MockUsageAPI_UsageGetUsageSummaryLandscape_Call { +// - teamId int +func (_e *MockUsageAPI_Expecter) UsageGetUsageSummaryLandscape(ctx any, teamId any) *MockUsageAPI_UsageGetUsageSummaryLandscape_Call { return &MockUsageAPI_UsageGetUsageSummaryLandscape_Call{Call: _e.mock.On("UsageGetUsageSummaryLandscape", ctx, teamId)} } @@ -5221,9 +5221,9 @@ type MockVaultAPI_VaultDeleteWorkspaceSecrets_Call struct { // VaultDeleteWorkspaceSecrets is a helper method to define mock.On call // - ctx context.Context -// - teamId float32 -// - workspaceId float32 -func (_e *MockVaultAPI_Expecter) VaultDeleteWorkspaceSecrets(ctx interface{}, teamId interface{}, workspaceId interface{}) *MockVaultAPI_VaultDeleteWorkspaceSecrets_Call { +// - teamId int +// - workspaceId int +func (_e *MockVaultAPI_Expecter) VaultDeleteWorkspaceSecrets(ctx any, teamId any, workspaceId any) *MockVaultAPI_VaultDeleteWorkspaceSecrets_Call { return &MockVaultAPI_VaultDeleteWorkspaceSecrets_Call{Call: _e.mock.On("VaultDeleteWorkspaceSecrets", ctx, teamId, workspaceId)} } @@ -5872,9 +5872,9 @@ type MockVaultAPI_VaultListWorkspaceSecrets_Call struct { // VaultListWorkspaceSecrets is a helper method to define mock.On call // - ctx context.Context -// - teamId float32 -// - workspaceId float32 -func (_e *MockVaultAPI_Expecter) VaultListWorkspaceSecrets(ctx interface{}, teamId interface{}, workspaceId interface{}) *MockVaultAPI_VaultListWorkspaceSecrets_Call { +// - teamId int +// - workspaceId int +func (_e *MockVaultAPI_Expecter) VaultListWorkspaceSecrets(ctx any, teamId any, workspaceId any) *MockVaultAPI_VaultListWorkspaceSecrets_Call { return &MockVaultAPI_VaultListWorkspaceSecrets_Call{Call: _e.mock.On("VaultListWorkspaceSecrets", ctx, teamId, workspaceId)} } @@ -6138,9 +6138,9 @@ type MockVaultAPI_VaultStoreWorkspaceSecrets_Call struct { // VaultStoreWorkspaceSecrets is a helper method to define mock.On call // - ctx context.Context -// - teamId float32 -// - workspaceId float32 -func (_e *MockVaultAPI_Expecter) VaultStoreWorkspaceSecrets(ctx interface{}, teamId interface{}, workspaceId interface{}) *MockVaultAPI_VaultStoreWorkspaceSecrets_Call { +// - teamId int +// - workspaceId int +func (_e *MockVaultAPI_Expecter) VaultStoreWorkspaceSecrets(ctx any, teamId any, workspaceId any) *MockVaultAPI_VaultStoreWorkspaceSecrets_Call { return &MockVaultAPI_VaultStoreWorkspaceSecrets_Call{Call: _e.mock.On("VaultStoreWorkspaceSecrets", ctx, teamId, workspaceId)} } @@ -6419,8 +6419,8 @@ type MockWorkspacesAPI_WorkspacesDeleteEnvVar_Call struct { // WorkspacesDeleteEnvVar is a helper method to define mock.On call // - ctx context.Context -// - workspaceId float32 -func (_e *MockWorkspacesAPI_Expecter) WorkspacesDeleteEnvVar(ctx interface{}, workspaceId interface{}) *MockWorkspacesAPI_WorkspacesDeleteEnvVar_Call { +// - workspaceId int +func (_e *MockWorkspacesAPI_Expecter) WorkspacesDeleteEnvVar(ctx any, workspaceId any) *MockWorkspacesAPI_WorkspacesDeleteEnvVar_Call { return &MockWorkspacesAPI_WorkspacesDeleteEnvVar_Call{Call: _e.mock.On("WorkspacesDeleteEnvVar", ctx, workspaceId)} } @@ -6538,8 +6538,8 @@ type MockWorkspacesAPI_WorkspacesDeleteWorkspace_Call struct { // WorkspacesDeleteWorkspace is a helper method to define mock.On call // - ctx context.Context -// - workspaceId float32 -func (_e *MockWorkspacesAPI_Expecter) WorkspacesDeleteWorkspace(ctx interface{}, workspaceId interface{}) *MockWorkspacesAPI_WorkspacesDeleteWorkspace_Call { +// - workspaceId int +func (_e *MockWorkspacesAPI_Expecter) WorkspacesDeleteWorkspace(ctx any, workspaceId any) *MockWorkspacesAPI_WorkspacesDeleteWorkspace_Call { return &MockWorkspacesAPI_WorkspacesDeleteWorkspace_Call{Call: _e.mock.On("WorkspacesDeleteWorkspace", ctx, workspaceId)} } @@ -6657,8 +6657,8 @@ type MockWorkspacesAPI_WorkspacesDeployLandscape_Call struct { // WorkspacesDeployLandscape is a helper method to define mock.On call // - ctx context.Context -// - workspaceId float32 -func (_e *MockWorkspacesAPI_Expecter) WorkspacesDeployLandscape(ctx interface{}, workspaceId interface{}) *MockWorkspacesAPI_WorkspacesDeployLandscape_Call { +// - workspaceId int +func (_e *MockWorkspacesAPI_Expecter) WorkspacesDeployLandscape(ctx any, workspaceId any) *MockWorkspacesAPI_WorkspacesDeployLandscape_Call { return &MockWorkspacesAPI_WorkspacesDeployLandscape_Call{Call: _e.mock.On("WorkspacesDeployLandscape", ctx, workspaceId)} } @@ -6901,8 +6901,8 @@ type MockWorkspacesAPI_WorkspacesExecuteCommand_Call struct { // WorkspacesExecuteCommand is a helper method to define mock.On call // - ctx context.Context -// - workspaceId float32 -func (_e *MockWorkspacesAPI_Expecter) WorkspacesExecuteCommand(ctx interface{}, workspaceId interface{}) *MockWorkspacesAPI_WorkspacesExecuteCommand_Call { +// - workspaceId int +func (_e *MockWorkspacesAPI_Expecter) WorkspacesExecuteCommand(ctx any, workspaceId any) *MockWorkspacesAPI_WorkspacesExecuteCommand_Call { return &MockWorkspacesAPI_WorkspacesExecuteCommand_Call{Call: _e.mock.On("WorkspacesExecuteCommand", ctx, workspaceId)} } @@ -7028,8 +7028,8 @@ type MockWorkspacesAPI_WorkspacesGetWorkspace_Call struct { // WorkspacesGetWorkspace is a helper method to define mock.On call // - ctx context.Context -// - workspaceId float32 -func (_e *MockWorkspacesAPI_Expecter) WorkspacesGetWorkspace(ctx interface{}, workspaceId interface{}) *MockWorkspacesAPI_WorkspacesGetWorkspace_Call { +// - workspaceId int +func (_e *MockWorkspacesAPI_Expecter) WorkspacesGetWorkspace(ctx any, workspaceId any) *MockWorkspacesAPI_WorkspacesGetWorkspace_Call { return &MockWorkspacesAPI_WorkspacesGetWorkspace_Call{Call: _e.mock.On("WorkspacesGetWorkspace", ctx, workspaceId)} } @@ -7155,8 +7155,8 @@ type MockWorkspacesAPI_WorkspacesGetWorkspaceStatus_Call struct { // WorkspacesGetWorkspaceStatus is a helper method to define mock.On call // - ctx context.Context -// - workspaceId float32 -func (_e *MockWorkspacesAPI_Expecter) WorkspacesGetWorkspaceStatus(ctx interface{}, workspaceId interface{}) *MockWorkspacesAPI_WorkspacesGetWorkspaceStatus_Call { +// - workspaceId int +func (_e *MockWorkspacesAPI_Expecter) WorkspacesGetWorkspaceStatus(ctx any, workspaceId any) *MockWorkspacesAPI_WorkspacesGetWorkspaceStatus_Call { return &MockWorkspacesAPI_WorkspacesGetWorkspaceStatus_Call{Call: _e.mock.On("WorkspacesGetWorkspaceStatus", ctx, workspaceId)} } @@ -7282,8 +7282,8 @@ type MockWorkspacesAPI_WorkspacesGitHead_Call struct { // WorkspacesGitHead is a helper method to define mock.On call // - ctx context.Context -// - workspaceId float32 -func (_e *MockWorkspacesAPI_Expecter) WorkspacesGitHead(ctx interface{}, workspaceId interface{}) *MockWorkspacesAPI_WorkspacesGitHead_Call { +// - workspaceId int +func (_e *MockWorkspacesAPI_Expecter) WorkspacesGitHead(ctx any, workspaceId any) *MockWorkspacesAPI_WorkspacesGitHead_Call { return &MockWorkspacesAPI_WorkspacesGitHead_Call{Call: _e.mock.On("WorkspacesGitHead", ctx, workspaceId)} } @@ -7409,8 +7409,8 @@ type MockWorkspacesAPI_WorkspacesGitPull_Call struct { // WorkspacesGitPull is a helper method to define mock.On call // - ctx context.Context -// - workspaceId float32 -func (_e *MockWorkspacesAPI_Expecter) WorkspacesGitPull(ctx interface{}, workspaceId interface{}) *MockWorkspacesAPI_WorkspacesGitPull_Call { +// - workspaceId int +func (_e *MockWorkspacesAPI_Expecter) WorkspacesGitPull(ctx any, workspaceId any) *MockWorkspacesAPI_WorkspacesGitPull_Call { return &MockWorkspacesAPI_WorkspacesGitPull_Call{Call: _e.mock.On("WorkspacesGitPull", ctx, workspaceId)} } @@ -7784,8 +7784,8 @@ type MockWorkspacesAPI_WorkspacesListEnvVars_Call struct { // WorkspacesListEnvVars is a helper method to define mock.On call // - ctx context.Context -// - workspaceId float32 -func (_e *MockWorkspacesAPI_Expecter) WorkspacesListEnvVars(ctx interface{}, workspaceId interface{}) *MockWorkspacesAPI_WorkspacesListEnvVars_Call { +// - workspaceId int +func (_e *MockWorkspacesAPI_Expecter) WorkspacesListEnvVars(ctx any, workspaceId any) *MockWorkspacesAPI_WorkspacesListEnvVars_Call { return &MockWorkspacesAPI_WorkspacesListEnvVars_Call{Call: _e.mock.On("WorkspacesListEnvVars", ctx, workspaceId)} } @@ -7911,8 +7911,8 @@ type MockWorkspacesAPI_WorkspacesListWorkspaces_Call struct { // WorkspacesListWorkspaces is a helper method to define mock.On call // - ctx context.Context -// - teamId float32 -func (_e *MockWorkspacesAPI_Expecter) WorkspacesListWorkspaces(ctx interface{}, teamId interface{}) *MockWorkspacesAPI_WorkspacesListWorkspaces_Call { +// - teamId int +func (_e *MockWorkspacesAPI_Expecter) WorkspacesListWorkspaces(ctx any, teamId any) *MockWorkspacesAPI_WorkspacesListWorkspaces_Call { return &MockWorkspacesAPI_WorkspacesListWorkspaces_Call{Call: _e.mock.On("WorkspacesListWorkspaces", ctx, teamId)} } @@ -8040,8 +8040,8 @@ type MockWorkspacesAPI_WorkspacesLogs_Call struct { // - ctx context.Context // - workspaceId int // - stage string -// - step float32 -func (_e *MockWorkspacesAPI_Expecter) WorkspacesLogs(ctx interface{}, workspaceId interface{}, stage interface{}, step interface{}) *MockWorkspacesAPI_WorkspacesLogs_Call { +// - step int +func (_e *MockWorkspacesAPI_Expecter) WorkspacesLogs(ctx any, workspaceId any, stage any, step any) *MockWorkspacesAPI_WorkspacesLogs_Call { return &MockWorkspacesAPI_WorkspacesLogs_Call{Call: _e.mock.On("WorkspacesLogs", ctx, workspaceId, stage, step)} } @@ -8449,8 +8449,8 @@ type MockWorkspacesAPI_WorkspacesScaleLandscapeServices_Call struct { // WorkspacesScaleLandscapeServices is a helper method to define mock.On call // - ctx context.Context -// - workspaceId float32 -func (_e *MockWorkspacesAPI_Expecter) WorkspacesScaleLandscapeServices(ctx interface{}, workspaceId interface{}) *MockWorkspacesAPI_WorkspacesScaleLandscapeServices_Call { +// - workspaceId int +func (_e *MockWorkspacesAPI_Expecter) WorkspacesScaleLandscapeServices(ctx any, workspaceId any) *MockWorkspacesAPI_WorkspacesScaleLandscapeServices_Call { return &MockWorkspacesAPI_WorkspacesScaleLandscapeServices_Call{Call: _e.mock.On("WorkspacesScaleLandscapeServices", ctx, workspaceId)} } @@ -8707,8 +8707,8 @@ type MockWorkspacesAPI_WorkspacesSetEnvVar_Call struct { // WorkspacesSetEnvVar is a helper method to define mock.On call // - ctx context.Context -// - workspaceId float32 -func (_e *MockWorkspacesAPI_Expecter) WorkspacesSetEnvVar(ctx interface{}, workspaceId interface{}) *MockWorkspacesAPI_WorkspacesSetEnvVar_Call { +// - workspaceId int +func (_e *MockWorkspacesAPI_Expecter) WorkspacesSetEnvVar(ctx any, workspaceId any) *MockWorkspacesAPI_WorkspacesSetEnvVar_Call { return &MockWorkspacesAPI_WorkspacesSetEnvVar_Call{Call: _e.mock.On("WorkspacesSetEnvVar", ctx, workspaceId)} } @@ -9207,8 +9207,8 @@ type MockWorkspacesAPI_WorkspacesTeardownLandscape_Call struct { // WorkspacesTeardownLandscape is a helper method to define mock.On call // - ctx context.Context -// - workspaceId float32 -func (_e *MockWorkspacesAPI_Expecter) WorkspacesTeardownLandscape(ctx interface{}, workspaceId interface{}) *MockWorkspacesAPI_WorkspacesTeardownLandscape_Call { +// - workspaceId int +func (_e *MockWorkspacesAPI_Expecter) WorkspacesTeardownLandscape(ctx any, workspaceId any) *MockWorkspacesAPI_WorkspacesTeardownLandscape_Call { return &MockWorkspacesAPI_WorkspacesTeardownLandscape_Call{Call: _e.mock.On("WorkspacesTeardownLandscape", ctx, workspaceId)} } @@ -9326,8 +9326,8 @@ type MockWorkspacesAPI_WorkspacesUpdateWorkspace_Call struct { // WorkspacesUpdateWorkspace is a helper method to define mock.On call // - ctx context.Context -// - workspaceId float32 -func (_e *MockWorkspacesAPI_Expecter) WorkspacesUpdateWorkspace(ctx interface{}, workspaceId interface{}) *MockWorkspacesAPI_WorkspacesUpdateWorkspace_Call { +// - workspaceId int +func (_e *MockWorkspacesAPI_Expecter) WorkspacesUpdateWorkspace(ctx any, workspaceId any) *MockWorkspacesAPI_WorkspacesUpdateWorkspace_Call { return &MockWorkspacesAPI_WorkspacesUpdateWorkspace_Call{Call: _e.mock.On("WorkspacesUpdateWorkspace", ctx, workspaceId)} } From 93e31a84c62c828788cc73f86827a22221fe8060 Mon Sep 17 00:00:00 2001 From: Maximilian Date: Mon, 6 Jul 2026 17:25:45 +0200 Subject: [PATCH 57/61] updated api client Signed-off-by: Maximilian --- api/openapi_client/api_managed_services.go | 147 +++++- api/openapi_client/api_organizations.go | 11 + api/openapi_client/api_ssh.go | 432 +++++++++++++++ api/openapi_client/client.go | 3 + api/openapi_client/mocks.go | 495 ++++++++++++++++++ ...anaged_services_create_provider_request.go | 104 ---- ...es_create_provider_request_any_of_scope.go | 104 ---- .../model_managed_services_create_request.go | 2 +- ...anaged_services_update_provider_request.go | 12 +- ...anaged_services_upsert_provider_request.go | 104 ++++ ...ervices_upsert_provider_request_any_of.go} | 174 +++--- ...vices_upsert_provider_request_any_of_1.go} | 82 +-- ...es_upsert_provider_request_any_of_scope.go | 104 ++++ ...t_provider_request_any_of_scope_any_of.go} | 60 +-- ...provider_request_any_of_scope_any_of_1.go} | 66 +-- .../model_ssh_delete_public_key_request.go | 157 ++++++ ...ssh_list_public_keys_200_response_inner.go | 242 +++++++++ .../model_ssh_upload_public_key_request.go | 157 ++++++ 18 files changed, 2046 insertions(+), 410 deletions(-) create mode 100644 api/openapi_client/api_ssh.go delete mode 100644 api/openapi_client/model_managed_services_create_provider_request.go delete mode 100644 api/openapi_client/model_managed_services_create_provider_request_any_of_scope.go create mode 100644 api/openapi_client/model_managed_services_upsert_provider_request.go rename api/openapi_client/{model_managed_services_create_provider_request_any_of.go => model_managed_services_upsert_provider_request_any_of.go} (71%) rename api/openapi_client/{model_managed_services_create_provider_request_any_of_1.go => model_managed_services_upsert_provider_request_any_of_1.go} (55%) create mode 100644 api/openapi_client/model_managed_services_upsert_provider_request_any_of_scope.go rename api/openapi_client/{model_managed_services_create_provider_request_any_of_scope_any_of.go => model_managed_services_upsert_provider_request_any_of_scope_any_of.go} (50%) rename api/openapi_client/{model_managed_services_create_provider_request_any_of_scope_any_of_1.go => model_managed_services_upsert_provider_request_any_of_scope_any_of_1.go} (53%) create mode 100644 api/openapi_client/model_ssh_delete_public_key_request.go create mode 100644 api/openapi_client/model_ssh_list_public_keys_200_response_inner.go create mode 100644 api/openapi_client/model_ssh_upload_public_key_request.go diff --git a/api/openapi_client/api_managed_services.go b/api/openapi_client/api_managed_services.go index 999bbfdb..1c187041 100644 --- a/api/openapi_client/api_managed_services.go +++ b/api/openapi_client/api_managed_services.go @@ -147,6 +147,18 @@ type ManagedServicesAPI interface { // ManagedServicesUpdateProviderExecute executes the request // @return ManagedServicesListProviders200ResponseInnerAnyOf ManagedServicesUpdateProviderExecute(r ApiManagedServicesUpdateProviderRequest) (*ManagedServicesListProviders200ResponseInnerAnyOf, *http.Response, error) + + /* + ManagedServicesUpsertProvider upsertProvider + + @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiManagedServicesUpsertProviderRequest + */ + ManagedServicesUpsertProvider(ctx context.Context) ApiManagedServicesUpsertProviderRequest + + // ManagedServicesUpsertProviderExecute executes the request + // @return ManagedServicesListProviders200ResponseInnerAnyOf + ManagedServicesUpsertProviderExecute(r ApiManagedServicesUpsertProviderRequest) (*ManagedServicesListProviders200ResponseInnerAnyOf, *http.Response, error) } // ManagedServicesAPIService ManagedServicesAPI service @@ -282,11 +294,11 @@ func (a *ManagedServicesAPIService) ManagedServicesCreateExecute(r ApiManagedSer type ApiManagedServicesCreateProviderRequest struct { ctx context.Context ApiService ManagedServicesAPI - managedServicesCreateProviderRequest *ManagedServicesCreateProviderRequest + managedServicesUpsertProviderRequest *ManagedServicesUpsertProviderRequest } -func (r ApiManagedServicesCreateProviderRequest) ManagedServicesCreateProviderRequest(managedServicesCreateProviderRequest ManagedServicesCreateProviderRequest) ApiManagedServicesCreateProviderRequest { - r.managedServicesCreateProviderRequest = &managedServicesCreateProviderRequest +func (r ApiManagedServicesCreateProviderRequest) ManagedServicesUpsertProviderRequest(managedServicesUpsertProviderRequest ManagedServicesUpsertProviderRequest) ApiManagedServicesCreateProviderRequest { + r.managedServicesUpsertProviderRequest = &managedServicesUpsertProviderRequest return r } @@ -347,7 +359,7 @@ func (a *ManagedServicesAPIService) ManagedServicesCreateProviderExecute(r ApiMa localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept } // body params - localVarPostBody = r.managedServicesCreateProviderRequest + localVarPostBody = r.managedServicesUpsertProviderRequest req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles) if err != nil { return localVarReturnValue, nil, err @@ -1446,3 +1458,130 @@ func (a *ManagedServicesAPIService) ManagedServicesUpdateProviderExecute(r ApiMa return localVarReturnValue, localVarHTTPResponse, nil } + +type ApiManagedServicesUpsertProviderRequest struct { + ctx context.Context + ApiService ManagedServicesAPI + managedServicesUpsertProviderRequest *ManagedServicesUpsertProviderRequest +} + +func (r ApiManagedServicesUpsertProviderRequest) ManagedServicesUpsertProviderRequest(managedServicesUpsertProviderRequest ManagedServicesUpsertProviderRequest) ApiManagedServicesUpsertProviderRequest { + r.managedServicesUpsertProviderRequest = &managedServicesUpsertProviderRequest + return r +} + +func (r ApiManagedServicesUpsertProviderRequest) Execute() (*ManagedServicesListProviders200ResponseInnerAnyOf, *http.Response, error) { + return r.ApiService.ManagedServicesUpsertProviderExecute(r) +} + +/* +ManagedServicesUpsertProvider upsertProvider + + @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiManagedServicesUpsertProviderRequest +*/ +func (a *ManagedServicesAPIService) ManagedServicesUpsertProvider(ctx context.Context) ApiManagedServicesUpsertProviderRequest { + return ApiManagedServicesUpsertProviderRequest{ + ApiService: a, + ctx: ctx, + } +} + +// Execute executes the request +// +// @return ManagedServicesListProviders200ResponseInnerAnyOf +func (a *ManagedServicesAPIService) ManagedServicesUpsertProviderExecute(r ApiManagedServicesUpsertProviderRequest) (*ManagedServicesListProviders200ResponseInnerAnyOf, *http.Response, error) { + var ( + localVarHTTPMethod = http.MethodPut + localVarPostBody interface{} + formFiles []formFile + localVarReturnValue *ManagedServicesListProviders200ResponseInnerAnyOf + ) + + localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ManagedServicesAPIService.ManagedServicesUpsertProvider") + if err != nil { + return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()} + } + + localVarPath := localBasePath + "/managed-services/providers" + + localVarHeaderParams := make(map[string]string) + localVarQueryParams := url.Values{} + localVarFormParams := url.Values{} + + // to determine the Content-Type header + localVarHTTPContentTypes := []string{"application/json"} + + // set Content-Type header + localVarHTTPContentType := selectHeaderContentType(localVarHTTPContentTypes) + if localVarHTTPContentType != "" { + localVarHeaderParams["Content-Type"] = localVarHTTPContentType + } + + // to determine the Accept header + localVarHTTPHeaderAccepts := []string{"application/json"} + + // set Accept header + localVarHTTPHeaderAccept := selectHeaderAccept(localVarHTTPHeaderAccepts) + if localVarHTTPHeaderAccept != "" { + localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept + } + // body params + localVarPostBody = r.managedServicesUpsertProviderRequest + req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles) + if err != nil { + return localVarReturnValue, nil, err + } + + localVarHTTPResponse, err := a.client.callAPI(req) + if err != nil || localVarHTTPResponse == nil { + return localVarReturnValue, localVarHTTPResponse, err + } + + localVarBody, err := io.ReadAll(localVarHTTPResponse.Body) + localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = io.NopCloser(bytes.NewBuffer(localVarBody)) + if err != nil { + return localVarReturnValue, localVarHTTPResponse, err + } + + if localVarHTTPResponse.StatusCode >= 300 { + newErr := &GenericOpenAPIError{ + body: localVarBody, + error: localVarHTTPResponse.Status, + } + if localVarHTTPResponse.StatusCode == 400 { + var v DomainsGetDomain400Response + err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr + } + newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v) + newErr.model = v + return localVarReturnValue, localVarHTTPResponse, newErr + } + if localVarHTTPResponse.StatusCode == 401 { + var v DomainsGetDomain401Response + err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr + } + newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v) + newErr.model = v + } + return localVarReturnValue, localVarHTTPResponse, newErr + } + + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr := &GenericOpenAPIError{ + body: localVarBody, + error: err.Error(), + } + return localVarReturnValue, localVarHTTPResponse, newErr + } + + return localVarReturnValue, localVarHTTPResponse, nil +} diff --git a/api/openapi_client/api_organizations.go b/api/openapi_client/api_organizations.go index 7b47b8fc..2303120e 100644 --- a/api/openapi_client/api_organizations.go +++ b/api/openapi_client/api_organizations.go @@ -834,6 +834,17 @@ func (a *OrganizationsAPIService) OrganizationsRemoveOrgMemberExecute(r ApiOrgan } newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v) newErr.model = v + return localVarHTTPResponse, newErr + } + if localVarHTTPResponse.StatusCode == 409 { + var v DomainsUpdateDomain409Response + err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarHTTPResponse, newErr + } + newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v) + newErr.model = v } return localVarHTTPResponse, newErr } diff --git a/api/openapi_client/api_ssh.go b/api/openapi_client/api_ssh.go new file mode 100644 index 00000000..508f83e8 --- /dev/null +++ b/api/openapi_client/api_ssh.go @@ -0,0 +1,432 @@ +// Copyright (c) Codesphere Inc. +// SPDX-License-Identifier: Apache-2.0 + +/* +Codesphere Public API + +API version: 0.1.0 +*/ + +// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. + +package openapi_client + +import ( + "bytes" + "context" + "io" + "net/http" + "net/url" +) + +type SshAPI interface { + + /* + SshDeletePublicKey deletePublicKey + + Delete a public SSH key for the authenticated user + + @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiSshDeletePublicKeyRequest + */ + SshDeletePublicKey(ctx context.Context) ApiSshDeletePublicKeyRequest + + // SshDeletePublicKeyExecute executes the request + SshDeletePublicKeyExecute(r ApiSshDeletePublicKeyRequest) (*http.Response, error) + + /* + SshListPublicKeys listPublicKeys + + List public SSH keys for the authenticated user + + @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiSshListPublicKeysRequest + */ + SshListPublicKeys(ctx context.Context) ApiSshListPublicKeysRequest + + // SshListPublicKeysExecute executes the request + // @return []SshListPublicKeys200ResponseInner + SshListPublicKeysExecute(r ApiSshListPublicKeysRequest) ([]SshListPublicKeys200ResponseInner, *http.Response, error) + + /* + SshUploadPublicKey uploadPublicKey + + Upload a public SSH key for the authenticated user + + @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiSshUploadPublicKeyRequest + */ + SshUploadPublicKey(ctx context.Context) ApiSshUploadPublicKeyRequest + + // SshUploadPublicKeyExecute executes the request + SshUploadPublicKeyExecute(r ApiSshUploadPublicKeyRequest) (*http.Response, error) +} + +// SshAPIService SshAPI service +type SshAPIService service + +type ApiSshDeletePublicKeyRequest struct { + ctx context.Context + ApiService SshAPI + sshDeletePublicKeyRequest *SshDeletePublicKeyRequest +} + +func (r ApiSshDeletePublicKeyRequest) SshDeletePublicKeyRequest(sshDeletePublicKeyRequest SshDeletePublicKeyRequest) ApiSshDeletePublicKeyRequest { + r.sshDeletePublicKeyRequest = &sshDeletePublicKeyRequest + return r +} + +func (r ApiSshDeletePublicKeyRequest) Execute() (*http.Response, error) { + return r.ApiService.SshDeletePublicKeyExecute(r) +} + +/* +SshDeletePublicKey deletePublicKey + +Delete a public SSH key for the authenticated user + + @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiSshDeletePublicKeyRequest +*/ +func (a *SshAPIService) SshDeletePublicKey(ctx context.Context) ApiSshDeletePublicKeyRequest { + return ApiSshDeletePublicKeyRequest{ + ApiService: a, + ctx: ctx, + } +} + +// Execute executes the request +func (a *SshAPIService) SshDeletePublicKeyExecute(r ApiSshDeletePublicKeyRequest) (*http.Response, error) { + var ( + localVarHTTPMethod = http.MethodDelete + localVarPostBody interface{} + formFiles []formFile + ) + + localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "SshAPIService.SshDeletePublicKey") + if err != nil { + return nil, &GenericOpenAPIError{error: err.Error()} + } + + localVarPath := localBasePath + "/ssh/keys" + + localVarHeaderParams := make(map[string]string) + localVarQueryParams := url.Values{} + localVarFormParams := url.Values{} + + // to determine the Content-Type header + localVarHTTPContentTypes := []string{"application/json"} + + // set Content-Type header + localVarHTTPContentType := selectHeaderContentType(localVarHTTPContentTypes) + if localVarHTTPContentType != "" { + localVarHeaderParams["Content-Type"] = localVarHTTPContentType + } + + // to determine the Accept header + localVarHTTPHeaderAccepts := []string{"application/json"} + + // set Accept header + localVarHTTPHeaderAccept := selectHeaderAccept(localVarHTTPHeaderAccepts) + if localVarHTTPHeaderAccept != "" { + localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept + } + // body params + localVarPostBody = r.sshDeletePublicKeyRequest + req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles) + if err != nil { + return nil, err + } + + localVarHTTPResponse, err := a.client.callAPI(req) + if err != nil || localVarHTTPResponse == nil { + return localVarHTTPResponse, err + } + + localVarBody, err := io.ReadAll(localVarHTTPResponse.Body) + localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = io.NopCloser(bytes.NewBuffer(localVarBody)) + if err != nil { + return localVarHTTPResponse, err + } + + if localVarHTTPResponse.StatusCode >= 300 { + newErr := &GenericOpenAPIError{ + body: localVarBody, + error: localVarHTTPResponse.Status, + } + if localVarHTTPResponse.StatusCode == 400 { + var v DomainsGetDomain400Response + err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarHTTPResponse, newErr + } + newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v) + newErr.model = v + return localVarHTTPResponse, newErr + } + if localVarHTTPResponse.StatusCode == 401 { + var v DomainsGetDomain401Response + err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarHTTPResponse, newErr + } + newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v) + newErr.model = v + return localVarHTTPResponse, newErr + } + if localVarHTTPResponse.StatusCode == 404 { + var v DomainsGetDomain404Response + err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarHTTPResponse, newErr + } + newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v) + newErr.model = v + } + return localVarHTTPResponse, newErr + } + + return localVarHTTPResponse, nil +} + +type ApiSshListPublicKeysRequest struct { + ctx context.Context + ApiService SshAPI +} + +func (r ApiSshListPublicKeysRequest) Execute() ([]SshListPublicKeys200ResponseInner, *http.Response, error) { + return r.ApiService.SshListPublicKeysExecute(r) +} + +/* +SshListPublicKeys listPublicKeys + +List public SSH keys for the authenticated user + + @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiSshListPublicKeysRequest +*/ +func (a *SshAPIService) SshListPublicKeys(ctx context.Context) ApiSshListPublicKeysRequest { + return ApiSshListPublicKeysRequest{ + ApiService: a, + ctx: ctx, + } +} + +// Execute executes the request +// +// @return []SshListPublicKeys200ResponseInner +func (a *SshAPIService) SshListPublicKeysExecute(r ApiSshListPublicKeysRequest) ([]SshListPublicKeys200ResponseInner, *http.Response, error) { + var ( + localVarHTTPMethod = http.MethodGet + localVarPostBody interface{} + formFiles []formFile + localVarReturnValue []SshListPublicKeys200ResponseInner + ) + + localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "SshAPIService.SshListPublicKeys") + if err != nil { + return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()} + } + + localVarPath := localBasePath + "/ssh/keys" + + localVarHeaderParams := make(map[string]string) + localVarQueryParams := url.Values{} + localVarFormParams := url.Values{} + + // to determine the Content-Type header + localVarHTTPContentTypes := []string{} + + // set Content-Type header + localVarHTTPContentType := selectHeaderContentType(localVarHTTPContentTypes) + if localVarHTTPContentType != "" { + localVarHeaderParams["Content-Type"] = localVarHTTPContentType + } + + // to determine the Accept header + localVarHTTPHeaderAccepts := []string{"application/json"} + + // set Accept header + localVarHTTPHeaderAccept := selectHeaderAccept(localVarHTTPHeaderAccepts) + if localVarHTTPHeaderAccept != "" { + localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept + } + req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles) + if err != nil { + return localVarReturnValue, nil, err + } + + localVarHTTPResponse, err := a.client.callAPI(req) + if err != nil || localVarHTTPResponse == nil { + return localVarReturnValue, localVarHTTPResponse, err + } + + localVarBody, err := io.ReadAll(localVarHTTPResponse.Body) + localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = io.NopCloser(bytes.NewBuffer(localVarBody)) + if err != nil { + return localVarReturnValue, localVarHTTPResponse, err + } + + if localVarHTTPResponse.StatusCode >= 300 { + newErr := &GenericOpenAPIError{ + body: localVarBody, + error: localVarHTTPResponse.Status, + } + if localVarHTTPResponse.StatusCode == 401 { + var v DomainsGetDomain401Response + err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr + } + newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v) + newErr.model = v + } + return localVarReturnValue, localVarHTTPResponse, newErr + } + + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr := &GenericOpenAPIError{ + body: localVarBody, + error: err.Error(), + } + return localVarReturnValue, localVarHTTPResponse, newErr + } + + return localVarReturnValue, localVarHTTPResponse, nil +} + +type ApiSshUploadPublicKeyRequest struct { + ctx context.Context + ApiService SshAPI + sshUploadPublicKeyRequest *SshUploadPublicKeyRequest +} + +func (r ApiSshUploadPublicKeyRequest) SshUploadPublicKeyRequest(sshUploadPublicKeyRequest SshUploadPublicKeyRequest) ApiSshUploadPublicKeyRequest { + r.sshUploadPublicKeyRequest = &sshUploadPublicKeyRequest + return r +} + +func (r ApiSshUploadPublicKeyRequest) Execute() (*http.Response, error) { + return r.ApiService.SshUploadPublicKeyExecute(r) +} + +/* +SshUploadPublicKey uploadPublicKey + +Upload a public SSH key for the authenticated user + + @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiSshUploadPublicKeyRequest +*/ +func (a *SshAPIService) SshUploadPublicKey(ctx context.Context) ApiSshUploadPublicKeyRequest { + return ApiSshUploadPublicKeyRequest{ + ApiService: a, + ctx: ctx, + } +} + +// Execute executes the request +func (a *SshAPIService) SshUploadPublicKeyExecute(r ApiSshUploadPublicKeyRequest) (*http.Response, error) { + var ( + localVarHTTPMethod = http.MethodPost + localVarPostBody interface{} + formFiles []formFile + ) + + localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "SshAPIService.SshUploadPublicKey") + if err != nil { + return nil, &GenericOpenAPIError{error: err.Error()} + } + + localVarPath := localBasePath + "/ssh/keys" + + localVarHeaderParams := make(map[string]string) + localVarQueryParams := url.Values{} + localVarFormParams := url.Values{} + + // to determine the Content-Type header + localVarHTTPContentTypes := []string{"application/json"} + + // set Content-Type header + localVarHTTPContentType := selectHeaderContentType(localVarHTTPContentTypes) + if localVarHTTPContentType != "" { + localVarHeaderParams["Content-Type"] = localVarHTTPContentType + } + + // to determine the Accept header + localVarHTTPHeaderAccepts := []string{"application/json"} + + // set Accept header + localVarHTTPHeaderAccept := selectHeaderAccept(localVarHTTPHeaderAccepts) + if localVarHTTPHeaderAccept != "" { + localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept + } + // body params + localVarPostBody = r.sshUploadPublicKeyRequest + req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles) + if err != nil { + return nil, err + } + + localVarHTTPResponse, err := a.client.callAPI(req) + if err != nil || localVarHTTPResponse == nil { + return localVarHTTPResponse, err + } + + localVarBody, err := io.ReadAll(localVarHTTPResponse.Body) + localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = io.NopCloser(bytes.NewBuffer(localVarBody)) + if err != nil { + return localVarHTTPResponse, err + } + + if localVarHTTPResponse.StatusCode >= 300 { + newErr := &GenericOpenAPIError{ + body: localVarBody, + error: localVarHTTPResponse.Status, + } + if localVarHTTPResponse.StatusCode == 400 { + var v DomainsGetDomain400Response + err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarHTTPResponse, newErr + } + newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v) + newErr.model = v + return localVarHTTPResponse, newErr + } + if localVarHTTPResponse.StatusCode == 401 { + var v DomainsGetDomain401Response + err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarHTTPResponse, newErr + } + newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v) + newErr.model = v + return localVarHTTPResponse, newErr + } + if localVarHTTPResponse.StatusCode == 409 { + var v DomainsUpdateDomain409Response + err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarHTTPResponse, newErr + } + newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v) + newErr.model = v + } + return localVarHTTPResponse, newErr + } + + return localVarHTTPResponse, nil +} diff --git a/api/openapi_client/client.go b/api/openapi_client/client.go index cbcbfc47..18bcf9fc 100644 --- a/api/openapi_client/client.go +++ b/api/openapi_client/client.go @@ -57,6 +57,8 @@ type APIClient struct { OrganizationsAPI OrganizationsAPI + SshAPI SshAPI + TeamsAPI TeamsAPI UsageAPI UsageAPI @@ -86,6 +88,7 @@ func NewAPIClient(cfg *Configuration) *APIClient { c.ManagedServicesAPI = (*ManagedServicesAPIService)(&c.common) c.MetadataAPI = (*MetadataAPIService)(&c.common) c.OrganizationsAPI = (*OrganizationsAPIService)(&c.common) + c.SshAPI = (*SshAPIService)(&c.common) c.TeamsAPI = (*TeamsAPIService)(&c.common) c.UsageAPI = (*UsageAPIService)(&c.common) c.VaultAPI = (*VaultAPIService)(&c.common) diff --git a/api/openapi_client/mocks.go b/api/openapi_client/mocks.go index d22d5f13..3535e70c 100644 --- a/api/openapi_client/mocks.go +++ b/api/openapi_client/mocks.go @@ -2223,6 +2223,127 @@ func (_c *MockManagedServicesAPI_ManagedServicesUpdateProviderExecute_Call) RunA return _c } +// ManagedServicesUpsertProvider provides a mock function for the type MockManagedServicesAPI +func (_mock *MockManagedServicesAPI) ManagedServicesUpsertProvider(ctx context.Context) ApiManagedServicesUpsertProviderRequest { + ret := _mock.Called(ctx) + + if len(ret) == 0 { + panic("no return value specified for ManagedServicesUpsertProvider") + } + + var r0 ApiManagedServicesUpsertProviderRequest + if returnFunc, ok := ret.Get(0).(func(context.Context) ApiManagedServicesUpsertProviderRequest); ok { + r0 = returnFunc(ctx) + } else { + r0 = ret.Get(0).(ApiManagedServicesUpsertProviderRequest) + } + return r0 +} + +// MockManagedServicesAPI_ManagedServicesUpsertProvider_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ManagedServicesUpsertProvider' +type MockManagedServicesAPI_ManagedServicesUpsertProvider_Call struct { + *mock.Call +} + +// ManagedServicesUpsertProvider is a helper method to define mock.On call +// - ctx context.Context +func (_e *MockManagedServicesAPI_Expecter) ManagedServicesUpsertProvider(ctx any) *MockManagedServicesAPI_ManagedServicesUpsertProvider_Call { + return &MockManagedServicesAPI_ManagedServicesUpsertProvider_Call{Call: _e.mock.On("ManagedServicesUpsertProvider", ctx)} +} + +func (_c *MockManagedServicesAPI_ManagedServicesUpsertProvider_Call) Run(run func(ctx context.Context)) *MockManagedServicesAPI_ManagedServicesUpsertProvider_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + run( + arg0, + ) + }) + return _c +} + +func (_c *MockManagedServicesAPI_ManagedServicesUpsertProvider_Call) Return(apiManagedServicesUpsertProviderRequest ApiManagedServicesUpsertProviderRequest) *MockManagedServicesAPI_ManagedServicesUpsertProvider_Call { + _c.Call.Return(apiManagedServicesUpsertProviderRequest) + return _c +} + +func (_c *MockManagedServicesAPI_ManagedServicesUpsertProvider_Call) RunAndReturn(run func(ctx context.Context) ApiManagedServicesUpsertProviderRequest) *MockManagedServicesAPI_ManagedServicesUpsertProvider_Call { + _c.Call.Return(run) + return _c +} + +// ManagedServicesUpsertProviderExecute provides a mock function for the type MockManagedServicesAPI +func (_mock *MockManagedServicesAPI) ManagedServicesUpsertProviderExecute(r ApiManagedServicesUpsertProviderRequest) (*ManagedServicesListProviders200ResponseInnerAnyOf, *http.Response, error) { + ret := _mock.Called(r) + + if len(ret) == 0 { + panic("no return value specified for ManagedServicesUpsertProviderExecute") + } + + var r0 *ManagedServicesListProviders200ResponseInnerAnyOf + var r1 *http.Response + var r2 error + if returnFunc, ok := ret.Get(0).(func(ApiManagedServicesUpsertProviderRequest) (*ManagedServicesListProviders200ResponseInnerAnyOf, *http.Response, error)); ok { + return returnFunc(r) + } + if returnFunc, ok := ret.Get(0).(func(ApiManagedServicesUpsertProviderRequest) *ManagedServicesListProviders200ResponseInnerAnyOf); ok { + r0 = returnFunc(r) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*ManagedServicesListProviders200ResponseInnerAnyOf) + } + } + if returnFunc, ok := ret.Get(1).(func(ApiManagedServicesUpsertProviderRequest) *http.Response); ok { + r1 = returnFunc(r) + } else { + if ret.Get(1) != nil { + r1 = ret.Get(1).(*http.Response) + } + } + if returnFunc, ok := ret.Get(2).(func(ApiManagedServicesUpsertProviderRequest) error); ok { + r2 = returnFunc(r) + } else { + r2 = ret.Error(2) + } + return r0, r1, r2 +} + +// MockManagedServicesAPI_ManagedServicesUpsertProviderExecute_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ManagedServicesUpsertProviderExecute' +type MockManagedServicesAPI_ManagedServicesUpsertProviderExecute_Call struct { + *mock.Call +} + +// ManagedServicesUpsertProviderExecute is a helper method to define mock.On call +// - r ApiManagedServicesUpsertProviderRequest +func (_e *MockManagedServicesAPI_Expecter) ManagedServicesUpsertProviderExecute(r any) *MockManagedServicesAPI_ManagedServicesUpsertProviderExecute_Call { + return &MockManagedServicesAPI_ManagedServicesUpsertProviderExecute_Call{Call: _e.mock.On("ManagedServicesUpsertProviderExecute", r)} +} + +func (_c *MockManagedServicesAPI_ManagedServicesUpsertProviderExecute_Call) Run(run func(r ApiManagedServicesUpsertProviderRequest)) *MockManagedServicesAPI_ManagedServicesUpsertProviderExecute_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 ApiManagedServicesUpsertProviderRequest + if args[0] != nil { + arg0 = args[0].(ApiManagedServicesUpsertProviderRequest) + } + run( + arg0, + ) + }) + return _c +} + +func (_c *MockManagedServicesAPI_ManagedServicesUpsertProviderExecute_Call) Return(managedServicesListProviders200ResponseInnerAnyOf *ManagedServicesListProviders200ResponseInnerAnyOf, response *http.Response, err error) *MockManagedServicesAPI_ManagedServicesUpsertProviderExecute_Call { + _c.Call.Return(managedServicesListProviders200ResponseInnerAnyOf, response, err) + return _c +} + +func (_c *MockManagedServicesAPI_ManagedServicesUpsertProviderExecute_Call) RunAndReturn(run func(r ApiManagedServicesUpsertProviderRequest) (*ManagedServicesListProviders200ResponseInnerAnyOf, *http.Response, error)) *MockManagedServicesAPI_ManagedServicesUpsertProviderExecute_Call { + _c.Call.Return(run) + return _c +} + // NewMockMetadataAPI creates a new instance of MockMetadataAPI. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. // The first argument is typically a *testing.T value. func NewMockMetadataAPI(t interface { @@ -3384,6 +3505,380 @@ func (_c *MockOrganizationsAPI_OrganizationsRemoveOrgMemberExecute_Call) RunAndR return _c } +// NewMockSshAPI creates a new instance of MockSshAPI. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +// The first argument is typically a *testing.T value. +func NewMockSshAPI(t interface { + mock.TestingT + Cleanup(func()) +}) *MockSshAPI { + mock := &MockSshAPI{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} + +// MockSshAPI is an autogenerated mock type for the SshAPI type +type MockSshAPI struct { + mock.Mock +} + +type MockSshAPI_Expecter struct { + mock *mock.Mock +} + +func (_m *MockSshAPI) EXPECT() *MockSshAPI_Expecter { + return &MockSshAPI_Expecter{mock: &_m.Mock} +} + +// SshDeletePublicKey provides a mock function for the type MockSshAPI +func (_mock *MockSshAPI) SshDeletePublicKey(ctx context.Context) ApiSshDeletePublicKeyRequest { + ret := _mock.Called(ctx) + + if len(ret) == 0 { + panic("no return value specified for SshDeletePublicKey") + } + + var r0 ApiSshDeletePublicKeyRequest + if returnFunc, ok := ret.Get(0).(func(context.Context) ApiSshDeletePublicKeyRequest); ok { + r0 = returnFunc(ctx) + } else { + r0 = ret.Get(0).(ApiSshDeletePublicKeyRequest) + } + return r0 +} + +// MockSshAPI_SshDeletePublicKey_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'SshDeletePublicKey' +type MockSshAPI_SshDeletePublicKey_Call struct { + *mock.Call +} + +// SshDeletePublicKey is a helper method to define mock.On call +// - ctx context.Context +func (_e *MockSshAPI_Expecter) SshDeletePublicKey(ctx any) *MockSshAPI_SshDeletePublicKey_Call { + return &MockSshAPI_SshDeletePublicKey_Call{Call: _e.mock.On("SshDeletePublicKey", ctx)} +} + +func (_c *MockSshAPI_SshDeletePublicKey_Call) Run(run func(ctx context.Context)) *MockSshAPI_SshDeletePublicKey_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + run( + arg0, + ) + }) + return _c +} + +func (_c *MockSshAPI_SshDeletePublicKey_Call) Return(apiSshDeletePublicKeyRequest ApiSshDeletePublicKeyRequest) *MockSshAPI_SshDeletePublicKey_Call { + _c.Call.Return(apiSshDeletePublicKeyRequest) + return _c +} + +func (_c *MockSshAPI_SshDeletePublicKey_Call) RunAndReturn(run func(ctx context.Context) ApiSshDeletePublicKeyRequest) *MockSshAPI_SshDeletePublicKey_Call { + _c.Call.Return(run) + return _c +} + +// SshDeletePublicKeyExecute provides a mock function for the type MockSshAPI +func (_mock *MockSshAPI) SshDeletePublicKeyExecute(r ApiSshDeletePublicKeyRequest) (*http.Response, error) { + ret := _mock.Called(r) + + if len(ret) == 0 { + panic("no return value specified for SshDeletePublicKeyExecute") + } + + var r0 *http.Response + var r1 error + if returnFunc, ok := ret.Get(0).(func(ApiSshDeletePublicKeyRequest) (*http.Response, error)); ok { + return returnFunc(r) + } + if returnFunc, ok := ret.Get(0).(func(ApiSshDeletePublicKeyRequest) *http.Response); ok { + r0 = returnFunc(r) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*http.Response) + } + } + if returnFunc, ok := ret.Get(1).(func(ApiSshDeletePublicKeyRequest) error); ok { + r1 = returnFunc(r) + } else { + r1 = ret.Error(1) + } + return r0, r1 +} + +// MockSshAPI_SshDeletePublicKeyExecute_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'SshDeletePublicKeyExecute' +type MockSshAPI_SshDeletePublicKeyExecute_Call struct { + *mock.Call +} + +// SshDeletePublicKeyExecute is a helper method to define mock.On call +// - r ApiSshDeletePublicKeyRequest +func (_e *MockSshAPI_Expecter) SshDeletePublicKeyExecute(r any) *MockSshAPI_SshDeletePublicKeyExecute_Call { + return &MockSshAPI_SshDeletePublicKeyExecute_Call{Call: _e.mock.On("SshDeletePublicKeyExecute", r)} +} + +func (_c *MockSshAPI_SshDeletePublicKeyExecute_Call) Run(run func(r ApiSshDeletePublicKeyRequest)) *MockSshAPI_SshDeletePublicKeyExecute_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 ApiSshDeletePublicKeyRequest + if args[0] != nil { + arg0 = args[0].(ApiSshDeletePublicKeyRequest) + } + run( + arg0, + ) + }) + return _c +} + +func (_c *MockSshAPI_SshDeletePublicKeyExecute_Call) Return(response *http.Response, err error) *MockSshAPI_SshDeletePublicKeyExecute_Call { + _c.Call.Return(response, err) + return _c +} + +func (_c *MockSshAPI_SshDeletePublicKeyExecute_Call) RunAndReturn(run func(r ApiSshDeletePublicKeyRequest) (*http.Response, error)) *MockSshAPI_SshDeletePublicKeyExecute_Call { + _c.Call.Return(run) + return _c +} + +// SshListPublicKeys provides a mock function for the type MockSshAPI +func (_mock *MockSshAPI) SshListPublicKeys(ctx context.Context) ApiSshListPublicKeysRequest { + ret := _mock.Called(ctx) + + if len(ret) == 0 { + panic("no return value specified for SshListPublicKeys") + } + + var r0 ApiSshListPublicKeysRequest + if returnFunc, ok := ret.Get(0).(func(context.Context) ApiSshListPublicKeysRequest); ok { + r0 = returnFunc(ctx) + } else { + r0 = ret.Get(0).(ApiSshListPublicKeysRequest) + } + return r0 +} + +// MockSshAPI_SshListPublicKeys_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'SshListPublicKeys' +type MockSshAPI_SshListPublicKeys_Call struct { + *mock.Call +} + +// SshListPublicKeys is a helper method to define mock.On call +// - ctx context.Context +func (_e *MockSshAPI_Expecter) SshListPublicKeys(ctx any) *MockSshAPI_SshListPublicKeys_Call { + return &MockSshAPI_SshListPublicKeys_Call{Call: _e.mock.On("SshListPublicKeys", ctx)} +} + +func (_c *MockSshAPI_SshListPublicKeys_Call) Run(run func(ctx context.Context)) *MockSshAPI_SshListPublicKeys_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + run( + arg0, + ) + }) + return _c +} + +func (_c *MockSshAPI_SshListPublicKeys_Call) Return(apiSshListPublicKeysRequest ApiSshListPublicKeysRequest) *MockSshAPI_SshListPublicKeys_Call { + _c.Call.Return(apiSshListPublicKeysRequest) + return _c +} + +func (_c *MockSshAPI_SshListPublicKeys_Call) RunAndReturn(run func(ctx context.Context) ApiSshListPublicKeysRequest) *MockSshAPI_SshListPublicKeys_Call { + _c.Call.Return(run) + return _c +} + +// SshListPublicKeysExecute provides a mock function for the type MockSshAPI +func (_mock *MockSshAPI) SshListPublicKeysExecute(r ApiSshListPublicKeysRequest) ([]SshListPublicKeys200ResponseInner, *http.Response, error) { + ret := _mock.Called(r) + + if len(ret) == 0 { + panic("no return value specified for SshListPublicKeysExecute") + } + + var r0 []SshListPublicKeys200ResponseInner + var r1 *http.Response + var r2 error + if returnFunc, ok := ret.Get(0).(func(ApiSshListPublicKeysRequest) ([]SshListPublicKeys200ResponseInner, *http.Response, error)); ok { + return returnFunc(r) + } + if returnFunc, ok := ret.Get(0).(func(ApiSshListPublicKeysRequest) []SshListPublicKeys200ResponseInner); ok { + r0 = returnFunc(r) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).([]SshListPublicKeys200ResponseInner) + } + } + if returnFunc, ok := ret.Get(1).(func(ApiSshListPublicKeysRequest) *http.Response); ok { + r1 = returnFunc(r) + } else { + if ret.Get(1) != nil { + r1 = ret.Get(1).(*http.Response) + } + } + if returnFunc, ok := ret.Get(2).(func(ApiSshListPublicKeysRequest) error); ok { + r2 = returnFunc(r) + } else { + r2 = ret.Error(2) + } + return r0, r1, r2 +} + +// MockSshAPI_SshListPublicKeysExecute_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'SshListPublicKeysExecute' +type MockSshAPI_SshListPublicKeysExecute_Call struct { + *mock.Call +} + +// SshListPublicKeysExecute is a helper method to define mock.On call +// - r ApiSshListPublicKeysRequest +func (_e *MockSshAPI_Expecter) SshListPublicKeysExecute(r any) *MockSshAPI_SshListPublicKeysExecute_Call { + return &MockSshAPI_SshListPublicKeysExecute_Call{Call: _e.mock.On("SshListPublicKeysExecute", r)} +} + +func (_c *MockSshAPI_SshListPublicKeysExecute_Call) Run(run func(r ApiSshListPublicKeysRequest)) *MockSshAPI_SshListPublicKeysExecute_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 ApiSshListPublicKeysRequest + if args[0] != nil { + arg0 = args[0].(ApiSshListPublicKeysRequest) + } + run( + arg0, + ) + }) + return _c +} + +func (_c *MockSshAPI_SshListPublicKeysExecute_Call) Return(sshListPublicKeys200ResponseInners []SshListPublicKeys200ResponseInner, response *http.Response, err error) *MockSshAPI_SshListPublicKeysExecute_Call { + _c.Call.Return(sshListPublicKeys200ResponseInners, response, err) + return _c +} + +func (_c *MockSshAPI_SshListPublicKeysExecute_Call) RunAndReturn(run func(r ApiSshListPublicKeysRequest) ([]SshListPublicKeys200ResponseInner, *http.Response, error)) *MockSshAPI_SshListPublicKeysExecute_Call { + _c.Call.Return(run) + return _c +} + +// SshUploadPublicKey provides a mock function for the type MockSshAPI +func (_mock *MockSshAPI) SshUploadPublicKey(ctx context.Context) ApiSshUploadPublicKeyRequest { + ret := _mock.Called(ctx) + + if len(ret) == 0 { + panic("no return value specified for SshUploadPublicKey") + } + + var r0 ApiSshUploadPublicKeyRequest + if returnFunc, ok := ret.Get(0).(func(context.Context) ApiSshUploadPublicKeyRequest); ok { + r0 = returnFunc(ctx) + } else { + r0 = ret.Get(0).(ApiSshUploadPublicKeyRequest) + } + return r0 +} + +// MockSshAPI_SshUploadPublicKey_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'SshUploadPublicKey' +type MockSshAPI_SshUploadPublicKey_Call struct { + *mock.Call +} + +// SshUploadPublicKey is a helper method to define mock.On call +// - ctx context.Context +func (_e *MockSshAPI_Expecter) SshUploadPublicKey(ctx any) *MockSshAPI_SshUploadPublicKey_Call { + return &MockSshAPI_SshUploadPublicKey_Call{Call: _e.mock.On("SshUploadPublicKey", ctx)} +} + +func (_c *MockSshAPI_SshUploadPublicKey_Call) Run(run func(ctx context.Context)) *MockSshAPI_SshUploadPublicKey_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + run( + arg0, + ) + }) + return _c +} + +func (_c *MockSshAPI_SshUploadPublicKey_Call) Return(apiSshUploadPublicKeyRequest ApiSshUploadPublicKeyRequest) *MockSshAPI_SshUploadPublicKey_Call { + _c.Call.Return(apiSshUploadPublicKeyRequest) + return _c +} + +func (_c *MockSshAPI_SshUploadPublicKey_Call) RunAndReturn(run func(ctx context.Context) ApiSshUploadPublicKeyRequest) *MockSshAPI_SshUploadPublicKey_Call { + _c.Call.Return(run) + return _c +} + +// SshUploadPublicKeyExecute provides a mock function for the type MockSshAPI +func (_mock *MockSshAPI) SshUploadPublicKeyExecute(r ApiSshUploadPublicKeyRequest) (*http.Response, error) { + ret := _mock.Called(r) + + if len(ret) == 0 { + panic("no return value specified for SshUploadPublicKeyExecute") + } + + var r0 *http.Response + var r1 error + if returnFunc, ok := ret.Get(0).(func(ApiSshUploadPublicKeyRequest) (*http.Response, error)); ok { + return returnFunc(r) + } + if returnFunc, ok := ret.Get(0).(func(ApiSshUploadPublicKeyRequest) *http.Response); ok { + r0 = returnFunc(r) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*http.Response) + } + } + if returnFunc, ok := ret.Get(1).(func(ApiSshUploadPublicKeyRequest) error); ok { + r1 = returnFunc(r) + } else { + r1 = ret.Error(1) + } + return r0, r1 +} + +// MockSshAPI_SshUploadPublicKeyExecute_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'SshUploadPublicKeyExecute' +type MockSshAPI_SshUploadPublicKeyExecute_Call struct { + *mock.Call +} + +// SshUploadPublicKeyExecute is a helper method to define mock.On call +// - r ApiSshUploadPublicKeyRequest +func (_e *MockSshAPI_Expecter) SshUploadPublicKeyExecute(r any) *MockSshAPI_SshUploadPublicKeyExecute_Call { + return &MockSshAPI_SshUploadPublicKeyExecute_Call{Call: _e.mock.On("SshUploadPublicKeyExecute", r)} +} + +func (_c *MockSshAPI_SshUploadPublicKeyExecute_Call) Run(run func(r ApiSshUploadPublicKeyRequest)) *MockSshAPI_SshUploadPublicKeyExecute_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 ApiSshUploadPublicKeyRequest + if args[0] != nil { + arg0 = args[0].(ApiSshUploadPublicKeyRequest) + } + run( + arg0, + ) + }) + return _c +} + +func (_c *MockSshAPI_SshUploadPublicKeyExecute_Call) Return(response *http.Response, err error) *MockSshAPI_SshUploadPublicKeyExecute_Call { + _c.Call.Return(response, err) + return _c +} + +func (_c *MockSshAPI_SshUploadPublicKeyExecute_Call) RunAndReturn(run func(r ApiSshUploadPublicKeyRequest) (*http.Response, error)) *MockSshAPI_SshUploadPublicKeyExecute_Call { + _c.Call.Return(run) + return _c +} + // NewMockTeamsAPI creates a new instance of MockTeamsAPI. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. // The first argument is typically a *testing.T value. func NewMockTeamsAPI(t interface { diff --git a/api/openapi_client/model_managed_services_create_provider_request.go b/api/openapi_client/model_managed_services_create_provider_request.go deleted file mode 100644 index 2a61b521..00000000 --- a/api/openapi_client/model_managed_services_create_provider_request.go +++ /dev/null @@ -1,104 +0,0 @@ -// Copyright (c) Codesphere Inc. -// SPDX-License-Identifier: Apache-2.0 - -/* -Codesphere Public API - -API version: 0.1.0 -*/ - -// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. - -package openapi_client - -import ( - "encoding/json" - "fmt" -) - -// ManagedServicesCreateProviderRequest struct for ManagedServicesCreateProviderRequest -type ManagedServicesCreateProviderRequest struct { - ManagedServicesCreateProviderRequestAnyOf *ManagedServicesCreateProviderRequestAnyOf - ManagedServicesCreateProviderRequestAnyOf1 *ManagedServicesCreateProviderRequestAnyOf1 -} - -// Unmarshal JSON data into any of the pointers in the struct -func (dst *ManagedServicesCreateProviderRequest) UnmarshalJSON(data []byte) error { - var err error - // try to unmarshal JSON data into ManagedServicesCreateProviderRequestAnyOf - err = json.Unmarshal(data, &dst.ManagedServicesCreateProviderRequestAnyOf) - if err == nil { - jsonManagedServicesCreateProviderRequestAnyOf, _ := json.Marshal(dst.ManagedServicesCreateProviderRequestAnyOf) - if string(jsonManagedServicesCreateProviderRequestAnyOf) == "{}" { // empty struct - dst.ManagedServicesCreateProviderRequestAnyOf = nil - } else { - return nil // data stored in dst.ManagedServicesCreateProviderRequestAnyOf, return on the first match - } - } else { - dst.ManagedServicesCreateProviderRequestAnyOf = nil - } - - // try to unmarshal JSON data into ManagedServicesCreateProviderRequestAnyOf1 - err = json.Unmarshal(data, &dst.ManagedServicesCreateProviderRequestAnyOf1) - if err == nil { - jsonManagedServicesCreateProviderRequestAnyOf1, _ := json.Marshal(dst.ManagedServicesCreateProviderRequestAnyOf1) - if string(jsonManagedServicesCreateProviderRequestAnyOf1) == "{}" { // empty struct - dst.ManagedServicesCreateProviderRequestAnyOf1 = nil - } else { - return nil // data stored in dst.ManagedServicesCreateProviderRequestAnyOf1, return on the first match - } - } else { - dst.ManagedServicesCreateProviderRequestAnyOf1 = nil - } - - return fmt.Errorf("data failed to match schemas in anyOf(ManagedServicesCreateProviderRequest)") -} - -// Marshal data from the first non-nil pointers in the struct to JSON -func (src ManagedServicesCreateProviderRequest) MarshalJSON() ([]byte, error) { - if src.ManagedServicesCreateProviderRequestAnyOf != nil { - return json.Marshal(&src.ManagedServicesCreateProviderRequestAnyOf) - } - - if src.ManagedServicesCreateProviderRequestAnyOf1 != nil { - return json.Marshal(&src.ManagedServicesCreateProviderRequestAnyOf1) - } - - return nil, nil // no data in anyOf schemas -} - -type NullableManagedServicesCreateProviderRequest struct { - value *ManagedServicesCreateProviderRequest - isSet bool -} - -func (v NullableManagedServicesCreateProviderRequest) Get() *ManagedServicesCreateProviderRequest { - return v.value -} - -func (v *NullableManagedServicesCreateProviderRequest) Set(val *ManagedServicesCreateProviderRequest) { - v.value = val - v.isSet = true -} - -func (v NullableManagedServicesCreateProviderRequest) IsSet() bool { - return v.isSet -} - -func (v *NullableManagedServicesCreateProviderRequest) Unset() { - v.value = nil - v.isSet = false -} - -func NewNullableManagedServicesCreateProviderRequest(val *ManagedServicesCreateProviderRequest) *NullableManagedServicesCreateProviderRequest { - return &NullableManagedServicesCreateProviderRequest{value: val, isSet: true} -} - -func (v NullableManagedServicesCreateProviderRequest) MarshalJSON() ([]byte, error) { - return json.Marshal(v.value) -} - -func (v *NullableManagedServicesCreateProviderRequest) UnmarshalJSON(src []byte) error { - v.isSet = true - return json.Unmarshal(src, &v.value) -} diff --git a/api/openapi_client/model_managed_services_create_provider_request_any_of_scope.go b/api/openapi_client/model_managed_services_create_provider_request_any_of_scope.go deleted file mode 100644 index 56eb1a96..00000000 --- a/api/openapi_client/model_managed_services_create_provider_request_any_of_scope.go +++ /dev/null @@ -1,104 +0,0 @@ -// Copyright (c) Codesphere Inc. -// SPDX-License-Identifier: Apache-2.0 - -/* -Codesphere Public API - -API version: 0.1.0 -*/ - -// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. - -package openapi_client - -import ( - "encoding/json" - "fmt" -) - -// ManagedServicesCreateProviderRequestAnyOfScope struct for ManagedServicesCreateProviderRequestAnyOfScope -type ManagedServicesCreateProviderRequestAnyOfScope struct { - ManagedServicesCreateProviderRequestAnyOfScopeAnyOf *ManagedServicesCreateProviderRequestAnyOfScopeAnyOf - ManagedServicesCreateProviderRequestAnyOfScopeAnyOf1 *ManagedServicesCreateProviderRequestAnyOfScopeAnyOf1 -} - -// Unmarshal JSON data into any of the pointers in the struct -func (dst *ManagedServicesCreateProviderRequestAnyOfScope) UnmarshalJSON(data []byte) error { - var err error - // try to unmarshal JSON data into ManagedServicesCreateProviderRequestAnyOfScopeAnyOf - err = json.Unmarshal(data, &dst.ManagedServicesCreateProviderRequestAnyOfScopeAnyOf) - if err == nil { - jsonManagedServicesCreateProviderRequestAnyOfScopeAnyOf, _ := json.Marshal(dst.ManagedServicesCreateProviderRequestAnyOfScopeAnyOf) - if string(jsonManagedServicesCreateProviderRequestAnyOfScopeAnyOf) == "{}" { // empty struct - dst.ManagedServicesCreateProviderRequestAnyOfScopeAnyOf = nil - } else { - return nil // data stored in dst.ManagedServicesCreateProviderRequestAnyOfScopeAnyOf, return on the first match - } - } else { - dst.ManagedServicesCreateProviderRequestAnyOfScopeAnyOf = nil - } - - // try to unmarshal JSON data into ManagedServicesCreateProviderRequestAnyOfScopeAnyOf1 - err = json.Unmarshal(data, &dst.ManagedServicesCreateProviderRequestAnyOfScopeAnyOf1) - if err == nil { - jsonManagedServicesCreateProviderRequestAnyOfScopeAnyOf1, _ := json.Marshal(dst.ManagedServicesCreateProviderRequestAnyOfScopeAnyOf1) - if string(jsonManagedServicesCreateProviderRequestAnyOfScopeAnyOf1) == "{}" { // empty struct - dst.ManagedServicesCreateProviderRequestAnyOfScopeAnyOf1 = nil - } else { - return nil // data stored in dst.ManagedServicesCreateProviderRequestAnyOfScopeAnyOf1, return on the first match - } - } else { - dst.ManagedServicesCreateProviderRequestAnyOfScopeAnyOf1 = nil - } - - return fmt.Errorf("data failed to match schemas in anyOf(ManagedServicesCreateProviderRequestAnyOfScope)") -} - -// Marshal data from the first non-nil pointers in the struct to JSON -func (src ManagedServicesCreateProviderRequestAnyOfScope) MarshalJSON() ([]byte, error) { - if src.ManagedServicesCreateProviderRequestAnyOfScopeAnyOf != nil { - return json.Marshal(&src.ManagedServicesCreateProviderRequestAnyOfScopeAnyOf) - } - - if src.ManagedServicesCreateProviderRequestAnyOfScopeAnyOf1 != nil { - return json.Marshal(&src.ManagedServicesCreateProviderRequestAnyOfScopeAnyOf1) - } - - return nil, nil // no data in anyOf schemas -} - -type NullableManagedServicesCreateProviderRequestAnyOfScope struct { - value *ManagedServicesCreateProviderRequestAnyOfScope - isSet bool -} - -func (v NullableManagedServicesCreateProviderRequestAnyOfScope) Get() *ManagedServicesCreateProviderRequestAnyOfScope { - return v.value -} - -func (v *NullableManagedServicesCreateProviderRequestAnyOfScope) Set(val *ManagedServicesCreateProviderRequestAnyOfScope) { - v.value = val - v.isSet = true -} - -func (v NullableManagedServicesCreateProviderRequestAnyOfScope) IsSet() bool { - return v.isSet -} - -func (v *NullableManagedServicesCreateProviderRequestAnyOfScope) Unset() { - v.value = nil - v.isSet = false -} - -func NewNullableManagedServicesCreateProviderRequestAnyOfScope(val *ManagedServicesCreateProviderRequestAnyOfScope) *NullableManagedServicesCreateProviderRequestAnyOfScope { - return &NullableManagedServicesCreateProviderRequestAnyOfScope{value: val, isSet: true} -} - -func (v NullableManagedServicesCreateProviderRequestAnyOfScope) MarshalJSON() ([]byte, error) { - return json.Marshal(v.value) -} - -func (v *NullableManagedServicesCreateProviderRequestAnyOfScope) UnmarshalJSON(src []byte) error { - v.isSet = true - return json.Unmarshal(src, &v.value) -} diff --git a/api/openapi_client/model_managed_services_create_request.go b/api/openapi_client/model_managed_services_create_request.go index 6e6a1a26..04a9a6ce 100644 --- a/api/openapi_client/model_managed_services_create_request.go +++ b/api/openapi_client/model_managed_services_create_request.go @@ -25,7 +25,7 @@ type ManagedServicesCreateRequest struct { Backups *ManagedServicesCreateRequestBackups `json:"backups,omitempty"` Config map[string]interface{} `json:"config"` Provider ManagedServicesCreateRequestProvider `json:"provider"` - Name string `json:"name"` + Name string `json:"name" validate:"regexp=^(?!\\\\s)[a-zA-Z0-9\\\\-_\\\\s]{0,126}[a-zA-Z0-9\\\\-_]$"` Plan ManagedServicesList200ResponseInnerPlan `json:"plan"` RecoverFrom *ManagedServicesCreateRequestRecoverFrom `json:"recoverFrom,omitempty"` Secrets map[string]interface{} `json:"secrets"` diff --git a/api/openapi_client/model_managed_services_update_provider_request.go b/api/openapi_client/model_managed_services_update_provider_request.go index 8f95fccf..7b31ded4 100644 --- a/api/openapi_client/model_managed_services_update_provider_request.go +++ b/api/openapi_client/model_managed_services_update_provider_request.go @@ -36,7 +36,7 @@ type ManagedServicesUpdateProviderRequest struct { Plans []ManagedServicesListProviders200ResponseInnerAnyOfPlansInner `json:"plans,omitempty"` Versions *map[string]ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue `json:"versions,omitempty"` Backend *ManagedServicesListProviders200ResponseInnerAnyOfBackend `json:"backend,omitempty"` - Scope *ManagedServicesCreateProviderRequestAnyOfScope `json:"scope,omitempty"` + Scope *ManagedServicesUpsertProviderRequestAnyOfScope `json:"scope,omitempty"` } // NewManagedServicesUpdateProviderRequest instantiates a new ManagedServicesUpdateProviderRequest object @@ -473,9 +473,9 @@ func (o *ManagedServicesUpdateProviderRequest) SetBackend(v ManagedServicesListP } // GetScope returns the Scope field value if set, zero value otherwise. -func (o *ManagedServicesUpdateProviderRequest) GetScope() ManagedServicesCreateProviderRequestAnyOfScope { +func (o *ManagedServicesUpdateProviderRequest) GetScope() ManagedServicesUpsertProviderRequestAnyOfScope { if o == nil || IsNil(o.Scope) { - var ret ManagedServicesCreateProviderRequestAnyOfScope + var ret ManagedServicesUpsertProviderRequestAnyOfScope return ret } return *o.Scope @@ -483,7 +483,7 @@ func (o *ManagedServicesUpdateProviderRequest) GetScope() ManagedServicesCreateP // GetScopeOk returns a tuple with the Scope field value if set, nil otherwise // and a boolean to check if the value has been set. -func (o *ManagedServicesUpdateProviderRequest) GetScopeOk() (*ManagedServicesCreateProviderRequestAnyOfScope, bool) { +func (o *ManagedServicesUpdateProviderRequest) GetScopeOk() (*ManagedServicesUpsertProviderRequestAnyOfScope, bool) { if o == nil || IsNil(o.Scope) { return nil, false } @@ -499,8 +499,8 @@ func (o *ManagedServicesUpdateProviderRequest) HasScope() bool { return false } -// SetScope gets a reference to the given ManagedServicesCreateProviderRequestAnyOfScope and assigns it to the Scope field. -func (o *ManagedServicesUpdateProviderRequest) SetScope(v ManagedServicesCreateProviderRequestAnyOfScope) { +// SetScope gets a reference to the given ManagedServicesUpsertProviderRequestAnyOfScope and assigns it to the Scope field. +func (o *ManagedServicesUpdateProviderRequest) SetScope(v ManagedServicesUpsertProviderRequestAnyOfScope) { o.Scope = &v } diff --git a/api/openapi_client/model_managed_services_upsert_provider_request.go b/api/openapi_client/model_managed_services_upsert_provider_request.go new file mode 100644 index 00000000..b87e66d0 --- /dev/null +++ b/api/openapi_client/model_managed_services_upsert_provider_request.go @@ -0,0 +1,104 @@ +// Copyright (c) Codesphere Inc. +// SPDX-License-Identifier: Apache-2.0 + +/* +Codesphere Public API + +API version: 0.1.0 +*/ + +// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. + +package openapi_client + +import ( + "encoding/json" + "fmt" +) + +// ManagedServicesUpsertProviderRequest struct for ManagedServicesUpsertProviderRequest +type ManagedServicesUpsertProviderRequest struct { + ManagedServicesUpsertProviderRequestAnyOf *ManagedServicesUpsertProviderRequestAnyOf + ManagedServicesUpsertProviderRequestAnyOf1 *ManagedServicesUpsertProviderRequestAnyOf1 +} + +// Unmarshal JSON data into any of the pointers in the struct +func (dst *ManagedServicesUpsertProviderRequest) UnmarshalJSON(data []byte) error { + var err error + // try to unmarshal JSON data into ManagedServicesUpsertProviderRequestAnyOf + err = json.Unmarshal(data, &dst.ManagedServicesUpsertProviderRequestAnyOf) + if err == nil { + jsonManagedServicesUpsertProviderRequestAnyOf, _ := json.Marshal(dst.ManagedServicesUpsertProviderRequestAnyOf) + if string(jsonManagedServicesUpsertProviderRequestAnyOf) == "{}" { // empty struct + dst.ManagedServicesUpsertProviderRequestAnyOf = nil + } else { + return nil // data stored in dst.ManagedServicesUpsertProviderRequestAnyOf, return on the first match + } + } else { + dst.ManagedServicesUpsertProviderRequestAnyOf = nil + } + + // try to unmarshal JSON data into ManagedServicesUpsertProviderRequestAnyOf1 + err = json.Unmarshal(data, &dst.ManagedServicesUpsertProviderRequestAnyOf1) + if err == nil { + jsonManagedServicesUpsertProviderRequestAnyOf1, _ := json.Marshal(dst.ManagedServicesUpsertProviderRequestAnyOf1) + if string(jsonManagedServicesUpsertProviderRequestAnyOf1) == "{}" { // empty struct + dst.ManagedServicesUpsertProviderRequestAnyOf1 = nil + } else { + return nil // data stored in dst.ManagedServicesUpsertProviderRequestAnyOf1, return on the first match + } + } else { + dst.ManagedServicesUpsertProviderRequestAnyOf1 = nil + } + + return fmt.Errorf("data failed to match schemas in anyOf(ManagedServicesUpsertProviderRequest)") +} + +// Marshal data from the first non-nil pointers in the struct to JSON +func (src ManagedServicesUpsertProviderRequest) MarshalJSON() ([]byte, error) { + if src.ManagedServicesUpsertProviderRequestAnyOf != nil { + return json.Marshal(&src.ManagedServicesUpsertProviderRequestAnyOf) + } + + if src.ManagedServicesUpsertProviderRequestAnyOf1 != nil { + return json.Marshal(&src.ManagedServicesUpsertProviderRequestAnyOf1) + } + + return nil, nil // no data in anyOf schemas +} + +type NullableManagedServicesUpsertProviderRequest struct { + value *ManagedServicesUpsertProviderRequest + isSet bool +} + +func (v NullableManagedServicesUpsertProviderRequest) Get() *ManagedServicesUpsertProviderRequest { + return v.value +} + +func (v *NullableManagedServicesUpsertProviderRequest) Set(val *ManagedServicesUpsertProviderRequest) { + v.value = val + v.isSet = true +} + +func (v NullableManagedServicesUpsertProviderRequest) IsSet() bool { + return v.isSet +} + +func (v *NullableManagedServicesUpsertProviderRequest) Unset() { + v.value = nil + v.isSet = false +} + +func NewNullableManagedServicesUpsertProviderRequest(val *ManagedServicesUpsertProviderRequest) *NullableManagedServicesUpsertProviderRequest { + return &NullableManagedServicesUpsertProviderRequest{value: val, isSet: true} +} + +func (v NullableManagedServicesUpsertProviderRequest) MarshalJSON() ([]byte, error) { + return json.Marshal(v.value) +} + +func (v *NullableManagedServicesUpsertProviderRequest) UnmarshalJSON(src []byte) error { + v.isSet = true + return json.Unmarshal(src, &v.value) +} diff --git a/api/openapi_client/model_managed_services_create_provider_request_any_of.go b/api/openapi_client/model_managed_services_upsert_provider_request_any_of.go similarity index 71% rename from api/openapi_client/model_managed_services_create_provider_request_any_of.go rename to api/openapi_client/model_managed_services_upsert_provider_request_any_of.go index e464c90c..00a85fb4 100644 --- a/api/openapi_client/model_managed_services_create_provider_request_any_of.go +++ b/api/openapi_client/model_managed_services_upsert_provider_request_any_of.go @@ -17,11 +17,11 @@ import ( "fmt" ) -// checks if the ManagedServicesCreateProviderRequestAnyOf type satisfies the MappedNullable interface at compile time -var _ MappedNullable = &ManagedServicesCreateProviderRequestAnyOf{} +// checks if the ManagedServicesUpsertProviderRequestAnyOf type satisfies the MappedNullable interface at compile time +var _ MappedNullable = &ManagedServicesUpsertProviderRequestAnyOf{} -// ManagedServicesCreateProviderRequestAnyOf struct for ManagedServicesCreateProviderRequestAnyOf -type ManagedServicesCreateProviderRequestAnyOf struct { +// ManagedServicesUpsertProviderRequestAnyOf struct for ManagedServicesUpsertProviderRequestAnyOf +type ManagedServicesUpsertProviderRequestAnyOf struct { Author string `json:"author"` Backups *ManagedServicesListProviders200ResponseInnerAnyOfBackups `json:"backups,omitempty"` Capabilities *ManagedServicesListProviders200ResponseInnerAnyOfCapabilities `json:"capabilities,omitempty"` @@ -41,17 +41,17 @@ type ManagedServicesCreateProviderRequestAnyOf struct { Version *string `json:"version,omitempty" validate:"regexp=^v[0-9][0-9a-z]*$"` SchemaVersion *string `json:"schemaVersion,omitempty" validate:"regexp=^v[0-9][0-9a-z]*$"` Backend ManagedServicesListProviders200ResponseInnerAnyOfBackend `json:"backend"` - Scope *ManagedServicesCreateProviderRequestAnyOfScope `json:"scope,omitempty"` + Scope *ManagedServicesUpsertProviderRequestAnyOfScope `json:"scope,omitempty"` } -type _ManagedServicesCreateProviderRequestAnyOf ManagedServicesCreateProviderRequestAnyOf +type _ManagedServicesUpsertProviderRequestAnyOf ManagedServicesUpsertProviderRequestAnyOf -// NewManagedServicesCreateProviderRequestAnyOf instantiates a new ManagedServicesCreateProviderRequestAnyOf object +// NewManagedServicesUpsertProviderRequestAnyOf instantiates a new ManagedServicesUpsertProviderRequestAnyOf object // This constructor will assign default values to properties that have it defined, // and makes sure properties required by API are set, but the set of arguments // will change when the set of required properties is changed -func NewManagedServicesCreateProviderRequestAnyOf(author string, category string, description string, displayName string, iconUrl string, configSchema map[string]interface{}, detailsSchema map[string]interface{}, secretsSchema map[string]interface{}, plans []ManagedServicesListProviders200ResponseInnerAnyOfPlansInner, name string, backend ManagedServicesListProviders200ResponseInnerAnyOfBackend) *ManagedServicesCreateProviderRequestAnyOf { - this := ManagedServicesCreateProviderRequestAnyOf{} +func NewManagedServicesUpsertProviderRequestAnyOf(author string, category string, description string, displayName string, iconUrl string, configSchema map[string]interface{}, detailsSchema map[string]interface{}, secretsSchema map[string]interface{}, plans []ManagedServicesListProviders200ResponseInnerAnyOfPlansInner, name string, backend ManagedServicesListProviders200ResponseInnerAnyOfBackend) *ManagedServicesUpsertProviderRequestAnyOf { + this := ManagedServicesUpsertProviderRequestAnyOf{} this.Author = author this.Category = category this.Description = description @@ -66,16 +66,16 @@ func NewManagedServicesCreateProviderRequestAnyOf(author string, category string return &this } -// NewManagedServicesCreateProviderRequestAnyOfWithDefaults instantiates a new ManagedServicesCreateProviderRequestAnyOf object +// NewManagedServicesUpsertProviderRequestAnyOfWithDefaults instantiates a new ManagedServicesUpsertProviderRequestAnyOf object // This constructor will only assign default values to properties that have it defined, // but it doesn't guarantee that properties required by API are set -func NewManagedServicesCreateProviderRequestAnyOfWithDefaults() *ManagedServicesCreateProviderRequestAnyOf { - this := ManagedServicesCreateProviderRequestAnyOf{} +func NewManagedServicesUpsertProviderRequestAnyOfWithDefaults() *ManagedServicesUpsertProviderRequestAnyOf { + this := ManagedServicesUpsertProviderRequestAnyOf{} return &this } // GetAuthor returns the Author field value -func (o *ManagedServicesCreateProviderRequestAnyOf) GetAuthor() string { +func (o *ManagedServicesUpsertProviderRequestAnyOf) GetAuthor() string { if o == nil { var ret string return ret @@ -86,7 +86,7 @@ func (o *ManagedServicesCreateProviderRequestAnyOf) GetAuthor() string { // GetAuthorOk returns a tuple with the Author field value // and a boolean to check if the value has been set. -func (o *ManagedServicesCreateProviderRequestAnyOf) GetAuthorOk() (*string, bool) { +func (o *ManagedServicesUpsertProviderRequestAnyOf) GetAuthorOk() (*string, bool) { if o == nil { return nil, false } @@ -94,12 +94,12 @@ func (o *ManagedServicesCreateProviderRequestAnyOf) GetAuthorOk() (*string, bool } // SetAuthor sets field value -func (o *ManagedServicesCreateProviderRequestAnyOf) SetAuthor(v string) { +func (o *ManagedServicesUpsertProviderRequestAnyOf) SetAuthor(v string) { o.Author = v } // GetBackups returns the Backups field value if set, zero value otherwise. -func (o *ManagedServicesCreateProviderRequestAnyOf) GetBackups() ManagedServicesListProviders200ResponseInnerAnyOfBackups { +func (o *ManagedServicesUpsertProviderRequestAnyOf) GetBackups() ManagedServicesListProviders200ResponseInnerAnyOfBackups { if o == nil || IsNil(o.Backups) { var ret ManagedServicesListProviders200ResponseInnerAnyOfBackups return ret @@ -109,7 +109,7 @@ func (o *ManagedServicesCreateProviderRequestAnyOf) GetBackups() ManagedServices // GetBackupsOk returns a tuple with the Backups field value if set, nil otherwise // and a boolean to check if the value has been set. -func (o *ManagedServicesCreateProviderRequestAnyOf) GetBackupsOk() (*ManagedServicesListProviders200ResponseInnerAnyOfBackups, bool) { +func (o *ManagedServicesUpsertProviderRequestAnyOf) GetBackupsOk() (*ManagedServicesListProviders200ResponseInnerAnyOfBackups, bool) { if o == nil || IsNil(o.Backups) { return nil, false } @@ -117,7 +117,7 @@ func (o *ManagedServicesCreateProviderRequestAnyOf) GetBackupsOk() (*ManagedServ } // HasBackups returns a boolean if a field has been set. -func (o *ManagedServicesCreateProviderRequestAnyOf) HasBackups() bool { +func (o *ManagedServicesUpsertProviderRequestAnyOf) HasBackups() bool { if o != nil && !IsNil(o.Backups) { return true } @@ -126,12 +126,12 @@ func (o *ManagedServicesCreateProviderRequestAnyOf) HasBackups() bool { } // SetBackups gets a reference to the given ManagedServicesListProviders200ResponseInnerAnyOfBackups and assigns it to the Backups field. -func (o *ManagedServicesCreateProviderRequestAnyOf) SetBackups(v ManagedServicesListProviders200ResponseInnerAnyOfBackups) { +func (o *ManagedServicesUpsertProviderRequestAnyOf) SetBackups(v ManagedServicesListProviders200ResponseInnerAnyOfBackups) { o.Backups = &v } // GetCapabilities returns the Capabilities field value if set, zero value otherwise. -func (o *ManagedServicesCreateProviderRequestAnyOf) GetCapabilities() ManagedServicesListProviders200ResponseInnerAnyOfCapabilities { +func (o *ManagedServicesUpsertProviderRequestAnyOf) GetCapabilities() ManagedServicesListProviders200ResponseInnerAnyOfCapabilities { if o == nil || IsNil(o.Capabilities) { var ret ManagedServicesListProviders200ResponseInnerAnyOfCapabilities return ret @@ -141,7 +141,7 @@ func (o *ManagedServicesCreateProviderRequestAnyOf) GetCapabilities() ManagedSer // GetCapabilitiesOk returns a tuple with the Capabilities field value if set, nil otherwise // and a boolean to check if the value has been set. -func (o *ManagedServicesCreateProviderRequestAnyOf) GetCapabilitiesOk() (*ManagedServicesListProviders200ResponseInnerAnyOfCapabilities, bool) { +func (o *ManagedServicesUpsertProviderRequestAnyOf) GetCapabilitiesOk() (*ManagedServicesListProviders200ResponseInnerAnyOfCapabilities, bool) { if o == nil || IsNil(o.Capabilities) { return nil, false } @@ -149,7 +149,7 @@ func (o *ManagedServicesCreateProviderRequestAnyOf) GetCapabilitiesOk() (*Manage } // HasCapabilities returns a boolean if a field has been set. -func (o *ManagedServicesCreateProviderRequestAnyOf) HasCapabilities() bool { +func (o *ManagedServicesUpsertProviderRequestAnyOf) HasCapabilities() bool { if o != nil && !IsNil(o.Capabilities) { return true } @@ -158,12 +158,12 @@ func (o *ManagedServicesCreateProviderRequestAnyOf) HasCapabilities() bool { } // SetCapabilities gets a reference to the given ManagedServicesListProviders200ResponseInnerAnyOfCapabilities and assigns it to the Capabilities field. -func (o *ManagedServicesCreateProviderRequestAnyOf) SetCapabilities(v ManagedServicesListProviders200ResponseInnerAnyOfCapabilities) { +func (o *ManagedServicesUpsertProviderRequestAnyOf) SetCapabilities(v ManagedServicesListProviders200ResponseInnerAnyOfCapabilities) { o.Capabilities = &v } // GetCategory returns the Category field value -func (o *ManagedServicesCreateProviderRequestAnyOf) GetCategory() string { +func (o *ManagedServicesUpsertProviderRequestAnyOf) GetCategory() string { if o == nil { var ret string return ret @@ -174,7 +174,7 @@ func (o *ManagedServicesCreateProviderRequestAnyOf) GetCategory() string { // GetCategoryOk returns a tuple with the Category field value // and a boolean to check if the value has been set. -func (o *ManagedServicesCreateProviderRequestAnyOf) GetCategoryOk() (*string, bool) { +func (o *ManagedServicesUpsertProviderRequestAnyOf) GetCategoryOk() (*string, bool) { if o == nil { return nil, false } @@ -182,12 +182,12 @@ func (o *ManagedServicesCreateProviderRequestAnyOf) GetCategoryOk() (*string, bo } // SetCategory sets field value -func (o *ManagedServicesCreateProviderRequestAnyOf) SetCategory(v string) { +func (o *ManagedServicesUpsertProviderRequestAnyOf) SetCategory(v string) { o.Category = v } // GetDescription returns the Description field value -func (o *ManagedServicesCreateProviderRequestAnyOf) GetDescription() string { +func (o *ManagedServicesUpsertProviderRequestAnyOf) GetDescription() string { if o == nil { var ret string return ret @@ -198,7 +198,7 @@ func (o *ManagedServicesCreateProviderRequestAnyOf) GetDescription() string { // GetDescriptionOk returns a tuple with the Description field value // and a boolean to check if the value has been set. -func (o *ManagedServicesCreateProviderRequestAnyOf) GetDescriptionOk() (*string, bool) { +func (o *ManagedServicesUpsertProviderRequestAnyOf) GetDescriptionOk() (*string, bool) { if o == nil { return nil, false } @@ -206,12 +206,12 @@ func (o *ManagedServicesCreateProviderRequestAnyOf) GetDescriptionOk() (*string, } // SetDescription sets field value -func (o *ManagedServicesCreateProviderRequestAnyOf) SetDescription(v string) { +func (o *ManagedServicesUpsertProviderRequestAnyOf) SetDescription(v string) { o.Description = v } // GetDisplayName returns the DisplayName field value -func (o *ManagedServicesCreateProviderRequestAnyOf) GetDisplayName() string { +func (o *ManagedServicesUpsertProviderRequestAnyOf) GetDisplayName() string { if o == nil { var ret string return ret @@ -222,7 +222,7 @@ func (o *ManagedServicesCreateProviderRequestAnyOf) GetDisplayName() string { // GetDisplayNameOk returns a tuple with the DisplayName field value // and a boolean to check if the value has been set. -func (o *ManagedServicesCreateProviderRequestAnyOf) GetDisplayNameOk() (*string, bool) { +func (o *ManagedServicesUpsertProviderRequestAnyOf) GetDisplayNameOk() (*string, bool) { if o == nil { return nil, false } @@ -230,12 +230,12 @@ func (o *ManagedServicesCreateProviderRequestAnyOf) GetDisplayNameOk() (*string, } // SetDisplayName sets field value -func (o *ManagedServicesCreateProviderRequestAnyOf) SetDisplayName(v string) { +func (o *ManagedServicesUpsertProviderRequestAnyOf) SetDisplayName(v string) { o.DisplayName = v } // GetIconUrl returns the IconUrl field value -func (o *ManagedServicesCreateProviderRequestAnyOf) GetIconUrl() string { +func (o *ManagedServicesUpsertProviderRequestAnyOf) GetIconUrl() string { if o == nil { var ret string return ret @@ -246,7 +246,7 @@ func (o *ManagedServicesCreateProviderRequestAnyOf) GetIconUrl() string { // GetIconUrlOk returns a tuple with the IconUrl field value // and a boolean to check if the value has been set. -func (o *ManagedServicesCreateProviderRequestAnyOf) GetIconUrlOk() (*string, bool) { +func (o *ManagedServicesUpsertProviderRequestAnyOf) GetIconUrlOk() (*string, bool) { if o == nil { return nil, false } @@ -254,12 +254,12 @@ func (o *ManagedServicesCreateProviderRequestAnyOf) GetIconUrlOk() (*string, boo } // SetIconUrl sets field value -func (o *ManagedServicesCreateProviderRequestAnyOf) SetIconUrl(v string) { +func (o *ManagedServicesUpsertProviderRequestAnyOf) SetIconUrl(v string) { o.IconUrl = v } // GetConfigSchema returns the ConfigSchema field value -func (o *ManagedServicesCreateProviderRequestAnyOf) GetConfigSchema() map[string]interface{} { +func (o *ManagedServicesUpsertProviderRequestAnyOf) GetConfigSchema() map[string]interface{} { if o == nil { var ret map[string]interface{} return ret @@ -270,7 +270,7 @@ func (o *ManagedServicesCreateProviderRequestAnyOf) GetConfigSchema() map[string // GetConfigSchemaOk returns a tuple with the ConfigSchema field value // and a boolean to check if the value has been set. -func (o *ManagedServicesCreateProviderRequestAnyOf) GetConfigSchemaOk() (map[string]interface{}, bool) { +func (o *ManagedServicesUpsertProviderRequestAnyOf) GetConfigSchemaOk() (map[string]interface{}, bool) { if o == nil { return map[string]interface{}{}, false } @@ -278,12 +278,12 @@ func (o *ManagedServicesCreateProviderRequestAnyOf) GetConfigSchemaOk() (map[str } // SetConfigSchema sets field value -func (o *ManagedServicesCreateProviderRequestAnyOf) SetConfigSchema(v map[string]interface{}) { +func (o *ManagedServicesUpsertProviderRequestAnyOf) SetConfigSchema(v map[string]interface{}) { o.ConfigSchema = v } // GetDetailsSchema returns the DetailsSchema field value -func (o *ManagedServicesCreateProviderRequestAnyOf) GetDetailsSchema() map[string]interface{} { +func (o *ManagedServicesUpsertProviderRequestAnyOf) GetDetailsSchema() map[string]interface{} { if o == nil { var ret map[string]interface{} return ret @@ -294,7 +294,7 @@ func (o *ManagedServicesCreateProviderRequestAnyOf) GetDetailsSchema() map[strin // GetDetailsSchemaOk returns a tuple with the DetailsSchema field value // and a boolean to check if the value has been set. -func (o *ManagedServicesCreateProviderRequestAnyOf) GetDetailsSchemaOk() (map[string]interface{}, bool) { +func (o *ManagedServicesUpsertProviderRequestAnyOf) GetDetailsSchemaOk() (map[string]interface{}, bool) { if o == nil { return map[string]interface{}{}, false } @@ -302,12 +302,12 @@ func (o *ManagedServicesCreateProviderRequestAnyOf) GetDetailsSchemaOk() (map[st } // SetDetailsSchema sets field value -func (o *ManagedServicesCreateProviderRequestAnyOf) SetDetailsSchema(v map[string]interface{}) { +func (o *ManagedServicesUpsertProviderRequestAnyOf) SetDetailsSchema(v map[string]interface{}) { o.DetailsSchema = v } // GetSecretsSchema returns the SecretsSchema field value -func (o *ManagedServicesCreateProviderRequestAnyOf) GetSecretsSchema() map[string]interface{} { +func (o *ManagedServicesUpsertProviderRequestAnyOf) GetSecretsSchema() map[string]interface{} { if o == nil { var ret map[string]interface{} return ret @@ -318,7 +318,7 @@ func (o *ManagedServicesCreateProviderRequestAnyOf) GetSecretsSchema() map[strin // GetSecretsSchemaOk returns a tuple with the SecretsSchema field value // and a boolean to check if the value has been set. -func (o *ManagedServicesCreateProviderRequestAnyOf) GetSecretsSchemaOk() (map[string]interface{}, bool) { +func (o *ManagedServicesUpsertProviderRequestAnyOf) GetSecretsSchemaOk() (map[string]interface{}, bool) { if o == nil { return map[string]interface{}{}, false } @@ -326,12 +326,12 @@ func (o *ManagedServicesCreateProviderRequestAnyOf) GetSecretsSchemaOk() (map[st } // SetSecretsSchema sets field value -func (o *ManagedServicesCreateProviderRequestAnyOf) SetSecretsSchema(v map[string]interface{}) { +func (o *ManagedServicesUpsertProviderRequestAnyOf) SetSecretsSchema(v map[string]interface{}) { o.SecretsSchema = v } // GetPlans returns the Plans field value -func (o *ManagedServicesCreateProviderRequestAnyOf) GetPlans() []ManagedServicesListProviders200ResponseInnerAnyOfPlansInner { +func (o *ManagedServicesUpsertProviderRequestAnyOf) GetPlans() []ManagedServicesListProviders200ResponseInnerAnyOfPlansInner { if o == nil { var ret []ManagedServicesListProviders200ResponseInnerAnyOfPlansInner return ret @@ -342,7 +342,7 @@ func (o *ManagedServicesCreateProviderRequestAnyOf) GetPlans() []ManagedServices // GetPlansOk returns a tuple with the Plans field value // and a boolean to check if the value has been set. -func (o *ManagedServicesCreateProviderRequestAnyOf) GetPlansOk() ([]ManagedServicesListProviders200ResponseInnerAnyOfPlansInner, bool) { +func (o *ManagedServicesUpsertProviderRequestAnyOf) GetPlansOk() ([]ManagedServicesListProviders200ResponseInnerAnyOfPlansInner, bool) { if o == nil { return nil, false } @@ -350,12 +350,12 @@ func (o *ManagedServicesCreateProviderRequestAnyOf) GetPlansOk() ([]ManagedServi } // SetPlans sets field value -func (o *ManagedServicesCreateProviderRequestAnyOf) SetPlans(v []ManagedServicesListProviders200ResponseInnerAnyOfPlansInner) { +func (o *ManagedServicesUpsertProviderRequestAnyOf) SetPlans(v []ManagedServicesListProviders200ResponseInnerAnyOfPlansInner) { o.Plans = v } // GetVersions returns the Versions field value if set, zero value otherwise. -func (o *ManagedServicesCreateProviderRequestAnyOf) GetVersions() map[string]ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue { +func (o *ManagedServicesUpsertProviderRequestAnyOf) GetVersions() map[string]ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue { if o == nil || IsNil(o.Versions) { var ret map[string]ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue return ret @@ -365,7 +365,7 @@ func (o *ManagedServicesCreateProviderRequestAnyOf) GetVersions() map[string]Man // GetVersionsOk returns a tuple with the Versions field value if set, nil otherwise // and a boolean to check if the value has been set. -func (o *ManagedServicesCreateProviderRequestAnyOf) GetVersionsOk() (*map[string]ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue, bool) { +func (o *ManagedServicesUpsertProviderRequestAnyOf) GetVersionsOk() (*map[string]ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue, bool) { if o == nil || IsNil(o.Versions) { return nil, false } @@ -373,7 +373,7 @@ func (o *ManagedServicesCreateProviderRequestAnyOf) GetVersionsOk() (*map[string } // HasVersions returns a boolean if a field has been set. -func (o *ManagedServicesCreateProviderRequestAnyOf) HasVersions() bool { +func (o *ManagedServicesUpsertProviderRequestAnyOf) HasVersions() bool { if o != nil && !IsNil(o.Versions) { return true } @@ -382,12 +382,12 @@ func (o *ManagedServicesCreateProviderRequestAnyOf) HasVersions() bool { } // SetVersions gets a reference to the given map[string]ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue and assigns it to the Versions field. -func (o *ManagedServicesCreateProviderRequestAnyOf) SetVersions(v map[string]ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue) { +func (o *ManagedServicesUpsertProviderRequestAnyOf) SetVersions(v map[string]ManagedServicesListProviders200ResponseInnerAnyOfVersionsValue) { o.Versions = &v } // GetName returns the Name field value -func (o *ManagedServicesCreateProviderRequestAnyOf) GetName() string { +func (o *ManagedServicesUpsertProviderRequestAnyOf) GetName() string { if o == nil { var ret string return ret @@ -398,7 +398,7 @@ func (o *ManagedServicesCreateProviderRequestAnyOf) GetName() string { // GetNameOk returns a tuple with the Name field value // and a boolean to check if the value has been set. -func (o *ManagedServicesCreateProviderRequestAnyOf) GetNameOk() (*string, bool) { +func (o *ManagedServicesUpsertProviderRequestAnyOf) GetNameOk() (*string, bool) { if o == nil { return nil, false } @@ -406,12 +406,12 @@ func (o *ManagedServicesCreateProviderRequestAnyOf) GetNameOk() (*string, bool) } // SetName sets field value -func (o *ManagedServicesCreateProviderRequestAnyOf) SetName(v string) { +func (o *ManagedServicesUpsertProviderRequestAnyOf) SetName(v string) { o.Name = v } // GetVersion returns the Version field value if set, zero value otherwise. -func (o *ManagedServicesCreateProviderRequestAnyOf) GetVersion() string { +func (o *ManagedServicesUpsertProviderRequestAnyOf) GetVersion() string { if o == nil || IsNil(o.Version) { var ret string return ret @@ -421,7 +421,7 @@ func (o *ManagedServicesCreateProviderRequestAnyOf) GetVersion() string { // GetVersionOk returns a tuple with the Version field value if set, nil otherwise // and a boolean to check if the value has been set. -func (o *ManagedServicesCreateProviderRequestAnyOf) GetVersionOk() (*string, bool) { +func (o *ManagedServicesUpsertProviderRequestAnyOf) GetVersionOk() (*string, bool) { if o == nil || IsNil(o.Version) { return nil, false } @@ -429,7 +429,7 @@ func (o *ManagedServicesCreateProviderRequestAnyOf) GetVersionOk() (*string, boo } // HasVersion returns a boolean if a field has been set. -func (o *ManagedServicesCreateProviderRequestAnyOf) HasVersion() bool { +func (o *ManagedServicesUpsertProviderRequestAnyOf) HasVersion() bool { if o != nil && !IsNil(o.Version) { return true } @@ -438,12 +438,12 @@ func (o *ManagedServicesCreateProviderRequestAnyOf) HasVersion() bool { } // SetVersion gets a reference to the given string and assigns it to the Version field. -func (o *ManagedServicesCreateProviderRequestAnyOf) SetVersion(v string) { +func (o *ManagedServicesUpsertProviderRequestAnyOf) SetVersion(v string) { o.Version = &v } // GetSchemaVersion returns the SchemaVersion field value if set, zero value otherwise. -func (o *ManagedServicesCreateProviderRequestAnyOf) GetSchemaVersion() string { +func (o *ManagedServicesUpsertProviderRequestAnyOf) GetSchemaVersion() string { if o == nil || IsNil(o.SchemaVersion) { var ret string return ret @@ -453,7 +453,7 @@ func (o *ManagedServicesCreateProviderRequestAnyOf) GetSchemaVersion() string { // GetSchemaVersionOk returns a tuple with the SchemaVersion field value if set, nil otherwise // and a boolean to check if the value has been set. -func (o *ManagedServicesCreateProviderRequestAnyOf) GetSchemaVersionOk() (*string, bool) { +func (o *ManagedServicesUpsertProviderRequestAnyOf) GetSchemaVersionOk() (*string, bool) { if o == nil || IsNil(o.SchemaVersion) { return nil, false } @@ -461,7 +461,7 @@ func (o *ManagedServicesCreateProviderRequestAnyOf) GetSchemaVersionOk() (*strin } // HasSchemaVersion returns a boolean if a field has been set. -func (o *ManagedServicesCreateProviderRequestAnyOf) HasSchemaVersion() bool { +func (o *ManagedServicesUpsertProviderRequestAnyOf) HasSchemaVersion() bool { if o != nil && !IsNil(o.SchemaVersion) { return true } @@ -470,12 +470,12 @@ func (o *ManagedServicesCreateProviderRequestAnyOf) HasSchemaVersion() bool { } // SetSchemaVersion gets a reference to the given string and assigns it to the SchemaVersion field. -func (o *ManagedServicesCreateProviderRequestAnyOf) SetSchemaVersion(v string) { +func (o *ManagedServicesUpsertProviderRequestAnyOf) SetSchemaVersion(v string) { o.SchemaVersion = &v } // GetBackend returns the Backend field value -func (o *ManagedServicesCreateProviderRequestAnyOf) GetBackend() ManagedServicesListProviders200ResponseInnerAnyOfBackend { +func (o *ManagedServicesUpsertProviderRequestAnyOf) GetBackend() ManagedServicesListProviders200ResponseInnerAnyOfBackend { if o == nil { var ret ManagedServicesListProviders200ResponseInnerAnyOfBackend return ret @@ -486,7 +486,7 @@ func (o *ManagedServicesCreateProviderRequestAnyOf) GetBackend() ManagedServices // GetBackendOk returns a tuple with the Backend field value // and a boolean to check if the value has been set. -func (o *ManagedServicesCreateProviderRequestAnyOf) GetBackendOk() (*ManagedServicesListProviders200ResponseInnerAnyOfBackend, bool) { +func (o *ManagedServicesUpsertProviderRequestAnyOf) GetBackendOk() (*ManagedServicesListProviders200ResponseInnerAnyOfBackend, bool) { if o == nil { return nil, false } @@ -494,14 +494,14 @@ func (o *ManagedServicesCreateProviderRequestAnyOf) GetBackendOk() (*ManagedServ } // SetBackend sets field value -func (o *ManagedServicesCreateProviderRequestAnyOf) SetBackend(v ManagedServicesListProviders200ResponseInnerAnyOfBackend) { +func (o *ManagedServicesUpsertProviderRequestAnyOf) SetBackend(v ManagedServicesListProviders200ResponseInnerAnyOfBackend) { o.Backend = v } // GetScope returns the Scope field value if set, zero value otherwise. -func (o *ManagedServicesCreateProviderRequestAnyOf) GetScope() ManagedServicesCreateProviderRequestAnyOfScope { +func (o *ManagedServicesUpsertProviderRequestAnyOf) GetScope() ManagedServicesUpsertProviderRequestAnyOfScope { if o == nil || IsNil(o.Scope) { - var ret ManagedServicesCreateProviderRequestAnyOfScope + var ret ManagedServicesUpsertProviderRequestAnyOfScope return ret } return *o.Scope @@ -509,7 +509,7 @@ func (o *ManagedServicesCreateProviderRequestAnyOf) GetScope() ManagedServicesCr // GetScopeOk returns a tuple with the Scope field value if set, nil otherwise // and a boolean to check if the value has been set. -func (o *ManagedServicesCreateProviderRequestAnyOf) GetScopeOk() (*ManagedServicesCreateProviderRequestAnyOfScope, bool) { +func (o *ManagedServicesUpsertProviderRequestAnyOf) GetScopeOk() (*ManagedServicesUpsertProviderRequestAnyOfScope, bool) { if o == nil || IsNil(o.Scope) { return nil, false } @@ -517,7 +517,7 @@ func (o *ManagedServicesCreateProviderRequestAnyOf) GetScopeOk() (*ManagedServic } // HasScope returns a boolean if a field has been set. -func (o *ManagedServicesCreateProviderRequestAnyOf) HasScope() bool { +func (o *ManagedServicesUpsertProviderRequestAnyOf) HasScope() bool { if o != nil && !IsNil(o.Scope) { return true } @@ -525,12 +525,12 @@ func (o *ManagedServicesCreateProviderRequestAnyOf) HasScope() bool { return false } -// SetScope gets a reference to the given ManagedServicesCreateProviderRequestAnyOfScope and assigns it to the Scope field. -func (o *ManagedServicesCreateProviderRequestAnyOf) SetScope(v ManagedServicesCreateProviderRequestAnyOfScope) { +// SetScope gets a reference to the given ManagedServicesUpsertProviderRequestAnyOfScope and assigns it to the Scope field. +func (o *ManagedServicesUpsertProviderRequestAnyOf) SetScope(v ManagedServicesUpsertProviderRequestAnyOfScope) { o.Scope = &v } -func (o ManagedServicesCreateProviderRequestAnyOf) MarshalJSON() ([]byte, error) { +func (o ManagedServicesUpsertProviderRequestAnyOf) MarshalJSON() ([]byte, error) { toSerialize, err := o.ToMap() if err != nil { return []byte{}, err @@ -538,7 +538,7 @@ func (o ManagedServicesCreateProviderRequestAnyOf) MarshalJSON() ([]byte, error) return json.Marshal(toSerialize) } -func (o ManagedServicesCreateProviderRequestAnyOf) ToMap() (map[string]interface{}, error) { +func (o ManagedServicesUpsertProviderRequestAnyOf) ToMap() (map[string]interface{}, error) { toSerialize := map[string]interface{}{} toSerialize["author"] = o.Author if !IsNil(o.Backups) { @@ -572,7 +572,7 @@ func (o ManagedServicesCreateProviderRequestAnyOf) ToMap() (map[string]interface return toSerialize, nil } -func (o *ManagedServicesCreateProviderRequestAnyOf) UnmarshalJSON(data []byte) (err error) { +func (o *ManagedServicesUpsertProviderRequestAnyOf) UnmarshalJSON(data []byte) (err error) { // This validates that all required properties are included in the JSON object // by unmarshalling the object into a generic map with string keys and checking // that every required field exists as a key in the generic map. @@ -604,53 +604,53 @@ func (o *ManagedServicesCreateProviderRequestAnyOf) UnmarshalJSON(data []byte) ( } } - varManagedServicesCreateProviderRequestAnyOf := _ManagedServicesCreateProviderRequestAnyOf{} + varManagedServicesUpsertProviderRequestAnyOf := _ManagedServicesUpsertProviderRequestAnyOf{} decoder := json.NewDecoder(bytes.NewReader(data)) //decoder.DisallowUnknownFields() - err = decoder.Decode(&varManagedServicesCreateProviderRequestAnyOf) + err = decoder.Decode(&varManagedServicesUpsertProviderRequestAnyOf) if err != nil { return err } - *o = ManagedServicesCreateProviderRequestAnyOf(varManagedServicesCreateProviderRequestAnyOf) + *o = ManagedServicesUpsertProviderRequestAnyOf(varManagedServicesUpsertProviderRequestAnyOf) return err } -type NullableManagedServicesCreateProviderRequestAnyOf struct { - value *ManagedServicesCreateProviderRequestAnyOf +type NullableManagedServicesUpsertProviderRequestAnyOf struct { + value *ManagedServicesUpsertProviderRequestAnyOf isSet bool } -func (v NullableManagedServicesCreateProviderRequestAnyOf) Get() *ManagedServicesCreateProviderRequestAnyOf { +func (v NullableManagedServicesUpsertProviderRequestAnyOf) Get() *ManagedServicesUpsertProviderRequestAnyOf { return v.value } -func (v *NullableManagedServicesCreateProviderRequestAnyOf) Set(val *ManagedServicesCreateProviderRequestAnyOf) { +func (v *NullableManagedServicesUpsertProviderRequestAnyOf) Set(val *ManagedServicesUpsertProviderRequestAnyOf) { v.value = val v.isSet = true } -func (v NullableManagedServicesCreateProviderRequestAnyOf) IsSet() bool { +func (v NullableManagedServicesUpsertProviderRequestAnyOf) IsSet() bool { return v.isSet } -func (v *NullableManagedServicesCreateProviderRequestAnyOf) Unset() { +func (v *NullableManagedServicesUpsertProviderRequestAnyOf) Unset() { v.value = nil v.isSet = false } -func NewNullableManagedServicesCreateProviderRequestAnyOf(val *ManagedServicesCreateProviderRequestAnyOf) *NullableManagedServicesCreateProviderRequestAnyOf { - return &NullableManagedServicesCreateProviderRequestAnyOf{value: val, isSet: true} +func NewNullableManagedServicesUpsertProviderRequestAnyOf(val *ManagedServicesUpsertProviderRequestAnyOf) *NullableManagedServicesUpsertProviderRequestAnyOf { + return &NullableManagedServicesUpsertProviderRequestAnyOf{value: val, isSet: true} } -func (v NullableManagedServicesCreateProviderRequestAnyOf) MarshalJSON() ([]byte, error) { +func (v NullableManagedServicesUpsertProviderRequestAnyOf) MarshalJSON() ([]byte, error) { return json.Marshal(v.value) } -func (v *NullableManagedServicesCreateProviderRequestAnyOf) UnmarshalJSON(src []byte) error { +func (v *NullableManagedServicesUpsertProviderRequestAnyOf) UnmarshalJSON(src []byte) error { v.isSet = true return json.Unmarshal(src, &v.value) } diff --git a/api/openapi_client/model_managed_services_create_provider_request_any_of_1.go b/api/openapi_client/model_managed_services_upsert_provider_request_any_of_1.go similarity index 55% rename from api/openapi_client/model_managed_services_create_provider_request_any_of_1.go rename to api/openapi_client/model_managed_services_upsert_provider_request_any_of_1.go index 179b3770..20273373 100644 --- a/api/openapi_client/model_managed_services_create_provider_request_any_of_1.go +++ b/api/openapi_client/model_managed_services_upsert_provider_request_any_of_1.go @@ -17,38 +17,38 @@ import ( "fmt" ) -// checks if the ManagedServicesCreateProviderRequestAnyOf1 type satisfies the MappedNullable interface at compile time -var _ MappedNullable = &ManagedServicesCreateProviderRequestAnyOf1{} +// checks if the ManagedServicesUpsertProviderRequestAnyOf1 type satisfies the MappedNullable interface at compile time +var _ MappedNullable = &ManagedServicesUpsertProviderRequestAnyOf1{} -// ManagedServicesCreateProviderRequestAnyOf1 struct for ManagedServicesCreateProviderRequestAnyOf1 -type ManagedServicesCreateProviderRequestAnyOf1 struct { +// ManagedServicesUpsertProviderRequestAnyOf1 struct for ManagedServicesUpsertProviderRequestAnyOf1 +type ManagedServicesUpsertProviderRequestAnyOf1 struct { GitUrl string `json:"gitUrl"` GitRef *string `json:"gitRef,omitempty"` - Scope *ManagedServicesCreateProviderRequestAnyOfScope `json:"scope,omitempty"` + Scope *ManagedServicesUpsertProviderRequestAnyOfScope `json:"scope,omitempty"` } -type _ManagedServicesCreateProviderRequestAnyOf1 ManagedServicesCreateProviderRequestAnyOf1 +type _ManagedServicesUpsertProviderRequestAnyOf1 ManagedServicesUpsertProviderRequestAnyOf1 -// NewManagedServicesCreateProviderRequestAnyOf1 instantiates a new ManagedServicesCreateProviderRequestAnyOf1 object +// NewManagedServicesUpsertProviderRequestAnyOf1 instantiates a new ManagedServicesUpsertProviderRequestAnyOf1 object // This constructor will assign default values to properties that have it defined, // and makes sure properties required by API are set, but the set of arguments // will change when the set of required properties is changed -func NewManagedServicesCreateProviderRequestAnyOf1(gitUrl string) *ManagedServicesCreateProviderRequestAnyOf1 { - this := ManagedServicesCreateProviderRequestAnyOf1{} +func NewManagedServicesUpsertProviderRequestAnyOf1(gitUrl string) *ManagedServicesUpsertProviderRequestAnyOf1 { + this := ManagedServicesUpsertProviderRequestAnyOf1{} this.GitUrl = gitUrl return &this } -// NewManagedServicesCreateProviderRequestAnyOf1WithDefaults instantiates a new ManagedServicesCreateProviderRequestAnyOf1 object +// NewManagedServicesUpsertProviderRequestAnyOf1WithDefaults instantiates a new ManagedServicesUpsertProviderRequestAnyOf1 object // This constructor will only assign default values to properties that have it defined, // but it doesn't guarantee that properties required by API are set -func NewManagedServicesCreateProviderRequestAnyOf1WithDefaults() *ManagedServicesCreateProviderRequestAnyOf1 { - this := ManagedServicesCreateProviderRequestAnyOf1{} +func NewManagedServicesUpsertProviderRequestAnyOf1WithDefaults() *ManagedServicesUpsertProviderRequestAnyOf1 { + this := ManagedServicesUpsertProviderRequestAnyOf1{} return &this } // GetGitUrl returns the GitUrl field value -func (o *ManagedServicesCreateProviderRequestAnyOf1) GetGitUrl() string { +func (o *ManagedServicesUpsertProviderRequestAnyOf1) GetGitUrl() string { if o == nil { var ret string return ret @@ -59,7 +59,7 @@ func (o *ManagedServicesCreateProviderRequestAnyOf1) GetGitUrl() string { // GetGitUrlOk returns a tuple with the GitUrl field value // and a boolean to check if the value has been set. -func (o *ManagedServicesCreateProviderRequestAnyOf1) GetGitUrlOk() (*string, bool) { +func (o *ManagedServicesUpsertProviderRequestAnyOf1) GetGitUrlOk() (*string, bool) { if o == nil { return nil, false } @@ -67,12 +67,12 @@ func (o *ManagedServicesCreateProviderRequestAnyOf1) GetGitUrlOk() (*string, boo } // SetGitUrl sets field value -func (o *ManagedServicesCreateProviderRequestAnyOf1) SetGitUrl(v string) { +func (o *ManagedServicesUpsertProviderRequestAnyOf1) SetGitUrl(v string) { o.GitUrl = v } // GetGitRef returns the GitRef field value if set, zero value otherwise. -func (o *ManagedServicesCreateProviderRequestAnyOf1) GetGitRef() string { +func (o *ManagedServicesUpsertProviderRequestAnyOf1) GetGitRef() string { if o == nil || IsNil(o.GitRef) { var ret string return ret @@ -82,7 +82,7 @@ func (o *ManagedServicesCreateProviderRequestAnyOf1) GetGitRef() string { // GetGitRefOk returns a tuple with the GitRef field value if set, nil otherwise // and a boolean to check if the value has been set. -func (o *ManagedServicesCreateProviderRequestAnyOf1) GetGitRefOk() (*string, bool) { +func (o *ManagedServicesUpsertProviderRequestAnyOf1) GetGitRefOk() (*string, bool) { if o == nil || IsNil(o.GitRef) { return nil, false } @@ -90,7 +90,7 @@ func (o *ManagedServicesCreateProviderRequestAnyOf1) GetGitRefOk() (*string, boo } // HasGitRef returns a boolean if a field has been set. -func (o *ManagedServicesCreateProviderRequestAnyOf1) HasGitRef() bool { +func (o *ManagedServicesUpsertProviderRequestAnyOf1) HasGitRef() bool { if o != nil && !IsNil(o.GitRef) { return true } @@ -99,14 +99,14 @@ func (o *ManagedServicesCreateProviderRequestAnyOf1) HasGitRef() bool { } // SetGitRef gets a reference to the given string and assigns it to the GitRef field. -func (o *ManagedServicesCreateProviderRequestAnyOf1) SetGitRef(v string) { +func (o *ManagedServicesUpsertProviderRequestAnyOf1) SetGitRef(v string) { o.GitRef = &v } // GetScope returns the Scope field value if set, zero value otherwise. -func (o *ManagedServicesCreateProviderRequestAnyOf1) GetScope() ManagedServicesCreateProviderRequestAnyOfScope { +func (o *ManagedServicesUpsertProviderRequestAnyOf1) GetScope() ManagedServicesUpsertProviderRequestAnyOfScope { if o == nil || IsNil(o.Scope) { - var ret ManagedServicesCreateProviderRequestAnyOfScope + var ret ManagedServicesUpsertProviderRequestAnyOfScope return ret } return *o.Scope @@ -114,7 +114,7 @@ func (o *ManagedServicesCreateProviderRequestAnyOf1) GetScope() ManagedServicesC // GetScopeOk returns a tuple with the Scope field value if set, nil otherwise // and a boolean to check if the value has been set. -func (o *ManagedServicesCreateProviderRequestAnyOf1) GetScopeOk() (*ManagedServicesCreateProviderRequestAnyOfScope, bool) { +func (o *ManagedServicesUpsertProviderRequestAnyOf1) GetScopeOk() (*ManagedServicesUpsertProviderRequestAnyOfScope, bool) { if o == nil || IsNil(o.Scope) { return nil, false } @@ -122,7 +122,7 @@ func (o *ManagedServicesCreateProviderRequestAnyOf1) GetScopeOk() (*ManagedServi } // HasScope returns a boolean if a field has been set. -func (o *ManagedServicesCreateProviderRequestAnyOf1) HasScope() bool { +func (o *ManagedServicesUpsertProviderRequestAnyOf1) HasScope() bool { if o != nil && !IsNil(o.Scope) { return true } @@ -130,12 +130,12 @@ func (o *ManagedServicesCreateProviderRequestAnyOf1) HasScope() bool { return false } -// SetScope gets a reference to the given ManagedServicesCreateProviderRequestAnyOfScope and assigns it to the Scope field. -func (o *ManagedServicesCreateProviderRequestAnyOf1) SetScope(v ManagedServicesCreateProviderRequestAnyOfScope) { +// SetScope gets a reference to the given ManagedServicesUpsertProviderRequestAnyOfScope and assigns it to the Scope field. +func (o *ManagedServicesUpsertProviderRequestAnyOf1) SetScope(v ManagedServicesUpsertProviderRequestAnyOfScope) { o.Scope = &v } -func (o ManagedServicesCreateProviderRequestAnyOf1) MarshalJSON() ([]byte, error) { +func (o ManagedServicesUpsertProviderRequestAnyOf1) MarshalJSON() ([]byte, error) { toSerialize, err := o.ToMap() if err != nil { return []byte{}, err @@ -143,7 +143,7 @@ func (o ManagedServicesCreateProviderRequestAnyOf1) MarshalJSON() ([]byte, error return json.Marshal(toSerialize) } -func (o ManagedServicesCreateProviderRequestAnyOf1) ToMap() (map[string]interface{}, error) { +func (o ManagedServicesUpsertProviderRequestAnyOf1) ToMap() (map[string]interface{}, error) { toSerialize := map[string]interface{}{} toSerialize["gitUrl"] = o.GitUrl if !IsNil(o.GitRef) { @@ -155,7 +155,7 @@ func (o ManagedServicesCreateProviderRequestAnyOf1) ToMap() (map[string]interfac return toSerialize, nil } -func (o *ManagedServicesCreateProviderRequestAnyOf1) UnmarshalJSON(data []byte) (err error) { +func (o *ManagedServicesUpsertProviderRequestAnyOf1) UnmarshalJSON(data []byte) (err error) { // This validates that all required properties are included in the JSON object // by unmarshalling the object into a generic map with string keys and checking // that every required field exists as a key in the generic map. @@ -177,53 +177,53 @@ func (o *ManagedServicesCreateProviderRequestAnyOf1) UnmarshalJSON(data []byte) } } - varManagedServicesCreateProviderRequestAnyOf1 := _ManagedServicesCreateProviderRequestAnyOf1{} + varManagedServicesUpsertProviderRequestAnyOf1 := _ManagedServicesUpsertProviderRequestAnyOf1{} decoder := json.NewDecoder(bytes.NewReader(data)) //decoder.DisallowUnknownFields() - err = decoder.Decode(&varManagedServicesCreateProviderRequestAnyOf1) + err = decoder.Decode(&varManagedServicesUpsertProviderRequestAnyOf1) if err != nil { return err } - *o = ManagedServicesCreateProviderRequestAnyOf1(varManagedServicesCreateProviderRequestAnyOf1) + *o = ManagedServicesUpsertProviderRequestAnyOf1(varManagedServicesUpsertProviderRequestAnyOf1) return err } -type NullableManagedServicesCreateProviderRequestAnyOf1 struct { - value *ManagedServicesCreateProviderRequestAnyOf1 +type NullableManagedServicesUpsertProviderRequestAnyOf1 struct { + value *ManagedServicesUpsertProviderRequestAnyOf1 isSet bool } -func (v NullableManagedServicesCreateProviderRequestAnyOf1) Get() *ManagedServicesCreateProviderRequestAnyOf1 { +func (v NullableManagedServicesUpsertProviderRequestAnyOf1) Get() *ManagedServicesUpsertProviderRequestAnyOf1 { return v.value } -func (v *NullableManagedServicesCreateProviderRequestAnyOf1) Set(val *ManagedServicesCreateProviderRequestAnyOf1) { +func (v *NullableManagedServicesUpsertProviderRequestAnyOf1) Set(val *ManagedServicesUpsertProviderRequestAnyOf1) { v.value = val v.isSet = true } -func (v NullableManagedServicesCreateProviderRequestAnyOf1) IsSet() bool { +func (v NullableManagedServicesUpsertProviderRequestAnyOf1) IsSet() bool { return v.isSet } -func (v *NullableManagedServicesCreateProviderRequestAnyOf1) Unset() { +func (v *NullableManagedServicesUpsertProviderRequestAnyOf1) Unset() { v.value = nil v.isSet = false } -func NewNullableManagedServicesCreateProviderRequestAnyOf1(val *ManagedServicesCreateProviderRequestAnyOf1) *NullableManagedServicesCreateProviderRequestAnyOf1 { - return &NullableManagedServicesCreateProviderRequestAnyOf1{value: val, isSet: true} +func NewNullableManagedServicesUpsertProviderRequestAnyOf1(val *ManagedServicesUpsertProviderRequestAnyOf1) *NullableManagedServicesUpsertProviderRequestAnyOf1 { + return &NullableManagedServicesUpsertProviderRequestAnyOf1{value: val, isSet: true} } -func (v NullableManagedServicesCreateProviderRequestAnyOf1) MarshalJSON() ([]byte, error) { +func (v NullableManagedServicesUpsertProviderRequestAnyOf1) MarshalJSON() ([]byte, error) { return json.Marshal(v.value) } -func (v *NullableManagedServicesCreateProviderRequestAnyOf1) UnmarshalJSON(src []byte) error { +func (v *NullableManagedServicesUpsertProviderRequestAnyOf1) UnmarshalJSON(src []byte) error { v.isSet = true return json.Unmarshal(src, &v.value) } diff --git a/api/openapi_client/model_managed_services_upsert_provider_request_any_of_scope.go b/api/openapi_client/model_managed_services_upsert_provider_request_any_of_scope.go new file mode 100644 index 00000000..26018737 --- /dev/null +++ b/api/openapi_client/model_managed_services_upsert_provider_request_any_of_scope.go @@ -0,0 +1,104 @@ +// Copyright (c) Codesphere Inc. +// SPDX-License-Identifier: Apache-2.0 + +/* +Codesphere Public API + +API version: 0.1.0 +*/ + +// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. + +package openapi_client + +import ( + "encoding/json" + "fmt" +) + +// ManagedServicesUpsertProviderRequestAnyOfScope struct for ManagedServicesUpsertProviderRequestAnyOfScope +type ManagedServicesUpsertProviderRequestAnyOfScope struct { + ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf *ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf + ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1 *ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1 +} + +// Unmarshal JSON data into any of the pointers in the struct +func (dst *ManagedServicesUpsertProviderRequestAnyOfScope) UnmarshalJSON(data []byte) error { + var err error + // try to unmarshal JSON data into ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf + err = json.Unmarshal(data, &dst.ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf) + if err == nil { + jsonManagedServicesUpsertProviderRequestAnyOfScopeAnyOf, _ := json.Marshal(dst.ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf) + if string(jsonManagedServicesUpsertProviderRequestAnyOfScopeAnyOf) == "{}" { // empty struct + dst.ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf = nil + } else { + return nil // data stored in dst.ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf, return on the first match + } + } else { + dst.ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf = nil + } + + // try to unmarshal JSON data into ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1 + err = json.Unmarshal(data, &dst.ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1) + if err == nil { + jsonManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1, _ := json.Marshal(dst.ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1) + if string(jsonManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1) == "{}" { // empty struct + dst.ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1 = nil + } else { + return nil // data stored in dst.ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1, return on the first match + } + } else { + dst.ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1 = nil + } + + return fmt.Errorf("data failed to match schemas in anyOf(ManagedServicesUpsertProviderRequestAnyOfScope)") +} + +// Marshal data from the first non-nil pointers in the struct to JSON +func (src ManagedServicesUpsertProviderRequestAnyOfScope) MarshalJSON() ([]byte, error) { + if src.ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf != nil { + return json.Marshal(&src.ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf) + } + + if src.ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1 != nil { + return json.Marshal(&src.ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1) + } + + return nil, nil // no data in anyOf schemas +} + +type NullableManagedServicesUpsertProviderRequestAnyOfScope struct { + value *ManagedServicesUpsertProviderRequestAnyOfScope + isSet bool +} + +func (v NullableManagedServicesUpsertProviderRequestAnyOfScope) Get() *ManagedServicesUpsertProviderRequestAnyOfScope { + return v.value +} + +func (v *NullableManagedServicesUpsertProviderRequestAnyOfScope) Set(val *ManagedServicesUpsertProviderRequestAnyOfScope) { + v.value = val + v.isSet = true +} + +func (v NullableManagedServicesUpsertProviderRequestAnyOfScope) IsSet() bool { + return v.isSet +} + +func (v *NullableManagedServicesUpsertProviderRequestAnyOfScope) Unset() { + v.value = nil + v.isSet = false +} + +func NewNullableManagedServicesUpsertProviderRequestAnyOfScope(val *ManagedServicesUpsertProviderRequestAnyOfScope) *NullableManagedServicesUpsertProviderRequestAnyOfScope { + return &NullableManagedServicesUpsertProviderRequestAnyOfScope{value: val, isSet: true} +} + +func (v NullableManagedServicesUpsertProviderRequestAnyOfScope) MarshalJSON() ([]byte, error) { + return json.Marshal(v.value) +} + +func (v *NullableManagedServicesUpsertProviderRequestAnyOfScope) UnmarshalJSON(src []byte) error { + v.isSet = true + return json.Unmarshal(src, &v.value) +} diff --git a/api/openapi_client/model_managed_services_create_provider_request_any_of_scope_any_of.go b/api/openapi_client/model_managed_services_upsert_provider_request_any_of_scope_any_of.go similarity index 50% rename from api/openapi_client/model_managed_services_create_provider_request_any_of_scope_any_of.go rename to api/openapi_client/model_managed_services_upsert_provider_request_any_of_scope_any_of.go index 994f70fa..b38fc959 100644 --- a/api/openapi_client/model_managed_services_create_provider_request_any_of_scope_any_of.go +++ b/api/openapi_client/model_managed_services_upsert_provider_request_any_of_scope_any_of.go @@ -17,36 +17,36 @@ import ( "fmt" ) -// checks if the ManagedServicesCreateProviderRequestAnyOfScopeAnyOf type satisfies the MappedNullable interface at compile time -var _ MappedNullable = &ManagedServicesCreateProviderRequestAnyOfScopeAnyOf{} +// checks if the ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf type satisfies the MappedNullable interface at compile time +var _ MappedNullable = &ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf{} -// ManagedServicesCreateProviderRequestAnyOfScopeAnyOf struct for ManagedServicesCreateProviderRequestAnyOfScopeAnyOf -type ManagedServicesCreateProviderRequestAnyOfScopeAnyOf struct { +// ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf struct for ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf +type ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf struct { Type string `json:"type"` } -type _ManagedServicesCreateProviderRequestAnyOfScopeAnyOf ManagedServicesCreateProviderRequestAnyOfScopeAnyOf +type _ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf -// NewManagedServicesCreateProviderRequestAnyOfScopeAnyOf instantiates a new ManagedServicesCreateProviderRequestAnyOfScopeAnyOf object +// NewManagedServicesUpsertProviderRequestAnyOfScopeAnyOf instantiates a new ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf object // This constructor will assign default values to properties that have it defined, // and makes sure properties required by API are set, but the set of arguments // will change when the set of required properties is changed -func NewManagedServicesCreateProviderRequestAnyOfScopeAnyOf(type_ string) *ManagedServicesCreateProviderRequestAnyOfScopeAnyOf { - this := ManagedServicesCreateProviderRequestAnyOfScopeAnyOf{} +func NewManagedServicesUpsertProviderRequestAnyOfScopeAnyOf(type_ string) *ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf { + this := ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf{} this.Type = type_ return &this } -// NewManagedServicesCreateProviderRequestAnyOfScopeAnyOfWithDefaults instantiates a new ManagedServicesCreateProviderRequestAnyOfScopeAnyOf object +// NewManagedServicesUpsertProviderRequestAnyOfScopeAnyOfWithDefaults instantiates a new ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf object // This constructor will only assign default values to properties that have it defined, // but it doesn't guarantee that properties required by API are set -func NewManagedServicesCreateProviderRequestAnyOfScopeAnyOfWithDefaults() *ManagedServicesCreateProviderRequestAnyOfScopeAnyOf { - this := ManagedServicesCreateProviderRequestAnyOfScopeAnyOf{} +func NewManagedServicesUpsertProviderRequestAnyOfScopeAnyOfWithDefaults() *ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf { + this := ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf{} return &this } // GetType returns the Type field value -func (o *ManagedServicesCreateProviderRequestAnyOfScopeAnyOf) GetType() string { +func (o *ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf) GetType() string { if o == nil { var ret string return ret @@ -57,7 +57,7 @@ func (o *ManagedServicesCreateProviderRequestAnyOfScopeAnyOf) GetType() string { // GetTypeOk returns a tuple with the Type field value // and a boolean to check if the value has been set. -func (o *ManagedServicesCreateProviderRequestAnyOfScopeAnyOf) GetTypeOk() (*string, bool) { +func (o *ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf) GetTypeOk() (*string, bool) { if o == nil { return nil, false } @@ -65,11 +65,11 @@ func (o *ManagedServicesCreateProviderRequestAnyOfScopeAnyOf) GetTypeOk() (*stri } // SetType sets field value -func (o *ManagedServicesCreateProviderRequestAnyOfScopeAnyOf) SetType(v string) { +func (o *ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf) SetType(v string) { o.Type = v } -func (o ManagedServicesCreateProviderRequestAnyOfScopeAnyOf) MarshalJSON() ([]byte, error) { +func (o ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf) MarshalJSON() ([]byte, error) { toSerialize, err := o.ToMap() if err != nil { return []byte{}, err @@ -77,13 +77,13 @@ func (o ManagedServicesCreateProviderRequestAnyOfScopeAnyOf) MarshalJSON() ([]by return json.Marshal(toSerialize) } -func (o ManagedServicesCreateProviderRequestAnyOfScopeAnyOf) ToMap() (map[string]interface{}, error) { +func (o ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf) ToMap() (map[string]interface{}, error) { toSerialize := map[string]interface{}{} toSerialize["type"] = o.Type return toSerialize, nil } -func (o *ManagedServicesCreateProviderRequestAnyOfScopeAnyOf) UnmarshalJSON(data []byte) (err error) { +func (o *ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf) UnmarshalJSON(data []byte) (err error) { // This validates that all required properties are included in the JSON object // by unmarshalling the object into a generic map with string keys and checking // that every required field exists as a key in the generic map. @@ -105,53 +105,53 @@ func (o *ManagedServicesCreateProviderRequestAnyOfScopeAnyOf) UnmarshalJSON(data } } - varManagedServicesCreateProviderRequestAnyOfScopeAnyOf := _ManagedServicesCreateProviderRequestAnyOfScopeAnyOf{} + varManagedServicesUpsertProviderRequestAnyOfScopeAnyOf := _ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf{} decoder := json.NewDecoder(bytes.NewReader(data)) //decoder.DisallowUnknownFields() - err = decoder.Decode(&varManagedServicesCreateProviderRequestAnyOfScopeAnyOf) + err = decoder.Decode(&varManagedServicesUpsertProviderRequestAnyOfScopeAnyOf) if err != nil { return err } - *o = ManagedServicesCreateProviderRequestAnyOfScopeAnyOf(varManagedServicesCreateProviderRequestAnyOfScopeAnyOf) + *o = ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf(varManagedServicesUpsertProviderRequestAnyOfScopeAnyOf) return err } -type NullableManagedServicesCreateProviderRequestAnyOfScopeAnyOf struct { - value *ManagedServicesCreateProviderRequestAnyOfScopeAnyOf +type NullableManagedServicesUpsertProviderRequestAnyOfScopeAnyOf struct { + value *ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf isSet bool } -func (v NullableManagedServicesCreateProviderRequestAnyOfScopeAnyOf) Get() *ManagedServicesCreateProviderRequestAnyOfScopeAnyOf { +func (v NullableManagedServicesUpsertProviderRequestAnyOfScopeAnyOf) Get() *ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf { return v.value } -func (v *NullableManagedServicesCreateProviderRequestAnyOfScopeAnyOf) Set(val *ManagedServicesCreateProviderRequestAnyOfScopeAnyOf) { +func (v *NullableManagedServicesUpsertProviderRequestAnyOfScopeAnyOf) Set(val *ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf) { v.value = val v.isSet = true } -func (v NullableManagedServicesCreateProviderRequestAnyOfScopeAnyOf) IsSet() bool { +func (v NullableManagedServicesUpsertProviderRequestAnyOfScopeAnyOf) IsSet() bool { return v.isSet } -func (v *NullableManagedServicesCreateProviderRequestAnyOfScopeAnyOf) Unset() { +func (v *NullableManagedServicesUpsertProviderRequestAnyOfScopeAnyOf) Unset() { v.value = nil v.isSet = false } -func NewNullableManagedServicesCreateProviderRequestAnyOfScopeAnyOf(val *ManagedServicesCreateProviderRequestAnyOfScopeAnyOf) *NullableManagedServicesCreateProviderRequestAnyOfScopeAnyOf { - return &NullableManagedServicesCreateProviderRequestAnyOfScopeAnyOf{value: val, isSet: true} +func NewNullableManagedServicesUpsertProviderRequestAnyOfScopeAnyOf(val *ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf) *NullableManagedServicesUpsertProviderRequestAnyOfScopeAnyOf { + return &NullableManagedServicesUpsertProviderRequestAnyOfScopeAnyOf{value: val, isSet: true} } -func (v NullableManagedServicesCreateProviderRequestAnyOfScopeAnyOf) MarshalJSON() ([]byte, error) { +func (v NullableManagedServicesUpsertProviderRequestAnyOfScopeAnyOf) MarshalJSON() ([]byte, error) { return json.Marshal(v.value) } -func (v *NullableManagedServicesCreateProviderRequestAnyOfScopeAnyOf) UnmarshalJSON(src []byte) error { +func (v *NullableManagedServicesUpsertProviderRequestAnyOfScopeAnyOf) UnmarshalJSON(src []byte) error { v.isSet = true return json.Unmarshal(src, &v.value) } diff --git a/api/openapi_client/model_managed_services_create_provider_request_any_of_scope_any_of_1.go b/api/openapi_client/model_managed_services_upsert_provider_request_any_of_scope_any_of_1.go similarity index 53% rename from api/openapi_client/model_managed_services_create_provider_request_any_of_scope_any_of_1.go rename to api/openapi_client/model_managed_services_upsert_provider_request_any_of_scope_any_of_1.go index 59ca750b..037d4e51 100644 --- a/api/openapi_client/model_managed_services_create_provider_request_any_of_scope_any_of_1.go +++ b/api/openapi_client/model_managed_services_upsert_provider_request_any_of_scope_any_of_1.go @@ -17,38 +17,38 @@ import ( "fmt" ) -// checks if the ManagedServicesCreateProviderRequestAnyOfScopeAnyOf1 type satisfies the MappedNullable interface at compile time -var _ MappedNullable = &ManagedServicesCreateProviderRequestAnyOfScopeAnyOf1{} +// checks if the ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1 type satisfies the MappedNullable interface at compile time +var _ MappedNullable = &ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1{} -// ManagedServicesCreateProviderRequestAnyOfScopeAnyOf1 struct for ManagedServicesCreateProviderRequestAnyOfScopeAnyOf1 -type ManagedServicesCreateProviderRequestAnyOfScopeAnyOf1 struct { +// ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1 struct for ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1 +type ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1 struct { Type string `json:"type"` TeamIds []int `json:"teamIds"` } -type _ManagedServicesCreateProviderRequestAnyOfScopeAnyOf1 ManagedServicesCreateProviderRequestAnyOfScopeAnyOf1 +type _ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1 ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1 -// NewManagedServicesCreateProviderRequestAnyOfScopeAnyOf1 instantiates a new ManagedServicesCreateProviderRequestAnyOfScopeAnyOf1 object +// NewManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1 instantiates a new ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1 object // This constructor will assign default values to properties that have it defined, // and makes sure properties required by API are set, but the set of arguments // will change when the set of required properties is changed -func NewManagedServicesCreateProviderRequestAnyOfScopeAnyOf1(type_ string, teamIds []int) *ManagedServicesCreateProviderRequestAnyOfScopeAnyOf1 { - this := ManagedServicesCreateProviderRequestAnyOfScopeAnyOf1{} +func NewManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1(type_ string, teamIds []int) *ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1 { + this := ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1{} this.Type = type_ this.TeamIds = teamIds return &this } -// NewManagedServicesCreateProviderRequestAnyOfScopeAnyOf1WithDefaults instantiates a new ManagedServicesCreateProviderRequestAnyOfScopeAnyOf1 object +// NewManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1WithDefaults instantiates a new ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1 object // This constructor will only assign default values to properties that have it defined, // but it doesn't guarantee that properties required by API are set -func NewManagedServicesCreateProviderRequestAnyOfScopeAnyOf1WithDefaults() *ManagedServicesCreateProviderRequestAnyOfScopeAnyOf1 { - this := ManagedServicesCreateProviderRequestAnyOfScopeAnyOf1{} +func NewManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1WithDefaults() *ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1 { + this := ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1{} return &this } // GetType returns the Type field value -func (o *ManagedServicesCreateProviderRequestAnyOfScopeAnyOf1) GetType() string { +func (o *ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1) GetType() string { if o == nil { var ret string return ret @@ -59,7 +59,7 @@ func (o *ManagedServicesCreateProviderRequestAnyOfScopeAnyOf1) GetType() string // GetTypeOk returns a tuple with the Type field value // and a boolean to check if the value has been set. -func (o *ManagedServicesCreateProviderRequestAnyOfScopeAnyOf1) GetTypeOk() (*string, bool) { +func (o *ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1) GetTypeOk() (*string, bool) { if o == nil { return nil, false } @@ -67,12 +67,12 @@ func (o *ManagedServicesCreateProviderRequestAnyOfScopeAnyOf1) GetTypeOk() (*str } // SetType sets field value -func (o *ManagedServicesCreateProviderRequestAnyOfScopeAnyOf1) SetType(v string) { +func (o *ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1) SetType(v string) { o.Type = v } // GetTeamIds returns the TeamIds field value -func (o *ManagedServicesCreateProviderRequestAnyOfScopeAnyOf1) GetTeamIds() []int { +func (o *ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1) GetTeamIds() []int { if o == nil { var ret []int return ret @@ -83,7 +83,7 @@ func (o *ManagedServicesCreateProviderRequestAnyOfScopeAnyOf1) GetTeamIds() []in // GetTeamIdsOk returns a tuple with the TeamIds field value // and a boolean to check if the value has been set. -func (o *ManagedServicesCreateProviderRequestAnyOfScopeAnyOf1) GetTeamIdsOk() ([]int, bool) { +func (o *ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1) GetTeamIdsOk() ([]int, bool) { if o == nil { return nil, false } @@ -91,11 +91,11 @@ func (o *ManagedServicesCreateProviderRequestAnyOfScopeAnyOf1) GetTeamIdsOk() ([ } // SetTeamIds sets field value -func (o *ManagedServicesCreateProviderRequestAnyOfScopeAnyOf1) SetTeamIds(v []int) { +func (o *ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1) SetTeamIds(v []int) { o.TeamIds = v } -func (o ManagedServicesCreateProviderRequestAnyOfScopeAnyOf1) MarshalJSON() ([]byte, error) { +func (o ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1) MarshalJSON() ([]byte, error) { toSerialize, err := o.ToMap() if err != nil { return []byte{}, err @@ -103,14 +103,14 @@ func (o ManagedServicesCreateProviderRequestAnyOfScopeAnyOf1) MarshalJSON() ([]b return json.Marshal(toSerialize) } -func (o ManagedServicesCreateProviderRequestAnyOfScopeAnyOf1) ToMap() (map[string]interface{}, error) { +func (o ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1) ToMap() (map[string]interface{}, error) { toSerialize := map[string]interface{}{} toSerialize["type"] = o.Type toSerialize["teamIds"] = o.TeamIds return toSerialize, nil } -func (o *ManagedServicesCreateProviderRequestAnyOfScopeAnyOf1) UnmarshalJSON(data []byte) (err error) { +func (o *ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1) UnmarshalJSON(data []byte) (err error) { // This validates that all required properties are included in the JSON object // by unmarshalling the object into a generic map with string keys and checking // that every required field exists as a key in the generic map. @@ -133,53 +133,53 @@ func (o *ManagedServicesCreateProviderRequestAnyOfScopeAnyOf1) UnmarshalJSON(dat } } - varManagedServicesCreateProviderRequestAnyOfScopeAnyOf1 := _ManagedServicesCreateProviderRequestAnyOfScopeAnyOf1{} + varManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1 := _ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1{} decoder := json.NewDecoder(bytes.NewReader(data)) //decoder.DisallowUnknownFields() - err = decoder.Decode(&varManagedServicesCreateProviderRequestAnyOfScopeAnyOf1) + err = decoder.Decode(&varManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1) if err != nil { return err } - *o = ManagedServicesCreateProviderRequestAnyOfScopeAnyOf1(varManagedServicesCreateProviderRequestAnyOfScopeAnyOf1) + *o = ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1(varManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1) return err } -type NullableManagedServicesCreateProviderRequestAnyOfScopeAnyOf1 struct { - value *ManagedServicesCreateProviderRequestAnyOfScopeAnyOf1 +type NullableManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1 struct { + value *ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1 isSet bool } -func (v NullableManagedServicesCreateProviderRequestAnyOfScopeAnyOf1) Get() *ManagedServicesCreateProviderRequestAnyOfScopeAnyOf1 { +func (v NullableManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1) Get() *ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1 { return v.value } -func (v *NullableManagedServicesCreateProviderRequestAnyOfScopeAnyOf1) Set(val *ManagedServicesCreateProviderRequestAnyOfScopeAnyOf1) { +func (v *NullableManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1) Set(val *ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1) { v.value = val v.isSet = true } -func (v NullableManagedServicesCreateProviderRequestAnyOfScopeAnyOf1) IsSet() bool { +func (v NullableManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1) IsSet() bool { return v.isSet } -func (v *NullableManagedServicesCreateProviderRequestAnyOfScopeAnyOf1) Unset() { +func (v *NullableManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1) Unset() { v.value = nil v.isSet = false } -func NewNullableManagedServicesCreateProviderRequestAnyOfScopeAnyOf1(val *ManagedServicesCreateProviderRequestAnyOfScopeAnyOf1) *NullableManagedServicesCreateProviderRequestAnyOfScopeAnyOf1 { - return &NullableManagedServicesCreateProviderRequestAnyOfScopeAnyOf1{value: val, isSet: true} +func NewNullableManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1(val *ManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1) *NullableManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1 { + return &NullableManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1{value: val, isSet: true} } -func (v NullableManagedServicesCreateProviderRequestAnyOfScopeAnyOf1) MarshalJSON() ([]byte, error) { +func (v NullableManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1) MarshalJSON() ([]byte, error) { return json.Marshal(v.value) } -func (v *NullableManagedServicesCreateProviderRequestAnyOfScopeAnyOf1) UnmarshalJSON(src []byte) error { +func (v *NullableManagedServicesUpsertProviderRequestAnyOfScopeAnyOf1) UnmarshalJSON(src []byte) error { v.isSet = true return json.Unmarshal(src, &v.value) } diff --git a/api/openapi_client/model_ssh_delete_public_key_request.go b/api/openapi_client/model_ssh_delete_public_key_request.go new file mode 100644 index 00000000..fba7171e --- /dev/null +++ b/api/openapi_client/model_ssh_delete_public_key_request.go @@ -0,0 +1,157 @@ +// Copyright (c) Codesphere Inc. +// SPDX-License-Identifier: Apache-2.0 + +/* +Codesphere Public API + +API version: 0.1.0 +*/ + +// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. + +package openapi_client + +import ( + "bytes" + "encoding/json" + "fmt" +) + +// checks if the SshDeletePublicKeyRequest type satisfies the MappedNullable interface at compile time +var _ MappedNullable = &SshDeletePublicKeyRequest{} + +// SshDeletePublicKeyRequest struct for SshDeletePublicKeyRequest +type SshDeletePublicKeyRequest struct { + PublicKeyFingerprint string `json:"publicKeyFingerprint"` +} + +type _SshDeletePublicKeyRequest SshDeletePublicKeyRequest + +// NewSshDeletePublicKeyRequest instantiates a new SshDeletePublicKeyRequest object +// This constructor will assign default values to properties that have it defined, +// and makes sure properties required by API are set, but the set of arguments +// will change when the set of required properties is changed +func NewSshDeletePublicKeyRequest(publicKeyFingerprint string) *SshDeletePublicKeyRequest { + this := SshDeletePublicKeyRequest{} + this.PublicKeyFingerprint = publicKeyFingerprint + return &this +} + +// NewSshDeletePublicKeyRequestWithDefaults instantiates a new SshDeletePublicKeyRequest object +// This constructor will only assign default values to properties that have it defined, +// but it doesn't guarantee that properties required by API are set +func NewSshDeletePublicKeyRequestWithDefaults() *SshDeletePublicKeyRequest { + this := SshDeletePublicKeyRequest{} + return &this +} + +// GetPublicKeyFingerprint returns the PublicKeyFingerprint field value +func (o *SshDeletePublicKeyRequest) GetPublicKeyFingerprint() string { + if o == nil { + var ret string + return ret + } + + return o.PublicKeyFingerprint +} + +// GetPublicKeyFingerprintOk returns a tuple with the PublicKeyFingerprint field value +// and a boolean to check if the value has been set. +func (o *SshDeletePublicKeyRequest) GetPublicKeyFingerprintOk() (*string, bool) { + if o == nil { + return nil, false + } + return &o.PublicKeyFingerprint, true +} + +// SetPublicKeyFingerprint sets field value +func (o *SshDeletePublicKeyRequest) SetPublicKeyFingerprint(v string) { + o.PublicKeyFingerprint = v +} + +func (o SshDeletePublicKeyRequest) MarshalJSON() ([]byte, error) { + toSerialize, err := o.ToMap() + if err != nil { + return []byte{}, err + } + return json.Marshal(toSerialize) +} + +func (o SshDeletePublicKeyRequest) ToMap() (map[string]interface{}, error) { + toSerialize := map[string]interface{}{} + toSerialize["publicKeyFingerprint"] = o.PublicKeyFingerprint + return toSerialize, nil +} + +func (o *SshDeletePublicKeyRequest) UnmarshalJSON(data []byte) (err error) { + // This validates that all required properties are included in the JSON object + // by unmarshalling the object into a generic map with string keys and checking + // that every required field exists as a key in the generic map. + requiredProperties := []string{ + "publicKeyFingerprint", + } + + allProperties := make(map[string]interface{}) + + err = json.Unmarshal(data, &allProperties) + + if err != nil { + return err + } + + for _, requiredProperty := range requiredProperties { + if _, exists := allProperties[requiredProperty]; !exists { + return fmt.Errorf("no value given for required property %v", requiredProperty) + } + } + + varSshDeletePublicKeyRequest := _SshDeletePublicKeyRequest{} + + decoder := json.NewDecoder(bytes.NewReader(data)) + //decoder.DisallowUnknownFields() + err = decoder.Decode(&varSshDeletePublicKeyRequest) + + if err != nil { + return err + } + + *o = SshDeletePublicKeyRequest(varSshDeletePublicKeyRequest) + + return err +} + +type NullableSshDeletePublicKeyRequest struct { + value *SshDeletePublicKeyRequest + isSet bool +} + +func (v NullableSshDeletePublicKeyRequest) Get() *SshDeletePublicKeyRequest { + return v.value +} + +func (v *NullableSshDeletePublicKeyRequest) Set(val *SshDeletePublicKeyRequest) { + v.value = val + v.isSet = true +} + +func (v NullableSshDeletePublicKeyRequest) IsSet() bool { + return v.isSet +} + +func (v *NullableSshDeletePublicKeyRequest) Unset() { + v.value = nil + v.isSet = false +} + +func NewNullableSshDeletePublicKeyRequest(val *SshDeletePublicKeyRequest) *NullableSshDeletePublicKeyRequest { + return &NullableSshDeletePublicKeyRequest{value: val, isSet: true} +} + +func (v NullableSshDeletePublicKeyRequest) MarshalJSON() ([]byte, error) { + return json.Marshal(v.value) +} + +func (v *NullableSshDeletePublicKeyRequest) UnmarshalJSON(src []byte) error { + v.isSet = true + return json.Unmarshal(src, &v.value) +} diff --git a/api/openapi_client/model_ssh_list_public_keys_200_response_inner.go b/api/openapi_client/model_ssh_list_public_keys_200_response_inner.go new file mode 100644 index 00000000..9ba10c80 --- /dev/null +++ b/api/openapi_client/model_ssh_list_public_keys_200_response_inner.go @@ -0,0 +1,242 @@ +// Copyright (c) Codesphere Inc. +// SPDX-License-Identifier: Apache-2.0 + +/* +Codesphere Public API + +API version: 0.1.0 +*/ + +// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. + +package openapi_client + +import ( + "bytes" + "encoding/json" + "fmt" + "time" +) + +// checks if the SshListPublicKeys200ResponseInner type satisfies the MappedNullable interface at compile time +var _ MappedNullable = &SshListPublicKeys200ResponseInner{} + +// SshListPublicKeys200ResponseInner struct for SshListPublicKeys200ResponseInner +type SshListPublicKeys200ResponseInner struct { + PublicKey string `json:"publicKey"` + PublicKeyFingerprint string `json:"publicKeyFingerprint"` + Title string `json:"title"` + CreatedAt time.Time `json:"createdAt"` +} + +type _SshListPublicKeys200ResponseInner SshListPublicKeys200ResponseInner + +// NewSshListPublicKeys200ResponseInner instantiates a new SshListPublicKeys200ResponseInner object +// This constructor will assign default values to properties that have it defined, +// and makes sure properties required by API are set, but the set of arguments +// will change when the set of required properties is changed +func NewSshListPublicKeys200ResponseInner(publicKey string, publicKeyFingerprint string, title string, createdAt time.Time) *SshListPublicKeys200ResponseInner { + this := SshListPublicKeys200ResponseInner{} + this.PublicKey = publicKey + this.PublicKeyFingerprint = publicKeyFingerprint + this.Title = title + this.CreatedAt = createdAt + return &this +} + +// NewSshListPublicKeys200ResponseInnerWithDefaults instantiates a new SshListPublicKeys200ResponseInner object +// This constructor will only assign default values to properties that have it defined, +// but it doesn't guarantee that properties required by API are set +func NewSshListPublicKeys200ResponseInnerWithDefaults() *SshListPublicKeys200ResponseInner { + this := SshListPublicKeys200ResponseInner{} + return &this +} + +// GetPublicKey returns the PublicKey field value +func (o *SshListPublicKeys200ResponseInner) GetPublicKey() string { + if o == nil { + var ret string + return ret + } + + return o.PublicKey +} + +// GetPublicKeyOk returns a tuple with the PublicKey field value +// and a boolean to check if the value has been set. +func (o *SshListPublicKeys200ResponseInner) GetPublicKeyOk() (*string, bool) { + if o == nil { + return nil, false + } + return &o.PublicKey, true +} + +// SetPublicKey sets field value +func (o *SshListPublicKeys200ResponseInner) SetPublicKey(v string) { + o.PublicKey = v +} + +// GetPublicKeyFingerprint returns the PublicKeyFingerprint field value +func (o *SshListPublicKeys200ResponseInner) GetPublicKeyFingerprint() string { + if o == nil { + var ret string + return ret + } + + return o.PublicKeyFingerprint +} + +// GetPublicKeyFingerprintOk returns a tuple with the PublicKeyFingerprint field value +// and a boolean to check if the value has been set. +func (o *SshListPublicKeys200ResponseInner) GetPublicKeyFingerprintOk() (*string, bool) { + if o == nil { + return nil, false + } + return &o.PublicKeyFingerprint, true +} + +// SetPublicKeyFingerprint sets field value +func (o *SshListPublicKeys200ResponseInner) SetPublicKeyFingerprint(v string) { + o.PublicKeyFingerprint = v +} + +// GetTitle returns the Title field value +func (o *SshListPublicKeys200ResponseInner) GetTitle() string { + if o == nil { + var ret string + return ret + } + + return o.Title +} + +// GetTitleOk returns a tuple with the Title field value +// and a boolean to check if the value has been set. +func (o *SshListPublicKeys200ResponseInner) GetTitleOk() (*string, bool) { + if o == nil { + return nil, false + } + return &o.Title, true +} + +// SetTitle sets field value +func (o *SshListPublicKeys200ResponseInner) SetTitle(v string) { + o.Title = v +} + +// GetCreatedAt returns the CreatedAt field value +func (o *SshListPublicKeys200ResponseInner) GetCreatedAt() time.Time { + if o == nil { + var ret time.Time + return ret + } + + return o.CreatedAt +} + +// GetCreatedAtOk returns a tuple with the CreatedAt field value +// and a boolean to check if the value has been set. +func (o *SshListPublicKeys200ResponseInner) GetCreatedAtOk() (*time.Time, bool) { + if o == nil { + return nil, false + } + return &o.CreatedAt, true +} + +// SetCreatedAt sets field value +func (o *SshListPublicKeys200ResponseInner) SetCreatedAt(v time.Time) { + o.CreatedAt = v +} + +func (o SshListPublicKeys200ResponseInner) MarshalJSON() ([]byte, error) { + toSerialize, err := o.ToMap() + if err != nil { + return []byte{}, err + } + return json.Marshal(toSerialize) +} + +func (o SshListPublicKeys200ResponseInner) ToMap() (map[string]interface{}, error) { + toSerialize := map[string]interface{}{} + toSerialize["publicKey"] = o.PublicKey + toSerialize["publicKeyFingerprint"] = o.PublicKeyFingerprint + toSerialize["title"] = o.Title + toSerialize["createdAt"] = o.CreatedAt + return toSerialize, nil +} + +func (o *SshListPublicKeys200ResponseInner) UnmarshalJSON(data []byte) (err error) { + // This validates that all required properties are included in the JSON object + // by unmarshalling the object into a generic map with string keys and checking + // that every required field exists as a key in the generic map. + requiredProperties := []string{ + "publicKey", + "publicKeyFingerprint", + "title", + "createdAt", + } + + allProperties := make(map[string]interface{}) + + err = json.Unmarshal(data, &allProperties) + + if err != nil { + return err + } + + for _, requiredProperty := range requiredProperties { + if _, exists := allProperties[requiredProperty]; !exists { + return fmt.Errorf("no value given for required property %v", requiredProperty) + } + } + + varSshListPublicKeys200ResponseInner := _SshListPublicKeys200ResponseInner{} + + decoder := json.NewDecoder(bytes.NewReader(data)) + //decoder.DisallowUnknownFields() + err = decoder.Decode(&varSshListPublicKeys200ResponseInner) + + if err != nil { + return err + } + + *o = SshListPublicKeys200ResponseInner(varSshListPublicKeys200ResponseInner) + + return err +} + +type NullableSshListPublicKeys200ResponseInner struct { + value *SshListPublicKeys200ResponseInner + isSet bool +} + +func (v NullableSshListPublicKeys200ResponseInner) Get() *SshListPublicKeys200ResponseInner { + return v.value +} + +func (v *NullableSshListPublicKeys200ResponseInner) Set(val *SshListPublicKeys200ResponseInner) { + v.value = val + v.isSet = true +} + +func (v NullableSshListPublicKeys200ResponseInner) IsSet() bool { + return v.isSet +} + +func (v *NullableSshListPublicKeys200ResponseInner) Unset() { + v.value = nil + v.isSet = false +} + +func NewNullableSshListPublicKeys200ResponseInner(val *SshListPublicKeys200ResponseInner) *NullableSshListPublicKeys200ResponseInner { + return &NullableSshListPublicKeys200ResponseInner{value: val, isSet: true} +} + +func (v NullableSshListPublicKeys200ResponseInner) MarshalJSON() ([]byte, error) { + return json.Marshal(v.value) +} + +func (v *NullableSshListPublicKeys200ResponseInner) UnmarshalJSON(src []byte) error { + v.isSet = true + return json.Unmarshal(src, &v.value) +} diff --git a/api/openapi_client/model_ssh_upload_public_key_request.go b/api/openapi_client/model_ssh_upload_public_key_request.go new file mode 100644 index 00000000..42d9b019 --- /dev/null +++ b/api/openapi_client/model_ssh_upload_public_key_request.go @@ -0,0 +1,157 @@ +// Copyright (c) Codesphere Inc. +// SPDX-License-Identifier: Apache-2.0 + +/* +Codesphere Public API + +API version: 0.1.0 +*/ + +// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. + +package openapi_client + +import ( + "bytes" + "encoding/json" + "fmt" +) + +// checks if the SshUploadPublicKeyRequest type satisfies the MappedNullable interface at compile time +var _ MappedNullable = &SshUploadPublicKeyRequest{} + +// SshUploadPublicKeyRequest A public SSH key uploaded for the authenticated user. +type SshUploadPublicKeyRequest struct { + PublicKey string `json:"publicKey"` +} + +type _SshUploadPublicKeyRequest SshUploadPublicKeyRequest + +// NewSshUploadPublicKeyRequest instantiates a new SshUploadPublicKeyRequest object +// This constructor will assign default values to properties that have it defined, +// and makes sure properties required by API are set, but the set of arguments +// will change when the set of required properties is changed +func NewSshUploadPublicKeyRequest(publicKey string) *SshUploadPublicKeyRequest { + this := SshUploadPublicKeyRequest{} + this.PublicKey = publicKey + return &this +} + +// NewSshUploadPublicKeyRequestWithDefaults instantiates a new SshUploadPublicKeyRequest object +// This constructor will only assign default values to properties that have it defined, +// but it doesn't guarantee that properties required by API are set +func NewSshUploadPublicKeyRequestWithDefaults() *SshUploadPublicKeyRequest { + this := SshUploadPublicKeyRequest{} + return &this +} + +// GetPublicKey returns the PublicKey field value +func (o *SshUploadPublicKeyRequest) GetPublicKey() string { + if o == nil { + var ret string + return ret + } + + return o.PublicKey +} + +// GetPublicKeyOk returns a tuple with the PublicKey field value +// and a boolean to check if the value has been set. +func (o *SshUploadPublicKeyRequest) GetPublicKeyOk() (*string, bool) { + if o == nil { + return nil, false + } + return &o.PublicKey, true +} + +// SetPublicKey sets field value +func (o *SshUploadPublicKeyRequest) SetPublicKey(v string) { + o.PublicKey = v +} + +func (o SshUploadPublicKeyRequest) MarshalJSON() ([]byte, error) { + toSerialize, err := o.ToMap() + if err != nil { + return []byte{}, err + } + return json.Marshal(toSerialize) +} + +func (o SshUploadPublicKeyRequest) ToMap() (map[string]interface{}, error) { + toSerialize := map[string]interface{}{} + toSerialize["publicKey"] = o.PublicKey + return toSerialize, nil +} + +func (o *SshUploadPublicKeyRequest) UnmarshalJSON(data []byte) (err error) { + // This validates that all required properties are included in the JSON object + // by unmarshalling the object into a generic map with string keys and checking + // that every required field exists as a key in the generic map. + requiredProperties := []string{ + "publicKey", + } + + allProperties := make(map[string]interface{}) + + err = json.Unmarshal(data, &allProperties) + + if err != nil { + return err + } + + for _, requiredProperty := range requiredProperties { + if _, exists := allProperties[requiredProperty]; !exists { + return fmt.Errorf("no value given for required property %v", requiredProperty) + } + } + + varSshUploadPublicKeyRequest := _SshUploadPublicKeyRequest{} + + decoder := json.NewDecoder(bytes.NewReader(data)) + //decoder.DisallowUnknownFields() + err = decoder.Decode(&varSshUploadPublicKeyRequest) + + if err != nil { + return err + } + + *o = SshUploadPublicKeyRequest(varSshUploadPublicKeyRequest) + + return err +} + +type NullableSshUploadPublicKeyRequest struct { + value *SshUploadPublicKeyRequest + isSet bool +} + +func (v NullableSshUploadPublicKeyRequest) Get() *SshUploadPublicKeyRequest { + return v.value +} + +func (v *NullableSshUploadPublicKeyRequest) Set(val *SshUploadPublicKeyRequest) { + v.value = val + v.isSet = true +} + +func (v NullableSshUploadPublicKeyRequest) IsSet() bool { + return v.isSet +} + +func (v *NullableSshUploadPublicKeyRequest) Unset() { + v.value = nil + v.isSet = false +} + +func NewNullableSshUploadPublicKeyRequest(val *SshUploadPublicKeyRequest) *NullableSshUploadPublicKeyRequest { + return &NullableSshUploadPublicKeyRequest{value: val, isSet: true} +} + +func (v NullableSshUploadPublicKeyRequest) MarshalJSON() ([]byte, error) { + return json.Marshal(v.value) +} + +func (v *NullableSshUploadPublicKeyRequest) UnmarshalJSON(src []byte) error { + v.isSet = true + return json.Unmarshal(src, &v.value) +} From e82d47e64caf5660dc111739788e83f50588ca41 Mon Sep 17 00:00:00 2001 From: Maximilian Date: Mon, 6 Jul 2026 17:30:16 +0200 Subject: [PATCH 58/61] rebased on main Signed-off-by: Maximilian --- pkg/tmpl/NOTICE | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/tmpl/NOTICE b/pkg/tmpl/NOTICE index d3444d50..7ef9d38d 100644 --- a/pkg/tmpl/NOTICE +++ b/pkg/tmpl/NOTICE @@ -263,15 +263,15 @@ License URL: https://github.com/munnerz/goautoneg/blob/a7dc8b61c822/LICENSE ---------- Module: github.com/onsi/ginkgo/v2 -Version: v2.31.0 +Version: v2.32.0 License: MIT -License URL: https://github.com/onsi/ginkgo/blob/v2.31.0/LICENSE +License URL: https://github.com/onsi/ginkgo/blob/v2.32.0/LICENSE ---------- Module: github.com/onsi/gomega -Version: v1.42.0 +Version: v1.42.1 License: MIT -License URL: https://github.com/onsi/gomega/blob/v1.42.0/LICENSE +License URL: https://github.com/onsi/gomega/blob/v1.42.1/LICENSE ---------- Module: github.com/pjbgf/sha1cd From 1fee531fbce7ea94d7be36b91f5e4a17ffb7e48b Mon Sep 17 00:00:00 2001 From: Maximilian Date: Mon, 6 Jul 2026 17:37:15 +0200 Subject: [PATCH 59/61] fix: suppress unused variable warning by ignoring Close return value in team creation tests Signed-off-by: Maximilian --- cli/cmd/team_create_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cli/cmd/team_create_test.go b/cli/cmd/team_create_test.go index 8a781a6e..ad31d808 100644 --- a/cli/cmd/team_create_test.go +++ b/cli/cmd/team_create_test.go @@ -84,7 +84,7 @@ var _ = Describe("CreateTeam", func() { err := c.RunE(nil, []string{}) Expect(err).ToNot(HaveOccurred()) - w.Close() + _ = w.Close() var buf bytes.Buffer _, _ = io.Copy(&buf, r) os.Stdout = oldStdout @@ -110,7 +110,7 @@ var _ = Describe("CreateTeam", func() { err := c.RunE(nil, []string{}) Expect(err).ToNot(HaveOccurred()) - w.Close() + _ = w.Close() var buf bytes.Buffer _, _ = io.Copy(&buf, r) os.Stdout = oldStdout From 3112fe99afed413f36f4bff45f854541da6f7620 Mon Sep 17 00:00:00 2001 From: Maximilian Date: Tue, 7 Jul 2026 10:26:58 +0200 Subject: [PATCH 60/61] removed unnecessary comment for team member add because there the Org id is not required Signed-off-by: Maximilian --- cli/cmd/team_add_member.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cli/cmd/team_add_member.go b/cli/cmd/team_add_member.go index 1ec46b5d..2bd19a94 100644 --- a/cli/cmd/team_add_member.go +++ b/cli/cmd/team_add_member.go @@ -33,11 +33,10 @@ func AddAddTeamMemberCmd(team *cobra.Command, opts *GlobalOptions) { Short: "Add team member", Long: io.Long(`Add team member to a team. - To add a member to a team within an organization, the CS_ORG_ID environment variable or the -O/--org flag must be set.`), + To add a member to a team within an organization or a standalone team`), Example: io.FormatExampleCommands("team member add", []io.Example{ {Cmd: "-t -e user@example.com -r 1", Desc: "Add a user to a team as a member"}, {Cmd: "-t -e admin@example.com -r -1", Desc: "Add a user to a team as an admin"}, - {Cmd: "-O -t -e user@example.com -r 1", Desc: "Add a user to a team within an organization"}, }), }, Opts: AddTeamMemberOpts{ From 82347eacdc5a7dd22016345185f46ff05190f512 Mon Sep 17 00:00:00 2001 From: DerBurri <7892993+DerBurri@users.noreply.github.com> Date: Tue, 7 Jul 2026 08:28:20 +0000 Subject: [PATCH 61/61] chore(docs): Auto-update docs and licenses Signed-off-by: DerBurri <7892993+DerBurri@users.noreply.github.com> --- NOTICE | 4 ++-- docs/cs_team_member_add.md | 9 +++------ pkg/tmpl/NOTICE | 4 ++-- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/NOTICE b/NOTICE index 7ef9d38d..876cb80f 100644 --- a/NOTICE +++ b/NOTICE @@ -509,9 +509,9 @@ License URL: https://cs.opensource.google/go/x/time/+/v0.15.0:LICENSE ---------- Module: golang.org/x/tools -Version: v0.46.0 +Version: v0.47.0 License: BSD-3-Clause -License URL: https://cs.opensource.google/go/x/tools/+/v0.46.0:LICENSE +License URL: https://cs.opensource.google/go/x/tools/+/v0.47.0:LICENSE ---------- Module: google.golang.org/protobuf diff --git a/docs/cs_team_member_add.md b/docs/cs_team_member_add.md index fbd24c0f..4814120d 100644 --- a/docs/cs_team_member_add.md +++ b/docs/cs_team_member_add.md @@ -6,7 +6,7 @@ Add team member Add team member to a team. -To add a member to a team within an organization, the CS_ORG_ID environment variable or the -O/--org flag must be set. +To add a member to a team within an organization or a standalone team ``` cs team member add [flags] @@ -19,10 +19,7 @@ cs team member add [flags] $ cs team member add -t -e user@example.com -r 1 # Add a user to a team as an admin -$ cs team member add -t -e admin@example.com -r 0 - -# Add a user to a team within an organization -$ cs team member add -O -t -e user@example.com -r 1 +$ cs team member add -t -e admin@example.com -r -1 ``` ### Options @@ -30,7 +27,7 @@ $ cs team member add -O -t -e user@example.com -r 1 ``` -e, --email string Team member email -h, --help help for add - -r, --role int Team member role 0=admin, 1=member + -r, --role int Team member role 1=member, -1=admin (default 1) ``` ### Options inherited from parent commands diff --git a/pkg/tmpl/NOTICE b/pkg/tmpl/NOTICE index 7ef9d38d..876cb80f 100644 --- a/pkg/tmpl/NOTICE +++ b/pkg/tmpl/NOTICE @@ -509,9 +509,9 @@ License URL: https://cs.opensource.google/go/x/time/+/v0.15.0:LICENSE ---------- Module: golang.org/x/tools -Version: v0.46.0 +Version: v0.47.0 License: BSD-3-Clause -License URL: https://cs.opensource.google/go/x/tools/+/v0.46.0:LICENSE +License URL: https://cs.opensource.google/go/x/tools/+/v0.47.0:LICENSE ---------- Module: google.golang.org/protobuf