diff --git a/clients/gitlab/client.go b/clients/gitlab/client.go index 45e7cd945e4993ac43b9e320edd275e8cdf1dd72..7b39504e56c0f81068f3749092fa027712f0f074 100644 --- a/clients/gitlab/client.go +++ b/clients/gitlab/client.go @@ -599,8 +599,8 @@ func (r Client) GetProjects(search *string) ([]*gogitlab.Project, error) { ListOptions: listOptions, OrderBy: &orderBy, } - // if search defined add it to opts + // if search defined add it to opts if search != nil { opts.Search = search } @@ -629,7 +629,7 @@ func (r Client) GetProjects(search *string) ([]*gogitlab.Project, error) { } // AddProject - -func (r Client) AddProject(createProjectOptions gogitlab.CreateProjectOptions, groupID int) (*gogitlab.Project, int, error) { +func (r Client) AddProject(createProjectOptions gogitlab.CreateProjectOptions) (*gogitlab.Project, int, error) { logPrefix := "AddProject" // force visibility to private var visibility = gogitlab.PrivateVisibility @@ -638,7 +638,7 @@ func (r Client) AddProject(createProjectOptions gogitlab.CreateProjectOptions, g Name: createProjectOptions.Name, Path: createProjectOptions.Path, Description: createProjectOptions.Description, - NamespaceID: &groupID, + NamespaceID: createProjectOptions.NamespaceID, // hard coded values Visibility: &visibility, } diff --git a/clients/gitlab/client_test.go b/clients/gitlab/client_test.go index c37374f6bd0e9630b58a31f09b84b6d736928e13..9073ddc5ea7a86b1096d12281566431a2771e246 100644 --- a/clients/gitlab/client_test.go +++ b/clients/gitlab/client_test.go @@ -937,9 +937,10 @@ func TestClient_AddProject(t *testing.T) { defer httpmock.DeactivateAndReset() testProjectID := 1 + testGroupID := 12 testProjectName := "testProjectName" testProject := gogitlab.Project{ID: testProjectID, Name: testProjectName} - createTestProjetOptions := gogitlab.CreateProjectOptions{Name: &testProjectName} + createTestProjetOptions := gogitlab.CreateProjectOptions{Name: &testProjectName, NamespaceID: &testGroupID} httpmock.RegisterResponder("POST", "https://test/api/v4/projects", @@ -959,7 +960,6 @@ func TestClient_AddProject(t *testing.T) { } type args struct { createProjectOptions *gogitlab.CreateProjectOptions - groupID int } tests := []struct { name string @@ -985,7 +985,7 @@ func TestClient_AddProject(t *testing.T) { token: tt.fields.token, apiURL: tt.fields.apiURL, } - got, got1, err := r.AddProject(*tt.args.createProjectOptions, tt.args.groupID) + got, got1, err := r.AddProject(*tt.args.createProjectOptions) if (err != nil) != tt.wantErr { t.Errorf("Client.AddProject() error = %v, wantErr %v", err, tt.wantErr) return diff --git a/integration-tests/gitlab/api/gitlab_api_adhoc_test.go b/integration-tests/gitlab/api/gitlab_api_adhoc_test.go index b21e399c74ead84d0d5a8cb45083733477391648..4e50afd3e36d9daca1f9dfb9e1c7297156c77242 100644 --- a/integration-tests/gitlab/api/gitlab_api_adhoc_test.go +++ b/integration-tests/gitlab/api/gitlab_api_adhoc_test.go @@ -3,15 +3,13 @@ package integration import ( - "testing" "errors" "os" + "testing" gitlab "valkyrie.dso.mil/valkyrie-api/clients/gitlab" - - gogitlab "github.com/xanzy/go-gitlab" ) -// getClient_AdHoc - +// getClient_AdHoc - func getClient_AdHoc() (gitlab.Client, error) { gitlabAPIURL, ok := os.LookupEnv("GITLAB_API_URL") if !ok { @@ -21,7 +19,7 @@ func getClient_AdHoc() (gitlab.Client, error) { if !ok { return gitlab.Client{}, errors.New("env variable GITLAB_API_TOKEN undefinded") } - var client = gitlab.NewClient(gitlabAPIURL, gitlabAPIToken,nil) + var client = gitlab.NewClient(gitlabAPIURL, gitlabAPIToken, nil) return client, nil } func TestClient_AdHoc_getUsers_All(t *testing.T) { @@ -37,7 +35,7 @@ func TestClient_AdHoc_getUsers_All(t *testing.T) { return } t.Logf("GetUsers %d", len(got)) - for x:=0;x