Skip to content

fix(server-nestjs/nexus): fall back to public Nexus URL when internal URL is unset #2302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KepoParis wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −5
Open

fix(server-nestjs/nexus): fall back to public Nexus URL when internal URL is unset #2302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions apps/server-nestjs/src/modules/nexus/nexus-client.service.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { Test } from '@nestjs/testing'
import { http, HttpResponse } from 'msw'
import { setupServer } from 'msw/node'
import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it } from 'vitest'
import { mockDeep } from 'vitest-mock-extended'
import { ConfigurationService } from '../infrastructure/configuration/configuration.service'
import { NexusClientService } from './nexus-client.service'
import { NexusHttpClientService } from './nexus-http-client.service'
Expand All @@ -21,13 +22,14 @@ function createNexusServiceTestingModule() {
NexusHttpClientService,
{
provide: ConfigurationService,
useValue: {
useValue: mockDeep<ConfigurationService>({
nexusSecretExposedUrl: 'https://nexus.example',
nexusInternalUrl: nexusUrl,
nexusAdmin: 'admin',
nexusAdminPassword,
projectRootDir: 'forge',
} satisfies Partial<ConfigurationService>,
getInternalOrPublicNexusUrl: () => nexusUrl,
} satisfies Partial<ConfigurationService>),
},
],
})
Expand Down
7 changes: 4 additions & 3 deletions apps/server-nestjs/src/modules/nexus/nexus-http-client.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,11 @@ export class NexusHttpClientService {
}

private get baseUrl() {
if (!this.config.nexusInternalUrl) {
throw new NexusError('NotConfigured', 'NEXUS_INTERNAL_URL is required')
const url = this.config.getInternalOrPublicNexusUrl()
if (!url) {
throw new NexusError('NotConfigured', 'NEXUS_INTERNAL_URL or NEXUS_URL is required')
}
return this.config.nexusInternalUrl
return url
}

private get apiBaseUrl() {
Expand Down