diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bcbdb07..784e849 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,13 +7,29 @@ on: pull_request: types: [opened, synchronize, reopened] jobs: + cdk-build: + runs-on: ubuntu-latest + strategy: + matrix: + node: [ 18 ] + name: Node ${{ matrix.node }} sample + steps: + - uses: actions/checkout@v3 + - name: Setup node + uses: actions/setup-node@v3 + with: + node-version: ${{ matrix.node }} + - run: npm install && npm run build + docker-build: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - name: Build the Docker image - run: cd app && docker build . -t python-ping-api:$(date +%s) + run: cd app && docker build . -t eks-cdk:$(date +%s) + sonarqube: + name: Build runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -37,6 +53,6 @@ jobs: restore-keys: ${{ runner.os }}-gradle - name: Build and analyze env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} run: ./gradlew build sonarqube --info \ No newline at end of file diff --git a/.gitignore b/.gitignore index 2c83b75..b09f9b6 100644 --- a/.gitignore +++ b/.gitignore @@ -28,6 +28,7 @@ **/cdk.out **/cdk.context.json **/cdk-outputs.json +**/ts.out #------------------- diff --git a/package-lock.json b/package-lock.json index 4d84603..c84045e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,9 +10,10 @@ "dependencies": { "@types/js-yaml": "4.0.5", "aws-cdk-lib": "2.32.1", - "cdk-ecr-deployment": "2.5.5", + "cdk-ecr-deployment": "^2.5.6", "constructs": "^10.0.0", - "sync-request": "6.1.0" + "sync-request": "6.1.0", + "tsc": "^2.0.4" }, "bin": { "cluster": "ecs-ec2-cluster/bin/index.js" @@ -24,7 +25,7 @@ "jest": "^26.4.2", "ts-jest": "^26.2.0", "ts-node": "^9.0.0", - "typescript": "~3.9.7" + "typescript": "^4.9.4" } }, "node_modules/@ampproject/remapping": { @@ -1749,9 +1750,9 @@ "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==" }, "node_modules/cdk-ecr-deployment": { - "version": "2.5.5", - "resolved": "https://registry.npmjs.org/cdk-ecr-deployment/-/cdk-ecr-deployment-2.5.5.tgz", - "integrity": "sha512-glU4fIotzz/sTDqpTqEUs3XKSlYxWBFt5sTAWgZAzIUf149i3AIhrq3OoJsH7Q7WwjFcGcLX5+BFiHvPe9l1yg==", + "version": "2.5.6", + "resolved": "https://registry.npmjs.org/cdk-ecr-deployment/-/cdk-ecr-deployment-2.5.6.tgz", + "integrity": "sha512-Vl6FksKZLC1wE/ZjHvShg4fVZqOR8x2aIUAP+M3fe1MLKQHztApi0cG4ceVYf4FLpUlYXGRjTkJR28/cWY9RnQ==", "bundleDependencies": [ "got", "hpagent" @@ -1925,7 +1926,7 @@ } }, "node_modules/cdk-ecr-deployment/node_modules/got": { - "version": "11.8.3", + "version": "11.8.5", "inBundle": true, "license": "MIT", "dependencies": { @@ -2416,9 +2417,9 @@ "dev": true }, "node_modules/decode-uri-component": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", - "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=", + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz", + "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==", "dev": true, "engines": { "node": ">=0.10" @@ -6438,6 +6439,14 @@ "typescript": ">=2.7" } }, + "node_modules/tsc": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/tsc/-/tsc-2.0.4.tgz", + "integrity": "sha512-fzoSieZI5KKJVBYGvwbVZs/J5za84f2lSTLPYf6AGiIf43tZ3GNrI1QzTLcjtyDDP4aLxd46RTZq1nQxe7+k5Q==", + "bin": { + "tsc": "bin/tsc" + } + }, "node_modules/type-check": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", @@ -6486,9 +6495,9 @@ } }, "node_modules/typescript": { - "version": "3.9.10", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz", - "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==", + "version": "4.9.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz", + "integrity": "sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -8208,9 +8217,9 @@ "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==" }, "cdk-ecr-deployment": { - "version": "2.5.5", - "resolved": "https://registry.npmjs.org/cdk-ecr-deployment/-/cdk-ecr-deployment-2.5.5.tgz", - "integrity": "sha512-glU4fIotzz/sTDqpTqEUs3XKSlYxWBFt5sTAWgZAzIUf149i3AIhrq3OoJsH7Q7WwjFcGcLX5+BFiHvPe9l1yg==", + "version": "2.5.6", + "resolved": "https://registry.npmjs.org/cdk-ecr-deployment/-/cdk-ecr-deployment-2.5.6.tgz", + "integrity": "sha512-Vl6FksKZLC1wE/ZjHvShg4fVZqOR8x2aIUAP+M3fe1MLKQHztApi0cG4ceVYf4FLpUlYXGRjTkJR28/cWY9RnQ==", "requires": { "aws-cdk-lib": "^2.0.0", "constructs": "^10.0.5", @@ -8331,7 +8340,7 @@ } }, "got": { - "version": "11.8.3", + "version": "11.8.5", "bundled": true, "requires": { "@sindresorhus/is": "^4.0.0", @@ -8711,9 +8720,9 @@ "dev": true }, "decode-uri-component": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", - "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=", + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz", + "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==", "dev": true }, "deep-is": { @@ -11842,6 +11851,11 @@ "yn": "3.1.1" } }, + "tsc": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/tsc/-/tsc-2.0.4.tgz", + "integrity": "sha512-fzoSieZI5KKJVBYGvwbVZs/J5za84f2lSTLPYf6AGiIf43tZ3GNrI1QzTLcjtyDDP4aLxd46RTZq1nQxe7+k5Q==" + }, "type-check": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", @@ -11878,9 +11892,9 @@ } }, "typescript": { - "version": "3.9.10", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz", - "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==", + "version": "4.9.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz", + "integrity": "sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==", "dev": true }, "union-value": { diff --git a/package.json b/package.json index 2a277b8..2449849 100644 --- a/package.json +++ b/package.json @@ -17,13 +17,14 @@ "jest": "^26.4.2", "ts-jest": "^26.2.0", "ts-node": "^9.0.0", - "typescript": "~3.9.7" + "typescript": "^4.9.4" }, "dependencies": { "@types/js-yaml": "4.0.5", "aws-cdk-lib": "2.32.1", - "cdk-ecr-deployment": "2.5.5", + "cdk-ecr-deployment": "^2.5.6", "constructs": "^10.0.0", - "sync-request": "6.1.0" + "sync-request": "6.1.0", + "tsc": "^2.0.4" } }