Skip to content

fix(gemini-enterprise): parse hyphenated tenant ids and the FAST tenant bucket name in brownfield discovery #217

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
scottonix wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −3
Open

fix(gemini-enterprise): parse hyphenated tenant ids and the FAST tenant bucket name in brownfield discovery #217

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
14 changes: 11 additions & 3 deletions blueprints/fedramp-high/gemini-enterprise/deploy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,9 +525,15 @@ discover_infrastructure() {

if [[ "$IS_BROWNFIELD" == "true" ]]; then
# 1. Extract Environment and Tenant
# Format: prefix-env-tenant-main-0
# Format: prefix-env-tenant-main-0. The tenant id may itself contain
# hyphens (FAST tenants are typically named like "ten-1"), so take
# everything between the environment and the "-main-0" suffix rather
# than the third hyphen-separated field.
ENVIRONMENT=$(echo "$PROJECT_ID" | cut -d'-' -f2)
TENANT_VAL=$(echo "$PROJECT_ID" | cut -d'-' -f3)
TENANT_VAL=$(echo "$PROJECT_ID" | sed -E 's/^[^-]+-[^-]+-(.+)-main-0$/\1/')
if [[ "$TENANT_VAL" == "$PROJECT_ID" ]]; then
TENANT_VAL=""
fi

# Validate extraction (basic check)
if [[ -z "$ENVIRONMENT" || -z "$TENANT_VAL" ]]; then
Expand Down Expand Up @@ -573,7 +579,9 @@ discover_infrastructure() {
fi

# 3. Check State Bucket
POTENTIAL_BUCKET="${PREFIX}-${ENVIRONMENT}-${TENANT}-iac-0"
# 1-resman names the tenant state bucket <prefix>-tn-<env>-<tenant>-0
# (branch-tenants.tf, module tenant-core-gcs).
POTENTIAL_BUCKET="${PREFIX}-tn-${ENVIRONMENT}-${TENANT}-0"
echo "Checking for Terraform State Bucket: ${POTENTIAL_BUCKET}..."
if gcloud storage buckets describe "gs://${POTENTIAL_BUCKET}" &>/dev/null; then
STATE_BUCKET="${POTENTIAL_BUCKET}"
Expand Down