Merge pull request #1632 from openmeterio/tsp-fixes

Final TSP fixes

.dagger/ci.go

@@ -23,22 +23,22 @@ func (m *Openmeter) Ci(ctx context.Context) (*dagger.Directory, error) {
 
 	releaseAssets := dag.Directory().WithFiles("", m.releaseAssets("ci"))
 
-	generated := dag.Directory().
-		WithFile("", m.Generate().Openapi()).
-		WithDirectory("sdk/python", m.Generate().PythonSdk()).
-		WithDirectory("sdk/node", m.Generate().NodeSdk()).
-		WithDirectory("sdk/web", m.Generate().WebSdk())
+	// generated := dag.Directory().
+	// 	WithFile("", m.Generate().Openapi()).
+	// 	WithDirectory("sdk/python", m.Generate().PythonSdk()).
+	// 	WithDirectory("sdk/node", m.Generate().NodeSdk()).
+	// 	WithDirectory("sdk/web", m.Generate().WebSdk())
 
 	dir := dag.Directory().
 		WithFile("scans/image.sarif", trivy.Container(containerImages[0]).Report("sarif")).
 		WithFile("scans/helm-openmeter.sarif", trivy.HelmChart(helmChartOpenMeter).Report("sarif")).
 		WithFile("scans/helm-benthos-collector.sarif", trivy.HelmChart(helmChartBenthosCollector).Report("sarif")).
 		WithDirectory("charts/", helmCharts).
-		WithDirectory("release/", releaseAssets).
-		WithDirectory("generated/", generated)
+		WithDirectory("release/", releaseAssets)
+		// WithDirectory("generated/", generated)
 
 	p.addJobs(
-		m.Generate().Check,
+		// m.Generate().Check,
 
 		wrapSyncable(m.Test()),
 		m.Lint().All,

.github/workflows/ci.yaml

@@ -239,6 +239,11 @@ jobs:
         run: docker compose -f docker-compose.yaml -f docker-compose.ci.yaml up -d
         working-directory: quickstart
 
+      - name: Check container health
+        run: docker inspect --format "{{json .State.Health }}" $(docker container list --all --filter 'name=^*-openmeter-*' --format '{{.Names}}')
+        if: always()
+        continue-on-error: true
+
       - name: Wait for worker to become ready
         run: curl --retry 10 --retry-max-time 120 --retry-all-errors http://localhost:10000/healthz
 

.spectral.yaml

@@ -1,3 +1,7 @@
 extends: [[spectral:oas, recommended]]
 rules:
   info-contact: off
+
+  # Disabled due to TypeSpec conversion
+  oas3-valid-schema-example: off
+  no-$ref-siblings: off