TF state correctly detects service owner changes from UI, test updated (

#499)

.changes/unreleased/Bugfix-20241007-102556.yaml

@@ -0,0 +1,3 @@
+kind: Bugfix
+body: TF state correctly detects service owner changes from UI
+time: 2024-10-07T10:25:56.045372-05:00

opslevel/resource_opslevel_service.go

@@ -62,13 +62,27 @@ func newServiceResourceModel(ctx context.Context, service opslevel.Service, give
 		Language:        OptionalStringValue(service.Language),
 		LifecycleAlias:  OptionalStringValue(service.Lifecycle.Alias),
 		Name:            RequiredStringValue(service.Name),
-		Note:            givenModel.Note,
-		Owner:           OptionalStringValue(givenModel.Owner.ValueString()),
-		Parent:          OptionalStringValue(givenModel.Parent.ValueString()),
+		Note:            OptionalStringValue(service.Note),
 		Product:         OptionalStringValue(service.Product),
 		TierAlias:       OptionalStringValue(service.Tier.Alias),
 	}
 
+	if string(service.Owner.Id) == "" {
+		serviceResourceModel.Owner = types.StringNull()
+	} else if string(service.Owner.Id) == givenModel.Owner.ValueString() || service.Owner.Alias == givenModel.Owner.ValueString() {
+		serviceResourceModel.Owner = givenModel.Owner
+	} else {
+		serviceResourceModel.Owner = OptionalStringValue(string(service.Owner.Id))
+	}
+
+	if service.Parent == nil {
+		serviceResourceModel.Parent = types.StringNull()
+	} else if string(service.Parent.Id) == givenModel.Parent.ValueString() || slices.Contains(service.Parent.Aliases, givenModel.Parent.ValueString()) {
+		serviceResourceModel.Parent = givenModel.Parent
+	} else {
+		serviceResourceModel.Parent = OptionalStringValue(string(service.Parent.Id))
+	}
+
 	if givenModel.Aliases.IsNull() {
 		serviceResourceModel.Aliases = types.SetNull(types.StringType)
 	} else {

tests/data/main.tf

@@ -2,6 +2,8 @@ data "opslevel_domains" "all" {}
 
 data "opslevel_filters" "all" {}
 
+data "opslevel_lifecycles" "all" {}
+
 data "opslevel_repositories" "all" {}
 
 data "opslevel_services" "all" {}
@@ -10,4 +12,6 @@ data "opslevel_systems" "all" {}
 
 data "opslevel_teams" "all" {}
 
+data "opslevel_tiers" "all" {}
+
 data "opslevel_users" "all" {}

tests/data/outputs.tf

@@ -6,6 +6,10 @@ output "all_filters" {
   value = data.opslevel_filters.all
 }
 
+output "all_lifecycles" {
+  value = data.opslevel_lifecycles.all
+}
+
 output "all_repositories" {
   value = data.opslevel_repositories.all
 }
@@ -22,6 +26,10 @@ output "all_teams" {
   value = data.opslevel_teams.all
 }
 
+output "all_tiers" {
+  value = data.opslevel_tiers.all
+}
+
 output "all_users" {
   value = data.opslevel_users.all
 }
@@ -34,6 +42,10 @@ output "first_filter" {
   value = data.opslevel_filters.all.filters[0]
 }
 
+output "first_lifecycle" {
+  value = data.opslevel_lifecycles.all.lifecycles[0]
+}
+
 output "first_repository" {
   value = data.opslevel_repositories.all.repositories[0]
 }
@@ -50,6 +62,10 @@ output "first_team" {
   value = data.opslevel_teams.all.teams[0]
 }
 
+output "first_tier" {
+  value = data.opslevel_tiers.all.tiers[0]
+}
+
 output "first_user" {
   value = data.opslevel_users.all.users[0]
 }