fix: Refactored the terraform scripts and fixing the deployment button.

Author: sachinlv

ai/use-cases/sentiment-intelligence/README.md

@@ -4,7 +4,9 @@ Sentiment Intelligence is a React and FastAPI demonstration application for
 brand monitoring, customer-feedback analysis, and natural-language data access
 with Oracle Autonomous AI Database, Select AI, and OCI Generative AI.
 
-[![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle-devrel/ai-quick-deploys/releases/latest/download/sentiment-intel-stack.zip)
+
+ [![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle-devrel/technology-engineering/raw/refs/heads/aicoe-sentiment-intelligence/ai/use-cases/sentiment-intelligence/sentiment-intelligence.zip)
+
 
 > Click the button above to deploy this application directly to your OCI tenancy
 > using **OCI Resource Manager**. It provisions a VCN, an OKE Kubernetes cluster,
@@ -35,7 +37,8 @@ sentiment-intelligence/
 |-- backend/    FastAPI, python-oracledb, Select AI and OCI SDK (+ Dockerfile)
 |-- rag-documents/     Optional sample documents for a separately configured RAG index
 |-- scripts/           Developer helper scripts (run.sh starts both services locally)
-|-- terraform/         OCI infrastructure as code (OKE, Autonomous DB, OCIR) + Resource Manager schema
+|-- deployment/        OCI infrastructure as code (OKE, Autonomous DB, OCIR) + Resource Manager schema
+|-- sentiment-intelligence.zip   OCI Resource Manager stack package (auto-built from deployment/)
 |-- README.md
 `-- .gitignore
 ```
@@ -172,7 +175,7 @@ npm run build
 
 ## Deploy to Oracle Cloud Infrastructure
 
-The `terraform/` directory contains infrastructure as code that provisions a
+The `deployment/` directory contains infrastructure as code that provisions a
 complete runtime on Oracle Cloud Infrastructure:
 
 - A VCN with public, private, and database subnets, gateways, and security lists.
@@ -215,11 +218,14 @@ Resource Manager creates the VCN, OKE cluster, Autonomous Database, OCIR
 repositories, and Kubernetes deployments. After apply, push the application
 images and complete the post-deploy steps below.
 
-> The button's `zipUrl` must point to a publicly reachable archive of the
-> `terraform/` directory. Generate one with
-> `cd terraform && zip -r ../sentiment-intel-stack.zip . -x '*.terraform*' 'terraform.tfvars'`
-> and host it (for example, as a GitHub release asset), then update the `zipUrl`
-> in the button link to match.
+> The button's `zipUrl` points at the committed `sentiment-intelligence.zip`
+> served raw from this repo on `main`:
+> `https://raw.githubusercontent.com/oracle-devrel/technology-engineering/main/ai/use-cases/sentiment-intelligence/sentiment-intelligence.zip`.
+> That archive is the `deployment/` directory, rebuilt automatically by the
+> pre-commit hook (or manually with `./deployment/build-stack-zip.sh`). It
+> resolves once this change is merged to `main` and pushed; until then, upload
+> the zip directly via **Resource Manager → Stacks → Create Stack → My
+> Configuration**.
 
 ### Option 2: Deploy with the Terraform CLI
 
@@ -233,7 +239,7 @@ images and complete the post-deploy steps below.
 
 1. **Configure variables**:
    ```bash
-   cd terraform
+   cd deployment
    cp terraform.tfvars.example terraform.tfvars
    # Edit terraform.tfvars with your OCI configuration and DB password
    ```
@@ -279,10 +285,10 @@ images and complete the post-deploy steps below.
 
 ### Option 3: Automated helper script
 
-`terraform/build_and_deploy.sh` wraps the full flow:
+`deployment/build_and_deploy.sh` wraps the full flow:
 
 ```bash
-cd terraform
+cd deployment
 cp terraform.tfvars.example terraform.tfvars   # then edit it
 ./build_and_deploy.sh deploy       # build + push images, apply infra, wire up kubectl
 
@@ -294,6 +300,26 @@ cp terraform.tfvars.example terraform.tfvars   # then edit it
 ./build_and_deploy.sh destroy      # Tear down everything
 ```
 
+### Resource Manager stack package
+
+`sentiment-intelligence.zip` at the project root is the Resource Manager stack
+package — every `deployment/` artifact (Terraform root, modules, and
+`schema.yaml`) archived with the configuration at the zip root, which is what
+Resource Manager requires. It is regenerated by `deployment/build-stack-zip.sh`.
+
+A git pre-commit hook keeps the package in sync: whenever files under
+`deployment/` are staged, it rebuilds the zip and stages it in the same commit.
+Because git hooks are not cloned, install it once after cloning:
+
+```bash
+cp ai/use-cases/sentiment-intelligence/deployment/hooks/pre-commit \
+  "$(git rev-parse --git-dir)/hooks/pre-commit"
+chmod +x "$(git rev-parse --git-dir)/hooks/pre-commit"
+```
+
+The hook is scoped to this project and is a no-op for any other commit in the
+monorepo.
+
 ### Post-deploy application setup
 
 The Terraform provisions infrastructure only; it does not seed the application

ai/use-cases/sentiment-intelligence/deployment/build-stack-zip.sh

@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+# =============================================================================
+# Build the OCI Resource Manager stack package.
+#
+# Produces ../sentiment-intelligence.zip containing every artifact Resource
+# Manager needs to create the stack: the Terraform root (*.tf), the child
+# modules, and schema.yaml — all at the ROOT of the zip (RMS requires the
+# configuration at the archive root, not nested in a folder).
+#
+# Deployment-time and local-only files are excluded (state, plans, the
+# provider cache, tfvars with secrets, editor/OS cruft).
+#
+# Run manually or via the git pre-commit hook, which regenerates the zip
+# whenever files under deployment/ are staged.
+# =============================================================================
+set -euo pipefail
+
+DEPLOY_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+PROJECT_ROOT="$(dirname "$DEPLOY_DIR")"
+ZIP_PATH="$PROJECT_ROOT/sentiment-intelligence.zip"
+
+# Delete the previous package so the zip is a fresh, exact snapshot.
+rm -f "$ZIP_PATH"
+
+# Package the deployment sources with the config at the archive root.
+( cd "$DEPLOY_DIR" && zip -r -q "$ZIP_PATH" . \
+    -x '*.terraform*' \
+       '*.tfstate*' \
+       'tfplan' '*.tfplan' \
+       'terraform.tfvars' \
+       'build-stack-zip.sh' \
+       '*.DS_Store' \
+       '*/.DS_Store' )
+
+echo "Built $ZIP_PATH"

…telligence/terraform/build_and_deploy.sh …elligence/deployment/build_and_deploy.shai/use-cases/sentiment-intelligence/terraform/build_and_deploy.sh renamed to ai/use-cases/sentiment-intelligence/deployment/build_and_deploy.sh ai/use-cases/sentiment-intelligence/terraform/build_and_deploy.sh renamed to ai/use-cases/sentiment-intelligence/deployment/build_and_deploy.sh

@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+# =============================================================================
+# Monorepo pre-commit hook.
+#
+# Scoped: only acts when files under the sentiment-intelligence deployment
+# sources are staged. For any other commit in the monorepo it does nothing.
+#
+# When deployment/ files are staged it rebuilds sentiment-intelligence.zip
+# (the OCI Resource Manager stack package) and stages it, so the committed
+# package always matches the committed Terraform sources.
+# =============================================================================
+set -euo pipefail
+
+PROJECT="ai/use-cases/sentiment-intelligence"
+DEPLOY_SRC="$PROJECT/deployment/"
+BUILD_SCRIPT="$PROJECT/deployment/build-stack-zip.sh"
+ZIP="$PROJECT/sentiment-intelligence.zip"
+
+# Any staged (added/copied/modified/renamed) files under deployment/?
+if git diff --cached --name-only --diff-filter=ACMR -z \
+    | grep -zq "^$DEPLOY_SRC"; then
+
+  if [ ! -x "$BUILD_SCRIPT" ]; then
+    echo "pre-commit: $BUILD_SCRIPT not found or not executable; skipping stack package build." >&2
+  else
+    echo "pre-commit: rebuilding $ZIP from staged deployment sources..."
+    "./$BUILD_SCRIPT"
+    git add "$ZIP"
+  fi
+fi

ai/use-cases/sentiment-intelligence/deployment/hooks/pre-commit

@@ -8,7 +8,7 @@ resource "oci_database_autonomous_database" "adb" {
   db_name                     = var.db_name
   admin_password              = var.admin_password
   cpu_core_count              = var.cpu_core_count
-  data_storage_size_in_gbs    = var.data_storage_size_in_gb
+  data_storage_size_in_gb     = var.data_storage_size_in_gb
   db_workload                 = var.db_workload
   is_free_tier                = var.is_free_tier
   license_model               = var.license_model