diff --git a/plugins/scaffolder-backend/api-report.md b/plugins/scaffolder-backend/api-report.md index 8a6598da33..b43adc189a 100644 --- a/plugins/scaffolder-backend/api-report.md +++ b/plugins/scaffolder-backend/api-report.md @@ -120,7 +120,7 @@ export function createGithubActionsDispatchAction(options: { // @public (undocumented) export function createGithubWebhookAction(options: { integrations: ScmIntegrationRegistry; - webhookSecretDefault?: string; + defaultWebhookSecret?: string; }): TemplateAction; // Warning: (ae-missing-release-tag) "createPublishAzureAction" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.test.ts index 6a49156d22..7d5da3e7b8 100644 --- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.test.ts +++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.test.ts @@ -33,10 +33,10 @@ describe('github:repository:webhook:create', () => { }); const integrations = ScmIntegrations.fromConfig(config); - const webhookSecretDefault = 'aafdfdivierernfdk23f'; + const defaultWebhookSecret = 'aafdfdivierernfdk23f'; const action = createGithubWebhookAction({ integrations, - webhookSecretDefault, + defaultWebhookSecret, }); const mockContext = { @@ -73,7 +73,7 @@ describe('github:repository:webhook:create', () => { config: { url: webhookUrl, content_type: 'form', - secret: webhookSecretDefault, + secret: defaultWebhookSecret, insecure_ssl: '0', }, }); @@ -116,7 +116,7 @@ describe('github:repository:webhook:create', () => { config: { url: webhookUrl, content_type: 'form', - secret: webhookSecretDefault, + secret: defaultWebhookSecret, insecure_ssl: '0', }, }); @@ -137,7 +137,7 @@ describe('github:repository:webhook:create', () => { config: { url: webhookUrl, content_type: 'json', - secret: webhookSecretDefault, + secret: defaultWebhookSecret, insecure_ssl: '0', }, }); @@ -158,7 +158,7 @@ describe('github:repository:webhook:create', () => { config: { url: webhookUrl, content_type: 'form', - secret: webhookSecretDefault, + secret: defaultWebhookSecret, insecure_ssl: '1', }, }); @@ -179,7 +179,7 @@ describe('github:repository:webhook:create', () => { config: { url: webhookUrl, content_type: 'form', - secret: webhookSecretDefault, + secret: defaultWebhookSecret, insecure_ssl: '1', }, }); @@ -200,7 +200,7 @@ describe('github:repository:webhook:create', () => { config: { url: webhookUrl, content_type: 'form', - secret: webhookSecretDefault, + secret: defaultWebhookSecret, insecure_ssl: '0', }, }); diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts index f0690cee95..9aefc37034 100644 --- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts +++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts @@ -21,9 +21,9 @@ type ContentType = 'form' | 'json'; export function createGithubWebhookAction(options: { integrations: ScmIntegrationRegistry; - webhookSecretDefault?: string; + defaultWebhookSecret?: string; }) { - const { integrations, webhookSecretDefault } = options; + const { integrations, defaultWebhookSecret } = options; const octokitProvider = new OctokitProvider(integrations); return createTemplateAction<{ @@ -90,7 +90,7 @@ export function createGithubWebhookAction(options: { const { repoUrl, webhookUrl, - webhookSecret = webhookSecretDefault, + webhookSecret = defaultWebhookSecret, events = ['push'], active = true, contentType = 'form',