Skip to content

Commit 3a7179b

Browse files
committed
allow step names to be empty
1 parent 478f7e5 commit 3a7179b

File tree

2 files changed

+14
-9
lines changed

2 files changed

+14
-9
lines changed

internal/provider/devhub_workflow_resource.go

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -298,8 +298,10 @@ func (r *workflowResource) Create(ctx context.Context, req resource.CreateReques
298298

299299
var steps []devhub.WorkflowStep
300300
for _, step := range plan.Steps {
301-
workflowStep := devhub.WorkflowStep{
302-
Name: step.Name.ValueString(),
301+
workflowStep := devhub.WorkflowStep{}
302+
303+
if step.Name.ValueString() != "" {
304+
workflowStep.Name = step.Name.ValueString()
303305
}
304306

305307
if step.ApiAction != nil {
@@ -439,8 +441,11 @@ func (r *workflowResource) Read(ctx context.Context, req resource.ReadRequest, r
439441
var stateSteps []workflowStepModel
440442
for _, step := range workflow.Steps {
441443
stepModel := workflowStepModel{
442-
Id: types.StringValue(step.Id),
443-
Name: types.StringValue(step.Name),
444+
Id: types.StringValue(step.Id),
445+
}
446+
447+
if step.Name != "" {
448+
stepModel.Name = types.StringValue(step.Name)
444449
}
445450

446451
switch step.Action.Type {
@@ -524,8 +529,11 @@ func (r *workflowResource) Update(ctx context.Context, req resource.UpdateReques
524529
var steps []devhub.WorkflowStep
525530
for _, step := range plan.Steps {
526531
workflowStep := devhub.WorkflowStep{
527-
Id: step.Id.ValueString(),
528-
Name: step.Name.ValueString(),
532+
Id: step.Id.ValueString(),
533+
}
534+
535+
if step.Name.ValueString() != "" {
536+
workflowStep.Name = step.Name.ValueString()
529537
}
530538

531539
if step.ApiAction != nil {

internal/provider/devhub_workflow_resource_test.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ func TestAccWorkflowResource(t *testing.T) {
3737
resource.TestCheckResourceAttr("devhub_workflow.test", "steps.3.slack_action.slack_channel", "#general"),
3838
resource.TestCheckResourceAttr("devhub_workflow.test", "steps.3.slack_action.message", "Hello, world!"),
3939
resource.TestCheckResourceAttr("devhub_workflow.test", "steps.3.slack_action.link_text", "Click here"),
40-
resource.TestCheckResourceAttr("devhub_workflow.test", "steps.4.name", "slack-reply-step"),
4140
resource.TestCheckResourceAttr("devhub_workflow.test", "steps.4.slack_reply_action.reply_to_step_name", "slack-step"),
4241
resource.TestCheckResourceAttr("devhub_workflow.test", "steps.4.slack_reply_action.message", "Hello, world!"),
4342
resource.TestCheckResourceAttrSet("devhub_workflow.test", "id"),
@@ -78,7 +77,6 @@ func TestAccWorkflowResource(t *testing.T) {
7877
resource.TestCheckResourceAttr("devhub_workflow.test", "steps.3.slack_action.slack_channel", "#general"),
7978
resource.TestCheckResourceAttr("devhub_workflow.test", "steps.3.slack_action.message", "Hello, world!"),
8079
resource.TestCheckResourceAttr("devhub_workflow.test", "steps.3.slack_action.link_text", "Click here"),
81-
resource.TestCheckResourceAttr("devhub_workflow.test", "steps.4.name", "slack-reply-step"),
8280
resource.TestCheckResourceAttr("devhub_workflow.test", "steps.4.slack_reply_action.reply_to_step_name", "slack-step"),
8381
resource.TestCheckResourceAttr("devhub_workflow.test", "steps.4.slack_reply_action.message", "Hello, world!"),
8482
resource.TestCheckResourceAttrSet("devhub_workflow.test", "id"),
@@ -140,7 +138,6 @@ resource "devhub_workflow" "test" {
140138
}
141139
},
142140
{
143-
name = "slack-reply-step"
144141
slack_reply_action = {
145142
reply_to_step_name = "slack-step"
146143
message = "Hello, world!"

0 commit comments

Comments
 (0)