Fix/ignore GitHub unmanaged urls

Dockerfile

@@ -1,5 +1,5 @@
 ARG REPO_LOCATION=
-FROM ${REPO_LOCATION}node:20-alpine as builder
+FROM ${REPO_LOCATION}node:20-alpine AS builder
 ARG NG_BUILD_CONFIG=
 
 RUN npm i -g @nestjs/cli
@@ -56,7 +56,7 @@ EXPOSE 3000
 
 VOLUME /config/envconsul
 
-ENV NODE_ENV production
+ENV NODE_ENV=production
 
 # Start up command
 ENTRYPOINT ["envconsul", "-config", "/config/envconsul/env.hcl", "node", "dist/main"]

package.json

@@ -23,14 +23,14 @@
  "typeorm": "typeorm-ts-node-commonjs"
  },
  "dependencies": {
- "@aws-sdk/client-kinesis": "^3.651.1",
+ "@aws-sdk/client-kinesis": "^3.654.0",
  "@nestjs/axios": "^3.0.3",
- "@nestjs/common": "^10.4.3",
+ "@nestjs/common": "^10.4.4",
  "@nestjs/config": "^3.2.3",
- "@nestjs/core": "^10.4.3",
+ "@nestjs/core": "^10.4.4",
  "@nestjs/jwt": "^10.2.0",
  "@nestjs/passport": "^10.0.3",
- "@nestjs/platform-express": "^10.4.3",
+ "@nestjs/platform-express": "^10.4.4",
  "@nestjs/schedule": "^4.1.1",
  "@nestjs/serve-static": "^4.0.2",
  "@nestjs/swagger": "^7.4.2",
@@ -62,11 +62,11 @@
  "uuid": "^10.0.0"
  },
  "devDependencies": {
- "@eslint/js": "^9.10.0",
+ "@eslint/js": "^9.11.0",
  "@golevelup/ts-jest": "^0.5.5",
  "@nestjs/cli": "^10.4.5",
  "@nestjs/schematics": "^10.1.4",
- "@nestjs/testing": "^10.4.3",
+ "@nestjs/testing": "^10.4.4",
  "@types/cron": "^2.4.0",
  "@types/deep-equal": "^1.0.4",
  "@types/ejs": "^3.1.5",
@@ -84,7 +84,7 @@
  "@types/uuid": "^10.0.0",
  "@typescript-eslint/eslint-plugin": "^8.6.0",
  "@typescript-eslint/parser": "^8.6.0",
- "eslint": "^9.10.0",
+ "eslint": "^9.11.0",
  "eslint-config-prettier": "^9.1.0",
  "eslint-plugin-prettier": "^5.2.1",
  "jest": "^29.7.0",

src/collection/account.service.ts

@@ -344,6 +344,7 @@ export class AccountService {
  1,
  );
  if (downstreamServices) {
+ const errors = [];
  for (const service of downstreamServices) {
  const serviceName = service.collection.name;
  const projectDtoArr =
@@ -353,14 +354,30 @@ export class AccountService {
  ['component'],
  );
  const projectName = projectDtoArr[0].collection.name;
- try {
+
+ // Determine if this is a valid service to sync for
+ if (
+ !this.githubService.isBrokerManagedScmUrl(service.collection.scmUrl)
+ ) {
  this.auditService.recordToolsSync(
- 'start',
+ 'info',
  'unknown',
- `Start sync: ${service.collection.scmUrl}`,
+ `Skip sync: ${service.collection.scmUrl}`,
  projectName,
  serviceName,
  );
+ continue;
+ }
+
+ this.auditService.recordToolsSync(
+ 'start',
+ 'unknown',
+ `Start sync: ${service.collection.scmUrl}`,
+ projectName,
+ serviceName,
+ );
+
+ try {
  await this.githubService.refresh(
  projectName,
  serviceName,
@@ -388,9 +405,13 @@ export class AccountService {
  serviceName,
  httpErr,
  );
- throw httpErr;
+ errors.push(httpErr);
  }
  }
+
+ if (errors.length > 0) {
+ throw errors[0];
+ }
  } else {
  this.auditService.recordToolsSync(
  'info',

src/constants.ts

@@ -99,3 +99,6 @@ export const REDIS_PUBSUB = {
 
 export const GITHUB_CLIENT_ID = process.env.GITHUB_CLIENT_ID ?? '';
 export const GITHUB_PRIVATE_KEY = process.env.GITHUB_PRIVATE_KEY ?? '';
+export const GITHUB_MANAGED_URL_REGEX =
+ process.env.GITHUB_MANAGED_URL_REGEX ??
+ '^https://github.com/([a-zA-Z0-9_-]+/[a-zA-Z0-9_-]+)$';

src/github/github.service.ts

@@ -5,6 +5,7 @@ import sodium from 'libsodium-wrappers';
 import * as jwt from 'jsonwebtoken';
 import {
  GITHUB_CLIENT_ID,
+ GITHUB_MANAGED_URL_REGEX,
  GITHUB_PRIVATE_KEY,
  VAULT_KV_APPS_MOUNT,
 } from '../constants';
@@ -13,6 +14,7 @@ import { VaultService } from '../vault/vault.service';
 @Injectable()
 export class GithubService {
  private readonly axiosInstance: AxiosInstance;
+ private brokerManagedRegex = new RegExp(GITHUB_MANAGED_URL_REGEX);
 
  constructor(private readonly vaultService: VaultService) {
  this.axiosInstance = axios.create({
@@ -27,11 +29,18 @@ export class GithubService {
  return GITHUB_CLIENT_ID !== '' && GITHUB_PRIVATE_KEY !== '';
  }
 
+ public isBrokerManagedScmUrl(scmUrl: string) {
+ if (!scmUrl) {
+ return false;
+ }
+ return this.brokerManagedRegex.test(scmUrl);
+ }
+
  public async refresh(project: string, service: string, scmUrl: string) {
  if (!this.isEnabled()) {
  throw new Error('Not enabled');
  }
- if (!scmUrl) {
+ if (!this.isBrokerManagedScmUrl(scmUrl)) {
  throw new Error('Service does not have Github repo URL to update');
  }
  const path = `tools/${project}/${service}`;

src/persistence/dto/collection-config.dto.ts

@@ -42,9 +42,6 @@ export class CollectionConfigDto {
  dir: 1 | -1;
  };
 
- @Column()
- graphVertexOmit?: boolean;
-
  @Column()
  index: number;