merge with main and resolve conflits

alithya-oss · Aug 28, 2024 · f9f2374 · f9f2374
2 parents b7fa9e1 + a7674f2
commit f9f2374
Show file tree

Hide file tree

Showing 82 changed files with 565 additions and 106 deletions.
diff --git a/packages/backend/CHANGELOG.md b/packages/backend/CHANGELOG.md
@@ -1,5 +1,25 @@
 # backend
 
+## 2.1.15
+
+### Patch Changes
+
+- Updated dependencies [d6ae6e9]
+  - @roadiehq/scaffolder-backend-module-http-request@4.3.3
+  - @roadiehq/scaffolder-backend-module-utils@2.0.1
+  - @roadiehq/scaffolder-backend-module-aws@2.4.25
+  - @roadiehq/rag-ai-backend-retrieval-augmenter@0.3.8
+  - @roadiehq/backstage-plugin-argo-cd-backend@3.0.4
+  - @roadiehq/rag-ai-backend-embeddings-openai@0.2.8
+  - @roadiehq/catalog-backend-module-gravatar@1.0.3
+  - @roadiehq/rag-ai-backend-embeddings-aws@0.2.8
+  - @roadiehq/catalog-backend-module-okta@0.10.2
+  - @roadiehq/catalog-backend-module-aws@5.0.2
+  - @roadiehq/backstage-plugin-aws-auth@0.4.24
+  - @roadiehq/rag-ai-storage-pgvector@0.1.6
+  - @roadiehq/backstage-plugin-aws-backend@1.1.24
+  - @roadiehq/rag-ai-backend@1.0.2
+
 ## 2.1.14
 
 ### Patch Changes

diff --git a/packages/backend/package.json b/packages/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "backend",
-  "version": "2.1.14",
+  "version": "2.1.15",
   "main": "dist/index.cjs.js",
   "types": "src/index.ts",
   "private": true,
@@ -42,20 +42,20 @@
     "@langchain/core": "^0.2.27",
     "@langchain/openai": "^0.2.7",
     "@octokit/rest": "^19.0.3",
-    "@roadiehq/backstage-plugin-argo-cd-backend": "3.0.3",
-    "@roadiehq/backstage-plugin-aws-auth": "^0.4.23",
-    "@roadiehq/backstage-plugin-aws-backend": "^1.1.23",
-    "@roadiehq/catalog-backend-module-aws": "^5.0.0",
-    "@roadiehq/catalog-backend-module-okta": "^0.10.0",
-    "@roadiehq/rag-ai-backend": "^1.0.0",
-    "@roadiehq/rag-ai-backend-embeddings-aws": "^0.2.7",
-    "@roadiehq/rag-ai-backend-embeddings-openai": "^0.2.7",
-    "@roadiehq/rag-ai-backend-retrieval-augmenter": "^0.3.7",
-    "@roadiehq/rag-ai-storage-pgvector": "^0.1.5",
-    "@roadiehq/catalog-backend-module-gravatar": "^1.0.0",
-    "@roadiehq/scaffolder-backend-module-aws": "^2.4.24",
-    "@roadiehq/scaffolder-backend-module-http-request": "^4.3.2",
-    "@roadiehq/scaffolder-backend-module-utils": "^2.0.0",
+    "@roadiehq/backstage-plugin-argo-cd-backend": "3.0.4",
+    "@roadiehq/backstage-plugin-aws-auth": "^0.4.24",
+    "@roadiehq/backstage-plugin-aws-backend": "^1.1.24",
+    "@roadiehq/catalog-backend-module-aws": "^5.0.2",
+    "@roadiehq/catalog-backend-module-okta": "^0.10.2",
+    "@roadiehq/rag-ai-backend": "^1.0.2",
+    "@roadiehq/rag-ai-backend-embeddings-aws": "^0.2.8",
+    "@roadiehq/rag-ai-backend-embeddings-openai": "^0.2.8",
+    "@roadiehq/rag-ai-backend-retrieval-augmenter": "^0.3.8",
+    "@roadiehq/rag-ai-storage-pgvector": "^0.1.6",
+    "@roadiehq/catalog-backend-module-gravatar": "^1.0.3",
+    "@roadiehq/scaffolder-backend-module-aws": "^2.4.25",
+    "@roadiehq/scaffolder-backend-module-http-request": "^4.3.3",
+    "@roadiehq/scaffolder-backend-module-utils": "^2.0.1",
     "app": "^1.1.3",
     "better-sqlite3": "^9.0.0",
     "dockerode": "^3.3.0",

diff --git a/plugins/backend/backstage-aws-backend/CHANGELOG.md b/plugins/backend/backstage-aws-backend/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @roadiehq/backstage-plugin-aws-backend
 
+## 1.1.24
+
+### Patch Changes
+
+- d6ae6e9: Release all packages to rollout new metadata
+
 ## 1.1.23
 
 ### Patch Changes

diff --git a/plugins/backend/backstage-aws-backend/package.json b/plugins/backend/backstage-aws-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@roadiehq/backstage-plugin-aws-backend",
-  "version": "1.1.23",
+  "version": "1.1.24",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -10,7 +10,11 @@
     "types": "dist/index.d.ts"
   },
   "backstage": {
-    "role": "backend-plugin"
+    "role": "backend-plugin",
+    "pluginId": "backstage-plugin-aws-backend",
+    "pluginPackages": [
+      "@roadiehq/backstage-plugin-aws-backend"
+    ]
   },
   "repository": {
     "type": "git",

diff --git a/plugins/backend/backstage-plugin-argo-cd-backend/CHANGELOG.md b/plugins/backend/backstage-plugin-argo-cd-backend/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @roadiehq/backstage-plugin-argo-cd-backend
 
+## 3.0.4
+
+### Patch Changes
+
+- d6ae6e9: Release all packages to rollout new metadata
+
 ## 3.0.3
 
 ### Patch Changes

diff --git a/plugins/backend/backstage-plugin-argo-cd-backend/package.json b/plugins/backend/backstage-plugin-argo-cd-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@roadiehq/backstage-plugin-argo-cd-backend",
-  "version": "3.0.3",
+  "version": "3.0.4",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -10,7 +10,11 @@
     "types": "dist/index.d.ts"
   },
   "backstage": {
-    "role": "backend-plugin"
+    "role": "backend-plugin",
+    "pluginId": "backstage-plugin-argo-cd-backend",
+    "pluginPackages": [
+      "@roadiehq/backstage-plugin-argo-cd-backend"
+    ]
   },
   "repository": {
     "type": "git",

diff --git a/plugins/backend/backstage-plugin-aws-auth/CHANGELOG.md b/plugins/backend/backstage-plugin-aws-auth/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @roadiehq/backstage-plugin-aws-auth
 
+## 0.4.24
+
+### Patch Changes
+
+- d6ae6e9: Release all packages to rollout new metadata
+
 ## 0.4.23
 
 ### Patch Changes

diff --git a/plugins/backend/backstage-plugin-aws-auth/package.json b/plugins/backend/backstage-plugin-aws-auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@roadiehq/backstage-plugin-aws-auth",
-  "version": "0.4.23",
+  "version": "0.4.24",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,7 +20,11 @@
     "clean": "backstage-cli clean"
   },
   "backstage": {
-    "role": "backend-plugin"
+    "role": "backend-plugin",
+    "pluginId": "backstage-plugin-aws-auth",
+    "pluginPackages": [
+      "@roadiehq/backstage-plugin-aws-auth"
+    ]
   },
   "repository": {
     "type": "git",

diff --git a/plugins/backend/catalog-backend-module-aws/CHANGELOG.md b/plugins/backend/catalog-backend-module-aws/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @backstage/plugin-catalog-backend-module-aws
 
+## 5.0.2
+
+### Patch Changes
+
+- d6ae6e9: Release all packages to rollout new metadata
+
 ## 5.0.1
 
 ### Patch Changes

diff --git a/plugins/backend/catalog-backend-module-aws/package.json b/plugins/backend/catalog-backend-module-aws/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@roadiehq/catalog-backend-module-aws",
   "description": "A set of Backstage catalog providers for AWS",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -12,7 +12,9 @@
     "types": "dist/index.d.ts"
   },
   "backstage": {
-    "role": "backend-plugin-module"
+    "role": "backend-plugin-module",
+    "pluginId": "catalog-backend-module-aws",
+    "pluginPackage": "@backstage/plugin-catalog-backend"
   },
   "homepage": "https://roadie.io",
   "repository": {

diff --git a/plugins/backend/catalog-backend-module-gravatar/CHANGELOG.md b/plugins/backend/catalog-backend-module-gravatar/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @roadiehq/catalog-backend-module-gravatar
 
+## 1.0.3
+
+### Patch Changes
+
+- d6ae6e9: Release all packages to rollout new metadata
+
 ## 1.0.2
 
 ### Patch Changes

diff --git a/plugins/backend/catalog-backend-module-gravatar/package.json b/plugins/backend/catalog-backend-module-gravatar/package.json
@@ -1,16 +1,25 @@
 {
   "name": "@roadiehq/catalog-backend-module-gravatar",
   "description": "A set of Backstage catalog providers for gravatar",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
   "exports": {
     ".": "./src/index.ts",
     "./package.json": "./package.json"
   },
+  "typesVersions": {
+    "*": {
+      "package.json": [
+        "package.json"
+      ]
+    }
+  },
   "backstage": {
-    "role": "backend-plugin-module"
+    "role": "backend-plugin-module",
+    "pluginId": "catalog-backend-module-gravatar",
+    "pluginPackage": "@backstage/plugin-catalog-backend"
   },
   "homepage": "https://roadie.io",
   "repository": {

diff --git a/plugins/backend/catalog-backend-module-okta/CHANGELOG.md b/plugins/backend/catalog-backend-module-okta/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @roadiehq/catalog-backend-module-okta
 
+## 0.10.2
+
+### Patch Changes
+
+- d6ae6e9: Release all packages to rollout new metadata
+
 ## 0.10.1
 
 ### Patch Changes

diff --git a/plugins/backend/catalog-backend-module-okta/package.json b/plugins/backend/catalog-backend-module-okta/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@roadiehq/catalog-backend-module-okta",
   "description": "A set of Backstage catalog providers for Okta",
-  "version": "0.10.1",
+  "version": "0.10.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -10,8 +10,20 @@
     "./package.json": "./package.json",
     "./new-backend": "./src/new-backend.ts"
   },
+  "typesVersions": {
+    "*": {
+      "package.json": [
+        "package.json"
+      ],
+      "new-backend": [
+        "src/new-backend.ts"
+      ]
+    }
+  },
   "backstage": {
-    "role": "backend-plugin-module"
+    "role": "backend-plugin-module",
+    "pluginId": "catalog-backend-module-okta",
+    "pluginPackage": "@backstage/plugin-catalog-backend"
   },
   "homepage": "https://roadie.io",
   "repository": {

diff --git a/plugins/backend/rag-ai-backend-embeddings-aws/CHANGELOG.md b/plugins/backend/rag-ai-backend-embeddings-aws/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @roadiehq/rag-ai-backend-embeddings-aws
 
+## 0.2.8
+
+### Patch Changes
+
+- d6ae6e9: Release all packages to rollout new metadata
+- Updated dependencies [d6ae6e9]
+  - @roadiehq/rag-ai-backend-retrieval-augmenter@0.3.8
+  - @roadiehq/rag-ai-backend@1.0.2
+  - @roadiehq/rag-ai-node@0.1.6
+
 ## 0.2.7
 
 ### Patch Changes

diff --git a/plugins/backend/rag-ai-backend-embeddings-aws/package.json b/plugins/backend/rag-ai-backend-embeddings-aws/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@roadiehq/rag-ai-backend-embeddings-aws",
   "description": "The AWS (Bedrock) backend module for the @roadiehq/rag-ai plugin.",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -11,7 +11,9 @@
     "types": "dist/index.d.ts"
   },
   "backstage": {
-    "role": "backend-plugin-module"
+    "role": "backend-plugin-module",
+    "pluginId": "rag-ai-backend-embeddings-aws",
+    "pluginPackage": "@roadiehq/rag-ai-backend"
   },
   "bugs": {
     "url": "https://github.com/RoadieHQ/roadie-backstage-plugins/issues",
@@ -40,9 +42,9 @@
     "@langchain/aws": "^0.0.10",
     "@langchain/community": "^0.2.28",
     "@langchain/core": "^0.2.27",
-    "@roadiehq/rag-ai-backend": "^1.0.0",
-    "@roadiehq/rag-ai-backend-retrieval-augmenter": "^0.3.7",
-    "@roadiehq/rag-ai-node": "^0.1.5",
+    "@roadiehq/rag-ai-backend": "^1.0.2",
+    "@roadiehq/rag-ai-backend-retrieval-augmenter": "^0.3.8",
+    "@roadiehq/rag-ai-node": "^0.1.6",
     "langchain": "^0.1.21",
     "winston": "^3.11.0"
   },

diff --git a/plugins/backend/rag-ai-backend-embeddings-openai/CHANGELOG.md b/plugins/backend/rag-ai-backend-embeddings-openai/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @roadiehq/rag-ai-backend-embeddings-openai
 
+## 0.2.8
+
+### Patch Changes
+
+- d6ae6e9: Release all packages to rollout new metadata
+- Updated dependencies [d6ae6e9]
+  - @roadiehq/rag-ai-backend-retrieval-augmenter@0.3.8
+  - @roadiehq/rag-ai-node@0.1.6
+
 ## 0.2.7
 
 ### Patch Changes

diff --git a/plugins/backend/rag-ai-backend-embeddings-openai/package.json b/plugins/backend/rag-ai-backend-embeddings-openai/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@roadiehq/rag-ai-backend-embeddings-openai",
   "description": "The OpenAI backend module for the @roadiehq/rag-ai plugin.",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -11,7 +11,9 @@
     "types": "dist/index.d.ts"
   },
   "backstage": {
-    "role": "backend-plugin-module"
+    "role": "backend-plugin-module",
+    "pluginId": "rag-ai-backend-embeddings-openai",
+    "pluginPackage": "@roadiehq/rag-ai-backend"
   },
   "bugs": {
     "url": "https://github.com/RoadieHQ/roadie-backstage-plugins/issues",
@@ -38,8 +40,8 @@
     "@langchain/core": "^0.2.27",
     "@langchain/community": "^0.2.28",
     "@langchain/openai": "^0.2.7",
-    "@roadiehq/rag-ai-backend-retrieval-augmenter": "^0.3.7",
-    "@roadiehq/rag-ai-node": "^0.1.5",
+    "@roadiehq/rag-ai-backend-retrieval-augmenter": "^0.3.8",
+    "@roadiehq/rag-ai-node": "^0.1.6",
     "langchain": "^0.0.209",
     "winston": "^3.11.0"
   },

diff --git a/plugins/backend/rag-ai-backend-retrieval-augmenter/CHANGELOG.md b/plugins/backend/rag-ai-backend-retrieval-augmenter/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @roadiehq/rag-ai-backend-retrieval-augmenter
 
+## 0.3.8
+
+### Patch Changes
+
+- d6ae6e9: Release all packages to rollout new metadata
+- Updated dependencies [d6ae6e9]
+  - @roadiehq/rag-ai-node@0.1.6
+
 ## 0.3.7
 
 ### Patch Changes