Merge pull request #1081 from RoadieHQ/update-dependencies-20230818-0…

…6-08 Update Dependencies - plugins
RoadieHQ · Aug 24, 2023 · d646791 · d646791
2 parents 677092d + 2fd1830
commit d646791
Show file tree

Hide file tree

Showing 38 changed files with 899 additions and 693 deletions.
diff --git a/.changeset/cold-years-yawn.md b/.changeset/cold-years-yawn.md
@@ -0,0 +1,32 @@
+---
+'@roadiehq/backstage-plugin-aws-backend': patch
+'@roadiehq/backstage-plugin-argo-cd-backend': patch
+'@roadiehq/backstage-plugin-aws-auth': patch
+'@roadiehq/catalog-backend-module-aws': patch
+'@roadiehq/catalog-backend-module-okta': patch
+'@roadiehq/backstage-plugin-argo-cd': patch
+'@roadiehq/backstage-plugin-aws': patch
+'@roadiehq/backstage-plugin-aws-lambda': patch
+'@roadiehq/backstage-plugin-bugsnag': patch
+'@roadiehq/backstage-plugin-buildkite': patch
+'@roadiehq/backstage-plugin-cloudsmith': patch
+'@roadiehq/backstage-plugin-datadog': patch
+'@roadiehq/backstage-plugin-github-insights': patch
+'@roadiehq/backstage-plugin-github-pull-requests': patch
+'@roadiehq/backstage-plugin-iframe': patch
+'@roadiehq/backstage-plugin-jira': patch
+'@roadiehq/backstage-plugin-prometheus': patch
+'@roadiehq/backstage-plugin-security-insights': patch
+'@roadiehq/backstage-plugin-shortcut': patch
+'@roadiehq/backstage-plugin-travis-ci': patch
+'@roadiehq/backstage-plugin-home-markdown': patch
+'@roadiehq/backstage-plugin-home-rss': patch
+'@roadiehq/scaffolder-backend-argocd': patch
+'@roadiehq/scaffolder-backend-module-aws': patch
+'@roadiehq/scaffolder-backend-module-http-request': patch
+'@roadiehq/scaffolder-backend-module-utils': patch
+'@roadiehq/plugin-scaffolder-frontend-module-http-request-field': patch
+'@roadiehq/roadie-backstage-entity-validator': patch
+---
+
+Bump package versions to backstage version 1.17.0
diff --git a/backstage.json b/backstage.json
@@ -1,3 +1,3 @@
 {
-  "version": "1.16.0"
+  "version": "1.17.4"
 }
diff --git a/package.json b/package.json
@@ -35,7 +35,7 @@
     ]
   },
   "devDependencies": {
-    "@backstage/cli": "^0.22.9",
+    "@backstage/cli": "^0.22.12",
     "@spotify/prettier-config": "^14.0.0",
     "@types/webpack": "^5.28.0",
     "concurrently": "^7.0.0",

diff --git a/packages/app/package.json b/packages/app/package.json
@@ -7,28 +7,28 @@
   },
   "bundled": true,
   "dependencies": {
-    "@backstage/app-defaults": "^1.4.1",
+    "@backstage/app-defaults": "^1.4.2",
     "@backstage/catalog-model": "^1.4.1",
     "@roadiehq/backstage-plugin-cloudsmith": "^1.0.10",
-    "@backstage/cli": "^0.22.9",
-    "@backstage/core-app-api": "^1.9.0",
-    "@backstage/core-components": "^0.13.3",
+    "@backstage/cli": "^0.22.12",
+    "@backstage/core-app-api": "^1.9.1",
+    "@backstage/core-components": "^0.13.4",
     "@backstage/core-plugin-api": "^1.5.3",
-    "@backstage/integration-react": "^1.1.15",
-    "@backstage/plugin-api-docs": "^0.9.6",
-    "@backstage/plugin-catalog": "^1.12.0",
-    "@backstage/plugin-catalog-graph": "^0.2.32",
-    "@backstage/plugin-catalog-import": "^0.9.10",
-    "@backstage/plugin-catalog-react": "^1.8.0",
-    "@backstage/plugin-github-actions": "^0.6.1",
-    "@backstage/plugin-home": "^0.5.4",
-    "@backstage/plugin-org": "^0.6.10",
-    "@backstage/plugin-scaffolder": "^1.14.1",
-    "@backstage/plugin-search": "^1.3.3",
-    "@backstage/plugin-tech-radar": "^0.6.6",
-    "@backstage/plugin-techdocs": "^1.6.5",
-    "@backstage/plugin-user-settings": "^0.7.5",
-    "@backstage/test-utils": "^1.4.1",
+    "@backstage/integration-react": "^1.1.18",
+    "@backstage/plugin-api-docs": "^0.9.10",
+    "@backstage/plugin-catalog": "^1.12.4",
+    "@backstage/plugin-catalog-graph": "^0.2.35",
+    "@backstage/plugin-catalog-import": "^0.9.13",
+    "@backstage/plugin-catalog-react": "^1.8.3",
+    "@backstage/plugin-github-actions": "^0.6.4",
+    "@backstage/plugin-home": "^0.5.7",
+    "@backstage/plugin-org": "^0.6.13",
+    "@backstage/plugin-scaffolder": "^1.14.4",
+    "@backstage/plugin-search": "^1.3.6",
+    "@backstage/plugin-tech-radar": "^0.6.7",
+    "@backstage/plugin-techdocs": "^1.6.8",
+    "@backstage/plugin-user-settings": "^0.7.8",
+    "@backstage/test-utils": "^1.4.2",
     "@backstage/theme": "^0.4.1",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",

diff --git a/packages/backend/package.json b/packages/backend/package.json
@@ -20,20 +20,20 @@
     "migrate:create": "knex migrate:make -x ts"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.19.1",
-    "@backstage/backend-tasks": "^0.5.4",
+    "@backstage/backend-common": "^0.19.4",
+    "@backstage/backend-tasks": "^0.5.7",
     "@backstage/catalog-client": "^1.4.3",
     "@backstage/catalog-model": "^1.4.1",
     "@backstage/config": "^1.0.8",
-    "@backstage/integration": "^1.5.1",
-    "@backstage/plugin-app-backend": "^0.3.47",
-    "@backstage/plugin-auth-backend": "^0.18.5",
-    "@backstage/plugin-catalog-backend": "^1.11.0",
+    "@backstage/integration": "^1.6.2",
+    "@backstage/plugin-app-backend": "^0.3.50",
+    "@backstage/plugin-auth-backend": "^0.18.8",
+    "@backstage/plugin-catalog-backend": "^1.12.3",
     "@backstage/plugin-permission-common": "^0.7.7",
-    "@backstage/plugin-permission-node": "^0.7.10",
-    "@backstage/plugin-proxy-backend": "^0.2.41",
-    "@backstage/plugin-scaffolder-backend": "^1.15.1",
-    "@backstage/plugin-techdocs-backend": "^1.6.4",
+    "@backstage/plugin-permission-node": "^0.7.13",
+    "@backstage/plugin-proxy-backend": "^0.3.2",
+    "@backstage/plugin-scaffolder-backend": "^1.16.4",
+    "@backstage/plugin-techdocs-backend": "^1.6.7",
     "@gitbeaker/node": "^29.2.0",
     "@octokit/rest": "^19.0.3",
     "@roadiehq/backstage-plugin-argo-cd-backend": "2.11.0",
@@ -55,7 +55,7 @@
     "winston": "^3.2.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.22.9",
+    "@backstage/cli": "^0.22.12",
     "@types/dockerode": "^3.2.1",
     "@types/express": "^4.17.6",
     "@types/express-serve-static-core": "^4.17.5"

diff --git a/plugins/backend/backstage-aws-backend/package.json b/plugins/backend/backstage-aws-backend/package.json
@@ -27,7 +27,7 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.19.1",
+    "@backstage/backend-common": "^0.19.4",
     "@backstage/catalog-client": "^1.4.3",
     "@backstage/config": "^1.0.8",
     "@types/express": "^4.17.6",
@@ -39,7 +39,7 @@
     "yn": "^4.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.22.9",
+    "@backstage/cli": "^0.22.12",
     "@types/supertest": "^2.0.8",
     "supertest": "^4.0.2",
     "aws-sdk-client-mock": "^0.6.2",

diff --git a/plugins/backend/backstage-plugin-argo-cd-backend/package.json b/plugins/backend/backstage-plugin-argo-cd-backend/package.json
@@ -27,7 +27,7 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.19.1",
+    "@backstage/backend-common": "^0.19.4",
     "@backstage/catalog-client": "^1.4.3",
     "@backstage/config": "^1.0.8",
     "@types/express": "^4.17.6",
@@ -38,7 +38,7 @@
     "yn": "^4.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.22.9",
+    "@backstage/cli": "^0.22.12",
     "@types/supertest": "^2.0.8",
     "jest-fetch-mock": "^3.0.3",
     "supertest": "^4.0.2",

diff --git a/plugins/backend/backstage-plugin-aws-auth/package.json b/plugins/backend/backstage-plugin-aws-auth/package.json
@@ -28,7 +28,7 @@
     "directory": "plugins/backend/backstage-plugin-argo-cd-backend"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.19.1",
+    "@backstage/backend-common": "^0.19.4",
     "@types/express": "^4.17.11",
     "aws-sdk": "^2.902.0",
     "cors": "^2.8.5",
@@ -38,8 +38,8 @@
     "winston": "^3.2.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.22.9",
-    "@backstage/dev-utils": "^1.0.17"
+    "@backstage/cli": "^0.22.12",
+    "@backstage/dev-utils": "^1.0.20"
   },
   "files": [
     "dist"

diff --git a/plugins/backend/catalog-backend-module-aws/config.d.ts b/plugins/backend/catalog-backend-module-aws/config.d.ts
@@ -13,69 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-export interface ValueMapping {
-  entityPath: string;
-  template?: string;
-}
-
-export interface DynamoDbTableDataConfig {
-  /**
-   * Name of the DDB table
-   */
-  tableName: string;
-
-  /**
-   * Identifier column to be used as the 'name' value in the entity
-   * If omitted, the value of the first hash key of the table is used
-   */
-  identifierColumn?: string;
-
-  /**
-   * Additional column value mappings to insert data from the table row to the entity definition
-   * A key-value pairs of column name and entity value mapping.
-   * The template is using a variable called `value` which can be used to construct entity values from DDB column data
-   *
-   * Examples:
-   *
-   * // json
-   * myColumnInDdb: {
-   *   entityPath: 'metadata.annotations."backstage.io/view-url"',
-   *   template: 'https://aws.web-services.eu-west-1.some-service/{{ value }}/display'
-   * }
-   *
-   * // yaml
-   * myColumnInDdb:
-   *   entityPath: 'metadata.annotations."backstage.io/view-url"'
-   *   template: 'https://aws.web-services.eu-west-1.some-service/{{ value }}/display'
-   *
-   */
-  columnValueMapping?: { [columnName: string]: ValueMapping };
-}
-
-export interface AWSAccountProviderConfig {
-  /**
-   * Account ID for this Account
-   */
-  accountId: string;
-  /**
-   * Role to assume for this account ID
-   */
-  roleArn: string;
-  /**
-   * Region to use for this account ID
-   */
-  region?: string;
-  /**
-   * External ID to use for the role assume
-   */
-  externalId?: string;
-
-  /**
-   * Configuration object for DynamoDB table data provider
-   */
-  dynamodbTableData?: DynamoDbTableDataConfig;
-}
+import { AWSAccountProviderConfig } from './src/types';
 
 export interface Config {
   integrations?: {

diff --git a/plugins/backend/catalog-backend-module-aws/package.json b/plugins/backend/catalog-backend-module-aws/package.json
@@ -33,33 +33,34 @@
     "start": "backstage-cli package start"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.19.1",
-    "@backstage/catalog-client": "^1.4.3",
-    "@backstage/catalog-model": "^1.4.1",
-    "@backstage/config": "^1.0.8",
-    "@backstage/errors": "^1.2.1",
-    "@backstage/plugin-catalog-backend": "^1.11.0",
-    "@backstage/types": "^1.1.0",
+    "@aws-sdk/client-cloudcontrol": "3.76.0",
+    "@aws-sdk/client-dynamodb": "3.76.0",
     "@aws-sdk/client-eks": "3.76.0",
-    "@aws-sdk/client-s3": "3.76.0",
     "@aws-sdk/client-iam": "3.76.0",
-    "@aws-sdk/client-sts": "3.76.0",
     "@aws-sdk/client-lambda": "3.76.0",
-    "@aws-sdk/client-dynamodb": "3.76.0",
-    "@aws-sdk/client-cloudcontrol": "3.76.0",
+    "@aws-sdk/client-s3": "3.76.0",
+    "@aws-sdk/client-sts": "3.76.0",
     "@aws-sdk/credential-providers": "3.76.0",
     "@aws-sdk/lib-dynamodb": "3.76.0",
+    "@backstage/backend-common": "^0.19.4",
+    "@backstage/catalog-client": "^1.4.3",
+    "@backstage/catalog-model": "^1.4.1",
+    "@backstage/config": "^1.0.8",
+    "@backstage/errors": "^1.2.1",
+    "@backstage/plugin-catalog-backend": "^1.12.3",
+    "@backstage/plugin-catalog-node": "^1.4.3",
+    "@backstage/types": "^1.1.0",
     "crypto-js": "^4.1.1",
     "link2aws": "^1.0.8",
     "lodash": "^4.17.21",
     "p-limit": "^3.0.2",
     "winston": "^3.2.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.22.9",
-    "@types/lodash": "^4.14.151",
+    "@backstage/cli": "^0.22.12",
     "@types/crypto-js": "^4.1.1",
     "@types/link2aws": "^1.0.0",
+    "@types/lodash": "^4.14.151",
     "aws-sdk-client-mock": "^0.6.2",
     "yaml": "^2.2.2"
   },

diff --git a/plugins/backend/catalog-backend-module-aws/src/providers/AWSDynamoDbTableDataProvider.ts b/plugins/backend/catalog-backend-module-aws/src/providers/AWSDynamoDbTableDataProvider.ts
@@ -21,7 +21,7 @@ import {
 import {
   EntityProvider,
   EntityProviderConnection,
-} from '@backstage/plugin-catalog-backend';
+} from '@backstage/plugin-catalog-node';
 import { fromTemporaryCredentials } from '@aws-sdk/credential-providers';
 import { STS } from '@aws-sdk/client-sts';
 import { Config } from '@backstage/config';
@@ -35,11 +35,7 @@ import {
   ANNOTATION_ACCOUNT_ID,
   ANNOTATION_AWS_DDB_TABLE_ARN,
 } from '../annotations';
-
-export type ValueMapping = {
-  entityPath: string;
-  template?: string;
-};
+import { ValueMapping } from '../types';
 
 type DdbTableDataConfigOptions = {
   tableName: string;

diff --git a/plugins/backend/catalog-backend-module-aws/src/types.ts b/plugins/backend/catalog-backend-module-aws/src/types.ts
@@ -14,6 +14,67 @@
  * limitations under the License.
  */
 
+export type ValueMapping = {
+  entityPath: string;
+  template?: string;
+};
+export interface DynamoDbTableDataConfig {
+  /**
+   * Name of the DDB table
+   */
+  tableName: string;
+
+  /**
+   * Identifier column to be used as the 'name' value in the entity
+   * If omitted, the value of the first hash key of the table is used
+   */
+  identifierColumn?: string;
+
+  /**
+   * Additional column value mappings to insert data from the table row to the entity definition
+   * A key-value pairs of column name and entity value mapping.
+   * The template is using a variable called `value` which can be used to construct entity values from DDB column data
+   *
+   * Examples:
+   *
+   * // json
+   * myColumnInDdb: {
+   *   entityPath: 'metadata.annotations."backstage.io/view-url"',
+   *   template: 'https://aws.web-services.eu-west-1.some-service/{{ value }}/display'
+   * }
+   *
+   * // yaml
+   * myColumnInDdb:
+   *   entityPath: 'metadata.annotations."backstage.io/view-url"'
+   *   template: 'https://aws.web-services.eu-west-1.some-service/{{ value }}/display'
+   *
+   */
+  columnValueMapping?: { [columnName: string]: ValueMapping };
+}
+export interface AWSAccountProviderConfig {
+  /**
+   * Account ID for this Account
+   */
+  accountId: string;
+  /**
+   * Role to assume for this account ID
+   */
+  roleArn: string;
+  /**
+   * Region to use for this account ID
+   */
+  region?: string;
+  /**
+   * External ID to use for the role assume
+   */
+  externalId?: string;
+
+  /**
+   * Configuration object for DynamoDB table data provider
+   */
+  dynamodbTableData?: DynamoDbTableDataConfig;
+}
+
 export type AccountConfig = {
   accountId: string;
   roleArn: string;