Merge branch 'main' into goodbye-graffiti-agent

GoogleCloudPlatform · Aug 16, 2023 · 2187bab · 2187bab
2 parents a8de297 + c40a851
commit 2187bab
Show file tree

Hide file tree

Showing 45 changed files with 554 additions and 478 deletions.
diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
@@ -69,7 +69,7 @@ jobs:
           retention-days: 5
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@cdcdbb579706841c47f7063dda365e292e5cad7a # v2.13.4
+        uses: github/codeql-action/upload-sarif@a09933a12a80f87b87005513f0abb1494c27a716 # v2.21.4
         with:
           sarif_file: results.sarif
 ...
diff --git a/dialogflow-comparison/firebase.json b/dialogflow-comparison/firebase.json
diff --git a/dialogflow-comparison/src/routes/+page.svelte b/dialogflow-comparison/src/routes/+page.svelte
diff --git a/dialogflow-comparison/src/routes/bot1/+page.svelte b/dialogflow-comparison/src/routes/bot1/+page.svelte
diff --git a/dialogflow-comparison/src/routes/bot2/+page.svelte b/dialogflow-comparison/src/routes/bot2/+page.svelte
diff --git a/dialogflow-comparison/src/routes/bot3/+page.svelte b/dialogflow-comparison/src/routes/bot3/+page.svelte
diff --git a/dialogflow-cx/vpc-sc-auth-server/server/requirements.txt b/dialogflow-cx/vpc-sc-auth-server/server/requirements.txt
@@ -15,7 +15,7 @@
 # shellcheck disable=SC1000-SC9999
 
 Flask==2.3.2
-werkzeug==2.3.6
+werkzeug==2.3.7
 types-Flask==1.1.6
 Flask-Logging==0.1.3
 gunicorn==20.1.0

diff --git a/dialogflow-cx/vpc-sc-demo/backend/requirements-test.txt b/dialogflow-cx/vpc-sc-demo/backend/requirements-test.txt
@@ -14,6 +14,6 @@
 # limitations under the License.
 # shellcheck disable=SC1000-SC9999
 
-pytest==7.2.0
+pytest==7.4.0
 mock==4.0.3
 types-jsonschema==4.17.0.10
diff --git a/dialogflow-cx/vpc-sc-demo/backend/requirements.txt b/dialogflow-cx/vpc-sc-demo/backend/requirements.txt
@@ -22,8 +22,8 @@ google-crc32c==1.5.0
 pycryptodome==3.18.0
 google-cloud-storage==2.10.0
 invoke==2.2.0
-werkzeug==2.3.6
+werkzeug==2.3.7
 google-cloud-bigquery==3.11.4
-jsonschema==4.17.3
+jsonschema==4.19.0
 types-jsonschema==4.17.0.10
 google-cloud-bigquery==3.11.4
diff --git a/...low-cx/vpc-sc-demo/components/reverse_proxy_server/proxy-server-src/requirements-test.txt b/...low-cx/vpc-sc-demo/components/reverse_proxy_server/proxy-server-src/requirements-test.txt
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-pytest==7.2.0
+pytest==7.4.0
 Flask==2.3.2
-werkzeug==2.2.3
+werkzeug==2.3.7
 types-Flask==1.1.6
diff --git a/dialogflow-cx/vpc-sc-demo/components/webhook/telecom-webhook-src/requirements-test.txt b/dialogflow-cx/vpc-sc-demo/components/webhook/telecom-webhook-src/requirements-test.txt
@@ -12,9 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-pytest==7.2.0
+pytest==7.4.0
 Flask==2.3.2
-werkzeug==2.2.3
+werkzeug==2.3.7
 types-Flask==1.1.6
 coverage==6.5.0
-pytest-cov==4.0.0
+pytest-cov==4.1.0
diff --git a/dialogflow-cx/vpc-sc-demo/deploy/terraform/requirements-test.txt b/dialogflow-cx/vpc-sc-demo/deploy/terraform/requirements-test.txt
@@ -12,6 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-pytest==7.2.0
+pytest==7.4.0
 networkx==2.8.8
-pygraphviz==1.10
+pygraphviz==1.11
diff --git a/dialogflow-cx/vpc-sc-demo/frontend/package-lock.json b/dialogflow-cx/vpc-sc-demo/frontend/package-lock.json
diff --git a/dialogflow-cx/vpc-sc-demo/frontend/package.json b/dialogflow-cx/vpc-sc-demo/frontend/package.json
@@ -15,7 +15,7 @@
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^13.3.0",
     "@testing-library/user-event": "^13.5.0",
-    "axios": "^0.27.2",
+    "axios": "^1.0.0",
     "eslint": "^8.30.0",
     "gapi-script": "^1.2.0",
     "http-proxy-middleware": "^2.0.6",

diff --git a/dialogflow-comparison/.eslintignore → generative-chatbots/.eslintignore b/dialogflow-comparison/.eslintignore → generative-chatbots/.eslintignore
diff --git a/dialogflow-comparison/.eslintrc.cjs → generative-chatbots/.eslintrc.cjs b/dialogflow-comparison/.eslintrc.cjs → generative-chatbots/.eslintrc.cjs
diff --git a/dialogflow-comparison/.firebaserc → generative-chatbots/.firebaserc b/dialogflow-comparison/.firebaserc → generative-chatbots/.firebaserc
diff --git a/dialogflow-comparison/.gitignore → generative-chatbots/.gitignore b/dialogflow-comparison/.gitignore → generative-chatbots/.gitignore
diff --git a/dialogflow-comparison/.npmrc → generative-chatbots/.npmrc b/dialogflow-comparison/.npmrc → generative-chatbots/.npmrc
diff --git a/dialogflow-comparison/.prettierignore → generative-chatbots/.prettierignore b/dialogflow-comparison/.prettierignore → generative-chatbots/.prettierignore
diff --git a/dialogflow-comparison/.prettierrc → generative-chatbots/.prettierrc b/dialogflow-comparison/.prettierrc → generative-chatbots/.prettierrc
diff --git a/dialogflow-comparison/README.md → generative-chatbots/README.md b/dialogflow-comparison/README.md → generative-chatbots/README.md
@@ -1,4 +1,4 @@
-# dialogflow-comparison
+# Generative Chatbots
 
 ## Overview
 
@@ -63,9 +63,9 @@ for more information.
 
 In your browser, navigate to your deployed app using a URL similar to:
 
-[https://dialogflow-comparison.web.app](https://dialogflow-comparison.web.app)
+[https://generative-chatbots.web.app](https://generative-chatbots.web.app)
 
-Congratulations, you've successfully deployed the Dialogflow Comparison Demo!
+Congratulations, you've successfully deployed the Generative Chatbots Demo!
 
 ## Additional resources
 

diff --git a/generative-chatbots/firebase.json b/generative-chatbots/firebase.json
@@ -0,0 +1,11 @@
+{
+  "hosting": {
+    "public": "build",
+    "target": "your-firebase-app-name",
+    "ignore": [
+      "firebase.json",
+      "**/.*",
+      "**/node_modules/**"
+    ]
+  }
+}