Skip to content

fix: prevent OSS policy name exceeding 32-char limit #686

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
madhununna wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: prevent OSS policy name exceeding 32-char limit #686

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
11 changes: 7 additions & 4 deletions rag/bedrock-prompt-flow-kb-rag-app/utils/knowledge_base_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,10 @@ def create_or_retrieve_knowledge_base(
"""
kb_id = None
ds_id = None
policy_suffix = policy_suffix or kb_name.lower()
policy_suffix = policy_suffix or str(self.suffix)
# OSS security policy names must be <= 32 chars. Pattern is "{prefix}-sp-{suffix}" (4 chars overhead).
# Truncate kb_name prefix used in policy names only; the actual KB name passed to Bedrock is unchanged.
kb_name_prefix = kb_name[:32 - 4 - len(policy_suffix)]
kbs_available = self.bedrock_agent_client.list_knowledge_bases(
maxResults=100,
)
Expand Down Expand Up @@ -133,9 +136,9 @@ def create_or_retrieve_knowledge_base(
valid_embeddings_str = str(valid_embedding_models)
raise ValueError(f"Invalid embedding model. Your embedding model should be one of {valid_embeddings_str}")
# self.embedding_model = embedding_model
encryption_policy_name = f"{kb_name}-sp-{policy_suffix}"
network_policy_name = f"{kb_name}-np-{policy_suffix}"
access_policy_name = f'{kb_name}-ap-{policy_suffix}'
encryption_policy_name = f"{kb_name_prefix}-sp-{policy_suffix}"
network_policy_name = f"{kb_name_prefix}-np-{policy_suffix}"
access_policy_name = f'{kb_name_prefix}-ap-{policy_suffix}'
kb_execution_role_name = f'AmazonBedrockExecutionRoleForKnowledgeBase_{policy_suffix}'
fm_policy_name = f'AmazonBedrockFoundationModelPolicyForKnowledgeBase_{policy_suffix}'
s3_policy_name = f'AmazonBedrockS3PolicyForKnowledgeBase_{policy_suffix}'
Expand Down