fix(r/trigger): updating env-wide trigger causes apply error (#709)

Updating an env-wide trigger was not handling the `dataset` attribute
correctly resulting in an apply-time error.

Also noticed that Trigger's didn't get the same update as SLOs to
support importing environment-wide triggers by 'bare ID' (e.g. no need
to use `__all__`), so fixed that here and updated the test.

- Closes #702

Author: jharley

docs/resources/slo.md

@@ -93,11 +93,7 @@ In addition to all arguments above, the following attributes are exported:
 
 ## Import
 
-SLOs can be imported using a combination of the dataset name and their ID, e.g.
-
-For multi-dataset SLOs, just pass in their ID.
-
-SLOs can be imported using by using their ID combined with their dataset.
+Single-dataset SLOs can be imported using by using their ID combined with their dataset.
 If the SLO is a multi-dataset (MD) SLO, the dataset is not provided.
 
 ### SLO

docs/resources/trigger.md

@@ -330,12 +330,22 @@ In addition to all arguments above, the following attributes are exported:
 
 * `id` - ID of the trigger.
 
+
 ## Import
 
-Triggers can be imported using a combination of the dataset name and their ID, e.g.
+Single-dataset Triggers can be imported using by using their ID combined with their dataset.
+If the Trigger is an environment-wide trigger, the dataset is not provided.
+
+### Trigger
+
+```
+$ terraform import honeycombio_trigger.my_trigger my-dataset/bj9BwOb1uKz
+```
+
+### Environment-wide Trigger
 
 ```
-$ terraform import honeycombio_trigger.my_trigger my-dataset/AeZzSoWws9G
+$ terraform import honeycombio_trigger.my_trigger bj9BwOb1uJz
 ```
 
 You can find the ID in the URL bar when visiting the trigger from the UI.

internal/provider/trigger_resource.go

@@ -317,8 +317,8 @@ func (r *triggerResource) Create(ctx context.Context, req resource.CreateRequest
 	}
 
 	var state models.TriggerResourceModel
-	state.Dataset = plan.Dataset
 	state.ID = types.StringValue(trigger.ID)
+	state.Dataset = plan.Dataset
 	state.Name = types.StringValue(trigger.Name)
 	state.Description = types.StringValue(trigger.Description)
 	state.Disabled = types.BoolValue(trigger.Disabled)
@@ -489,8 +489,8 @@ func (r *triggerResource) Update(ctx context.Context, req resource.UpdateRequest
 	}
 
 	var state models.TriggerResourceModel
-	state.Dataset = dataset
 	state.ID = types.StringValue(trigger.ID)
+	state.Dataset = plan.Dataset
 	state.Name = types.StringValue(trigger.Name)
 	state.Description = types.StringValue(trigger.Description)
 	state.Disabled = types.BoolValue(trigger.Disabled)
@@ -552,17 +552,20 @@ func (r *triggerResource) Delete(ctx context.Context, req resource.DeleteRequest
 }
 
 func (r *triggerResource) ImportState(ctx context.Context, req resource.ImportStateRequest, resp *resource.ImportStateResponse) {
-	// import ID is of the format <dataset>/<trigger ID>
 	dataset, id, found := strings.Cut(req.ID, "/")
+
+	// if dataset separator not found, we will assume its the bare id
+	// if thats the case, we need to reassign values since strings.Cut would return (id, "", false)
+	dsValue := types.StringNull()
+	idValue := id
 	if !found {
-		resp.Diagnostics.AddError(
-			"Invalid Import ID",
-			"The supplied ID must be wrtten as <dataset>/<trigger ID>.",
-		)
-		return
+		idValue = dataset
+	} else {
+		dsValue = types.StringValue(dataset)
 	}
-	req.ID = id
-	resp.State.SetAttribute(ctx, path.Root("dataset"), dataset)
+
+	req.ID = idValue
+	resp.State.SetAttribute(ctx, path.Root("dataset"), dsValue)
 	resp.State.SetAttribute(ctx, path.Root("query_id"), types.StringNull()) // favor query_json on import
 
 	resource.ImportStatePassthroughID(ctx, path.Root("id"), req, resp)

internal/provider/trigger_resource_test.go

@@ -439,10 +439,23 @@ resource "honeycombio_trigger" "test" {
 						resource.TestCheckResourceAttr("honeycombio_trigger.test", "threshold.0.value", "1000"),
 					),
 				},
+				{ // update the trigger's name
+					Config: testAccConfigEnvironmentWideTrigger(name + "0"),
+					Check: resource.ComposeAggregateTestCheckFunc(
+						testAccEnsureTriggerExists(t, "honeycombio_trigger.test"),
+						resource.TestCheckResourceAttr("honeycombio_trigger.test", "name", name+"0"),
+						resource.TestCheckNoResourceAttr("honeycombio_trigger.test", "dataset"),
+						resource.TestCheckResourceAttr("honeycombio_trigger.test", "description", "Environment-wide trigger"),
+						resource.TestCheckResourceAttr("honeycombio_trigger.test", "frequency", "1800"),
+						resource.TestCheckResourceAttr("honeycombio_trigger.test", "threshold.0.op", ">"),
+						resource.TestCheckResourceAttr("honeycombio_trigger.test", "threshold.0.value", "1000"),
+					),
+				},
 				{
-					ResourceName:        "honeycombio_trigger.test",
-					ImportStateIdPrefix: "__all__/",
-					ImportState:         true,
+					ResourceName:            "honeycombio_trigger.test",
+					ImportState:             true,
+					ImportStateVerify:       true,
+					ImportStateVerifyIgnore: []string{"recipient"},
 				},
 			},
 		})