diff --git a/README.md b/README.md index 70e3168..7717bd8 100644 --- a/README.md +++ b/README.md @@ -93,7 +93,7 @@ Also creates the following files: ### `out`: Publish a release. -Given a `commitish` and `tag`, this tags the commit and creates a release on GitLab, then uploads the files +Given a `commit_sha` and `tag`, this tags the commit and creates a release on GitLab, then uploads the files matching the patterns in `globs` to the release. #### Parameters diff --git a/gitlab.go b/gitlab.go index 4163a4b..2fd8065 100644 --- a/gitlab.go +++ b/gitlab.go @@ -31,14 +31,14 @@ type GitLab interface { DownloadProjectFile(url, file string) error } -type gitlabClient struct { +type GitlabClient struct { client *gitlab.Client accessToken string repository string } -func NewGitLabClient(source Source) (*gitlabClient, error) { +func NewGitLabClient(source Source) (*GitlabClient, error) { var httpClient = &http.Client{} var ctx = context.TODO() @@ -51,23 +51,23 @@ func NewGitLabClient(source Source) (*gitlabClient, error) { client := gitlab.NewClient(httpClient, source.AccessToken) - if source.GitlabAPIURL != "" { + if source.GitLabAPIURL != "" { var err error - baseUrl, err := url.Parse(source.GitlabAPIURL) + baseUrl, err := url.Parse(source.GitLabAPIURL) if err != nil { return nil, err } client.SetBaseURL(baseUrl.String()) } - return &gitlabClient{ + return &GitlabClient{ client: client, repository: source.Repository, accessToken: source.AccessToken, }, nil } -func (g *gitlabClient) ListTags() ([]*gitlab.Tag, error) { +func (g *GitlabClient) ListTags() ([]*gitlab.Tag, error) { var allTags []*gitlab.Tag opt := &gitlab.ListTagsOptions{ @@ -97,7 +97,7 @@ func (g *gitlabClient) ListTags() ([]*gitlab.Tag, error) { return allTags, nil } -func (g *gitlabClient) ListTagsUntil(tag_name string) ([]*gitlab.Tag, error) { +func (g *GitlabClient) ListTagsUntil(tag_name string) ([]*gitlab.Tag, error) { var allTags []*gitlab.Tag opt := &gitlab.ListTagsOptions{ @@ -138,7 +138,7 @@ func (g *gitlabClient) ListTagsUntil(tag_name string) ([]*gitlab.Tag, error) { return allTags, nil } -func (g *gitlabClient) GetTag(tag_name string) (*gitlab.Tag, error) { +func (g *GitlabClient) GetTag(tag_name string) (*gitlab.Tag, error) { tag, res, err := g.client.Tags.GetTag(g.repository, tag_name) if err != nil { return &gitlab.Tag{}, err @@ -152,7 +152,7 @@ func (g *gitlabClient) GetTag(tag_name string) (*gitlab.Tag, error) { return tag, nil } -func (g *gitlabClient) CreateTag(ref string, tag_name string) (*gitlab.Tag, error) { +func (g *GitlabClient) CreateTag(ref string, tag_name string) (*gitlab.Tag, error) { opt := &gitlab.CreateTagOptions{ TagName: gitlab.String(tag_name), Ref: gitlab.String(ref), @@ -172,7 +172,7 @@ func (g *gitlabClient) CreateTag(ref string, tag_name string) (*gitlab.Tag, erro return tag, nil } -func (g *gitlabClient) CreateRelease(tag_name string, description string) (*gitlab.Release, error) { +func (g *GitlabClient) CreateRelease(tag_name string, description string) (*gitlab.Release, error) { opt := &gitlab.CreateReleaseOptions{ Description: gitlab.String(description), } @@ -196,7 +196,7 @@ func (g *gitlabClient) CreateRelease(tag_name string, description string) (*gitl return release, nil } -func (g *gitlabClient) UpdateRelease(tag_name string, description string) (*gitlab.Release, error) { +func (g *GitlabClient) UpdateRelease(tag_name string, description string) (*gitlab.Release, error) { opt := &gitlab.UpdateReleaseOptions{ Description: gitlab.String(description), } @@ -214,7 +214,7 @@ func (g *gitlabClient) UpdateRelease(tag_name string, description string) (*gitl return release, nil } -func (g *gitlabClient) UploadProjectFile(file string) (*gitlab.ProjectFile, error) { +func (g *GitlabClient) UploadProjectFile(file string) (*gitlab.ProjectFile, error) { projectFile, res, err := g.client.Projects.UploadFile(g.repository, file) if err != nil { return &gitlab.ProjectFile{}, err @@ -228,7 +228,7 @@ func (g *gitlabClient) UploadProjectFile(file string) (*gitlab.ProjectFile, erro return projectFile, nil } -func (g *gitlabClient) DownloadProjectFile(filePath, destPath string) error { +func (g *GitlabClient) DownloadProjectFile(filePath, destPath string) error { out, err := os.Create(destPath) if err != nil { return err diff --git a/metadata.go b/metadata.go index fb9da84..6950501 100644 --- a/metadata.go +++ b/metadata.go @@ -7,7 +7,7 @@ func metadataFromTag(tag *gitlab.Tag) []MetadataPair { if tag.Name != "" { nameMeta := MetadataPair{ - Name: "name", + Name: "tag", Value: tag.Name, } diff --git a/resources.go b/resources.go index 435030c..730d45e 100644 --- a/resources.go +++ b/resources.go @@ -3,7 +3,7 @@ package resource type Source struct { Repository string `json:"repository"` - GitlabAPIURL string `json:"gitlab_api_url"` + GitLabAPIURL string `json:"gitlab_api_url"` AccessToken string `json:"access_token"` Insecure bool `json:"insecure"`