From e6553439be049d25e582af5bd0c315d33a2f18a2 Mon Sep 17 00:00:00 2001 From: Djebran Lezzoum Date: Thu, 23 Nov 2023 16:29:07 +0100 Subject: [PATCH] migrate-groups: add auth-type to identity add basic auth-type to identity for the groups migration script FIXES: https://issues.redhat.com/browse/THEEDGE-3555 --- cmd/migrategroups/migrategroups/migrategroups.go | 4 ++++ cmd/migrategroups/migrategroups/migrategroups_test.go | 1 + 2 files changed, 5 insertions(+) diff --git a/cmd/migrategroups/migrategroups/migrategroups.go b/cmd/migrategroups/migrategroups/migrategroups.go index c368278c8..aba96e7fb 100644 --- a/cmd/migrategroups/migrategroups/migrategroups.go +++ b/cmd/migrategroups/migrategroups/migrategroups.go @@ -38,6 +38,9 @@ var DefaultMaxDataPageNumber = 100 // DefaultIdentityType the default identity type used in header when requesting inventory groups end-point var DefaultIdentityType = "System" +// AuthTypeBASIC the BASIC identity type used in header when requesting inventory groups end-point +var AuthTypeBASIC = "basic-auth" + // OrgsGroupsFilter the filter added to filter an organization groups (if the org_id is defined in the map as a key) var OrgsGroupsFilter = map[string][]interface{}{ "11789772": {"device_groups.name LIKE ?", "%-Store-%"}, @@ -63,6 +66,7 @@ func newInventoryGroupsOrgClient(orgID string) (inventorygroups.ClientInterface, ident := identity.XRHID{Identity: identity.Identity{ OrgID: orgID, Type: DefaultIdentityType, + AuthType: AuthTypeBASIC, Internal: identity.Internal{OrgID: orgID}, }} jsonIdent, err := json.Marshal(&ident) diff --git a/cmd/migrategroups/migrategroups/migrategroups_test.go b/cmd/migrategroups/migrategroups/migrategroups_test.go index 719dd6ed7..d8364485b 100644 --- a/cmd/migrategroups/migrategroups/migrategroups_test.go +++ b/cmd/migrategroups/migrategroups/migrategroups_test.go @@ -119,6 +119,7 @@ var _ = Describe("Migrate device groups", func() { Expect(err).ToNot(HaveOccurred()) Expect(rhIndent.Identity.OrgID).To(Equal(orgID)) Expect(rhIndent.Identity.Type).To(Equal(migrategroups.DefaultIdentityType)) + Expect(rhIndent.Identity.AuthType).To(Equal(migrategroups.AuthTypeBASIC)) return mockInventoryGroupClient }