fix: Fix Blueprint integration test (#88)

Co-authored-by: Karl Weinmeister <11586922+kweinmeister@users.noreply.github.com>
GoogleCloudPlatform · Mar 27, 2024 · 0457df4 · 0457df4
1 parent 4551c08
commit 0457df4
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -39,6 +39,7 @@ Deployment: 6 mins
 | disable\_services\_on\_destroy | Whether project services will be disabled when the resources are destroyed. | `bool` | `false` | no |
 | documentai\_location | Document AI location, see https://cloud.google.com/document-ai/docs/regions | `string` | `"us"` | no |
 | firestore\_location | Firestore location, see https://firebase.google.com/docs/firestore/locations | `string` | `"nam5"` | no |
+| initial\_index\_json\_path | Path to the initial (placeholder) Vector Search index | `string` | `"initial-index.json"` | no |
 | project\_id | The Google Cloud project ID to deploy to | `string` | n/a | yes |
 | region | The Google Cloud region to deploy to | `string` | `"us-central1"` | no |
 | unique\_names | Whether to use unique names for resources | `bool` | `true` | no |

diff --git a/examples/simple_example/main.tf b/examples/simple_example/main.tf
@@ -15,7 +15,8 @@
  */
 
 module "simple" {
-  source       = "../../"
-  project_id   = var.project_id
-  webhook_path = abspath("../../webhook")
+  source                  = "../../"
+  project_id              = var.project_id
+  webhook_path            = abspath("../../webhook")
+  initial_index_json_path = abspath("../../initial-index.json")
 }
diff --git a/main.tf b/main.tf
@@ -260,5 +260,5 @@ resource "google_vertex_ai_index_endpoint" "docs" {
 resource "google_storage_bucket_object" "index_initial" {
   bucket = google_storage_bucket.main.name
   name   = "vector-search-index/initial.json"
-  source = abspath("initial-index.json")
+  source = var.initial_index_json_path
 }
diff --git a/metadata.display.yaml b/metadata.display.yaml
@@ -37,6 +37,9 @@ spec:
         firestore_location:
           name: firestore_location
           title: Firestore Location
+        initial_index_json_path:
+          name: initial_index_json_path
+          title: Initial Index Json Path
         project_id:
           name: project_id
           title: Project Id

diff --git a/metadata.yaml b/metadata.yaml
@@ -33,8 +33,8 @@ spec:
       detailed: This solution showcases how to extract question & answer pairs out of documents using Generative AI. It provides an end-to-end demonstration of QA extraction and fine-tuning of a large language model (LLM) on Vertex AI. Along the way, the solution utilizes Document AI Character Recognition (OCR), Firestore, Vector Search, Vertex AI Studio, and Cloud Functions.
     icon: assets/icon.png
     deploymentDuration:
-      configurationSecs: 120
-      deploymentSecs: 360
+      configurationSecs: "120"
+      deploymentSecs: "360"
     costEstimate:
       description: Cost Details
       url: https://cloud.google.com/products/calculator-legacy#id=2ed62cc0-d0ab-4bff-918a-d5cb297b4201
@@ -80,10 +80,13 @@ spec:
         description: Firestore location, see https://firebase.google.com/docs/firestore/locations
         varType: string
         defaultValue: nam5
+      - name: initial_index_json_path
+        description: Path to the initial (placeholder) Vector Search index
+        varType: string
+        defaultValue: initial-index.json
       - name: project_id
         description: The Google Cloud project ID to deploy to
         varType: string
-        defaultValue: null
         required: true
       - name: region
         description: The Google Cloud region to deploy to
@@ -124,12 +127,16 @@ spec:
           - roles/artifactregistry.admin
           - roles/documentai.editor
           - roles/firebase.admin
+          - roles/iam.serviceAccountAdmin
           - roles/iam.serviceAccountUser
+          - roles/resourcemanager.projectIamAdmin
+          - roles/serviceusage.serviceUsageAdmin
     services:
       - aiplatform.googleapis.com
       - artifactregistry.googleapis.com
       - cloudbuild.googleapis.com
       - cloudfunctions.googleapis.com
+      - cloudresourcemanager.googleapis.com
       - documentai.googleapis.com
       - eventarc.googleapis.com
       - firestore.googleapis.com

diff --git a/test/setup/iam.tf b/test/setup/iam.tf
@@ -20,7 +20,10 @@ locals {
     "roles/artifactregistry.admin",
     "roles/documentai.editor",
     "roles/firebase.admin",
+    "roles/iam.serviceAccountAdmin",
     "roles/iam.serviceAccountUser",
+    "roles/resourcemanager.projectIamAdmin",
+    "roles/serviceusage.serviceUsageAdmin",
   ]
 }
 

diff --git a/test/setup/main.tf b/test/setup/main.tf
@@ -29,6 +29,7 @@ module "project" {
     "artifactregistry.googleapis.com",
     "cloudbuild.googleapis.com",
     "cloudfunctions.googleapis.com",
+    "cloudresourcemanager.googleapis.com",
     "documentai.googleapis.com",
     "eventarc.googleapis.com",
     "firestore.googleapis.com",

diff --git a/variables.tf b/variables.tf
@@ -56,6 +56,13 @@ variable "webhook_path" {
   default     = "webhook"
 }
 
+# Used for testing.
+variable "initial_index_json_path" {
+  description = "Path to the initial (placeholder) Vector Search index"
+  type        = string
+  default     = "initial-index.json"
+}
+
 variable "unique_names" {
   description = "Whether to use unique names for resources"
   type        = bool