Skip to content

Commit 0cfe85d

Browse files
authored
Merge pull request #1113 from timofurrer/bugfix/issue-1110
Fix handling removal from state of microsoft teams integration resource
2 parents 76daeb3 + 910192e commit 0cfe85d

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

internal/provider/resource_gitlab_service_microsoft_teams.go

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -143,23 +143,18 @@ func resourceGitlabServiceMicrosoftTeamsRead(ctx context.Context, d *schema.Reso
143143
client := meta.(*gitlab.Client)
144144
project := d.Id()
145145

146-
p, _, err := client.Projects.GetProject(project, nil, gitlab.WithContext(ctx))
146+
log.Printf("[DEBUG] Read Gitlab Microsoft Teams service for project %s", d.Id())
147+
148+
teamsService, _, err := client.Services.GetMicrosoftTeamsService(project, gitlab.WithContext(ctx))
147149
if err != nil {
148150
if is404(err) {
149-
log.Printf("[DEBUG] Removing Gitlab Microsoft Teams service %s because project %s not found", d.Id(), p.Name)
151+
log.Printf("[DEBUG] Unable to find Gitlab Microsoft Teams service in project %s, removing from state", project)
150152
d.SetId("")
151153
return nil
152154
}
153155
return diag.FromErr(err)
154156
}
155157

156-
log.Printf("[DEBUG] Read Gitlab Microsoft Teams service for project %s", d.Id())
157-
158-
teamsService, _, err := client.Services.GetMicrosoftTeamsService(project, gitlab.WithContext(ctx))
159-
if err != nil {
160-
return diag.FromErr(err)
161-
}
162-
163158
d.Set("project", project)
164159
d.Set("created_at", teamsService.CreatedAt.String())
165160
d.Set("updated_at", teamsService.UpdatedAt.String())

0 commit comments

Comments
 (0)