From 4f7d429a87d609661ecbab1513691b72da259375 Mon Sep 17 00:00:00 2001 From: Cristian Magherusan-Stanciu Date: Tue, 9 Jun 2026 08:44:50 -0700 Subject: [PATCH] chore: point branch references at main after multicloud->main merge feat/multicloud-web-frontend has been merged into main (PR #1131) and retired. Update every forward-looking/operational reference so the repo reflects main as the sole integration base. Changes: - .github/workflows/deploy-{aws-lambda,azure,gcp}.yml: remove retired branch from push trigger branches list and update comment header - .github/workflows/pre-commit.yml: remove retired branch from both pull_request and push branch filters - .github/workflows/frontend-build.yml: remove retired branch from pull_request branch filter - terraform/environments/azure/ci-cd-permissions/sp.tf: remove the github_feat_multicloud federated identity credential resource (the OIDC subject it bound, refs/heads/feat/multicloud-web-frontend, no longer exists) - README.md: replace "part of feat/multicloud-web-frontend and not yet merged to main" with "included in main" Historical references left in place (describing past events): - frontend/src/recommendations.ts:140 - code comment recording which branch a verification was performed on ("verified against the recommendation collectors on origin/feat/multicloud-web-frontend") - specs/migration-resilience.md:161 - records the branch a specific commit was introduced on ("branch feat/multicloud-web-frontend") --- .github/workflows/deploy-aws-lambda.yml | 4 ++-- .github/workflows/deploy-azure.yml | 4 ++-- .github/workflows/deploy-gcp.yml | 4 ++-- .github/workflows/frontend-build.yml | 1 - .github/workflows/pre-commit.yml | 4 ++-- README.md | 3 +-- terraform/environments/azure/ci-cd-permissions/sp.tf | 10 ---------- 7 files changed, 9 insertions(+), 21 deletions(-) diff --git a/.github/workflows/deploy-aws-lambda.yml b/.github/workflows/deploy-aws-lambda.yml index 4e611bd6b..d52d6dc13 100644 --- a/.github/workflows/deploy-aws-lambda.yml +++ b/.github/workflows/deploy-aws-lambda.yml @@ -15,7 +15,7 @@ # - AWS_ROLE_TO_ASSUME: IAM role ARN for OIDC keyless auth # # Triggered by: -# - Pushes to main or feat/multicloud-web-frontend branch +# - Pushes to main branch # - Manual workflow dispatch with environment selection # - Release creation (auto-deploy to prod) # - Workflow call from other workflows @@ -32,7 +32,7 @@ concurrency: on: push: - branches: [main, feat/multicloud-web-frontend] + branches: [main] paths: - 'cmd/**' - 'internal/**' diff --git a/.github/workflows/deploy-azure.yml b/.github/workflows/deploy-azure.yml index a445c67e2..4bf0a96f2 100644 --- a/.github/workflows/deploy-azure.yml +++ b/.github/workflows/deploy-azure.yml @@ -16,7 +16,7 @@ # - KEY_VAULT_NAME: Azure Key Vault name # # Triggered by: -# - Pushes to main or feat/multicloud-web-frontend branch +# - Pushes to main branch # - Manual workflow dispatch # - Workflow call from deploy-all.yml @@ -32,7 +32,7 @@ concurrency: on: push: - branches: [main, feat/multicloud-web-frontend] + branches: [main] workflow_dispatch: inputs: environment: diff --git a/.github/workflows/deploy-gcp.yml b/.github/workflows/deploy-gcp.yml index 216b0b1ec..a34f9aca6 100644 --- a/.github/workflows/deploy-gcp.yml +++ b/.github/workflows/deploy-gcp.yml @@ -14,7 +14,7 @@ # - ARTIFACT_REGISTRY_REPO: Artifact Registry repository name (default: cudly) # # Triggered by: -# - Pushes to main or feat/multicloud-web-frontend branch +# - Pushes to main branch # - Manual workflow dispatch # - Workflow call from deploy-all.yml @@ -30,7 +30,7 @@ concurrency: on: push: - branches: [main, feat/multicloud-web-frontend] + branches: [main] workflow_dispatch: inputs: environment: diff --git a/.github/workflows/frontend-build.yml b/.github/workflows/frontend-build.yml index f6e11588d..727b96e21 100644 --- a/.github/workflows/frontend-build.yml +++ b/.github/workflows/frontend-build.yml @@ -20,7 +20,6 @@ name: Frontend build (PR) on: pull_request: branches: - - feat/multicloud-web-frontend - main paths: - "frontend/**" diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 7795c59ac..df799778a 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -2,9 +2,9 @@ name: pre-commit on: pull_request: - branches: [main, feat/multicloud-web-frontend] + branches: [main] push: - branches: [main, feat/multicloud-web-frontend] + branches: [main] permissions: contents: read diff --git a/README.md b/README.md index d5735d6ed..9ad56f9e2 100644 --- a/README.md +++ b/README.md @@ -469,8 +469,7 @@ no separate web server process. ### Capabilities and limitations -The web interface is part of the `feat/multicloud-web-frontend` branch and is -not yet merged to `main`. The dashboard is operational for AWS workloads; Azure +The web interface is included in `main`. The dashboard is operational for AWS workloads; Azure and GCP support in the web UI follows the same maturity as the CLI providers (both are experimental). Specifically: diff --git a/terraform/environments/azure/ci-cd-permissions/sp.tf b/terraform/environments/azure/ci-cd-permissions/sp.tf index 2a25c873e..025d79b29 100644 --- a/terraform/environments/azure/ci-cd-permissions/sp.tf +++ b/terraform/environments/azure/ci-cd-permissions/sp.tf @@ -48,13 +48,3 @@ resource "azuread_application_federated_identity_credential" "github_pr" { subject = "repo:${var.github_repo}:pull_request" } -resource "azuread_application_federated_identity_credential" "github_feat_multicloud" { - count = var.github_repo != "" ? 1 : 0 - - application_id = azuread_application.cudly_deploy.id - display_name = "github-actions-feat-multicloud" - description = "GitHub Actions OIDC — ${var.github_repo} feat/multicloud-web-frontend branch" - audiences = ["api://AzureADTokenExchange"] - issuer = "https://token.actions.githubusercontent.com" - subject = "repo:${var.github_repo}:ref:refs/heads/feat/multicloud-web-frontend" -}