chore: ensure project uses npm as package manager (#140)

* chore: ensure project uses npm as package manager * chore: skip eslint for otelbin-validation image * chore: move otel collector image to separate package * fix: prettify jest config * fix: path to validation image * fix: dirname * fix: restore esbuild in validator image build * fix: restore tests
dash0hq · Oct 20, 2023 · 94b0d38 · 94b0d38
1 parent 32b7a92
commit 94b0d38
Show file tree

Hide file tree

Showing 23 changed files with 234 additions and 5,851 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -145,7 +145,7 @@ jobs:
         run: |
           npm ci
 
-      - name: Retrieve API Key for Validation API
+      - name: Retrieve API Key for Validation API and run tests
         shell: bash
         working-directory: packages/otelbin-validation
         env:

diff --git a/.prettierignore b/.prettierignore
@@ -6,4 +6,5 @@
 *.md
 coverage
 .storybook/public/mockServiceWorker.js
-packages/otelbin-validation
+packages/otelbin-validation
+packages/otelbin-validation-image
diff --git a/jest.config.ts b/jest.config.ts
@@ -7,7 +7,7 @@ const config: Config = {
 		"^.+\\.ts?$": "ts-jest",
 	},
 	transformIgnorePatterns: ["<rootDir>/node_modules/"],
-	testPathIgnorePatterns: ["packages/otelbin-validation/*"],
+	testPathIgnorePatterns: ["packages/otelbin-validation/*", "packages/otelbin-validation-image/*"],
 };
 
 export default config;
diff --git a/...n/src/images/otelcol-validator/.gitignore → packages/otelbin-validation-image/.gitignore b/...n/src/images/otelcol-validator/.gitignore → packages/otelbin-validation-image/.gitignore
diff --git a/...n/src/images/otelcol-validator/Dockerfile → packages/otelbin-validation-image/Dockerfile b/...n/src/images/otelcol-validator/Dockerfile → packages/otelbin-validation-image/Dockerfile
diff --git a/...mages/otelcol-validator/package-lock.json → ...telbin-validation-image/package-lock.json b/...mages/otelcol-validator/package-lock.json → ...telbin-validation-image/package-lock.json
diff --git a/...src/images/otelcol-validator/package.json → ...ges/otelbin-validation-image/package.json b/...src/images/otelcol-validator/package.json → ...ges/otelbin-validation-image/package.json
@@ -19,10 +19,10 @@
   "homepage": "https://github.com/dash0hq/otelbin#readme",
   "devDependencies": {
     "@types/aws-lambda": "^8.10.122",
-    "aws-lambda": "^1.0.7",
     "esbuild": "^0.19.4"
   },
   "dependencies": {
+    "aws-lambda": "^1.0.7",
     "@expo/spawn-async": "^1.7.2",
     "js-yaml": "^4.1.0"
   }

diff --git a/.../images/otelcol-validator/rpm_download.sh → .../otelbin-validation-image/rpm_download.sh b/.../images/otelcol-validator/rpm_download.sh → .../otelbin-validation-image/rpm_download.sh
diff --git a/...src/images/otelcol-validator/src/index.ts → ...ges/otelbin-validation-image/src/index.ts b/...src/images/otelcol-validator/src/index.ts → ...ges/otelbin-validation-image/src/index.ts
diff --git a/packages/otelbin-validation/.eslintrc.json b/packages/otelbin-validation/.eslintrc.json
diff --git a/packages/otelbin-validation/.gitattributes b/packages/otelbin-validation/.gitattributes
diff --git a/packages/otelbin-validation/.gitignore b/packages/otelbin-validation/.gitignore
diff --git a/packages/otelbin-validation/.mergify.yml b/packages/otelbin-validation/.mergify.yml
diff --git a/packages/otelbin-validation/.npmignore b/packages/otelbin-validation/.npmignore
diff --git a/packages/otelbin-validation/.projen/deps.json b/packages/otelbin-validation/.projen/deps.json
diff --git a/packages/otelbin-validation/.projen/files.json b/packages/otelbin-validation/.projen/files.json
diff --git a/packages/otelbin-validation/.projen/tasks.json b/packages/otelbin-validation/.projen/tasks.json
diff --git a/packages/otelbin-validation/.projenrc.js b/packages/otelbin-validation/.projenrc.js
@@ -4,7 +4,18 @@ const project = new awscdk.AwsCdkTypeScriptApp({
   defaultReleaseBranch: 'main',
   name: 'otelbin-validation',
   deps: ['aws-lambda'],
-  devDeps: ['@jest/globals', '@types/aws-lambda', 'esbuild'],
+  devDeps: ['@jest/globals', '@types/aws-lambda', 'axios', 'esbuild'],
   github: false, // Skip GitHub integration, as this CDK app is not in the repo's root
+  packageManager: 'npm',
+  eslintOptions: {
+    ignorePatterns: [
+      '*.js',
+      '*.d.ts',
+      'node_modules/',
+      '*.generated.ts',
+      'coverage',
+      'src/images/otelcol-validator/',
+    ],
+  },
 });
 project.synth();