fix(queue_consumer): id population (#6181)

* resolves #5652

* Unifying queue consumer script and script_name in terraform state

* Populate queue consumer info in queue resource

* Modify mtls resource and mtls, org, and app tests

* feat(api): api update

* fixing bad merge

* Marking consumer_id as computed because it is generated from the create consumer response

* Adding tests for queue_consumer

* Refactoring tests to have test configs in files

* Adding more tests for different config cases

* Updating queue consumer tests

---------

Co-authored-by: Alex Holland <[email protected]>
Co-authored-by: stainless-app[bot] <142633134+stainless-app[bot]@users.noreply.github.com>

Author: 3 people

internal/services/queue_consumer/custom.go

@@ -0,0 +1,10 @@
+package queue_consumer
+
+func FixInconsistentCRUDResponses(data *QueueConsumerModel) {
+	if data.ScriptName.IsNull() && !data.Script.IsNull() {
+		data.ScriptName = data.Script
+	}
+	if data.Script.IsNull() && !data.ScriptName.IsNull() {
+		data.Script = data.ScriptName
+	}
+}

internal/services/queue_consumer/data_source_model.go

@@ -18,7 +18,7 @@ type QueueConsumerResultDataSourceEnvelope struct {
 
 type QueueConsumerDataSourceModel struct {
 	AccountID  types.String                                                   `tfsdk:"account_id" path:"account_id,required"`
-	ConsumerID types.String                                                   `tfsdk:"consumer_id" path:"consumer_id,required"`
+	ConsumerID types.String                                                   `tfsdk:"consumer_id" json:"consumer_id,computed"`
 	QueueID    types.String                                                   `tfsdk:"queue_id" path:"queue_id,required"`
 	CreatedOn  types.String                                                   `tfsdk:"created_on" json:"created_on,computed"`
 	Script     types.String                                                   `tfsdk:"script" json:"script,computed"`

internal/services/queue_consumer/data_source_schema.go

@@ -23,7 +23,7 @@ func DataSourceSchema(ctx context.Context) schema.Schema {
 			},
 			"consumer_id": schema.StringAttribute{
 				Description: "A Resource identifier.",
-				Required:    true,
+				Computed:    true,
 			},
 			"queue_id": schema.StringAttribute{
 				Description: "A Resource identifier.",

internal/services/queue_consumer/model.go

@@ -14,7 +14,7 @@ type QueueConsumerResultEnvelope struct {
 type QueueConsumerModel struct {
 	AccountID       types.String                `tfsdk:"account_id" path:"account_id,required"`
 	QueueID         types.String                `tfsdk:"queue_id" path:"queue_id,required"`
-	ConsumerID      types.String                `tfsdk:"consumer_id" path:"consumer_id,optional"`
+	ConsumerID      types.String                `tfsdk:"consumer_id" json:"consumer_id,computed"`
 	DeadLetterQueue types.String                `tfsdk:"dead_letter_queue" json:"dead_letter_queue,optional,no_refresh"`
 	ScriptName      types.String                `tfsdk:"script_name" json:"script_name,optional"`
 	Type            types.String                `tfsdk:"type" json:"type,optional"`

internal/services/queue_consumer/resource.go

@@ -89,7 +89,7 @@ func (r *QueueConsumerResource) Create(ctx context.Context, req resource.CreateR
 		return
 	}
 	data = &env.Result
-
+	FixInconsistentCRUDResponses(data)
 	resp.Diagnostics.Append(resp.State.Set(ctx, &data)...)
 }
 
@@ -140,6 +140,7 @@ func (r *QueueConsumerResource) Update(ctx context.Context, req resource.UpdateR
 	}
 	data = &env.Result
 
+	FixInconsistentCRUDResponses(data)
 	resp.Diagnostics.Append(resp.State.Set(ctx, &data)...)
 }
 
@@ -180,7 +181,7 @@ func (r *QueueConsumerResource) Read(ctx context.Context, req resource.ReadReque
 		return
 	}
 	data = &env.Result
-
+	FixInconsistentCRUDResponses(data)
 	resp.Diagnostics.Append(resp.State.Set(ctx, &data)...)
 }