lerentis/terraform-provider-gitea
1
0
Fork 0
Code Issues 4 Pull Requests Projects 1 Releases Wiki Activity

update to latest sdk

Browse Source
This commit is contained in:
techknowlogick
2022-03-31 19:19:14 -04:00
parent 4fbedb01b5
commit 75efa3bc7c
5 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gitea/config.go
View File

@ -59,7 +59,10 @@ func (c *Config) Client() (interface{}, error) {
c.BaseURL = "https://gitea.com"
}
client := gitea.NewClient(c.BaseURL, c.Token)
var client *gitea.Client
if c.Token != "" {
client, _ = gitea.NewClient(c.BaseURL, gitea.SetToken(c.Token))
}
client.SetHTTPClient(httpClient)
if c.Username != "" {
@ -67,7 +70,7 @@ func (c *Config) Client() (interface{}, error) {
}
// Test the credentials by checking we can get information about the authenticated user.
_, err := client.GetMyUserInfo()
_, _, err := client.GetMyUserInfo()
return client, err
}

2
gitea/data_source_gitea_org.go
View File

@ -65,7 +65,7 @@ func dataSourceGitlabOrgRead(d *schema.ResourceData, meta interface{}) error {
}
name := strings.ToLower(nameData.(string))
org, err = client.GetOrg(name)
org, _, err = client.GetOrg(name)
if err != nil {
return err
}

4
gitea/data_source_gitea_user.go
View File

@ -65,11 +65,11 @@ func dataSourceGitlabUserRead(d *schema.ResourceData, meta interface{}) error {
usernameData, usernameOk := d.GetOk("username")
if !usernameOk {
user, err = client.GetMyUserInfo()
user, _, err = client.GetMyUserInfo()
} else {
username := strings.ToLower(usernameData.(string))
user, err = client.GetUserInfo(username)
user, _, err = client.GetUserInfo(username)
if err != nil {
return err
}