From 1a802f39245492de72b73f7408a2394b876a6ba4 Mon Sep 17 00:00:00 2001 From: Mike Mason Date: Wed, 19 Jul 2023 18:36:52 +0000 Subject: [PATCH] match policy resource names --- internal/service/organizations.go | 2 +- internal/service/organizations_test.go | 8 ++++---- internal/service/projects.go | 2 +- internal/service/projects_test.go | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/internal/service/organizations.go b/internal/service/organizations.go index d91136e..f83c605 100644 --- a/internal/service/organizations.go +++ b/internal/service/organizations.go @@ -9,7 +9,7 @@ import ( "go.equinixmetal.net/infra9-metal-bridge/internal/metal/models" ) -const organizationEvent = "metalorganization" +const organizationEvent = "metal_organization" // buildOrganizationRelationships compiles all relations into a relationships object to be processed by the processors. func (s *service) buildOrganizationRelationships(org *models.OrganizationDetails) (Relationships, error) { diff --git a/internal/service/organizations_test.go b/internal/service/organizations_test.go index ead7efa..4b1cd1b 100644 --- a/internal/service/organizations_test.go +++ b/internal/service/organizations_test.go @@ -89,8 +89,8 @@ func TestTouchOrganizationEmpty(t *testing.T) { }, } - mPublisher.On("PublishChange", "metalorganization", orgTenantChangeMessage).Return(nil) - mPublisher.On("PublishChange", "metalorganization", relateProjectChangeMessage).Return(nil) + mPublisher.On("PublishChange", "metal_organization", orgTenantChangeMessage).Return(nil) + mPublisher.On("PublishChange", "metal_organization", relateProjectChangeMessage).Return(nil) // Memberships @@ -208,8 +208,8 @@ func TestTouchOrganizationCleanup(t *testing.T) { }, } - mPublisher.On("PublishChange", "metalorganization", orgTenantChangeMessage).Return(nil) - mPublisher.On("PublishChange", "metalorganization", relateProjectChangeMessage).Return(nil) + mPublisher.On("PublishChange", "metal_organization", orgTenantChangeMessage).Return(nil) + mPublisher.On("PublishChange", "metal_organization", relateProjectChangeMessage).Return(nil) // Memberships diff --git a/internal/service/projects.go b/internal/service/projects.go index 2400423..d47c428 100644 --- a/internal/service/projects.go +++ b/internal/service/projects.go @@ -9,7 +9,7 @@ import ( "go.equinixmetal.net/infra9-metal-bridge/internal/metal/models" ) -const projectEvent = "metalproject" +const projectEvent = "metal_project" // buildProjectRelationships compiles all relations into a relationships object to be processed by the processors. func (s *service) buildProjectRelationships(project *models.ProjectDetails) (Relationships, error) { diff --git a/internal/service/projects_test.go b/internal/service/projects_test.go index e3de5ec..4b1c095 100644 --- a/internal/service/projects_test.go +++ b/internal/service/projects_test.go @@ -68,7 +68,7 @@ func TestTouchProjectEmpty(t *testing.T) { }, } - mPublisher.On("PublishChange", "metalproject", relateParentChangeMessage).Return(nil) + mPublisher.On("PublishChange", "metal_project", relateParentChangeMessage).Return(nil) // Memberships @@ -166,7 +166,7 @@ func TestTouchProjectCleanup(t *testing.T) { }, } - mPublisher.On("PublishChange", "metalproject", relateParentChangeMessage).Return(nil) + mPublisher.On("PublishChange", "metal_project", relateParentChangeMessage).Return(nil) // Memberships