From de48650dba3618135b851432ee829799d2a99f47 Mon Sep 17 00:00:00 2001 From: Kira Pilot Date: Thu, 20 Oct 2022 15:52:39 +0000 Subject: [PATCH 1/3] chore: remove org_id from audit diffs --- enterprise/audit/table.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/enterprise/audit/table.go b/enterprise/audit/table.go index 54a21a986200a..fcc03cfcb6408 100644 --- a/enterprise/audit/table.go +++ b/enterprise/audit/table.go @@ -51,7 +51,7 @@ var AuditableResources = auditMap(map[any]map[string]Action{ "id": ActionTrack, "created_at": ActionIgnore, // Never changes, but is implicit and not helpful in a diff. "updated_at": ActionIgnore, // Changes, but is implicit and not helpful in a diff. - "organization_id": ActionTrack, + "organization_id": ActionIgnore, // Rarely changes and not useful to the user "deleted": ActionIgnore, // Changes, but is implicit when a delete event is fired. "name": ActionTrack, "provisioner": ActionTrack, @@ -68,7 +68,7 @@ var AuditableResources = auditMap(map[any]map[string]Action{ &database.TemplateVersion{}: { "id": ActionTrack, "template_id": ActionTrack, - "organization_id": ActionTrack, + "organization_id": ActionIgnore, // Rarely changes and not useful to the user "created_at": ActionIgnore, // Never changes, but is implicit and not helpful in a diff. "updated_at": ActionIgnore, // Changes, but is implicit and not helpful in a diff. "name": ActionTrack, @@ -95,7 +95,7 @@ var AuditableResources = auditMap(map[any]map[string]Action{ "created_at": ActionIgnore, // Never changes. "updated_at": ActionIgnore, // Changes, but is implicit and not helpful in a diff. "owner_id": ActionTrack, - "organization_id": ActionTrack, + "organization_id": ActionIgnore, // Rarely changes and not useful to the user "template_id": ActionTrack, "deleted": ActionIgnore, // Changes, but is implicit when a delete event is fired. "name": ActionTrack, @@ -106,7 +106,7 @@ var AuditableResources = auditMap(map[any]map[string]Action{ &database.Group{}: { "id": ActionTrack, "name": ActionTrack, - "organization_id": ActionTrack, + "organization_id": ActionIgnore, // Rarely changes and not useful to the user "avatar_url": ActionTrack, }, }) From c56106285f436e496ed61d1a7190f63f196afe97 Mon Sep 17 00:00:00 2001 From: Kira Pilot Date: Thu, 20 Oct 2022 16:13:22 +0000 Subject: [PATCH 2/3] PR feedback --- enterprise/audit/table.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/enterprise/audit/table.go b/enterprise/audit/table.go index fcc03cfcb6408..193b16a31687f 100644 --- a/enterprise/audit/table.go +++ b/enterprise/audit/table.go @@ -51,7 +51,7 @@ var AuditableResources = auditMap(map[any]map[string]Action{ "id": ActionTrack, "created_at": ActionIgnore, // Never changes, but is implicit and not helpful in a diff. "updated_at": ActionIgnore, // Changes, but is implicit and not helpful in a diff. - "organization_id": ActionIgnore, // Rarely changes and not useful to the user + "organization_id": ActionIgnore, /// Never changes. "deleted": ActionIgnore, // Changes, but is implicit when a delete event is fired. "name": ActionTrack, "provisioner": ActionTrack, @@ -68,7 +68,7 @@ var AuditableResources = auditMap(map[any]map[string]Action{ &database.TemplateVersion{}: { "id": ActionTrack, "template_id": ActionTrack, - "organization_id": ActionIgnore, // Rarely changes and not useful to the user + "organization_id": ActionIgnore, // Never changes. "created_at": ActionIgnore, // Never changes, but is implicit and not helpful in a diff. "updated_at": ActionIgnore, // Changes, but is implicit and not helpful in a diff. "name": ActionTrack, @@ -95,7 +95,7 @@ var AuditableResources = auditMap(map[any]map[string]Action{ "created_at": ActionIgnore, // Never changes. "updated_at": ActionIgnore, // Changes, but is implicit and not helpful in a diff. "owner_id": ActionTrack, - "organization_id": ActionIgnore, // Rarely changes and not useful to the user + "organization_id": ActionIgnore, // Never changes. "template_id": ActionTrack, "deleted": ActionIgnore, // Changes, but is implicit when a delete event is fired. "name": ActionTrack, @@ -106,7 +106,7 @@ var AuditableResources = auditMap(map[any]map[string]Action{ &database.Group{}: { "id": ActionTrack, "name": ActionTrack, - "organization_id": ActionIgnore, // Rarely changes and not useful to the user + "organization_id": ActionIgnore, // Never changes. "avatar_url": ActionTrack, }, }) From 858d1e2929ead0fc805e32cd39b6ceb54aa6d096 Mon Sep 17 00:00:00 2001 From: Kira Pilot Date: Fri, 21 Oct 2022 14:21:36 +0000 Subject: [PATCH 3/3] fix tests --- enterprise/audit/diff_internal_test.go | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/enterprise/audit/diff_internal_test.go b/enterprise/audit/diff_internal_test.go index 75af13fb086d5..ff21b0b18b32f 100644 --- a/enterprise/audit/diff_internal_test.go +++ b/enterprise/audit/diff_internal_test.go @@ -256,7 +256,6 @@ func Test_diff(t *testing.T) { }, exp: audit.Map{ "id": audit.OldNew{Old: "", New: uuid.UUID{1}.String()}, - "organization_id": audit.OldNew{Old: "", New: uuid.UUID{2}.String()}, "name": audit.OldNew{Old: "", New: "rust"}, "provisioner": audit.OldNew{Old: database.ProvisionerType(""), New: database.ProvisionerTypeTerraform}, "active_version_id": audit.OldNew{Old: "", New: uuid.UUID{3}.String()}, @@ -281,11 +280,10 @@ func Test_diff(t *testing.T) { CreatedBy: uuid.NullUUID{UUID: uuid.UUID{4}, Valid: true}, }, exp: audit.Map{ - "id": audit.OldNew{Old: "", New: uuid.UUID{1}.String()}, - "template_id": audit.OldNew{Old: "", New: uuid.UUID{2}.String()}, - "organization_id": audit.OldNew{Old: "", New: uuid.UUID{3}.String()}, - "created_by": audit.OldNew{Old: "", New: uuid.UUID{4}.String()}, - "name": audit.OldNew{Old: "", New: "rust"}, + "id": audit.OldNew{Old: "", New: uuid.UUID{1}.String()}, + "template_id": audit.OldNew{Old: "", New: uuid.UUID{2}.String()}, + "created_by": audit.OldNew{Old: "", New: uuid.UUID{4}.String()}, + "name": audit.OldNew{Old: "", New: "rust"}, }, }, { @@ -301,10 +299,9 @@ func Test_diff(t *testing.T) { CreatedBy: uuid.NullUUID{UUID: uuid.UUID{4}, Valid: true}, }, exp: audit.Map{ - "id": audit.OldNew{Old: "", New: uuid.UUID{1}.String()}, - "organization_id": audit.OldNew{Old: "", New: uuid.UUID{3}.String()}, - "created_by": audit.OldNew{Old: "null", New: uuid.UUID{4}.String()}, - "name": audit.OldNew{Old: "", New: "rust"}, + "id": audit.OldNew{Old: "", New: uuid.UUID{1}.String()}, + "created_by": audit.OldNew{Old: "null", New: uuid.UUID{4}.String()}, + "name": audit.OldNew{Old: "", New: "rust"}, }, }, })