Skip to content

Commit 5ed07f5

Browse files
committed
Add back Description fields which got removed by migration tool
1 parent 82b81d6 commit 5ed07f5

4 files changed

+16
-7
lines changed

gitlab/data_source_gitlab_project_protected_branch.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,8 @@ func convertBranchAccessDescriptionsToStateBranchAccessDescriptions(descriptions
135135

136136
func convertBranchAccessDescriptionToStateBranchAccessDescription(description *gitlab.BranchAccessDescription) stateBranchAccessDescription {
137137
stateDescription := stateBranchAccessDescription{
138-
AccessLevel: accessLevel[description.AccessLevel],
138+
AccessLevel: accessLevel[description.AccessLevel],
139+
AccessLevelDescription: description.AccessLevelDescription,
139140
}
140141
if description.UserID != 0 {
141142
stateDescription.UserID = description.UserID

gitlab/resource_gitlab_branch_protection.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,8 @@ func convertAllowedAccessLevelsToBranchAccessDescriptions(descriptions []*gitlab
282282
continue
283283
}
284284
result = append(result, stateBranchAccessDescription{
285-
AccessLevel: accessLevel[description.AccessLevel],
285+
AccessLevel: accessLevel[description.AccessLevel],
286+
AccessLevelDescription: description.AccessLevelDescription,
286287
})
287288
}
288289

@@ -297,9 +298,10 @@ func convertAllowedToToBranchAccessDescriptions(descriptions []*gitlab.BranchAcc
297298
continue
298299
}
299300
result = append(result, stateBranchAccessDescription{
300-
AccessLevel: accessLevel[description.AccessLevel],
301-
UserID: description.UserID,
302-
GroupID: description.GroupID,
301+
AccessLevel: accessLevel[description.AccessLevel],
302+
AccessLevelDescription: description.AccessLevelDescription,
303+
UserID: description.UserID,
304+
GroupID: description.GroupID,
303305
})
304306
}
305307

gitlab/resource_gitlab_pipeline_schedule.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ func resourceGitlabPipelineScheduleCreate(ctx context.Context, d *schema.Resourc
6868
client := meta.(*gitlab.Client)
6969
project := d.Get("project").(string)
7070
options := &gitlab.CreatePipelineScheduleOptions{
71+
Description: gitlab.String(d.Get("description").(string)),
7172
Ref: gitlab.String(d.Get("ref").(string)),
7273
Cron: gitlab.String(d.Get("cron").(string)),
7374
CronTimezone: gitlab.String(d.Get("cron_timezone").(string)),
@@ -139,6 +140,7 @@ func resourceGitlabPipelineScheduleUpdate(ctx context.Context, d *schema.Resourc
139140
client := meta.(*gitlab.Client)
140141
project := d.Get("project").(string)
141142
options := &gitlab.EditPipelineScheduleOptions{
143+
Description: gitlab.String(d.Get("description").(string)),
142144
Ref: gitlab.String(d.Get("ref").(string)),
143145
Cron: gitlab.String(d.Get("cron").(string)),
144146
CronTimezone: gitlab.String(d.Get("cron_timezone").(string)),

gitlab/resource_gitlab_pipeline_trigger.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ func resourceGitlabPipelineTrigger() *schema.Resource {
4747
func resourceGitlabPipelineTriggerCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
4848
client := meta.(*gitlab.Client)
4949
project := d.Get("project").(string)
50-
options := &gitlab.AddPipelineTriggerOptions{}
50+
options := &gitlab.AddPipelineTriggerOptions{
51+
Description: gitlab.String(d.Get("description").(string)),
52+
}
5153

5254
log.Printf("[DEBUG] create gitlab PipelineTrigger %s", *options.Description)
5355

@@ -91,7 +93,9 @@ func resourceGitlabPipelineTriggerRead(ctx context.Context, d *schema.ResourceDa
9193
func resourceGitlabPipelineTriggerUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
9294
client := meta.(*gitlab.Client)
9395
project := d.Get("project").(string)
94-
options := &gitlab.EditPipelineTriggerOptions{}
96+
options := &gitlab.EditPipelineTriggerOptions{
97+
Description: gitlab.String(d.Get("description").(string)),
98+
}
9599

96100
pipelineTriggerID, err := strconv.Atoi(d.Id())
97101

0 commit comments

Comments
 (0)