@xpertss/projen-types 0.0.21 → 0.0.22

package/README.md

@@ -36,6 +36,7 @@ All project types:
 - run a **drift check** in PR builds - a job that re-runs projen and fails if generated files were hand-edited. Edit `.projenrc.ts`, then run `npx projen`; never edit generated files directly.
 - use the GitHub secret `PROJEN_GITHUB_TOKEN` (a fine-grained PAT) for projen's automation. Override with `gheTokenSecret`.
 - make all publishing/deploying **manual** (workflow_dispatch) rather than on every merge.
+- offer an opt-in SonarCloud scan (`sonar.yml`) on any type via `sonarHostUrl` (see [SonarCloud (opt-in)](#sonarcloud-opt-in)).
 
 ## Getting started
 
@@ -60,9 +61,9 @@ installs dependencies. The type names `projen new` accepts are `cdk_infra`,
 `cdk_app`, `java_maven`, `java_library`, `java_app`, `java_spring_boot`,
 `java_service` and `git_hub_action`; pass a bogus one to have it list them.
 Required options become flags: `--name` for every type, plus
-`--group-id`/`--artifact-id` (Java) and `--sonar-host-url`
-(`git_hub_action`). Any other plainly-typed option can be passed the same
-way - `--java-version 1.8`, `--cdk-deploy-target-repo owner/repo`,
+`--group-id`/`--artifact-id` (Java). Any other plainly-typed option can be
+passed the same way - `--sonar-host-url` (opt-in Sonar, all types),
+`--java-version 1.8`, `--cdk-deploy-target-repo owner/repo`,
 `--docker-registry ghcr.io`, `--no-use-flyway`, and so on. Modules can't be
 passed on the command line; add them to `.projenrc.ts` afterwards (see
 [JavaMavenProject](#javamavenproject)).
@@ -329,7 +330,7 @@ You get:
   - **exact versions only**: a range such as `^1`, `~1.2` or `[1,2)` fails the synth
   - the compiler level, enforcer rule and JUnit line all follow `javaVersion`
 - one Maven run per build. `npx projen build` synthesizes, then runs `mvn -B verify`: compile, unit tests (surefire), package, and `*IT` integration tests (failsafe). There is no `mvn deploy` and no `dist/`.
-- `.github/workflows/build.yml`: a PR build that installs the pinned Node toolchain (`npm ci`) and the project's JDK (`actions/setup-java`, Maven cache), then runs `npx projen build`, plus a SonarQube step when `sonarProjectKey` is set. See [Adding CI jobs](#adding-ci-jobs-to-a-java-project).
+- `.github/workflows/build.yml`: a PR build that installs the pinned Node toolchain (`npm ci`) and the project's JDK (`actions/setup-java`, Maven cache), then runs `npx projen build`. The Maven build itself never runs a Sonar step - SonarCloud scanning is a separate, opt-in `sonar.yml` (set `sonarHostUrl`). See [Adding CI jobs](#adding-ci-jobs-to-a-java-project) and [SonarCloud (opt-in)](#sonarcloud-opt-in).
 - `.github/workflows/upgrade.yml`: a nightly (03:00 UTC) **report** of available dependency and plugin updates in the job summary. It changes nothing, because every version comes from `.projenrc.ts`; apply an update there. Turn it off with `upgradeWorkflow: false`. The same report runs locally with `npx projen upgrade`.
 - the projen drift check, `LICENSE` (MIT by default), `.editorconfig`, and a generated `package.json` that pins the projen toolchain exactly.
 - no sample code, unless `sample: true` on a single-module project.
@@ -353,7 +354,7 @@ const project = new JavaLibraryProject({
   groupId: 'org.xpertss',
   artifactId: 'common-utils',
   version: '1.0.0',
-  sonarProjectKey: 'org.xpertss:common-utils',
+  sonarHostUrl: 'https://sonarcloud.io',   // opt-in: adds sonar.yml (see SonarCloud)
   mavenCentralOidc: true,
 });
 
@@ -491,7 +492,7 @@ import { GitHubActionProject } from '@xpertss/projen-types';
 const project = new GitHubActionProject({
   name: 'auto-commit',
   description: 'Stage a folder and, only if it changed, commit and push it',
-  sonarHostUrl: 'https://sonarcloud.io',       // required, no default - your SonarCloud URL
+  sonarHostUrl: 'https://sonarcloud.io',       // optional - set it to add sonar.yml (see SonarCloud)
   sonarOrganization: 'xpertss',                 // default - your SonarCloud org key
   dogfood: {
     // Two scenario steps: the "changed" path and the "no-op" path are both
@@ -538,14 +539,14 @@ project.synth();
 You get:
 
 - `action.yml` and `auto-commit.sh` are hand-written - this type only lints their content via `build.yml`'s shellcheck/yamllint/actionlint checks.
-- `.github/workflows/build.yml` - lint gate: `apt`-installed shellcheck/yamllint plus a pinned, SHA-256-verified `actionlint` release binary. Gates `main` alongside `sonar.yml`.
+- `.github/workflows/build.yml` - lint gate: `apt`-installed shellcheck/yamllint plus a pinned, SHA-256-verified `actionlint` release binary. Gates `main` (alongside `sonar.yml` when Sonar is enabled).
 - `.github/workflows/test-dogfood.yml` - runs the `dogfood.scenario` steps above against this repo's own `action.yml` (via `uses: ./`), then the shared `cleanup`, on `workflow_dispatch`, every `pull_request`, and nightly. Omit `dogfood` and the workflow still exists, with one step that fails on every PR until you declare a scenario - AD-001 allows a dogfood to be missing loudly, never silently. A *partial* `dogfood` (a scenario with no cleanup) is a synth error.
-- `.github/workflows/sonar.yml` - SonarCloud scan via the Scanner CLI (the quality gate blocks the PR), scanning `action.yml`/`.github/workflows/**`/`**/*.sh` explicitly.
+- `.github/workflows/sonar.yml` - SonarCloud scan via the Scanner CLI (the quality gate blocks the PR), scanning `action.yml`/`.github/workflows/**`/`**/*.sh` explicitly. Opt-in: generated only when `sonarHostUrl` is set (see [SonarCloud (opt-in)](#sonarcloud-opt-in)).
 - `.github/workflows/release.yml` - `feat:`/`fix:` commits on `main` bump the version, tag `vX.Y.Z`, and create a GitHub Release.
 - `.github/workflows/projen-drift-check.yml` and `workflow-change-notice.yml` - drift detection and a change notice, always included.
 - `package.json` (**private**, version source only), `.yamllint`, `LICENSE` (MIT by default), and a `README.md` template - all regenerated by `npx projen`.
 
-Needs the same two secrets as everything else in this package: `PROJEN_GITHUB_TOKEN` (used for automated PR comments) and `SONAR_TOKEN` (the Sonar scan). Onboard a brand-new action repo by running the `projen new` command above first (see [Getting started](#getting-started)), then replace the generated `.projenrc.ts` with the one above and run `npx projen`, then hand-write `action.yml`/`auto-commit.sh`/`test/fixtures/`. If you wrote the `.projenrc.ts` before running `projen new`, see [Starting from an existing `.projenrc.ts`](#starting-from-an-existing-projenrcts).
+Needs `PROJEN_GITHUB_TOKEN` (used for automated PR comments), and `SONAR_TOKEN` only when Sonar is enabled (see [SonarCloud (opt-in)](#sonarcloud-opt-in)). Onboard a brand-new action repo by running the `projen new` command above first (see [Getting started](#getting-started)), then replace the generated `.projenrc.ts` with the one above and run `npx projen`, then hand-write `action.yml`/`auto-commit.sh`/`test/fixtures/`. If you wrote the `.projenrc.ts` before running `projen new`, see [Starting from an existing `.projenrc.ts`](#starting-from-an-existing-projenrcts).
 
 ## Java version support
 
@@ -640,7 +641,7 @@ Java project types (`JavaMavenProjectOptions` and everything built on it - `Java
 | `copyrightOwner` / `copyrightPeriod` | `Xpert Software` / current year | Named in the `LICENSE` |
 | `editorconfig` | `true` | Write a projen-managed `.editorconfig` (also on the CDK and action types) |
 | `upgradeWorkflow` | `true` | Generate the nightly update report (`upgrade.yml`) |
-| `sonarProjectKey` | - | SonarQube project key; the sonar step is skipped when unset |
+| Sonar options | - | `sonarHostUrl`, `sonarOrganization`, `sonarTokenSecret`, `sonarPullRequestGate`, `sonarProjectKey` - SonarCloud is opt-in; see [SonarCloud (opt-in)](#sonarcloud-opt-in) |
 | `gheTokenSecret` | `PROJEN_GITHUB_TOKEN` | GitHub secret holding projen's PAT |
 | `springBootVersion` | newest Boot for `javaVersion` (Spring Boot types only) | Exact Spring Boot version: the BOM and `spring-boot-maven-plugin` |
 | `cdkDeployTargetRepo` | - (service only; `deploy-cdk.yml` fails until set) | Companion CDK repo (`owner/repo`) whose `deploy.yml` the deploy hook dispatches |
@@ -692,10 +693,7 @@ Plain strings (`'dev'`) are shorthand for `{ name: 'dev' }`.
 | --- | --- | --- |
 | `name` | - (required) | Project name |
 | `description` | - | One-line description; used in the default README template and recorded in the private `package.json` |
-| `sonarHostUrl` | - (required) | URL of your SonarCloud instance (e.g. `https://sonarcloud.io`); must be reachable from github.com-hosted runners |
-| `sonarOrganization` | `xpertss` | SonarCloud org key (`sonar.organization`); required by the Scanner CLI, not derived from the token |
-| `sonarTokenSecret` | `SONAR_TOKEN` | GitHub secret holding the Sonar token |
-| `sonarPullRequestGate` | `true` | Whether `sonar.yml` also runs on `pull_request` as a pass/fail gate |
+| Sonar options | - | `sonarHostUrl`, `sonarOrganization`, `sonarTokenSecret`, `sonarPullRequestGate`, `sonarProjectKey` - SonarCloud is opt-in; see [SonarCloud (opt-in)](#sonarcloud-opt-in) |
 | `dogfood` | - (a `test-dogfood.yml` that fails until you declare one) | `ActionDogfoodOptions` - the scenario that exercises the action end-to-end via `uses: ./` |
 | `license` | `MIT` | SPDX identifier for the generated `LICENSE` |
 | `copyrightOwner` / `copyrightPeriod` | `Xpert Software` / current year | Named in the `LICENSE` |
@@ -720,12 +718,38 @@ interface ActionDogfoodStep {
 
 Most actions need exactly one `scenario` step. Actions with a re-run/no-op/idempotency behavior to verify (e.g. `auto-commit`'s no-op-on-no-change path, `create-pull-request`'s reuse-the-PR path) declare two - the second typically omits `fixtureSteps` so its invocation sees no new state, and its assertion checks the opposite outcome of the first. Reference an invocation's own outputs from a later assertion via `${{ steps.<id>.outputs.<name> }}`, using either the default slug or an explicit `id`.
 
+## SonarCloud (opt-in)
+
+SonarCloud is a shared, **opt-in** capability on every project type (CDK, Java, and GitHub Action). Set `sonarHostUrl` on any type and it generates a `.github/workflows/sonar.yml` that runs a pinned, SHA-256-verified Sonar Scanner CLI and blocks the PR on the quality gate. Omit it and no `sonar.yml` is generated. The Maven build itself never runs a Sonar step.
+
+Shared options (accepted by the CDK types, every Java type, and `GitHubActionProject`):
+
+| Option | Default | Description |
+| --- | --- | --- |
+| `sonarHostUrl` | - (required to enable) | URL of your SonarCloud instance (e.g. `https://sonarcloud.io`); must be reachable from github.com-hosted runners |
+| `sonarOrganization` | `xpertss` | SonarCloud org key (`sonar.organization`); required by the Scanner CLI, not derived from the token |
+| `sonarProjectKey` | `${sonarOrganization}_${name}` | `sonar.projectKey` - the org + project key SonarCloud uses (e.g. `xpertss_create-pull-request`) |
+| `sonarTokenSecret` | `SONAR_TOKEN` | GitHub secret holding the Sonar token |
+| `sonarPullRequestGate` | `true` | Whether `sonar.yml` also runs on `pull_request` as a pass/fail gate |
+
+Inclusions differ by type: a `GitHubActionProject` scans `action.yml`/`.github/workflows/**`/`**/*.sh` explicitly (YAML and shell are not in Sonar's default-recognized set), while the CDK and Java types rely on Sonar's default inclusions for their languages.
+
+```typescript
+new CdkInfraProject({
+  name: 'my-infra',
+  environments: ['dev', 'prod'],
+  sonarHostUrl: 'https://sonarcloud.io',   // adds sonar.yml
+});
+```
+
+Requires the `SONAR_TOKEN` secret (rename it with `sonarTokenSecret`).
+
 ## Required GitHub secrets
 
 | Secret | Used by | Notes |
 | --- | --- | --- |
 | `PROJEN_GITHUB_TOKEN` | all types | PAT for projen's self-mutation/automation; override via `gheTokenSecret` |
-| `SONAR_TOKEN` | Java types with `sonarProjectKey`; `GitHubActionProject` | SonarQube scan step in `build.yml` / `sonar.yml`; override via `sonarTokenSecret` on `GitHubActionProject` |
+| `SONAR_TOKEN` | any type with `sonarHostUrl` set | SonarCloud scan in `sonar.yml`; override the secret name via `sonarTokenSecret` |
 | `DOCKER_USERNAME` / `DOCKER_PASSWORD` | `JavaServiceProject` | Docker image push |
 | `MAVEN_GPG_PRIVATE_KEY`, `MAVEN_GPG_PASSPHRASE`, `MAVEN_CENTRAL_USERNAME`, `MAVEN_CENTRAL_PASSWORD` | `JavaLibraryProject` without `mavenCentralOidc` | Not needed with OIDC trusted publishing |
 
@@ -780,7 +804,7 @@ The project types are composed from smaller components you can also attach to yo
 | `CodeIndexWorkflow` | `JavaMavenProject` | Code index generation on push to `main` |
 | `ActionBuildWorkflow` | `GitHubProject` | The `lint` task (shellcheck/yamllint/pinned actionlint) + `build.yml` |
 | `ActionDogfoodWorkflow` | `GitHubProject` | `test-dogfood.yml` from an `ActionDogfoodOptions` scenario |
-| `ActionSonarWorkflow` | `GitHubProject` | `sonar.yml` (SonarCloud scan via the Scanner CLI) |
+| `SonarWorkflow` | `GitHubProject` | `sonar.yml` (SonarCloud scan via the Scanner CLI); opt-in, shared by every type via `sonarHostUrl` |
 
 Example - adding a Docker publish to a `JavaMavenProject` (`JavaServiceProject` is the packaged version of this, with Spring Boot):
 

package/lib/actions/action-build-workflow.js

@@ -20,7 +20,7 @@ const ACTIONLINT_SHA256 = '8aca8db96f1b94770f1b0d72b6dddcb1ebb8123cb3712530b08cc
  * the release build job, so the lint commands exist in exactly one place.
  */
 class ActionBuildWorkflow extends projen_1.Component {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@xpertss/projen-types.ActionBuildWorkflow", version: "0.0.21" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@xpertss/projen-types.ActionBuildWorkflow", version: "0.0.22" };
     task;
     workflow;
     constructor(scope) {

package/lib/actions/action-dogfood-workflow.js

@@ -41,7 +41,7 @@ const UNCONFIGURED_STEPS = [
  * error: if you wrote a scenario by hand, you can write its cleanup too.
  */
 class ActionDogfoodWorkflow extends projen_1.Component {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@xpertss/projen-types.ActionDogfoodWorkflow", version: "0.0.21" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@xpertss/projen-types.ActionDogfoodWorkflow", version: "0.0.22" };
     workflow;
     constructor(scope, options) {
         super(scope, 'ActionDogfoodWorkflow');

package/lib/actions/action-sonar-workflow.d.ts

@@ -1,32 +1,13 @@
-import { Component, github } from 'projen';
-export interface ActionSonarWorkflowOptions {
-    /**
-     * URL of the org's SonarCloud instance (e.g. `https://sonarcloud.io`).
-     * Required, no default - a guessed server is worse than a loud failure.
-     */
-    readonly sonarHostUrl: string;
-    /**
-     * SonarCloud organization key (`sonar.organization`). Mandatory for the
-     * Scanner CLI on SonarCloud - it is not derived from the token, so a scan
-     * without it always fails.
-     * @default "xpertss"
-     */
-    readonly sonarOrganization?: string;
-    /** @default "SONAR_TOKEN" */
-    readonly sonarTokenSecret?: string;
-    /**
-     * Whether `sonar.yml` also runs on `pull_request` as a pass/fail gate.
-     * @default true
-     */
-    readonly sonarPullRequestGate?: boolean;
-}
+import { github } from 'projen';
+import { SonarWorkflow, SonarWorkflowOptions } from '../common/sonar-workflow';
 /**
- * AD-001 Layer 2: SonarCloud via the Scanner CLI only (never
- * `SonarSource/sonarqube-scan-action` - third-party, and it carried a
- * security advisory). `sonar.inclusions` is set explicitly since default
- * inclusions may skip `action.yml` outside `.github/`.
+ * @deprecated Renamed to `SonarWorkflow` (now in `src/common/` and applied to
+ * every project type, not just actions). Use `SonarWorkflow` instead; this
+ * subclass is kept only so existing imports of `ActionSonarWorkflow` keep
+ * compiling. It behaves identically to `SonarWorkflow`.
  */
-export declare class ActionSonarWorkflow extends Component {
-    readonly workflow: github.GithubWorkflow;
-    constructor(scope: github.GitHubProject, options: ActionSonarWorkflowOptions);
+export declare class ActionSonarWorkflow extends SonarWorkflow {
+    constructor(scope: github.GitHubProject, options: SonarWorkflowOptions);
 }
+/** @deprecated Renamed to `SonarWorkflowOptions`. */
+export type ActionSonarWorkflowOptions = SonarWorkflowOptions;

package/lib/actions/action-sonar-workflow.js

@@ -2,67 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ActionSonarWorkflow = void 0;
 const JSII_RTTI_SYMBOL_1 = Symbol.for("jsii.rtti");
-const projen_1 = require("projen");
-const workflow_purpose_1 = require("../common/workflow-purpose");
-// Pinned release + verified SHA-256 (linux-x64) - upgrade is a reviewed diff
-// of this constant, never a floating version (AD-001).
-const SONAR_SCANNER_VERSION = '8.1.0.6389';
-const SONAR_SCANNER_SHA256 = 'bb8f709f9cb73352f8d1260a3b3c506c0f41146754bc630762c126d795499d0b';
+const sonar_workflow_1 = require("../common/sonar-workflow");
 /**
- * AD-001 Layer 2: SonarCloud via the Scanner CLI only (never
- * `SonarSource/sonarqube-scan-action` - third-party, and it carried a
- * security advisory). `sonar.inclusions` is set explicitly since default
- * inclusions may skip `action.yml` outside `.github/`.
+ * @deprecated Renamed to `SonarWorkflow` (now in `src/common/` and applied to
+ * every project type, not just actions). Use `SonarWorkflow` instead; this
+ * subclass is kept only so existing imports of `ActionSonarWorkflow` keep
+ * compiling. It behaves identically to `SonarWorkflow`.
  */
-class ActionSonarWorkflow extends projen_1.Component {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@xpertss/projen-types.ActionSonarWorkflow", version: "0.0.21" };
-    workflow;
+class ActionSonarWorkflow extends sonar_workflow_1.SonarWorkflow {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@xpertss/projen-types.ActionSonarWorkflow", version: "0.0.22" };
     constructor(scope, options) {
-        super(scope, 'ActionSonarWorkflow');
-        if (!options.sonarHostUrl) {
-            throw new Error('ActionSonarWorkflow requires sonarHostUrl');
-        }
-        const gh = scope.github;
-        if (!gh) {
-            throw new Error('ActionSonarWorkflow requires GitHub integration to be enabled');
-        }
-        const sonarTokenSecret = options.sonarTokenSecret ?? 'SONAR_TOKEN';
-        const pullRequestGate = options.sonarPullRequestGate ?? true;
-        const sonarOrganization = options.sonarOrganization ?? 'xpertss';
-        this.workflow = new projen_1.github.GithubWorkflow(gh, 'sonar');
-        (0, workflow_purpose_1.noteWorkflowPurpose)(this.workflow.file, 'Static-analysis scan of the action on the org SonarCloud.');
-        this.workflow.on({
-            push: { branches: ['main'] },
-            ...(pullRequestGate ? { pullRequest: {} } : {}),
-        });
-        this.workflow.addJob('sonar', {
-            runsOn: ['ubuntu-latest'],
-            permissions: { contents: projen_1.github.workflows.JobPermission.READ },
-            env: { SONAR_TOKEN: `\${{ secrets.${sonarTokenSecret} }}` },
-            steps: [
-                projen_1.github.WorkflowSteps.checkout(),
-                {
-                    name: 'Install sonar-scanner',
-                    run: `set -euo pipefail
-curl -fsSL -o /tmp/sonar-scanner.zip "https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_SCANNER_VERSION}-linux-x64.zip"
-echo "${SONAR_SCANNER_SHA256}  /tmp/sonar-scanner.zip" | sha256sum -c -
-unzip -q /tmp/sonar-scanner.zip -d /tmp
-echo "/tmp/sonar-scanner-${SONAR_SCANNER_VERSION}-linux-x64/bin" >> "$GITHUB_PATH"
-`,
-                },
-                {
-                    name: 'Scan',
-                    run: `sonar-scanner \\
-  -Dsonar.host.url=${options.sonarHostUrl} \\
-  -Dsonar.organization=${sonarOrganization} \\
-  -Dsonar.projectKey=${scope.name} \\
-  -Dsonar.projectVersion="$(git describe --tags --always)" \\
-  -Dsonar.inclusions=.github/workflows/**,action.yml,**/*.sh \\
-  -Dsonar.qualitygate.wait=true`,
-                },
-            ],
-        });
+        super(scope, options);
     }
 }
 exports.ActionSonarWorkflow = ActionSonarWorkflow;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWN0aW9uLXNvbmFyLXdvcmtmbG93LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FjdGlvbnMvYWN0aW9uLXNvbmFyLXdvcmtmbG93LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7QUFBQSxtQ0FBMkM7QUFDM0MsaUVBQWlFO0FBRWpFLDZFQUE2RTtBQUM3RSx1REFBdUQ7QUFDdkQsTUFBTSxxQkFBcUIsR0FBRyxZQUFZLENBQUM7QUFDM0MsTUFBTSxvQkFBb0IsR0FDeEIsa0VBQWtFLENBQUM7QUEyQnJFOzs7OztHQUtHO0FBQ0gsTUFBYSxtQkFBb0IsU0FBUSxrQkFBUzs7SUFDaEMsUUFBUSxDQUF3QjtJQUVoRCxZQUNFLEtBQTJCLEVBQzNCLE9BQW1DO1FBRW5DLEtBQUssQ0FBQyxLQUFLLEVBQUUscUJBQXFCLENBQUMsQ0FBQztRQUVwQyxJQUFJLENBQUMsT0FBTyxDQUFDLFlBQVksRUFBRSxDQUFDO1lBQzFCLE1BQU0sSUFBSSxLQUFLLENBQUMsMkNBQTJDLENBQUMsQ0FBQztRQUMvRCxDQUFDO1FBRUQsTUFBTSxFQUFFLEdBQUcsS0FBSyxDQUFDLE1BQU0sQ0FBQztRQUN4QixJQUFJLENBQUMsRUFBRSxFQUFFLENBQUM7WUFDUixNQUFNLElBQUksS0FBSyxDQUNiLCtEQUErRCxDQUNoRSxDQUFDO1FBQ0osQ0FBQztRQUVELE1BQU0sZ0JBQWdCLEdBQUcsT0FBTyxDQUFDLGdCQUFnQixJQUFJLGFBQWEsQ0FBQztRQUNuRSxNQUFNLGVBQWUsR0FBRyxPQUFPLENBQUMsb0JBQW9CLElBQUksSUFBSSxDQUFDO1FBQzdELE1BQU0saUJBQWlCLEdBQUcsT0FBTyxDQUFDLGlCQUFpQixJQUFJLFNBQVMsQ0FBQztRQUVqRSxJQUFJLENBQUMsUUFBUSxHQUFHLElBQUksZUFBTSxDQUFDLGNBQWMsQ0FBQyxFQUFFLEVBQUUsT0FBTyxDQUFDLENBQUM7UUFDdkQsSUFBQSxzQ0FBbUIsRUFDakIsSUFBSSxDQUFDLFFBQVEsQ0FBQyxJQUFJLEVBQ2xCLDJEQUEyRCxDQUM1RCxDQUFDO1FBQ0YsSUFBSSxDQUFDLFFBQVEsQ0FBQyxFQUFFLENBQUM7WUFDZixJQUFJLEVBQUUsRUFBRSxRQUFRLEVBQUUsQ0FBQyxNQUFNLENBQUMsRUFBRTtZQUM1QixHQUFHLENBQUMsZUFBZSxDQUFDLENBQUMsQ0FBQyxFQUFFLFdBQVcsRUFBRSxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDO1NBQ2hELENBQUMsQ0FBQztRQUNILElBQUksQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLE9BQU8sRUFBRTtZQUM1QixNQUFNLEVBQUUsQ0FBQyxlQUFlLENBQUM7WUFDekIsV0FBVyxFQUFFLEVBQUUsUUFBUSxFQUFFLGVBQU0sQ0FBQyxTQUFTLENBQUMsYUFBYSxDQUFDLElBQUksRUFBRTtZQUM5RCxHQUFHLEVBQUUsRUFBRSxXQUFXLEVBQUUsZ0JBQWdCLGdCQUFnQixLQUFLLEVBQUU7WUFDM0QsS0FBSyxFQUFFO2dCQUNMLGVBQU0sQ0FBQyxhQUFhLENBQUMsUUFBUSxFQUFFO2dCQUMvQjtvQkFDRSxJQUFJLEVBQUUsdUJBQXVCO29CQUM3QixHQUFHLEVBQUU7MEhBQzJHLHFCQUFxQjtRQUN2SSxvQkFBb0I7OzJCQUVELHFCQUFxQjtDQUMvQztpQkFDUTtnQkFDRDtvQkFDRSxJQUFJLEVBQUUsTUFBTTtvQkFDWixHQUFHLEVBQUU7cUJBQ00sT0FBTyxDQUFDLFlBQVk7eUJBQ2hCLGlCQUFpQjt1QkFDbkIsS0FBSyxDQUFDLElBQUk7OztnQ0FHRDtpQkFDdkI7YUFDRjtTQUNGLENBQUMsQ0FBQztJQUNMLENBQUM7O0FBNURILGtEQTZEQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IENvbXBvbmVudCwgZ2l0aHViIH0gZnJvbSAncHJvamVuJztcbmltcG9ydCB7IG5vdGVXb3JrZmxvd1B1cnBvc2UgfSBmcm9tICcuLi9jb21tb24vd29ya2Zsb3ctcHVycG9zZSc7XG5cbi8vIFBpbm5lZCByZWxlYXNlICsgdmVyaWZpZWQgU0hBLTI1NiAobGludXgteDY0KSAtIHVwZ3JhZGUgaXMgYSByZXZpZXdlZCBkaWZmXG4vLyBvZiB0aGlzIGNvbnN0YW50LCBuZXZlciBhIGZsb2F0aW5nIHZlcnNpb24gKEFELTAwMSkuXG5jb25zdCBTT05BUl9TQ0FOTkVSX1ZFUlNJT04gPSAnOC4xLjAuNjM4OSc7XG5jb25zdCBTT05BUl9TQ0FOTkVSX1NIQTI1NiA9XG4gICdiYjhmNzA5ZjljYjczMzUyZjhkMTI2MGEzYjNjNTA2YzBmNDExNDY3NTRiYzYzMDc2MmMxMjZkNzk1NDk5ZDBiJztcblxuZXhwb3J0IGludGVyZmFjZSBBY3Rpb25Tb25hcldvcmtmbG93T3B0aW9ucyB7XG4gIC8qKlxuICAgKiBVUkwgb2YgdGhlIG9yZydzIFNvbmFyQ2xvdWQgaW5zdGFuY2UgKGUuZy4gYGh0dHBzOi8vc29uYXJjbG91ZC5pb2ApLlxuICAgKiBSZXF1aXJlZCwgbm8gZGVmYXVsdCAtIGEgZ3Vlc3NlZCBzZXJ2ZXIgaXMgd29yc2UgdGhhbiBhIGxvdWQgZmFpbHVyZS5cbiAgICovXG4gIHJlYWRvbmx5IHNvbmFySG9zdFVybDogc3RyaW5nO1xuXG4gIC8qKlxuICAgKiBTb25hckNsb3VkIG9yZ2FuaXphdGlvbiBrZXkgKGBzb25hci5vcmdhbml6YXRpb25gKS4gTWFuZGF0b3J5IGZvciB0aGVcbiAgICogU2Nhbm5lciBDTEkgb24gU29uYXJDbG91ZCAtIGl0IGlzIG5vdCBkZXJpdmVkIGZyb20gdGhlIHRva2VuLCBzbyBhIHNjYW5cbiAgICogd2l0aG91dCBpdCBhbHdheXMgZmFpbHMuXG4gICAqIEBkZWZhdWx0IFwieHBlcnRzc1wiXG4gICAqL1xuICByZWFkb25seSBzb25hck9yZ2FuaXphdGlvbj86IHN0cmluZztcblxuICAvKiogQGRlZmF1bHQgXCJTT05BUl9UT0tFTlwiICovXG4gIHJlYWRvbmx5IHNvbmFyVG9rZW5TZWNyZXQ/OiBzdHJpbmc7XG5cbiAgLyoqXG4gICAqIFdoZXRoZXIgYHNvbmFyLnltbGAgYWxzbyBydW5zIG9uIGBwdWxsX3JlcXVlc3RgIGFzIGEgcGFzcy9mYWlsIGdhdGUuXG4gICAqIEBkZWZhdWx0IHRydWVcbiAgICovXG4gIHJlYWRvbmx5IHNvbmFyUHVsbFJlcXVlc3RHYXRlPzogYm9vbGVhbjtcbn1cblxuLyoqXG4gKiBBRC0wMDEgTGF5ZXIgMjogU29uYXJDbG91ZCB2aWEgdGhlIFNjYW5uZXIgQ0xJIG9ubHkgKG5ldmVyXG4gKiBgU29uYXJTb3VyY2Uvc29uYXJxdWJlLXNjYW4tYWN0aW9uYCAtIHRoaXJkLXBhcnR5LCBhbmQgaXQgY2FycmllZCBhXG4gKiBzZWN1cml0eSBhZHZpc29yeSkuIGBzb25hci5pbmNsdXNpb25zYCBpcyBzZXQgZXhwbGljaXRseSBzaW5jZSBkZWZhdWx0XG4gKiBpbmNsdXNpb25zIG1heSBza2lwIGBhY3Rpb24ueW1sYCBvdXRzaWRlIGAuZ2l0aHViL2AuXG4gKi9cbmV4cG9ydCBjbGFzcyBBY3Rpb25Tb25hcldvcmtmbG93IGV4dGVuZHMgQ29tcG9uZW50IHtcbiAgcHVibGljIHJlYWRvbmx5IHdvcmtmbG93OiBnaXRodWIuR2l0aHViV29ya2Zsb3c7XG5cbiAgY29uc3RydWN0b3IoXG4gICAgc2NvcGU6IGdpdGh1Yi5HaXRIdWJQcm9qZWN0LFxuICAgIG9wdGlvbnM6IEFjdGlvblNvbmFyV29ya2Zsb3dPcHRpb25zLFxuICApIHtcbiAgICBzdXBlcihzY29wZSwgJ0FjdGlvblNvbmFyV29ya2Zsb3cnKTtcblxuICAgIGlmICghb3B0aW9ucy5zb25hckhvc3RVcmwpIHtcbiAgICAgIHRocm93IG5ldyBFcnJvcignQWN0aW9uU29uYXJXb3JrZmxvdyByZXF1aXJlcyBzb25hckhvc3RVcmwnKTtcbiAgICB9XG5cbiAgICBjb25zdCBnaCA9IHNjb3BlLmdpdGh1YjtcbiAgICBpZiAoIWdoKSB7XG4gICAgICB0aHJvdyBuZXcgRXJyb3IoXG4gICAgICAgICdBY3Rpb25Tb25hcldvcmtmbG93IHJlcXVpcmVzIEdpdEh1YiBpbnRlZ3JhdGlvbiB0byBiZSBlbmFibGVkJyxcbiAgICAgICk7XG4gICAgfVxuXG4gICAgY29uc3Qgc29uYXJUb2tlblNlY3JldCA9IG9wdGlvbnMuc29uYXJUb2tlblNlY3JldCA/PyAnU09OQVJfVE9LRU4nO1xuICAgIGNvbnN0IHB1bGxSZXF1ZXN0R2F0ZSA9IG9wdGlvbnMuc29uYXJQdWxsUmVxdWVzdEdhdGUgPz8gdHJ1ZTtcbiAgICBjb25zdCBzb25hck9yZ2FuaXphdGlvbiA9IG9wdGlvbnMuc29uYXJPcmdhbml6YXRpb24gPz8gJ3hwZXJ0c3MnO1xuXG4gICAgdGhpcy53b3JrZmxvdyA9IG5ldyBnaXRodWIuR2l0aHViV29ya2Zsb3coZ2gsICdzb25hcicpO1xuICAgIG5vdGVXb3JrZmxvd1B1cnBvc2UoXG4gICAgICB0aGlzLndvcmtmbG93LmZpbGUsXG4gICAgICAnU3RhdGljLWFuYWx5c2lzIHNjYW4gb2YgdGhlIGFjdGlvbiBvbiB0aGUgb3JnIFNvbmFyQ2xvdWQuJyxcbiAgICApO1xuICAgIHRoaXMud29ya2Zsb3cub24oe1xuICAgICAgcHVzaDogeyBicmFuY2hlczogWydtYWluJ10gfSxcbiAgICAgIC4uLihwdWxsUmVxdWVzdEdhdGUgPyB7IHB1bGxSZXF1ZXN0OiB7fSB9IDoge30pLFxuICAgIH0pO1xuICAgIHRoaXMud29ya2Zsb3cuYWRkSm9iKCdzb25hcicsIHtcbiAgICAgIHJ1bnNPbjogWyd1YnVudHUtbGF0ZXN0J10sXG4gICAgICBwZXJtaXNzaW9uczogeyBjb250ZW50czogZ2l0aHViLndvcmtmbG93cy5Kb2JQZXJtaXNzaW9uLlJFQUQgfSxcbiAgICAgIGVudjogeyBTT05BUl9UT0tFTjogYFxcJHt7IHNlY3JldHMuJHtzb25hclRva2VuU2VjcmV0fSB9fWAgfSxcbiAgICAgIHN0ZXBzOiBbXG4gICAgICAgIGdpdGh1Yi5Xb3JrZmxvd1N0ZXBzLmNoZWNrb3V0KCksXG4gICAgICAgIHtcbiAgICAgICAgICBuYW1lOiAnSW5zdGFsbCBzb25hci1zY2FubmVyJyxcbiAgICAgICAgICBydW46IGBzZXQgLWV1byBwaXBlZmFpbFxuY3VybCAtZnNTTCAtbyAvdG1wL3NvbmFyLXNjYW5uZXIuemlwIFwiaHR0cHM6Ly9iaW5hcmllcy5zb25hcnNvdXJjZS5jb20vRGlzdHJpYnV0aW9uL3NvbmFyLXNjYW5uZXItY2xpL3NvbmFyLXNjYW5uZXItY2xpLSR7U09OQVJfU0NBTk5FUl9WRVJTSU9OfS1saW51eC14NjQuemlwXCJcbmVjaG8gXCIke1NPTkFSX1NDQU5ORVJfU0hBMjU2fSAgL3RtcC9zb25hci1zY2FubmVyLnppcFwiIHwgc2hhMjU2c3VtIC1jIC1cbnVuemlwIC1xIC90bXAvc29uYXItc2Nhbm5lci56aXAgLWQgL3RtcFxuZWNobyBcIi90bXAvc29uYXItc2Nhbm5lci0ke1NPTkFSX1NDQU5ORVJfVkVSU0lPTn0tbGludXgteDY0L2JpblwiID4+IFwiJEdJVEhVQl9QQVRIXCJcbmAsXG4gICAgICAgIH0sXG4gICAgICAgIHtcbiAgICAgICAgICBuYW1lOiAnU2NhbicsXG4gICAgICAgICAgcnVuOiBgc29uYXItc2Nhbm5lciBcXFxcXG4gIC1Ec29uYXIuaG9zdC51cmw9JHtvcHRpb25zLnNvbmFySG9zdFVybH0gXFxcXFxuICAtRHNvbmFyLm9yZ2FuaXphdGlvbj0ke3NvbmFyT3JnYW5pemF0aW9ufSBcXFxcXG4gIC1Ec29uYXIucHJvamVjdEtleT0ke3Njb3BlLm5hbWV9IFxcXFxcbiAgLURzb25hci5wcm9qZWN0VmVyc2lvbj1cIiQoZ2l0IGRlc2NyaWJlIC0tdGFncyAtLWFsd2F5cylcIiBcXFxcXG4gIC1Ec29uYXIuaW5jbHVzaW9ucz0uZ2l0aHViL3dvcmtmbG93cy8qKixhY3Rpb24ueW1sLCoqLyouc2ggXFxcXFxuICAtRHNvbmFyLnF1YWxpdHlnYXRlLndhaXQ9dHJ1ZWAsXG4gICAgICAgIH0sXG4gICAgICBdLFxuICAgIH0pO1xuICB9XG59XG4iXX0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWN0aW9uLXNvbmFyLXdvcmtmbG93LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FjdGlvbnMvYWN0aW9uLXNvbmFyLXdvcmtmbG93LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7QUFDQSw2REFBK0U7QUFFL0U7Ozs7O0dBS0c7QUFDSCxNQUFhLG1CQUFvQixTQUFRLDhCQUFhOztJQUNwRCxZQUFZLEtBQTJCLEVBQUUsT0FBNkI7UUFDcEUsS0FBSyxDQUFDLEtBQUssRUFBRSxPQUFPLENBQUMsQ0FBQztJQUN4QixDQUFDOztBQUhILGtEQUlDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgZ2l0aHViIH0gZnJvbSAncHJvamVuJztcbmltcG9ydCB7IFNvbmFyV29ya2Zsb3csIFNvbmFyV29ya2Zsb3dPcHRpb25zIH0gZnJvbSAnLi4vY29tbW9uL3NvbmFyLXdvcmtmbG93JztcblxuLyoqXG4gKiBAZGVwcmVjYXRlZCBSZW5hbWVkIHRvIGBTb25hcldvcmtmbG93YCAobm93IGluIGBzcmMvY29tbW9uL2AgYW5kIGFwcGxpZWQgdG9cbiAqIGV2ZXJ5IHByb2plY3QgdHlwZSwgbm90IGp1c3QgYWN0aW9ucykuIFVzZSBgU29uYXJXb3JrZmxvd2AgaW5zdGVhZDsgdGhpc1xuICogc3ViY2xhc3MgaXMga2VwdCBvbmx5IHNvIGV4aXN0aW5nIGltcG9ydHMgb2YgYEFjdGlvblNvbmFyV29ya2Zsb3dgIGtlZXBcbiAqIGNvbXBpbGluZy4gSXQgYmVoYXZlcyBpZGVudGljYWxseSB0byBgU29uYXJXb3JrZmxvd2AuXG4gKi9cbmV4cG9ydCBjbGFzcyBBY3Rpb25Tb25hcldvcmtmbG93IGV4dGVuZHMgU29uYXJXb3JrZmxvdyB7XG4gIGNvbnN0cnVjdG9yKHNjb3BlOiBnaXRodWIuR2l0SHViUHJvamVjdCwgb3B0aW9uczogU29uYXJXb3JrZmxvd09wdGlvbnMpIHtcbiAgICBzdXBlcihzY29wZSwgb3B0aW9ucyk7XG4gIH1cbn1cblxuLyoqIEBkZXByZWNhdGVkIFJlbmFtZWQgdG8gYFNvbmFyV29ya2Zsb3dPcHRpb25zYC4gKi9cbmV4cG9ydCB0eXBlIEFjdGlvblNvbmFyV29ya2Zsb3dPcHRpb25zID0gU29uYXJXb3JrZmxvd09wdGlvbnM7XG4iXX0=

package/lib/actions/github-action-project.d.ts

@@ -1,8 +1,9 @@
 import { github, release } from 'projen';
 import { ActionBuildWorkflow } from './action-build-workflow';
 import { ActionDogfoodOptions, ActionDogfoodWorkflow } from './action-dogfood-workflow';
-import { ActionSonarWorkflow } from './action-sonar-workflow';
-export interface GitHubActionProjectOptions extends github.GitHubProjectOptions {
+import { SonarScanOptions } from '../common/sonar-options';
+import { SonarWorkflow } from '../common/sonar-workflow';
+export interface GitHubActionProjectOptions extends github.GitHubProjectOptions, SonarScanOptions {
     /**
      * One-line description of the action. Used in the default README
      * template and recorded in the private `package.json`.
@@ -17,25 +18,6 @@ export interface GitHubActionProjectOptions extends github.GitHubProjectOptions
      * @default "PROJEN_GITHUB_TOKEN"
      */
     readonly gheTokenSecret?: string;
-    /**
-     * URL of the org's SonarCloud instance (e.g. `https://sonarcloud.io`).
-     * MUST be reachable from github.com-hosted (public) runners (AD-001).
-     * Required, no default: a guessed server is worse than a loud failure.
-     */
-    readonly sonarHostUrl: string;
-    /**
-     * SonarCloud organization key (`sonar.organization`), required by the
-     * Scanner CLI on SonarCloud.
-     * @default "xpertss"
-     */
-    readonly sonarOrganization?: string;
-    /** @default "SONAR_TOKEN" */
-    readonly sonarTokenSecret?: string;
-    /**
-     * Whether `sonar.yml` also runs on `pull_request` as a pass/fail gate.
-     * @default true
-     */
-    readonly sonarPullRequestGate?: boolean;
     /**
      * The dogfood scenario (AD-001). What fixture state, what to assert, and
      * how to clean up are specified by the action's own F### spec - the
@@ -86,7 +68,8 @@ export interface GitHubActionProjectOptions extends github.GitHubProjectOptions
 export declare class GitHubActionProject extends github.GitHubProject {
     readonly buildWorkflow: ActionBuildWorkflow;
     readonly dogfoodWorkflow: ActionDogfoodWorkflow;
-    readonly sonarWorkflow: ActionSonarWorkflow;
+    /** Set only when `sonarHostUrl` is provided. */
+    readonly sonarWorkflow?: SonarWorkflow;
     readonly release: release.Release;
     constructor(options: GitHubActionProjectOptions);
 }

package/lib/actions/github-action-project.js

@@ -5,13 +5,13 @@ const JSII_RTTI_SYMBOL_1 = Symbol.for("jsii.rtti");
 const projen_1 = require("projen");
 const action_build_workflow_1 = require("./action-build-workflow");
 const action_dogfood_workflow_1 = require("./action-dogfood-workflow");
-const action_sonar_workflow_1 = require("./action-sonar-workflow");
 const constants_1 = require("../common/constants");
 const editorconfig_1 = require("../common/editorconfig");
 const internal_actions_1 = require("../common/internal-actions");
 const license_file_1 = require("../common/license-file");
 const projen_drift_check_workflow_1 = require("../common/projen-drift-check-workflow");
 const projenrc_ts_1 = require("../common/projenrc-ts");
+const sonar_workflow_1 = require("../common/sonar-workflow");
 const workflow_change_notice_workflow_1 = require("../common/workflow-change-notice-workflow");
 const workflow_purpose_1 = require("../common/workflow-purpose");
 // `require('projen/package.json')`/`require('../../package.json')` resolve
@@ -64,15 +64,13 @@ hand-committed.
  * per the action's own F### spec - this type only lints it.
  */
 class GitHubActionProject extends projen_1.github.GitHubProject {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@xpertss/projen-types.GitHubActionProject", version: "0.0.21" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@xpertss/projen-types.GitHubActionProject", version: "0.0.22" };
     buildWorkflow;
     dogfoodWorkflow;
+    /** Set only when `sonarHostUrl` is provided. */
     sonarWorkflow;
     release;
     constructor(options) {
-        if (!options.sonarHostUrl) {
-            throw new Error('GitHubActionProject requires sonarHostUrl');
-        }
         // A declared-but-incomplete dogfood is still an error - see
         // `ActionDogfoodWorkflow`, which owns that check (and the
         // no-dogfood-declared case).
@@ -138,12 +136,18 @@ class GitHubActionProject extends projen_1.github.GitHubProject {
         });
         this.buildWorkflow = new action_build_workflow_1.ActionBuildWorkflow(this);
         this.dogfoodWorkflow = new action_dogfood_workflow_1.ActionDogfoodWorkflow(this, options.dogfood);
-        this.sonarWorkflow = new action_sonar_workflow_1.ActionSonarWorkflow(this, {
-            sonarHostUrl: options.sonarHostUrl,
-            sonarOrganization: options.sonarOrganization,
-            sonarTokenSecret: options.sonarTokenSecret,
-            sonarPullRequestGate: options.sonarPullRequestGate,
-        });
+        if (options.sonarHostUrl) {
+            this.sonarWorkflow = new sonar_workflow_1.SonarWorkflow(this, {
+                sonarHostUrl: options.sonarHostUrl,
+                sonarOrganization: options.sonarOrganization,
+                sonarTokenSecret: options.sonarTokenSecret,
+                sonarPullRequestGate: options.sonarPullRequestGate,
+                sonarProjectKey: options.sonarProjectKey,
+                // YAML / shell are not in Sonar's default-recognized set, so the
+                // action's `action.yml` and scripts need explicit inclusions.
+                sonarInclusions: '.github/workflows/**,action.yml,**/*.sh',
+            });
+        }
         // `githubRelease` defaults to true, which auto-wires
         // `publishToGitHubReleases` - its `gh release create ... --target
         // $GITHUB_SHA` creates the tag *and* the release together for our
@@ -171,4 +175,4 @@ class GitHubActionProject extends projen_1.github.GitHubProject {
     }
 }
 exports.GitHubActionProject = GitHubActionProject;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"github-action-project.js","sourceRoot":"","sources":["../../src/actions/github-action-project.ts"],"names":[],"mappings":";;;;AAAA,mCAMgB;AAChB,mEAA8D;AAC9D,uEAAwF;AACxF,mEAA8D;AAC9D,mDAA+D;AAC/D,yDAAyD;AACzD,iEAA0E;AAC1E,yDAAwD;AACxD,uFAAiF;AACjF,uDAAiE;AACjE,+FAAyF;AACzF,iEAAiE;AAEjE,2EAA2E;AAC3E,yEAAyE;AACzE,+DAA+D;AAC/D,yEAAyE;AACzE,oEAAoE;AACpE,kEAAkE;AAClE,iEAAiE;AACjE,MAAM,cAAc,GAAW,OAAO,CAAC,qBAAqB,CAAC,CAAC,OAAO,CAAC;AACtE,iEAAiE;AACjE,MAAM,oBAAoB,GAAW,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC;AAE3E,wEAAwE;AACxE,4EAA4E;AAC5E,mCAAmC;AACnC,MAAM,sBAAsB,GAAG,QAAQ,CAAC;AAqFxC,SAAS,qBAAqB,CAAC,OAAmC;IAChE,OAAO,KAAK,OAAO,CAAC,IAAI;;EAExB,OAAO,CAAC,WAAW,IAAI,EAAE;;;;;kBAKT,OAAO,CAAC,IAAI;;;;;;;;;;;;;;;CAe7B,CAAC;AACF,CAAC;AAED;;;;;;;;;GASG;AACH,MAAa,mBAAoB,SAAQ,eAAM,CAAC,aAAa;;IAC3C,aAAa,CAAsB;IACnC,eAAe,CAAwB;IACvC,aAAa,CAAsB;IACnC,OAAO,CAAkB;IAEzC,YAAY,OAAmC;QAC7C,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;YAC1B,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;QAC/D,CAAC;QACD,4DAA4D;QAC5D,0DAA0D;QAC1D,6BAA6B;QAE7B,KAAK,CAAC;YACJ,GAAG,OAAO;YACV,yEAAyE;YACzE,qEAAqE;YACrE,uEAAuE;YACvE,wEAAwE;YACxE,aAAa,EAAE,EAAE,GAAG,OAAO,CAAC,aAAa,EAAE,eAAe,EAAE,KAAK,EAAE;YACnE,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,EAAE,QAAQ,EAAE,qBAAqB,CAAC,OAAO,CAAC,EAAE;SACvE,CAAC,CAAC;QAEH,MAAM,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC;QACvB,IAAI,CAAC,EAAE,EAAE,CAAC;YACR,MAAM,IAAI,KAAK,CACb,+DAA+D,CAChE,CAAC;QACJ,CAAC;QACD,IAAA,+CAA4B,EAAC,EAAE,CAAC,CAAC;QAEjC,wEAAwE;QACxE,qEAAqE;QACrE,iBAAiB;QACjB,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;QAC9B,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAE5B,IAAI,OAAO,CAAC,YAAY,IAAI,IAAI,EAAE,CAAC;YACjC,IAAA,8BAAe,EAAC,IAAI,CAAC,CAAC;QACxB,CAAC;QAED,IAAI,sDAAwB,CAAC,IAAI,EAAE;YACjC,cAAc,EAAE,OAAO,CAAC,cAAc,IAAI,oCAAwB;SACnE,CAAC,CAAC;QACH,IAAI,8DAA4B,CAAC,IAAI,CAAC,CAAC;QAEvC,IAAA,6BAAc,EAAC,IAAI,EAAE;YACnB,IAAI,EAAE,OAAO,CAAC,OAAO,IAAI,KAAK;YAC9B,cAAc,EAAE,OAAO,CAAC,cAAc,IAAI,gBAAgB;YAC1D,eAAe,EAAE,OAAO,CAAC,eAAe;SACzC,CAAC,CAAC;QAEH,uEAAuE;QACvE,wEAAwE;QACxE,qEAAqE;QACrE,IAAA,sCAAwB,EAAC,IAAI,CAAC,CAAC;QAE/B,wEAAwE;QACxE,gEAAgE;QAChE,qEAAqE;QACrE,sEAAsE;QACtE,mBAAmB;QACnB,IAAI,iBAAQ,CAAC,IAAI,EAAE,cAAc,EAAE;YACjC,GAAG,EAAE;gBACH,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,OAAO,EAAE,OAAO;gBAChB,OAAO,EAAE,IAAI;gBACb,WAAW,EAAE,OAAO,CAAC,WAAW;gBAChC,eAAe,EAAE;oBACf,QAAQ,EAAE,cAAc;oBACxB,uBAAuB,EAAE,oBAAoB;oBAC7C,wBAAwB,EAAE,sBAAsB;iBACjD;aACF;YACD,QAAQ,EAAE,KAAK;SAChB,CAAC,CAAC;QAEH,IAAI,iBAAQ,CAAC,IAAI,EAAE,WAAW,EAAE;YAC9B,GAAG,EAAE;gBACH,OAAO,EAAE,SAAS;gBAClB,KAAK,EAAE,EAAE,aAAa,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;aACvC;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,aAAa,GAAG,IAAI,2CAAmB,CAAC,IAAI,CAAC,CAAC;QAEnD,IAAI,CAAC,eAAe,GAAG,IAAI,+CAAqB,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAExE,IAAI,CAAC,aAAa,GAAG,IAAI,2CAAmB,CAAC,IAAI,EAAE;YACjD,YAAY,EAAE,OAAO,CAAC,YAAY;YAClC,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;YAC5C,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;YAC1C,oBAAoB,EAAE,OAAO,CAAC,oBAAoB;SACnD,CAAC,CAAC;QAEH,qDAAqD;QACrD,kEAAkE;QAClE,kEAAkE;QAClE,qEAAqE;QACrE,8DAA8D;QAC9D,IAAI,CAAC,OAAO,GAAG,IAAI,gBAAO,CAAC,OAAO,CAAC,IAAI,EAAE;YACvC,MAAM,EAAE,MAAM;YACd,mEAAmE;YACnE,wDAAwD;YACxD,kBAAkB,EAAE,MAAM;YAC1B,KAAK,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC;YAChC,WAAW,EAAE,cAAc;YAC3B,iBAAiB,EAAE,0BAAiB,CAAC,gBAAgB,EAAE;YACvD,cAAc,EAAE,gBAAO,CAAC,cAAc,CAAC,UAAU,EAAE;YACnD,WAAW,EAAE,0BAA0B,sBAAsB,EAAE;YAC/D,yBAAyB,EAAE;gBACzB,EAAE,IAAI,EAAE,sBAAsB,EAAE,GAAG,EAAE,QAAQ,EAAE;aAChD;SACF,CAAC,CAAC;QAEH,mEAAmE;QACnE,sEAAsE;QACtE,kEAAkE;QAClE,6CAA6C;QAC7C,IAAA,sCAAmB,EACjB,IAAI,CAAC,WAAW,CAAC,+BAA+B,CAAC,EACjD,qFAAqF,CACtF,CAAC;IACJ,CAAC;;AA5HH,kDA6HC","sourcesContent":["import {\n  JsonFile,\n  ReleasableCommits,\n  YamlFile,\n  github,\n  release,\n} from 'projen';\nimport { ActionBuildWorkflow } from './action-build-workflow';\nimport { ActionDogfoodOptions, ActionDogfoodWorkflow } from './action-dogfood-workflow';\nimport { ActionSonarWorkflow } from './action-sonar-workflow';\nimport { DEFAULT_GHE_TOKEN_SECRET } from '../common/constants';\nimport { addEditorConfig } from '../common/editorconfig';\nimport { applyInternalActionOverrides } from '../common/internal-actions';\nimport { addLicenseFile } from '../common/license-file';\nimport { ProjenDriftCheckWorkflow } from '../common/projen-drift-check-workflow';\nimport { attachTypeScriptProjenrc } from '../common/projenrc-ts';\nimport { WorkflowChangeNoticeWorkflow } from '../common/workflow-change-notice-workflow';\nimport { noteWorkflowPurpose } from '../common/workflow-purpose';\n\n// `require('projen/package.json')`/`require('../../package.json')` resolve\n// via Node's normal module resolution, so in a *published* package these\n// read the versions actually installed in the consuming repo's\n// node_modules - exactly the \"PROJEN_VERSION of the synth\" / \"version of\n// this package that scaffolded the repo\" the private package.json's\n// devDependencies need to pin (see F010 CI-dependencies section).\n// eslint-disable-next-line @typescript-eslint/no-require-imports\nconst PROJEN_VERSION: string = require('projen/package.json').version;\n// eslint-disable-next-line @typescript-eslint/no-require-imports\nconst PROJEN_TYPES_VERSION: string = require('../../package.json').version;\n\n// Exact pin, recorded as a component constant (AD-001: no latest/moving\n// tag/semver range in anything a generated repo depends on). Upgrading this\n// is a reviewed diff of this file.\nconst COMMIT_AND_TAG_VERSION = '13.2.1';\n\nexport interface GitHubActionProjectOptions\n  extends github.GitHubProjectOptions {\n  /**\n   * One-line description of the action. Used in the default README\n   * template and recorded in the private `package.json`.\n   */\n  readonly description?: string;\n\n  /**\n   * Name of the GitHub Actions secret holding the PAT used for\n   * projen-automation PR comments (F003) and the drift-check's PR comments.\n   * It is **not** wired into the dogfood automatically: a dogfood that invokes\n   * an action with a `token` input must reference this secret in the step's\n   * `inputs` (e.g. `token: '${{ secrets.PROJEN_GITHUB_TOKEN }}'`).\n   * @default \"PROJEN_GITHUB_TOKEN\"\n   */\n  readonly gheTokenSecret?: string;\n\n  /**\n   * URL of the org's SonarCloud instance (e.g. `https://sonarcloud.io`).\n   * MUST be reachable from github.com-hosted (public) runners (AD-001).\n   * Required, no default: a guessed server is worse than a loud failure.\n   */\n  readonly sonarHostUrl: string;\n\n  /**\n   * SonarCloud organization key (`sonar.organization`), required by the\n   * Scanner CLI on SonarCloud.\n   * @default \"xpertss\"\n   */\n  readonly sonarOrganization?: string;\n\n  /** @default \"SONAR_TOKEN\" */\n  readonly sonarTokenSecret?: string;\n\n  /**\n   * Whether `sonar.yml` also runs on `pull_request` as a pass/fail gate.\n   * @default true\n   */\n  readonly sonarPullRequestGate?: boolean;\n\n  /**\n   * The dogfood scenario (AD-001). What fixture state, what to assert, and\n   * how to clean up are specified by the action's own F### spec - the\n   * highest-risk behavior of that action.\n   *\n   * Its type is a struct, which projen's CLI cannot render into a projenrc,\n   * so it can only be written by hand - it is therefore optional, because a\n   * *required* option `projen new` cannot supply would make this project\n   * type impossible to scaffold. AD-001's \"never a silent no-op dogfood\"\n   * rule is enforced instead by the workflow it generates in that case: a\n   * single step that fails on every PR until a scenario is declared.\n   *\n   * @default - `test-dogfood.yml` runs one failing step that tells you to\n   * declare a scenario\n   */\n  readonly dogfood?: ActionDogfoodOptions;\n\n  /**\n   * SPDX identifier for the generated `LICENSE`.\n   * @default \"MIT\"\n   */\n  readonly license?: string;\n\n  /**\n   * Copyright owner named in the `LICENSE`.\n   * @default \"Xpert Software\"\n   */\n  readonly copyrightOwner?: string;\n\n  /**\n   * Copyright period named in the `LICENSE`.\n   * @default - the current year\n   */\n  readonly copyrightPeriod?: string;\n\n  /**\n   * Write a projen-managed `.editorconfig`.\n   * @default true\n   */\n  readonly editorconfig?: boolean;\n}\n\nfunction defaultReadmeContents(options: GitHubActionProjectOptions): string {\n  return `# ${options.name}\n\n${options.description ?? ''}\n\n## Usage\n\n\\`\\`\\`yaml\n- uses: xpertss/${options.name}@<ref>\n\\`\\`\\`\n\n## Bumping\n\nA \\`feat:\\`/\\`fix:\\` commit pushed to \\`main\\` is released automatically: bump,\ntag \\`vX.Y.Z\\`, GitHub Release. See \\`.github/workflows/release.yml\\`.\n\n## Trust contract\n\nThis is a composite (shell) action - no Node/npm at runtime, no Docker. Its\nCI lint gate (\\`build.yml\\`), dogfood test (\\`test-dogfood.yml\\`), and Sonar\nscan (\\`sonar.yml\\`) are scaffolded by \\`@xpertss/projen-types\\`'\n\\`GitHubActionProject\\`; only \\`action.yml\\` and its shell scripts are\nhand-committed.\n`;\n}\n\n/**\n * Scaffolds the repo lifecycle (AD-001) around a hand-committed, composite\n * (shell) GitHub Action: the `build`/`test-dogfood`/`sonar`/`release`\n  * workflows, versioning and release discipline, the F003 verify components,\n  * and repo boilerplate (a private version-source `package.json`, `.yamllint`,\n  * `LICENSE`, and a `README.md` template). The\n * action's own content\n * (`action.yml`, its shell scripts, `test/` fixtures) is authored by hand\n * per the action's own F### spec - this type only lints it.\n */\nexport class GitHubActionProject extends github.GitHubProject {\n  public readonly buildWorkflow: ActionBuildWorkflow;\n  public readonly dogfoodWorkflow: ActionDogfoodWorkflow;\n  public readonly sonarWorkflow: ActionSonarWorkflow;\n  public readonly release: release.Release;\n\n  constructor(options: GitHubActionProjectOptions) {\n    if (!options.sonarHostUrl) {\n      throw new Error('GitHubActionProject requires sonarHostUrl');\n    }\n    // A declared-but-incomplete dogfood is still an error - see\n    // `ActionDogfoodWorkflow`, which owns that check (and the\n    // no-dogfood-declared case).\n\n    super({\n      ...options,\n      // PR titles are not gated: `feat:`/`fix:` matter only because they drive\n      // the release workflow (via `releasableCommits`), not PR checks. The\n      // conventional-commit PR-title lint is added by the `GitHub` component\n      // unless `githubOptions.pullRequestLint` is `false` (it defaults true).\n      githubOptions: { ...options.githubOptions, pullRequestLint: false },\n      readme: options.readme ?? { contents: defaultReadmeContents(options) },\n    });\n\n    const gh = this.github;\n    if (!gh) {\n      throw new Error(\n        'GitHubActionProject requires GitHub integration to be enabled',\n      );\n    }\n    applyInternalActionOverrides(gh);\n\n    // JetBrains IDE state (.idea/) is never tracked in generated repos, and\n    // neither is /spec/ (local plans and specs; the pattern covers every\n    // subdirectory).\n    this.addGitIgnore('/.idea/*');\n    this.addGitIgnore('/spec/');\n\n    if (options.editorconfig ?? true) {\n      addEditorConfig(this);\n    }\n\n    new ProjenDriftCheckWorkflow(this, {\n      gheTokenSecret: options.gheTokenSecret ?? DEFAULT_GHE_TOKEN_SECRET,\n    });\n    new WorkflowChangeNoticeWorkflow(this);\n\n    addLicenseFile(this, {\n      spdx: options.license ?? 'MIT',\n      copyrightOwner: options.copyrightOwner ?? 'Xpert Software',\n      copyrightPeriod: options.copyrightPeriod,\n    });\n\n    // `.projenrc.ts` + `npx projen`, same as every other type here. A bare\n    // GitHubProject has no default task that runs a projenrc on its own, so\n    // this is what makes `npx projen` work in the generated repo at all.\n    attachTypeScriptProjenrc(this);\n\n    // projen marks generated files read-only (0444) on disk by default, but\n    // this one must stay owner-writable: the documented update flow\n    // (`npm i -D @xpertss/projen-types@latest`) needs npm to rewrite the\n    // pinned versions in an existing repo. Hand-edits are still caught by\n    // the drift check.\n    new JsonFile(this, 'package.json', {\n      obj: {\n        name: options.name,\n        version: '0.0.0',\n        private: true,\n        description: options.description,\n        devDependencies: {\n          'projen': PROJEN_VERSION,\n          '@xpertss/projen-types': PROJEN_TYPES_VERSION,\n          'commit-and-tag-version': COMMIT_AND_TAG_VERSION,\n        },\n      },\n      readonly: false,\n    });\n\n    new YamlFile(this, '.yamllint', {\n      obj: {\n        extends: 'default',\n        rules: { 'line-length': { max: 120 } },\n      },\n    });\n\n    this.buildWorkflow = new ActionBuildWorkflow(this);\n\n    this.dogfoodWorkflow = new ActionDogfoodWorkflow(this, options.dogfood);\n\n    this.sonarWorkflow = new ActionSonarWorkflow(this, {\n      sonarHostUrl: options.sonarHostUrl,\n      sonarOrganization: options.sonarOrganization,\n      sonarTokenSecret: options.sonarTokenSecret,\n      sonarPullRequestGate: options.sonarPullRequestGate,\n    });\n\n    // `githubRelease` defaults to true, which auto-wires\n    // `publishToGitHubReleases` - its `gh release create ... --target\n    // $GITHUB_SHA` creates the tag *and* the release together for our\n    // continuous (push-to-main) trigger. No separate `publishToGit` call\n    // needed (that path only fires for a manual release trigger).\n    this.release = new release.Release(this, {\n      branch: 'main',\n      // No build artifact for a composite action (AD-001) - this is only\n      // where Release stages its own version/changelog files.\n      artifactsDirectory: 'dist',\n      tasks: [this.buildWorkflow.task],\n      versionFile: 'package.json',\n      releasableCommits: ReleasableCommits.featuresAndFixes(),\n      releaseTrigger: release.ReleaseTrigger.continuous(),\n      bumpPackage: `commit-and-tag-version@${COMMIT_AND_TAG_VERSION}`,\n      releaseWorkflowSetupSteps: [\n        { name: 'Install dependencies', run: 'npm ci' },\n      ],\n    });\n\n    // The release workflow is created inside `release.Release` (projen\n    // internal), not by this type - reach its file by path to annotate it\n    // like every other generated workflow. This type is always a root\n    // project, so projen names it `release.yml`.\n    noteWorkflowPurpose(\n      this.tryFindFile('.github/workflows/release.yml'),\n      'Continuous release on push to main: bump version, tag, and create a GitHub Release.',\n    );\n  }\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"github-action-project.js","sourceRoot":"","sources":["../../src/actions/github-action-project.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  JsonFile,\n  ReleasableCommits,\n  YamlFile,\n  github,\n  release,\n} from 'projen';\nimport { ActionBuildWorkflow } from './action-build-workflow';\nimport { ActionDogfoodOptions, ActionDogfoodWorkflow } from './action-dogfood-workflow';\nimport { DEFAULT_GHE_TOKEN_SECRET } from '../common/constants';\nimport { addEditorConfig } from '../common/editorconfig';\nimport { applyInternalActionOverrides } from '../common/internal-actions';\nimport { addLicenseFile } from '../common/license-file';\nimport { ProjenDriftCheckWorkflow } from '../common/projen-drift-check-workflow';\nimport { attachTypeScriptProjenrc } from '../common/projenrc-ts';\nimport { SonarScanOptions } from '../common/sonar-options';\nimport { SonarWorkflow } from '../common/sonar-workflow';\nimport { WorkflowChangeNoticeWorkflow } from '../common/workflow-change-notice-workflow';\nimport { noteWorkflowPurpose } from '../common/workflow-purpose';\n\n// `require('projen/package.json')`/`require('../../package.json')` resolve\n// via Node's normal module resolution, so in a *published* package these\n// read the versions actually installed in the consuming repo's\n// node_modules - exactly the \"PROJEN_VERSION of the synth\" / \"version of\n// this package that scaffolded the repo\" the private package.json's\n// devDependencies need to pin (see F010 CI-dependencies section).\n// eslint-disable-next-line @typescript-eslint/no-require-imports\nconst PROJEN_VERSION: string = require('projen/package.json').version;\n// eslint-disable-next-line @typescript-eslint/no-require-imports\nconst PROJEN_TYPES_VERSION: string = require('../../package.json').version;\n\n// Exact pin, recorded as a component constant (AD-001: no latest/moving\n// tag/semver range in anything a generated repo depends on). Upgrading this\n// is a reviewed diff of this file.\nconst COMMIT_AND_TAG_VERSION = '13.2.1';\n\nexport interface GitHubActionProjectOptions\n  extends github.GitHubProjectOptions,\n  SonarScanOptions {\n  /**\n   * One-line description of the action. Used in the default README\n   * template and recorded in the private `package.json`.\n   */\n  readonly description?: string;\n\n  /**\n   * Name of the GitHub Actions secret holding the PAT used for\n   * projen-automation PR comments (F003) and the drift-check's PR comments.\n   * It is **not** wired into the dogfood automatically: a dogfood that invokes\n   * an action with a `token` input must reference this secret in the step's\n   * `inputs` (e.g. `token: '${{ secrets.PROJEN_GITHUB_TOKEN }}'`).\n   * @default \"PROJEN_GITHUB_TOKEN\"\n   */\n  readonly gheTokenSecret?: string;\n\n  /**\n   * The dogfood scenario (AD-001). What fixture state, what to assert, and\n   * how to clean up are specified by the action's own F### spec - the\n   * highest-risk behavior of that action.\n   *\n   * Its type is a struct, which projen's CLI cannot render into a projenrc,\n   * so it can only be written by hand - it is therefore optional, because a\n   * *required* option `projen new` cannot supply would make this project\n   * type impossible to scaffold. AD-001's \"never a silent no-op dogfood\"\n   * rule is enforced instead by the workflow it generates in that case: a\n   * single step that fails on every PR until a scenario is declared.\n   *\n   * @default - `test-dogfood.yml` runs one failing step that tells you to\n   * declare a scenario\n   */\n  readonly dogfood?: ActionDogfoodOptions;\n\n  /**\n   * SPDX identifier for the generated `LICENSE`.\n   * @default \"MIT\"\n   */\n  readonly license?: string;\n\n  /**\n   * Copyright owner named in the `LICENSE`.\n   * @default \"Xpert Software\"\n   */\n  readonly copyrightOwner?: string;\n\n  /**\n   * Copyright period named in the `LICENSE`.\n   * @default - the current year\n   */\n  readonly copyrightPeriod?: string;\n\n  /**\n   * Write a projen-managed `.editorconfig`.\n   * @default true\n   */\n  readonly editorconfig?: boolean;\n}\n\nfunction defaultReadmeContents(options: GitHubActionProjectOptions): string {\n  return `# ${options.name}\n\n${options.description ?? ''}\n\n## Usage\n\n\\`\\`\\`yaml\n- uses: xpertss/${options.name}@<ref>\n\\`\\`\\`\n\n## Bumping\n\nA \\`feat:\\`/\\`fix:\\` commit pushed to \\`main\\` is released automatically: bump,\ntag \\`vX.Y.Z\\`, GitHub Release. See \\`.github/workflows/release.yml\\`.\n\n## Trust contract\n\nThis is a composite (shell) action - no Node/npm at runtime, no Docker. Its\nCI lint gate (\\`build.yml\\`), dogfood test (\\`test-dogfood.yml\\`), and Sonar\nscan (\\`sonar.yml\\`) are scaffolded by \\`@xpertss/projen-types\\`'\n\\`GitHubActionProject\\`; only \\`action.yml\\` and its shell scripts are\nhand-committed.\n`;\n}\n\n/**\n * Scaffolds the repo lifecycle (AD-001) around a hand-committed, composite\n * (shell) GitHub Action: the `build`/`test-dogfood`/`sonar`/`release`\n  * workflows, versioning and release discipline, the F003 verify components,\n  * and repo boilerplate (a private version-source `package.json`, `.yamllint`,\n  * `LICENSE`, and a `README.md` template). The\n * action's own content\n * (`action.yml`, its shell scripts, `test/` fixtures) is authored by hand\n * per the action's own F### spec - this type only lints it.\n */\nexport class GitHubActionProject extends github.GitHubProject {\n  public readonly buildWorkflow: ActionBuildWorkflow;\n  public readonly dogfoodWorkflow: ActionDogfoodWorkflow;\n  /** Set only when `sonarHostUrl` is provided. */\n  public readonly sonarWorkflow?: SonarWorkflow;\n  public readonly release: release.Release;\n\n  constructor(options: GitHubActionProjectOptions) {\n    // A declared-but-incomplete dogfood is still an error - see\n    // `ActionDogfoodWorkflow`, which owns that check (and the\n    // no-dogfood-declared case).\n\n    super({\n      ...options,\n      // PR titles are not gated: `feat:`/`fix:` matter only because they drive\n      // the release workflow (via `releasableCommits`), not PR checks. The\n      // conventional-commit PR-title lint is added by the `GitHub` component\n      // unless `githubOptions.pullRequestLint` is `false` (it defaults true).\n      githubOptions: { ...options.githubOptions, pullRequestLint: false },\n      readme: options.readme ?? { contents: defaultReadmeContents(options) },\n    });\n\n    const gh = this.github;\n    if (!gh) {\n      throw new Error(\n        'GitHubActionProject requires GitHub integration to be enabled',\n      );\n    }\n    applyInternalActionOverrides(gh);\n\n    // JetBrains IDE state (.idea/) is never tracked in generated repos, and\n    // neither is /spec/ (local plans and specs; the pattern covers every\n    // subdirectory).\n    this.addGitIgnore('/.idea/*');\n    this.addGitIgnore('/spec/');\n\n    if (options.editorconfig ?? true) {\n      addEditorConfig(this);\n    }\n\n    new ProjenDriftCheckWorkflow(this, {\n      gheTokenSecret: options.gheTokenSecret ?? DEFAULT_GHE_TOKEN_SECRET,\n    });\n    new WorkflowChangeNoticeWorkflow(this);\n\n    addLicenseFile(this, {\n      spdx: options.license ?? 'MIT',\n      copyrightOwner: options.copyrightOwner ?? 'Xpert Software',\n      copyrightPeriod: options.copyrightPeriod,\n    });\n\n    // `.projenrc.ts` + `npx projen`, same as every other type here. A bare\n    // GitHubProject has no default task that runs a projenrc on its own, so\n    // this is what makes `npx projen` work in the generated repo at all.\n    attachTypeScriptProjenrc(this);\n\n    // projen marks generated files read-only (0444) on disk by default, but\n    // this one must stay owner-writable: the documented update flow\n    // (`npm i -D @xpertss/projen-types@latest`) needs npm to rewrite the\n    // pinned versions in an existing repo. Hand-edits are still caught by\n    // the drift check.\n    new JsonFile(this, 'package.json', {\n      obj: {\n        name: options.name,\n        version: '0.0.0',\n        private: true,\n        description: options.description,\n        devDependencies: {\n          'projen': PROJEN_VERSION,\n          '@xpertss/projen-types': PROJEN_TYPES_VERSION,\n          'commit-and-tag-version': COMMIT_AND_TAG_VERSION,\n        },\n      },\n      readonly: false,\n    });\n\n    new YamlFile(this, '.yamllint', {\n      obj: {\n        extends: 'default',\n        rules: { 'line-length': { max: 120 } },\n      },\n    });\n\n    this.buildWorkflow = new ActionBuildWorkflow(this);\n\n    this.dogfoodWorkflow = new ActionDogfoodWorkflow(this, options.dogfood);\n\n    if (options.sonarHostUrl) {\n      this.sonarWorkflow = new SonarWorkflow(this, {\n        sonarHostUrl: options.sonarHostUrl,\n        sonarOrganization: options.sonarOrganization,\n        sonarTokenSecret: options.sonarTokenSecret,\n        sonarPullRequestGate: options.sonarPullRequestGate,\n        sonarProjectKey: options.sonarProjectKey,\n        // YAML / shell are not in Sonar's default-recognized set, so the\n        // action's `action.yml` and scripts need explicit inclusions.\n        sonarInclusions: '.github/workflows/**,action.yml,**/*.sh',\n      });\n    }\n\n    // `githubRelease` defaults to true, which auto-wires\n    // `publishToGitHubReleases` - its `gh release create ... --target\n    // $GITHUB_SHA` creates the tag *and* the release together for our\n    // continuous (push-to-main) trigger. No separate `publishToGit` call\n    // needed (that path only fires for a manual release trigger).\n    this.release = new release.Release(this, {\n      branch: 'main',\n      // No build artifact for a composite action (AD-001) - this is only\n      // where Release stages its own version/changelog files.\n      artifactsDirectory: 'dist',\n      tasks: [this.buildWorkflow.task],\n      versionFile: 'package.json',\n      releasableCommits: ReleasableCommits.featuresAndFixes(),\n      releaseTrigger: release.ReleaseTrigger.continuous(),\n      bumpPackage: `commit-and-tag-version@${COMMIT_AND_TAG_VERSION}`,\n      releaseWorkflowSetupSteps: [\n        { name: 'Install dependencies', run: 'npm ci' },\n      ],\n    });\n\n    // The release workflow is created inside `release.Release` (projen\n    // internal), not by this type - reach its file by path to annotate it\n    // like every other generated workflow. This type is always a root\n    // project, so projen names it `release.yml`.\n    noteWorkflowPurpose(\n      this.tryFindFile('.github/workflows/release.yml'),\n      'Continuous release on push to main: bump version, tag, and create a GitHub Release.',\n    );\n  }\n}\n"]}

package/lib/cdk/app-runtime-scaffold.js

@@ -8,7 +8,7 @@ const projen_1 = require("projen");
  * layered on top of `CdkTypescriptProject`'s pure-infra scaffold.
  */
 class AppRuntimeScaffold extends projen_1.Component {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@xpertss/projen-types.AppRuntimeScaffold", version: "0.0.21" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@xpertss/projen-types.AppRuntimeScaffold", version: "0.0.22" };
     constructor(project, appEntryPoint = 'src/app.ts') {
         super(project, 'AppRuntimeScaffold');
         const app = new projen_1.SourceCode(project, appEntryPoint);

package/lib/cdk/cdk-app-project.js

@@ -13,7 +13,7 @@ const workflow_purpose_1 = require("../common/workflow-purpose");
  * application source, a database, and an app-level build/test workflow.
  */
 class CdkAppProject extends cdk_infra_project_1.CdkInfraProject {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@xpertss/projen-types.CdkAppProject", version: "0.0.21" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@xpertss/projen-types.CdkAppProject", version: "0.0.22" };
     constructor(options) {
         super(options);
         new app_runtime_scaffold_1.AppRuntimeScaffold(this, options.appEntryPoint ?? 'src/app.ts');

package/lib/cdk/cdk-infra-project.js

@@ -11,7 +11,7 @@ const edge_networking_constructs_1 = require("./components/edge-networking-const
  * externally-built images). Reference example: SimulcastAVDelivery.
  */
 class CdkInfraProject extends cdk_typescript_base_1.CdkTypescriptProject {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@xpertss/projen-types.CdkInfraProject", version: "0.0.21" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@xpertss/projen-types.CdkInfraProject", version: "0.0.22" };
     constructor(options) {
         super(options);
         if (options.ecrEcs?.enabled) {

package/lib/cdk/cdk-typescript-base.d.ts

@@ -1,6 +1,7 @@
 import { awscdk } from 'projen';
 import { CommonCdkOptions } from './options';
 import { EnvironmentOptions } from '../common/environment-options';
+import { SonarWorkflow } from '../common/sonar-workflow';
 export interface CdkTypescriptProjectOptions extends CommonCdkOptions {
     readonly environments?: (string | EnvironmentOptions)[];
 }
@@ -12,5 +13,7 @@ export interface CdkTypescriptProjectOptions extends CommonCdkOptions {
  * `ManualDeployWorkflow` when `environments` is provided.
  */
 export declare class CdkTypescriptProject extends awscdk.AwsCdkTypeScriptApp {
+    /** Set only when `sonarHostUrl` is provided. */
+    readonly sonarWorkflow?: SonarWorkflow;
     constructor(options: CdkTypescriptProjectOptions);
 }