indraq_cli 2.4.0 → 2.6.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG_v2.5.0.md +67 -0
- package/CHANGELOG_v2.6.0.md +9 -0
- package/LICENSE +21 -21
- package/README.md +422 -605
- package/RELEASE_CHECKS_v2.5.0.md +93 -0
- package/TEST_RESULTS_v2.5.0.txt +46 -0
- package/TEST_RESULTS_v2.6.0.txt +16 -0
- package/cloud-api/.dockerignore +18 -18
- package/cloud-api/.env.example +14 -14
- package/cloud-api/.indraq/project.json +4 -0
- package/cloud-api/Dockerfile +19 -19
- package/cloud-api/README.md +3 -3
- package/cloud-api/dist/index.js +57 -7
- package/cloud-api/dist/index.js.map +1 -0
- package/cloud-api/package.json +1 -1
- package/cloud-api/sql/001_init.sql +8 -8
- package/cloud-api/sql/002_user_providers_and_project_resources.sql +40 -40
- package/cloud-api/sql/003_environment_infrastructure.sql +19 -19
- package/cloud-api/sql/004_managed_aws_credentials.sql +20 -20
- package/cloud-api/sql/005_project_members_and_resource_grants.sql +22 -22
- package/cloud-api/sql/006_catalog_identity_password_security.sql +96 -96
- package/cloud-api/sql/007_aws_access_key_rotation.sql +16 -16
- package/cloud-api/sql/008_provider_scopes.sql +91 -91
- package/cloud-api/src/index.ts +50 -6
- package/cloud-api/tsconfig.json +18 -18
- package/dist/cli/doctor.command.js +1 -1
- package/dist/cli/doctor.command.js.map +1 -1
- package/dist/cli/help-content.d.ts.map +1 -1
- package/dist/cli/help-content.js +19 -18
- package/dist/cli/help-content.js.map +1 -1
- package/dist/modules/access/commands/access.command.js +34 -34
- package/dist/modules/access/commands/access.command.js.map +1 -1
- package/dist/modules/aws/commands/dns.command.d.ts.map +1 -1
- package/dist/modules/aws/commands/dns.command.js +3 -2
- package/dist/modules/aws/commands/dns.command.js.map +1 -1
- package/dist/modules/cloud/commands/cloud.command.d.ts +3 -0
- package/dist/modules/cloud/commands/cloud.command.d.ts.map +1 -1
- package/dist/modules/cloud/commands/cloud.command.js +121 -34
- package/dist/modules/cloud/commands/cloud.command.js.map +1 -1
- package/dist/modules/cloud/commands/environment.command.js +1 -1
- package/dist/modules/cloud/commands/environment.command.js.map +1 -1
- package/dist/modules/cloud/commands/provider.command.js +1 -1
- package/dist/modules/cloud/commands/provider.command.js.map +1 -1
- package/dist/modules/cloud/index.js +2 -2
- package/dist/modules/cloud/index.js.map +1 -1
- package/dist/modules/cloud/services/cloud-aws.service.d.ts +1 -1
- package/dist/modules/cloud/services/cloud-aws.service.d.ts.map +1 -1
- package/dist/modules/cloud/services/cloud-aws.service.js +2 -2
- package/dist/modules/cloud/services/cloud-aws.service.js.map +1 -1
- package/dist/modules/cloud/services/cloud-ghcr.service.js +2 -2
- package/dist/modules/cloud/services/cloud-ghcr.service.js.map +1 -1
- package/dist/modules/cloud/services/cloud-jenkins.service.d.ts +1 -1
- package/dist/modules/cloud/services/cloud-jenkins.service.d.ts.map +1 -1
- package/dist/modules/cloud/services/cloud-jenkins.service.js +157 -33
- package/dist/modules/cloud/services/cloud-jenkins.service.js.map +1 -1
- package/dist/modules/cloud/services/cloud-npm.service.d.ts +1 -1
- package/dist/modules/cloud/services/cloud-npm.service.d.ts.map +1 -1
- package/dist/modules/cloud/services/cloud-npm.service.js +2 -2
- package/dist/modules/cloud/services/cloud-npm.service.js.map +1 -1
- package/dist/modules/cloud/services/project-cleanup.service.d.ts +24 -0
- package/dist/modules/cloud/services/project-cleanup.service.d.ts.map +1 -0
- package/dist/modules/cloud/services/project-cleanup.service.js +141 -0
- package/dist/modules/cloud/services/project-cleanup.service.js.map +1 -0
- package/dist/modules/cloud/services/user-provider.service.d.ts +1 -1
- package/dist/modules/cloud/services/user-provider.service.d.ts.map +1 -1
- package/dist/modules/cloud/services/user-provider.service.js +3 -3
- package/dist/modules/cloud/services/user-provider.service.js.map +1 -1
- package/dist/modules/configure/configure.command.js +6 -4
- package/dist/modules/configure/configure.command.js.map +1 -1
- package/dist/modules/deploy/commands/build.command.d.ts.map +1 -1
- package/dist/modules/deploy/commands/build.command.js +23 -12
- package/dist/modules/deploy/commands/build.command.js.map +1 -1
- package/dist/modules/deploy/commands/configure-docker.command.js +6 -6
- package/dist/modules/deploy/commands/configure-docker.command.js.map +1 -1
- package/dist/modules/deploy/config/docker-config.js +1 -1
- package/dist/modules/deploy/config/docker-config.js.map +1 -1
- package/dist/modules/deploy/index.js +1 -1
- package/dist/modules/deploy/index.js.map +1 -1
- package/dist/modules/deploy/services/docker.service.js +1 -1
- package/dist/modules/deploy/services/docker.service.js.map +1 -1
- package/dist/modules/dockerfile/services/project-docker.service.d.ts +9 -0
- package/dist/modules/dockerfile/services/project-docker.service.d.ts.map +1 -0
- package/dist/modules/dockerfile/services/project-docker.service.js +122 -0
- package/dist/modules/dockerfile/services/project-docker.service.js.map +1 -0
- package/dist/modules/jenkins/commands/create-deployment.command.js +4 -4
- package/dist/modules/jenkins/commands/create-deployment.command.js.map +1 -1
- package/dist/modules/jenkins/index.js +1 -1
- package/dist/modules/jenkins/index.js.map +1 -1
- package/dist/modules/mobile/commands/mobile-environment.command.js +1 -1
- package/dist/modules/mobile/commands/mobile-environment.command.js.map +1 -1
- package/dist/modules/mobile/commands/mobile-prebuild.command.js +1 -1
- package/dist/modules/mobile/commands/mobile-prebuild.command.js.map +1 -1
- package/dist/modules/mobile/commands/ota.command.js +3 -3
- package/dist/modules/mobile/commands/ota.command.js.map +1 -1
- package/dist/modules/mobile/index.d.ts.map +1 -1
- package/dist/modules/mobile/index.js +8 -7
- package/dist/modules/mobile/index.js.map +1 -1
- package/dist/modules/mobile/services/mobile-project-directory.d.ts +3 -0
- package/dist/modules/mobile/services/mobile-project-directory.d.ts.map +1 -0
- package/dist/modules/mobile/services/mobile-project-directory.js +31 -0
- package/dist/modules/mobile/services/mobile-project-directory.js.map +1 -0
- package/dist/modules/mobile/services/ota-setup.service.d.ts.map +1 -1
- package/dist/modules/mobile/services/ota-setup.service.js +5 -3
- package/dist/modules/mobile/services/ota-setup.service.js.map +1 -1
- package/dist/modules/prebuild/commands/prebuild.command.d.ts +4 -0
- package/dist/modules/prebuild/commands/prebuild.command.d.ts.map +1 -1
- package/dist/modules/prebuild/commands/prebuild.command.js +155 -100
- package/dist/modules/prebuild/commands/prebuild.command.js.map +1 -1
- package/dist/modules/prebuild/index.js +2 -2
- package/dist/modules/prebuild/index.js.map +1 -1
- package/dist/modules/prebuild/setup-plan.d.ts +11 -0
- package/dist/modules/prebuild/setup-plan.d.ts.map +1 -0
- package/dist/modules/prebuild/setup-plan.js +58 -0
- package/dist/modules/prebuild/setup-plan.js.map +1 -0
- package/dist/modules/proxy/services/npm-api.service.d.ts +1 -0
- package/dist/modules/proxy/services/npm-api.service.d.ts.map +1 -1
- package/dist/modules/proxy/services/npm-api.service.js +1 -0
- package/dist/modules/proxy/services/npm-api.service.js.map +1 -1
- package/dist/modules/scaffold/commands/init.command.d.ts.map +1 -1
- package/dist/modules/scaffold/commands/init.command.js +33 -18
- package/dist/modules/scaffold/commands/init.command.js.map +1 -1
- package/dist/modules/scaffold/types.d.ts +3 -1
- package/dist/modules/scaffold/types.d.ts.map +1 -1
- package/dist/modules/scopes/commands/scope.command.d.ts +3 -1
- package/dist/modules/scopes/commands/scope.command.d.ts.map +1 -1
- package/dist/modules/scopes/commands/scope.command.js +15 -8
- package/dist/modules/scopes/commands/scope.command.js.map +1 -1
- package/dist/modules/scopes/index.js +1 -1
- package/dist/modules/scopes/index.js.map +1 -1
- package/dist/modules/scopes/services/scope-native.service.d.ts.map +1 -1
- package/dist/modules/scopes/services/scope-native.service.js +16 -5
- package/dist/modules/scopes/services/scope-native.service.js.map +1 -1
- package/dist/modules/setup/commands/setup.command.d.ts.map +1 -1
- package/dist/modules/setup/commands/setup.command.js +41 -24
- package/dist/modules/setup/commands/setup.command.js.map +1 -1
- package/dist/modules/users/commands/user.command.d.ts.map +1 -1
- package/dist/modules/users/commands/user.command.js +10 -2
- package/dist/modules/users/commands/user.command.js.map +1 -1
- package/dist/modules/users/providers/jenkins-user.provider.js +95 -95
- package/dist/modules/users/providers/npm-user.provider.d.ts.map +1 -1
- package/dist/modules/users/providers/npm-user.provider.js +31 -2
- package/dist/modules/users/providers/npm-user.provider.js.map +1 -1
- package/dist/shared/config/config-files.js +7 -7
- package/dist/shared/jenkins/role-strategy-groovy.js +84 -84
- package/dist/shared/process/run-npx.d.ts +4 -0
- package/dist/shared/process/run-npx.d.ts.map +1 -0
- package/dist/shared/process/run-npx.js +31 -0
- package/dist/shared/process/run-npx.js.map +1 -0
- package/docs/ARCHITECTURE.md +7 -7
- package/docs/CREATE-DEPLOYMENT-reference.groovy +8 -8
- package/docs/README_v2.6.0_DETAILED.md +1021 -0
- package/package.json +12 -5
- package/templates/jenkins/CREATE-DEPLOYMENT.groovy +8 -8
- package/templates/jenkins/Jenkinsfile-Mobile-App +759 -759
|
@@ -22,12 +22,13 @@ const project_metadata_1 = require("../../scaffold/config/project-metadata");
|
|
|
22
22
|
const project_topology_1 = require("../../scaffold/project-topology");
|
|
23
23
|
const scope_service_1 = require("../../scopes/services/scope.service");
|
|
24
24
|
const scope_command_1 = require("../../scopes/commands/scope.command");
|
|
25
|
+
const setup_plan_1 = require("../setup-plan");
|
|
25
26
|
const normalizeZoneId = (value) => value.replace(/^\/hostedzone\//, '');
|
|
26
27
|
const normalizeDns = (value) => value.trim().endsWith('.') ? value.trim() : `${value.trim()}.`;
|
|
27
28
|
const subdomainLabel = (domain) => domain.replace(/\.$/, '').split('.')[0]?.replace(/[^A-Za-z0-9_.-]/g, '-') || 'record';
|
|
28
29
|
const warningConfigure = async (message, options) => {
|
|
29
30
|
console.log(chalk_1.default.yellow(`⚠ ${message}`));
|
|
30
|
-
if (options.yes)
|
|
31
|
+
if (options.yes || options.planned)
|
|
31
32
|
return true;
|
|
32
33
|
return (await inquirer_1.default.prompt([{ type: 'confirm', name: 'ok', message: 'Would you like to configure it now?', default: true }])).ok;
|
|
33
34
|
};
|
|
@@ -63,13 +64,15 @@ const ensureUserProvider = async (provider, label, options) => {
|
|
|
63
64
|
console.log(chalk_1.default.gray(' Ask an admin, or a manager who manages that scope, to add you before using it.'));
|
|
64
65
|
return false;
|
|
65
66
|
}
|
|
66
|
-
if (options.yes) {
|
|
67
|
+
if (options.yes && !options.planned) {
|
|
67
68
|
console.log(chalk_1.default.yellow(`⚠ No ${label} scope exists/has been assigned. --yes will not create organization credentials automatically.`));
|
|
68
69
|
return false;
|
|
69
70
|
}
|
|
70
|
-
if (!(await warningConfigure(`No ${label} provider scope is available. Create one now as organization admin?`, options)))
|
|
71
|
+
if (!options.planned && !(await warningConfigure(`No ${label} provider scope is available. Create one now as organization admin?`, options)))
|
|
71
72
|
return false;
|
|
72
73
|
try {
|
|
74
|
+
if (options.planned)
|
|
75
|
+
console.log(chalk_1.default.gray(` ${label}: no usable scope exists yet; starting admin setup.`));
|
|
73
76
|
await (0, provider_command_1.configureUserProvider)(provider);
|
|
74
77
|
}
|
|
75
78
|
catch (error) {
|
|
@@ -81,10 +84,10 @@ const ensureUserProvider = async (provider, label, options) => {
|
|
|
81
84
|
const ensureProjectProviderScope = async (provider, label, environment, options) => {
|
|
82
85
|
if ((await (0, scope_service_1.listProjectScopeLinks)(environment)).some((link) => link.provider === provider))
|
|
83
86
|
return true;
|
|
84
|
-
if (options.yes)
|
|
87
|
+
if (options.yes && !options.planned)
|
|
85
88
|
throw new Error(`${label} is not linked to project environment ${environment}. Run \`indraq project scopes --env ${environment}\` and select the ${label} scope first.`);
|
|
86
89
|
console.log(chalk_1.default.yellow(`⚠ ${label} is not linked to project environment ${environment}.`));
|
|
87
|
-
await (0, scope_command_1.projectScopes)(environment, [provider]);
|
|
90
|
+
await (0, scope_command_1.projectScopes)(environment, [provider], { automaticReasons: !!options.planned });
|
|
88
91
|
return (await (0, scope_service_1.listProjectScopeLinks)(environment)).some((link) => link.provider === provider);
|
|
89
92
|
};
|
|
90
93
|
const selectEnvironment = async (label, requested, excludeId, allowedNames) => {
|
|
@@ -105,24 +108,24 @@ const selectEnvironment = async (label, requested, excludeId, allowedNames) => {
|
|
|
105
108
|
return environments.find((environment) => environment.id === id) || null;
|
|
106
109
|
};
|
|
107
110
|
const ensureGhcr = async (component, environmentName, options) => {
|
|
108
|
-
if (!(await ensureUserProvider('ghcr', '
|
|
111
|
+
if (!(await ensureUserProvider('ghcr', 'GitHub Packages', options)))
|
|
109
112
|
return null;
|
|
110
113
|
const type = `ghcr-${(0, project_topology_1.componentKey)(component)}`;
|
|
111
114
|
const existing = await (0, project_cloud_service_1.getProjectResource)(type, environmentName);
|
|
112
115
|
if (existing?.config?.imageName && existing.config.fullImage) {
|
|
113
|
-
console.log(chalk_1.default.green(`✓
|
|
116
|
+
console.log(chalk_1.default.green(`✓ GitHub Packages image associated: ${existing.config.fullImage}`));
|
|
114
117
|
return existing.config;
|
|
115
118
|
}
|
|
116
|
-
if (!(await warningConfigure(`No
|
|
119
|
+
if (!(await warningConfigure(`No GitHub Packages image is associated with ${component.name} (${environmentName}).`, options)))
|
|
117
120
|
return null;
|
|
118
|
-
const profile = await (0, user_provider_service_1.resolveUserProvider)('ghcr', 'Configure project
|
|
121
|
+
const profile = await (0, user_provider_service_1.resolveUserProvider)('ghcr', 'Configure project GitHub Packages image', environmentName);
|
|
119
122
|
if (!profile.config?.registry || !profile.config?.owner)
|
|
120
|
-
throw new Error('The selected
|
|
121
|
-
const answer = await inquirer_1.default.prompt([{ type: 'input', name: 'imageName', message: `
|
|
123
|
+
throw new Error('The selected GitHub Packages scope is missing registry/owner configuration. Ask an admin to repair that scope.');
|
|
124
|
+
const answer = await inquirer_1.default.prompt([{ type: 'input', name: 'imageName', message: `GitHub Packages image name for ${component.name}:`, default: component.imageName, validate: (v) => /^[a-z0-9][a-z0-9._-]*$/i.test(v.trim()) || 'Use letters, numbers, dots, hyphens or underscores.' }]);
|
|
122
125
|
const imageName = answer.imageName.trim().toLowerCase();
|
|
123
126
|
const fullImage = `${profile.config.registry.replace(/\/+$/, '')}/${profile.config.owner.toLowerCase()}/${imageName}`;
|
|
124
|
-
await (0, project_cloud_service_1.saveProjectResource)(type, environmentName, 'ghcr', fullImage, { imageName, fullImage }, 'Associate
|
|
125
|
-
console.log(chalk_1.default.green(`✓
|
|
127
|
+
await (0, project_cloud_service_1.saveProjectResource)(type, environmentName, 'ghcr', fullImage, { imageName, fullImage }, 'Associate GitHub Packages image during prebuild');
|
|
128
|
+
console.log(chalk_1.default.green(`✓ GitHub Packages image associated: ${fullImage}`));
|
|
126
129
|
return { imageName, fullImage };
|
|
127
130
|
};
|
|
128
131
|
const preflightPort = async (context, component, imageName, provided, existing) => {
|
|
@@ -432,7 +435,9 @@ const chooseSecondaryEnvironment = async (routingPolicy, primary, options, allow
|
|
|
432
435
|
throw new Error(`${routingPolicy} Route53 routing requires a secondary environment.`);
|
|
433
436
|
return secondary;
|
|
434
437
|
};
|
|
435
|
-
const optionalAction = async (label, options) => {
|
|
438
|
+
const optionalAction = async (label, options, feature) => {
|
|
439
|
+
if (options.features || options.planned)
|
|
440
|
+
return (options.features || []).includes(feature) ? 'create' : 'skip';
|
|
436
441
|
if (options.yes)
|
|
437
442
|
return 'skip';
|
|
438
443
|
return (await inquirer_1.default.prompt([{ type: 'list', name: 'action', message: `${label}:`, choices: [
|
|
@@ -525,11 +530,11 @@ const ensureJenkins = async (component, environment, stage, imageName, fullImage
|
|
|
525
530
|
console.log(chalk_1.default.yellow('⚠ Jenkins bootstrap job CREATE-DEPLOYMENT is missing.'));
|
|
526
531
|
return false;
|
|
527
532
|
}
|
|
528
|
-
const ghcrProfile = await (0, user_provider_service_1.resolveUserProvider)('ghcr', 'Sync
|
|
533
|
+
const ghcrProfile = await (0, user_provider_service_1.resolveUserProvider)('ghcr', 'Sync GitHub Packages pull credential to Jenkins for this project', environment.name);
|
|
529
534
|
if (!ghcrProfile.secret?.username || !ghcrProfile.secret?.token)
|
|
530
|
-
throw new Error('
|
|
535
|
+
throw new Error('GitHub Packages credentials are incomplete.');
|
|
531
536
|
const ghcrCredentialId = `indraq-ghcr-${(0, project_cloud_service_1.requireProjectId)()}-${(0, project_topology_1.componentKey)(component)}`.slice(0, 100);
|
|
532
|
-
await (0, cloud_jenkins_service_1.ensureProjectJenkinsGhcrCredential)(controlContext, ghcrCredentialId, ghcrProfile.secret.username, ghcrProfile.secret.token, `IndraQ Cloud
|
|
537
|
+
await (0, cloud_jenkins_service_1.ensureProjectJenkinsGhcrCredential)(controlContext, ghcrCredentialId, ghcrProfile.secret.username, ghcrProfile.secret.token, `IndraQ Cloud GitHub Packages credential for ${component.name}`);
|
|
533
538
|
const extras = { networks: '', volumes: '', flags: '' };
|
|
534
539
|
const identity = await new cloud_api_service_1.CloudApiService().request('/auth/me');
|
|
535
540
|
const parameters = { APP_TYPE: component.kind === 'frontend' ? 'FRONTEND' : 'BACKEND', IMAGE_NAME: imageName, GHCR_IMAGE: fullImage, GHCR_CREDENTIAL_ID: ghcrCredentialId, INDRAQ_USERNAME: identity.name || '', CONTAINER_NAME: imageName.replace(/[^A-Za-z0-9_.-]/g, '-'), HOST_PORT: String(hostPort), CONTAINER_PORT: String(component.containerPort), HEALTH_ENDPOINT: component.healthEndpoint, DOCKER_NETWORKS: extras.networks.replace(/,/g, '\n'), DOCKER_VOLUMES: extras.volumes, DOCKER_FLAGS: extras.flags };
|
|
@@ -547,8 +552,9 @@ const ensureJenkins = async (component, environment, stage, imageName, fullImage
|
|
|
547
552
|
console.log(chalk_1.default.green(`✓ Jenkins deployment created: ${jobName}`));
|
|
548
553
|
return true;
|
|
549
554
|
};
|
|
555
|
+
const scopeProviderLabelForPrebuild = (provider) => provider === 'ghcr' ? 'GitHub Packages' : provider === 'npm' ? 'Nginx Proxy Manager' : provider === 'aws' ? 'AWS' : provider === 'jenkins-prod' ? 'Jenkins PROD' : 'Jenkins DEV';
|
|
550
556
|
const prebuild = async (options) => {
|
|
551
|
-
console.log(chalk_1.default.blue.bold('\nIndraQ Prebuild —
|
|
557
|
+
console.log(chalk_1.default.blue.bold('\nIndraQ Prebuild — choose once, configure once\n'));
|
|
552
558
|
if (!(await ensureCloud(options))) {
|
|
553
559
|
console.log(chalk_1.default.yellow('Prebuild stopped because Cloud configuration/login was skipped.'));
|
|
554
560
|
return;
|
|
@@ -566,11 +572,42 @@ const prebuild = async (options) => {
|
|
|
566
572
|
return;
|
|
567
573
|
}
|
|
568
574
|
const configuredTargets = (0, project_topology_1.configuredDeploymentTargets)(metadata);
|
|
575
|
+
let selectedFeatures;
|
|
576
|
+
if (options.requiredOnly)
|
|
577
|
+
selectedFeatures = ['github-packages', 'jenkins'];
|
|
578
|
+
else if (options.features?.length)
|
|
579
|
+
selectedFeatures = (0, setup_plan_1.expandWebSetupFeatures)(options.features);
|
|
580
|
+
else if (options.yes)
|
|
581
|
+
selectedFeatures = ['github-packages', 'jenkins'];
|
|
582
|
+
else
|
|
583
|
+
selectedFeatures = await (0, setup_plan_1.chooseWebSetupFeatures)({
|
|
584
|
+
includeDocker: false,
|
|
585
|
+
hasDeploymentTargets: configuredTargets.length > 0 || !!options.env,
|
|
586
|
+
defaults: ['github-packages', 'jenkins'],
|
|
587
|
+
message: 'What should prebuild configure?'
|
|
588
|
+
});
|
|
589
|
+
selectedFeatures = (0, setup_plan_1.infrastructureFeatures)(selectedFeatures);
|
|
590
|
+
if (!selectedFeatures.length) {
|
|
591
|
+
if (metadata.kind === 'backend-mobile' && !options.requiredOnly && !options.skipMobile) {
|
|
592
|
+
const { withMobileProjectDirectory } = await import('../../mobile/services/mobile-project-directory.js');
|
|
593
|
+
const { mobilePrebuild } = await import('../../mobile/commands/mobile-prebuild.command.js');
|
|
594
|
+
await withMobileProjectDirectory(() => mobilePrebuild({}));
|
|
595
|
+
}
|
|
596
|
+
else
|
|
597
|
+
console.log(chalk_1.default.gray('Nothing selected. Prebuild made no infrastructure changes.'));
|
|
598
|
+
return;
|
|
599
|
+
}
|
|
600
|
+
const plannedOptions = { ...options, features: selectedFeatures, planned: true };
|
|
569
601
|
if (options.allTargets) {
|
|
570
602
|
if (!configuredTargets.length)
|
|
571
603
|
throw new Error('This project has no configured deployment environments. Run `indraq project environments` first.');
|
|
572
604
|
for (const environment of configuredTargets) {
|
|
573
|
-
await (0, exports.prebuild)({ ...
|
|
605
|
+
await (0, exports.prebuild)({ ...plannedOptions, env: environment, allTargets: false, skipMobile: true });
|
|
606
|
+
}
|
|
607
|
+
if (metadata.kind === 'backend-mobile' && !options.requiredOnly && !options.skipMobile) {
|
|
608
|
+
const { withMobileProjectDirectory } = await import('../../mobile/services/mobile-project-directory.js');
|
|
609
|
+
const { mobilePrebuild } = await import('../../mobile/commands/mobile-prebuild.command.js');
|
|
610
|
+
await withMobileProjectDirectory(() => mobilePrebuild({}));
|
|
574
611
|
}
|
|
575
612
|
return;
|
|
576
613
|
}
|
|
@@ -579,128 +616,146 @@ const prebuild = async (options) => {
|
|
|
579
616
|
if (!primaryEnvironment)
|
|
580
617
|
return;
|
|
581
618
|
const stage = (0, project_topology_1.configuredDeploymentStage)(metadata, primaryEnvironment.name);
|
|
582
|
-
const
|
|
619
|
+
const stageProvider = stage === 'prod' ? 'jenkins-prod' : 'jenkins-dev';
|
|
620
|
+
const requiredScopeProviders = [];
|
|
621
|
+
if (selectedFeatures.includes('github-packages'))
|
|
622
|
+
requiredScopeProviders.push('ghcr');
|
|
623
|
+
if (selectedFeatures.includes('jenkins'))
|
|
624
|
+
requiredScopeProviders.push(stageProvider);
|
|
625
|
+
if (selectedFeatures.includes('route53'))
|
|
626
|
+
requiredScopeProviders.push('aws');
|
|
627
|
+
if (selectedFeatures.includes('npm'))
|
|
628
|
+
requiredScopeProviders.push('npm');
|
|
583
629
|
let projectScopeLinks = await (0, scope_service_1.listProjectScopeLinks)(primaryEnvironment.name);
|
|
584
630
|
let missingScopeProviders = requiredScopeProviders.filter((provider) => !projectScopeLinks.some((link) => link.provider === provider));
|
|
585
631
|
if (missingScopeProviders.length) {
|
|
586
|
-
|
|
587
|
-
|
|
588
|
-
console.log(chalk_1.default.yellow(`⚠ Project ${metadata.name} is missing required scope link(s) for environment ${primaryEnvironment.name}: ${missingScopeProviders.join(', ')}.`));
|
|
589
|
-
const select = (await inquirer_1.default.prompt([{ type: 'confirm', name: 'ok', message: 'Select/link project scopes now?', default: true }])).ok;
|
|
590
|
-
if (!select)
|
|
591
|
-
return;
|
|
592
|
-
await (0, scope_command_1.projectScopes)(primaryEnvironment.name, missingScopeProviders);
|
|
632
|
+
console.log(chalk_1.default.yellow(`⚠ Missing scope link(s) for ${primaryEnvironment.name}: ${missingScopeProviders.map((provider) => scopeProviderLabelForPrebuild(provider)).join(', ')}.`));
|
|
633
|
+
await (0, scope_command_1.projectScopes)(primaryEnvironment.name, missingScopeProviders, { automaticReasons: true });
|
|
593
634
|
projectScopeLinks = await (0, scope_service_1.listProjectScopeLinks)(primaryEnvironment.name);
|
|
594
635
|
missingScopeProviders = requiredScopeProviders.filter((provider) => !projectScopeLinks.some((link) => link.provider === provider));
|
|
595
636
|
if (missingScopeProviders.length)
|
|
596
637
|
throw new Error(`Required project scope link(s) are still missing: ${missingScopeProviders.join(', ')}.`);
|
|
597
638
|
}
|
|
598
|
-
const
|
|
599
|
-
|
|
600
|
-
{ provider:
|
|
601
|
-
|
|
602
|
-
|
|
603
|
-
|
|
604
|
-
|
|
639
|
+
const providerRequirements = [];
|
|
640
|
+
if (selectedFeatures.includes('github-packages'))
|
|
641
|
+
providerRequirements.push({ provider: 'ghcr', label: 'GitHub Packages' });
|
|
642
|
+
if (selectedFeatures.includes('jenkins'))
|
|
643
|
+
providerRequirements.push({ provider: stageProvider, label: `Jenkins ${stage.toUpperCase()}` });
|
|
644
|
+
if (selectedFeatures.includes('route53'))
|
|
645
|
+
providerRequirements.push({ provider: 'aws', label: 'AWS' });
|
|
646
|
+
if (selectedFeatures.includes('npm'))
|
|
647
|
+
providerRequirements.push({ provider: 'npm', label: 'Nginx Proxy Manager' });
|
|
648
|
+
for (const item of providerRequirements) {
|
|
649
|
+
if (!(await ensureUserProvider(item.provider, item.label, plannedOptions))) {
|
|
650
|
+
throw new Error(`${item.label} is selected but no usable scope is available for ${primaryEnvironment.name}.`);
|
|
605
651
|
}
|
|
606
652
|
}
|
|
607
|
-
|
|
608
|
-
|
|
609
|
-
|
|
653
|
+
let jenkinsControlContext;
|
|
654
|
+
if (selectedFeatures.includes('jenkins')) {
|
|
655
|
+
jenkinsControlContext = { projectId: (0, project_cloud_service_1.requireProjectId)(), environment: primaryEnvironment.name, stage };
|
|
656
|
+
await (0, cloud_jenkins_service_1.preflightProjectJenkinsControl)(jenkinsControlContext);
|
|
657
|
+
console.log(chalk_1.default.green(`✓ Jenkins control-plane preflight passed for ${primaryEnvironment.name}.`));
|
|
658
|
+
}
|
|
610
659
|
const components = (0, project_topology_1.projectComponents)(metadata);
|
|
611
660
|
if (!components.length)
|
|
612
661
|
throw new Error('Cloud project has no web components. Re-run `indraq project sync`.');
|
|
613
662
|
let incomplete = 0;
|
|
614
663
|
for (const component of components) {
|
|
615
664
|
console.log(chalk_1.default.blue.bold(`\n━━ ${component.name} (${primaryEnvironment.name}) ━━`));
|
|
616
|
-
|
|
617
|
-
if (
|
|
618
|
-
|
|
619
|
-
|
|
620
|
-
|
|
621
|
-
if (!(await ensureUserProvider(stage === 'prod' ? 'jenkins-prod' : 'jenkins-dev', `Jenkins ${stage}`, options))) {
|
|
622
|
-
incomplete += 1;
|
|
623
|
-
continue;
|
|
624
|
-
}
|
|
625
|
-
const jenkins = await (0, cloud_jenkins_service_1.getCloudJenkins)(stage, 'Preflight Jenkins host port and deployment', undefined, primaryEnvironment.name);
|
|
626
|
-
const existing = await (0, project_cloud_service_1.getProjectResource)(`jenkins-${(0, project_topology_1.componentKey)(component)}`, primaryEnvironment.name);
|
|
627
|
-
const hostPort = await preflightPort(jenkinsControlContext, component, ghcr.imageName, undefined, existing?.config?.hostPort);
|
|
628
|
-
if (!(await ensureJenkins(component, primaryEnvironment, stage, ghcr.imageName, ghcr.fullImage, hostPort, jenkins, options))) {
|
|
629
|
-
incomplete += 1;
|
|
630
|
-
continue;
|
|
665
|
+
let packageConfig = null;
|
|
666
|
+
if (selectedFeatures.includes('github-packages')) {
|
|
667
|
+
packageConfig = await ensureGhcr(component, primaryEnvironment.name, plannedOptions);
|
|
668
|
+
if (!packageConfig)
|
|
669
|
+
incomplete += 1;
|
|
631
670
|
}
|
|
632
|
-
|
|
633
|
-
|
|
634
|
-
continue;
|
|
671
|
+
else {
|
|
672
|
+
packageConfig = (await (0, project_cloud_service_1.getProjectResource)(`ghcr-${(0, project_topology_1.componentKey)(component)}`, primaryEnvironment.name))?.config || null;
|
|
635
673
|
}
|
|
636
|
-
|
|
674
|
+
const existingJenkins = await (0, project_cloud_service_1.getProjectResource)(`jenkins-${(0, project_topology_1.componentKey)(component)}`, primaryEnvironment.name);
|
|
637
675
|
const existingDns = await (0, project_cloud_service_1.getProjectResource)(`route53-${(0, project_topology_1.componentKey)(component)}`, primaryEnvironment.name);
|
|
638
|
-
|
|
639
|
-
|
|
640
|
-
|
|
641
|
-
|
|
676
|
+
const existingProxy = await (0, project_cloud_service_1.getProjectResource)(`npm-proxy-${(0, project_topology_1.componentKey)(component)}`, primaryEnvironment.name);
|
|
677
|
+
let hostPort = existingJenkins?.config?.hostPort || existingProxy?.config?.forwardPort || existingDns?.config?.hostPort;
|
|
678
|
+
if (selectedFeatures.includes('jenkins')) {
|
|
679
|
+
if (!packageConfig) {
|
|
680
|
+
console.log(chalk_1.default.yellow(`⚠ Jenkins for ${component.name} needs GitHub Packages first. Select GitHub Packages with Jenkins, or configure GitHub Packages before running Jenkins setup.`));
|
|
681
|
+
incomplete += 1;
|
|
642
682
|
}
|
|
643
683
|
else {
|
|
644
|
-
|
|
645
|
-
|
|
646
|
-
|
|
647
|
-
|
|
684
|
+
if (!jenkinsControlContext)
|
|
685
|
+
throw new Error('Jenkins control context is unavailable.');
|
|
686
|
+
const jenkins = await (0, cloud_jenkins_service_1.getCloudJenkins)(stage, 'Preflight Jenkins host port and deployment', undefined, primaryEnvironment.name);
|
|
687
|
+
hostPort = await preflightPort(jenkinsControlContext, component, packageConfig.imageName, undefined, existingJenkins?.config?.hostPort);
|
|
688
|
+
if (!(await ensureJenkins(component, primaryEnvironment, stage, packageConfig.imageName, packageConfig.fullImage, hostPort, jenkins, plannedOptions)))
|
|
648
689
|
incomplete += 1;
|
|
649
690
|
}
|
|
650
691
|
}
|
|
651
|
-
|
|
652
|
-
const
|
|
653
|
-
|
|
654
|
-
|
|
655
|
-
|
|
656
|
-
|
|
657
|
-
|
|
658
|
-
|
|
692
|
+
if (selectedFeatures.includes('route53')) {
|
|
693
|
+
const dnsHostPort = hostPort || existingDns?.config?.hostPort || (component.kind === 'frontend' ? 8080 : component.appPort);
|
|
694
|
+
let dns = null;
|
|
695
|
+
if (existingDns) {
|
|
696
|
+
if (existingDns.config.managed === false) {
|
|
697
|
+
console.log(chalk_1.default.green(`✓ Linked external Route53 record retained: ${existingDns.config.domain}`));
|
|
698
|
+
dns = { config: { ...existingDns.config, hostPort: dnsHostPort }, primary: primaryEnvironment };
|
|
699
|
+
}
|
|
700
|
+
else {
|
|
701
|
+
const routingPolicy = await chooseRoutingPolicy(plannedOptions, existingDns.config.routingPolicy || 'SIMPLE');
|
|
702
|
+
const secondaryEnvironment = await chooseSecondaryEnvironment(routingPolicy, primaryEnvironment, plannedOptions, configuredTargets.length ? configuredTargets : undefined);
|
|
703
|
+
dns = await ensureDns(component, primaryEnvironment, secondaryEnvironment, routingPolicy, packageConfig?.imageName || component.imageName, dnsHostPort, plannedOptions);
|
|
704
|
+
if (!dns)
|
|
705
|
+
incomplete += 1;
|
|
706
|
+
}
|
|
659
707
|
}
|
|
660
|
-
else
|
|
661
|
-
|
|
708
|
+
else {
|
|
709
|
+
const routingPolicy = await chooseRoutingPolicy(plannedOptions, 'SIMPLE');
|
|
710
|
+
const secondaryEnvironment = await chooseSecondaryEnvironment(routingPolicy, primaryEnvironment, plannedOptions, configuredTargets.length ? configuredTargets : undefined);
|
|
711
|
+
dns = await ensureDns(component, primaryEnvironment, secondaryEnvironment, routingPolicy, packageConfig?.imageName || component.imageName, dnsHostPort, plannedOptions);
|
|
662
712
|
if (!dns)
|
|
663
713
|
incomplete += 1;
|
|
664
714
|
}
|
|
665
|
-
else {
|
|
666
|
-
console.log(chalk_1.default.gray(' Route53 skipped. Deployment can continue without an IndraQ-managed DNS record.'));
|
|
667
|
-
}
|
|
668
715
|
}
|
|
669
|
-
|
|
670
|
-
|
|
671
|
-
|
|
672
|
-
|
|
673
|
-
|
|
674
|
-
|
|
675
|
-
|
|
716
|
+
if (selectedFeatures.includes('npm')) {
|
|
717
|
+
if (!hostPort) {
|
|
718
|
+
hostPort = (await inquirer_1.default.prompt([{
|
|
719
|
+
type: 'number',
|
|
720
|
+
name: 'port',
|
|
721
|
+
message: `Host port Nginx Proxy Manager should forward to for ${component.name}:`,
|
|
722
|
+
default: existingProxy?.config?.forwardPort || (component.kind === 'frontend' ? 8080 : component.appPort),
|
|
723
|
+
validate: (v) => (Number.isInteger(v) && v > 0 && v <= 65535) || 'Use a port from 1 to 65535.'
|
|
724
|
+
}])).port;
|
|
725
|
+
console.log(chalk_1.default.gray(' Port was not checked through Jenkins because Jenkins was not selected in this setup plan.'));
|
|
676
726
|
}
|
|
677
|
-
|
|
678
|
-
|
|
679
|
-
|
|
680
|
-
|
|
681
|
-
if (!(await
|
|
727
|
+
if (existingProxy) {
|
|
728
|
+
if (existingProxy.config.managed === false) {
|
|
729
|
+
console.log(chalk_1.default.green(`✓ Linked external Nginx Proxy Manager proxy retained: ${existingProxy.config.domain}`));
|
|
730
|
+
}
|
|
731
|
+
else if (!(await ensureProxy(component, primaryEnvironment, existingProxy.config.domain, hostPort, plannedOptions))) {
|
|
682
732
|
incomplete += 1;
|
|
733
|
+
}
|
|
683
734
|
}
|
|
684
|
-
else
|
|
685
|
-
|
|
735
|
+
else {
|
|
736
|
+
const dnsResource = await (0, project_cloud_service_1.getProjectResource)(`route53-${(0, project_topology_1.componentKey)(component)}`, primaryEnvironment.name);
|
|
737
|
+
let proxyDomain = dnsResource?.config?.domain || '';
|
|
686
738
|
if (!proxyDomain) {
|
|
687
|
-
proxyDomain = (await inquirer_1.default.prompt([{
|
|
739
|
+
proxyDomain = (await inquirer_1.default.prompt([{
|
|
740
|
+
type: 'input', name: 'domain', message: `Public domain for ${component.name}:`,
|
|
741
|
+
validate: (v) => v.trim().includes('.') || 'Enter a fully-qualified domain.'
|
|
742
|
+
}])).domain.trim().replace(/\.$/, '');
|
|
688
743
|
}
|
|
689
|
-
if (!(await ensureProxy(component, primaryEnvironment, proxyDomain, hostPort,
|
|
744
|
+
if (!(await ensureProxy(component, primaryEnvironment, proxyDomain, hostPort, plannedOptions)))
|
|
690
745
|
incomplete += 1;
|
|
691
746
|
}
|
|
692
|
-
else {
|
|
693
|
-
console.log(chalk_1.default.gray(' NPM skipped. Deployment can continue without an IndraQ-managed reverse proxy.'));
|
|
694
|
-
}
|
|
695
747
|
}
|
|
696
748
|
}
|
|
697
749
|
console.log('');
|
|
698
750
|
if (incomplete)
|
|
699
|
-
console.log(chalk_1.default.yellow(`⚠ Prebuild finished with ${incomplete} incomplete component(s).
|
|
700
|
-
else if (options.requiredOnly)
|
|
701
|
-
console.log(chalk_1.default.green('✓ Required prebuild complete. GHCR + Jenkins are reconciled.'));
|
|
751
|
+
console.log(chalk_1.default.yellow(`⚠ Prebuild finished with ${incomplete} incomplete component(s). Valid resources were kept.`));
|
|
702
752
|
else
|
|
703
|
-
console.log(chalk_1.default.green(
|
|
753
|
+
console.log(chalk_1.default.green(`✓ Prebuild complete: ${selectedFeatures.map((feature) => feature === 'github-packages' ? 'GitHub Packages' : feature === 'route53' ? 'Route53' : feature === 'npm' ? 'Nginx Proxy Manager' : 'Jenkins').join(', ')}.`));
|
|
754
|
+
if (metadata.kind === 'backend-mobile' && !options.requiredOnly && !options.skipMobile && !incomplete) {
|
|
755
|
+
const { withMobileProjectDirectory } = await import('../../mobile/services/mobile-project-directory.js');
|
|
756
|
+
const { mobilePrebuild } = await import('../../mobile/commands/mobile-prebuild.command.js');
|
|
757
|
+
await withMobileProjectDirectory(() => mobilePrebuild({}));
|
|
758
|
+
}
|
|
704
759
|
};
|
|
705
760
|
exports.prebuild = prebuild;
|
|
706
761
|
//# sourceMappingURL=prebuild.command.js.map
|