Skip to content

Fix token auth annotation to use opt-in instead of opt-out #15998

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TheRealJon wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix token auth annotation to use opt-in instead of opt-out #15998

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions ...erator-lifecycle-manager/src/components/operator-hub/__tests__/operator-hub-utils.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,6 +481,7 @@ describe('getInfrastructureFeatures', () => {
const result = getInfrastructureFeatures(
{
[OLMAnnotation.InfrastructureFeatures]: '["tokenAuth"]',
[OLMAnnotation.TokenAuthAWS]: 'true',
},
{ clusterIsAWSSTS, clusterIsAzureWIF, clusterIsGCPWIF },
);
Expand All @@ -493,6 +494,7 @@ describe('getInfrastructureFeatures', () => {
const result = getInfrastructureFeatures(
{
[OLMAnnotation.InfrastructureFeatures]: '["TokenAuth"]',
[OLMAnnotation.TokenAuthAWS]: 'true',
},
{ clusterIsAWSSTS, clusterIsAzureWIF, clusterIsGCPWIF },
);
Expand All @@ -505,6 +507,7 @@ describe('getInfrastructureFeatures', () => {
const result = getInfrastructureFeatures(
{
[OLMAnnotation.InfrastructureFeatures]: '["tokenAuth"]',
[OLMAnnotation.TokenAuthAzure]: 'true',
},
{ clusterIsAWSSTS, clusterIsAzureWIF, clusterIsGCPWIF },
);
Expand All @@ -517,6 +520,7 @@ describe('getInfrastructureFeatures', () => {
const result = getInfrastructureFeatures(
{
[OLMAnnotation.InfrastructureFeatures]: '["TokenAuth"]',
[OLMAnnotation.TokenAuthAzure]: 'true',
},
{ clusterIsAWSSTS, clusterIsAzureWIF, clusterIsGCPWIF },
);
Expand Down Expand Up @@ -615,6 +619,30 @@ describe('getInfrastructureFeatures', () => {
});
expect(result).toEqual([InfrastructureFeature.FIPSMode]);
});
it(`excludes TokenAuth when token-auth-aws is explicitly false on AWS STS cluster`, () => {
const clusterIsAWSSTS = true;
const clusterIsAzureWIF = false;
const clusterIsGCPWIF = false;
const result = getInfrastructureFeatures(
{
[OLMAnnotation.TokenAuthAWS]: 'false',
},
{ clusterIsAWSSTS, clusterIsAzureWIF, clusterIsGCPWIF },
);
expect(result).toEqual([]);
});
it(`excludes TokenAuth when token-auth-aws annotation is missing on AWS STS cluster`, () => {
const clusterIsAWSSTS = true;
const clusterIsAzureWIF = false;
const clusterIsGCPWIF = false;
const result = getInfrastructureFeatures(
{
[OLMAnnotation.Disconnected]: 'true',
},
{ clusterIsAWSSTS, clusterIsAzureWIF, clusterIsGCPWIF },
);
expect(result).toEqual([InfrastructureFeature.Disconnected]);
});
it(`returns empty array when ${OLMAnnotation.InfrastructureFeatures} is empty`, () => {
const result = getInfrastructureFeatures({
[OLMAnnotation.InfrastructureFeatures]: '[]',
Expand Down
4 changes: 2 additions & 2 deletions ...end/packages/operator-lifecycle-manager/src/components/operator-hub/operator-hub-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,9 +222,9 @@ export const getInfrastructureFeatures: AnnotationParser<
onError,
});
const azureTokenAuthIsSupported =
clusterIsAzureWIF && annotations[OLMAnnotation.TokenAuthAzure] !== 'false';
clusterIsAzureWIF && annotations[OLMAnnotation.TokenAuthAzure] === 'true';
const awsTokenAuthIsSupported =
clusterIsAWSSTS && annotations[OLMAnnotation.TokenAuthAWS] !== 'false';
clusterIsAWSSTS && annotations[OLMAnnotation.TokenAuthAWS] === 'true';
return [...parsedInfrastructureFeatures, ...Object.keys(annotations ?? {})].reduce(
(supportedFeatures, key) => {
const feature = infrastructureFeatureMap[key];
Expand Down