@govuk-pay/cli 0.0.112 → 0.0.114

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@govuk-pay/cli",
-  "version": "0.0.112",
+  "version": "0.0.114",
   "description": "GOV.UK Pay Command Line Interface",
   "bin": {
     "pay": "bin/cli.js",

package/src/commands/secrets/config/config.types.js

@@ -25,6 +25,8 @@ exports.SERVICE_NAMES = [
     'alb_and_s3_logging_pipeline',
     'amazon-managed-prometheus',
     'cardid',
+    'cd-web',
+    'cd-grafana',
     'cd-main',
     'cd-pay-deploy',
     'cd-pay-dev',

package/src/commands/secrets/config/secrets/pay_low_pass/deploy.js

@@ -14,6 +14,14 @@ exports.DEPLOY_CONFIG = {
         pager_duty_cloudwatch_integration_url_in_hours_only: 'pager-duty/govuk-pay-in-hours-only/amazon-cloudwatch-integration-url',
         pager_duty_cloudwatch_integration_url_24_7_p1: 'pager-duty/govuk-pay/amazon-cloudwatch-integration-url'
     },
+    'cd-web': {
+        github_client_id: 'govuk-pay-concourse-oauth/client_id',
+        github_client_secret: 'govuk-pay-concourse-oauth/client_secret' // pragma: allowlist secret
+    },
+    'cd-grafana': {
+        'github-client-id': 'govuk-pay-grafana-oauth/client_id',
+        'github-client-secret': 'govuk-pay-grafana-oauth/client_secret' // pragma: allowlist secret
+    },
     'cd-pay-deploy': {
         'docker-email': 'dockerhub/concourse-email',
         'docker-username': 'dockerhub/concourse-username',

package/src/commands/secrets/config/secrets/pay_low_pass/production-2.js

@@ -86,6 +86,8 @@ exports.PRODUCTION_2_CONFIG = {
     toolbox: {
         AUTH_GITHUB_CLIENT_ID: 'pay-toolbox/production/github_client_id',
         AUTH_GITHUB_CLIENT_SECRET: 'pay-toolbox/production/github_client_secret', // pragma: allowlist secret
+        GITHUB_OAUTH_CLIENT_ID: 'govuk-pay-toolbox-oauth/production/client_id',
+        GITHUB_OAUTH_CLIENT_SECRET: 'govuk-pay-toolbox-oauth/production/client_secret', // pragma: allowlist secret
         STRIPE_ACCOUNT_API_KEY: 'stripe/production/live/account-api-key', // pragma: allowlist secret
         STRIPE_ACCOUNT_TEST_API_KEY: 'stripe/production/test/account-api-key', // pragma: allowlist secret
         SENTRY_DSN: 'sentry/toolbox_dsn',

package/src/commands/secrets/config/secrets/pay_low_pass/staging-2.js

@@ -80,6 +80,8 @@ exports.STAGING_2_CONFIG = {
     toolbox: {
         AUTH_GITHUB_CLIENT_ID: 'pay-toolbox/staging/github_client_id',
         AUTH_GITHUB_CLIENT_SECRET: 'pay-toolbox/staging/github_client_secret', // pragma: allowlist secret
+        GITHUB_OAUTH_CLIENT_ID: 'govuk-pay-toolbox-oauth/staging/client_id',
+        GITHUB_OAUTH_CLIENT_SECRET: 'govuk-pay-toolbox-oauth/staging/client_secret', // pragma: allowlist secret
         STRIPE_ACCOUNT_API_KEY: 'stripe/staging/test/account-api-key', // pragma: allowlist secret
         STRIPE_ACCOUNT_TEST_API_KEY: 'stripe/staging/test/account-api-key', // pragma: allowlist secret
         SENTRY_DSN: 'sentry/toolbox_dsn',

package/src/commands/secrets/config/secrets/pay_low_pass/test-12.js

@@ -92,6 +92,8 @@ exports.TEST_12_CONFIG = {
     toolbox: {
         AUTH_GITHUB_CLIENT_ID: 'pay-toolbox/test/github_client_id',
         AUTH_GITHUB_CLIENT_SECRET: 'pay-toolbox/test/github_client_secret', // pragma: allowlist secret
+        GITHUB_OAUTH_CLIENT_ID: 'govuk-pay-toolbox-oauth/test/client_id',
+        GITHUB_OAUTH_CLIENT_SECRET: 'govuk-pay-toolbox-oauth/test/client_secret', // pragma: allowlist secret
         STRIPE_ACCOUNT_API_KEY: 'stripe/test/test/account-api-key', // pragma: allowlist secret
         STRIPE_ACCOUNT_TEST_API_KEY: 'stripe/test/test/account-api-key', // pragma: allowlist secret
         SENTRY_DSN: 'sentry/toolbox_dsn',

package/src/commands/secrets/config/secrets/pay_low_pass/test-perf-1.js

@@ -83,6 +83,8 @@ exports.TEST_PERF_1_CONFIG = {
     toolbox: {
         AUTH_GITHUB_CLIENT_ID: 'pay-toolbox/test/github_client_id',
         AUTH_GITHUB_CLIENT_SECRET: 'pay-toolbox/test/github_client_secret', // pragma: allowlist secret
+        GITHUB_OAUTH_CLIENT_ID: 'govuk-pay-toolbox-oauth/test/client_id',
+        GITHUB_OAUTH_CLIENT_SECRET: 'govuk-pay-toolbox-oauth/test/client_secret', // pragma: allowlist secret
         STRIPE_ACCOUNT_API_KEY: 'stripe/test/test/account-api-key', // pragma: allowlist secret
         STRIPE_ACCOUNT_TEST_API_KEY: 'stripe/test/test/account-api-key', // pragma: allowlist secret
         SENTRY_DSN: 'sentry/toolbox_dsn',

package/src/commands/secrets/config/service_secrets.js

@@ -23,6 +23,14 @@ exports.SERVICE_SECRETS = {
     cardid: [
         'SENTRY_DSN'
     ],
+    'cd-web': [
+        'github_client_id',
+        'github_client_secret'
+    ],
+    'cd-grafana': [
+        'github-client-id',
+        'github-client-secret'
+    ],
     'cd-main': [
         'docker-access-token',
         'docker-email',
@@ -217,6 +225,8 @@ exports.SERVICE_SECRETS = {
         'AUTH_GITHUB_CLIENT_SECRET',
         'AUTH_GITHUB_USER_SUPPORT_TEAM_ID',
         'AUTH_GITHUB_VIEW_ONLY_TEAM_ID',
+        'GITHUB_OAUTH_CLIENT_ID',
+        'GITHUB_OAUTH_CLIENT_SECRET',
         'SENTRY_DSN',
         'STRIPE_ACCOUNT_API_KEY',
         'STRIPE_ACCOUNT_TEST_API_KEY',

package/src/commands/secrets/providers/ssm.js

@@ -4,12 +4,19 @@ exports.SSMProvider = void 0;
 const client_ssm_1 = require("@aws-sdk/client-ssm");
 const providers_types_1 = require("./providers.types");
 const service_secrets_1 = require("../config/service_secrets");
-const CONCOURSE_SECRETS = [
-    'cd-pay-dev',
-    'cd-pay-deploy',
-    'cd-main'
-];
-const CONCOURSE_PARAMETER_NAME_PREFIX = '/pay-cd/concourse/pipelines/';
+var ConcourseParameterPrefix;
+(function (ConcourseParameterPrefix) {
+    ConcourseParameterPrefix["Root"] = "/pay-cd/";
+    ConcourseParameterPrefix["Concourse"] = "/pay-cd/concourse/";
+    ConcourseParameterPrefix["Pipelines"] = "/pay-cd/concourse/pipelines/";
+})(ConcourseParameterPrefix || (ConcourseParameterPrefix = {}));
+const CONCOURSE_SERVICE_PREFIXES = new Map([
+    ['cd-web', ConcourseParameterPrefix.Concourse],
+    ['cd-grafana', ConcourseParameterPrefix.Root],
+    ['cd-pay-dev', ConcourseParameterPrefix.Pipelines],
+    ['cd-pay-deploy', ConcourseParameterPrefix.Pipelines],
+    ['cd-main', ConcourseParameterPrefix.Pipelines]
+]);
 const LOWERCASE_SECRET_NAMES_TO_SECRET_NAMES = service_secrets_1.SECRET_NAMES.reduce((result, secretName) => {
     return { ...result, [secretName.toLowerCase()]: secretName };
 }, {});
@@ -110,8 +117,9 @@ class SSMProvider extends providers_types_1.AbstractSecretProvider {
         return secretConfigs;
     }
     ssmParameterNameToLowercaseSecret(parameterName, serviceName) {
-        if (parameterName.startsWith(CONCOURSE_PARAMETER_NAME_PREFIX)) {
-            return this.concourseParameterNameToLowercaseSecret(parameterName, serviceName);
+        const concoursePrefix = CONCOURSE_SERVICE_PREFIXES.get(serviceName);
+        if (concoursePrefix !== undefined) {
+            return this.concourseParameterNameToLowercaseSecret(parameterName, serviceName, concoursePrefix);
         }
         const lowercaseSecretName = parameterName.substring(parameterName.indexOf('.') + 1);
         return {
@@ -122,8 +130,8 @@ class SSMProvider extends providers_types_1.AbstractSecretProvider {
             source: 'ssm'
         };
     }
-    concourseParameterNameToLowercaseSecret(parameterName, serviceName) {
-        const paramNameWithoutPrefix = parameterName.substring(CONCOURSE_PARAMETER_NAME_PREFIX.length);
+    concourseParameterNameToLowercaseSecret(parameterName, serviceName, concoursePrefix) {
+        const paramNameWithoutPrefix = parameterName.substring(concoursePrefix.length);
         const lowercaseSecretName = paramNameWithoutPrefix.substring(paramNameWithoutPrefix.indexOf('/') + 1);
         return {
             environment: this.environment,
@@ -136,20 +144,22 @@ class SSMProvider extends providers_types_1.AbstractSecretProvider {
 }
 exports.SSMProvider = SSMProvider;
 function ssmParameterNameForSecret(secretConfig) {
-    if (CONCOURSE_SECRETS.includes(secretConfig.service)) {
-        return concourseSecretName(secretConfig);
+    const concoursePrefix = CONCOURSE_SERVICE_PREFIXES.get(secretConfig.service);
+    if (concoursePrefix !== undefined) {
+        return concourseSecretName(secretConfig, concoursePrefix);
     }
     return `${secretConfig.environment}_${secretConfig.service}.${secretConfig.name}`.toLowerCase();
 }
-function concourseSecretName(secretConfig) {
+function concourseSecretName(secretConfig, concoursePrefix) {
     // Service name is `cd-pay-dev` but the ssm name is only `pay-dev` so remove the cd-
     const serviceName = secretConfig.service.substring(3);
-    return `${CONCOURSE_PARAMETER_NAME_PREFIX}${serviceName.toLowerCase()}/${secretConfig.name.toLowerCase()}`;
+    return `${concoursePrefix}${serviceName.toLowerCase()}/${secretConfig.name.toLowerCase()}`;
 }
 function ssmParameterNamePrefix(environment, serviceName) {
-    if (CONCOURSE_SECRETS.includes(serviceName)) {
+    const concoursePrefix = CONCOURSE_SERVICE_PREFIXES.get(serviceName);
+    if (concoursePrefix !== undefined) {
         // Service name is `cd-pay-dev` but the ssm name is only `pay-dev` so remove the cd-
-        return `${CONCOURSE_PARAMETER_NAME_PREFIX}${serviceName.toLowerCase().substring(3)}/`;
+        return `${concoursePrefix}${serviceName.toLowerCase().substring(3)}/`;
     }
     return `${environment}_${serviceName}.`;
 }