Skip to content

Commit f178c20

Browse files
authored
fix: pass package settings directory only when package settings applied (#274)
What was Changed? Added a fix for only passing package settings directory when they were applied.
1 parent 2a0cc8e commit f178c20

3 files changed

Lines changed: 6 additions & 4 deletions

File tree

src/actions/sdk/publish.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,11 @@ export class SdkPublishAction {
3939
): Promise<ActionResult<PublishingInfo>> => {
4040
return await withDirPath(async (tempDirectory) => {
4141
const packageConfiguration = publishingProfile.getPackageConfigurationForLanguage(language);
42+
let packageSettingsDirectory: DirectoryPath | undefined;
43+
4244
if (packageConfiguration !== null && packageConfiguration.isEnabled) {
4345
const packageSettingsConfiguration = PackageSettingsConfiguration.create(language, packageConfiguration);
44-
const packageSettingsDirectory = tempDirectory.join('package-settings');
46+
packageSettingsDirectory = tempDirectory.join('package-settings');
4547
const packageSettingsContext = new PackageSettingsContext(packageSettingsDirectory);
4648
await packageSettingsContext.writeConfiguration(packageSettingsConfiguration, language);
4749
}
@@ -57,7 +59,7 @@ export class SdkPublishAction {
5759
false,
5860
undefined,
5961
semVersion,
60-
tempDirectory
62+
packageSettingsDirectory
6163
);
6264
if (sdkGenerationResult.isFailed()) {
6365
return ActionResult.failed();

src/infrastructure/env-info.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class EnvInfo {
5757
const envBaseUrls = process.env.APIMATIC_BASE_URL;
5858
if (envBaseUrls) {
5959
const baseUrls = envBaseUrls.split(';');
60-
EnvInfo.cachedAuthBaseUrl = baseUrls.length === 2 ? baseUrls[1] : undefined;
60+
EnvInfo.cachedAuthBaseUrl = baseUrls.length === 3 ? baseUrls[1] : undefined;
6161
}
6262
return EnvInfo.cachedAuthBaseUrl;
6363
}

src/types/build-context.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export class BuildContext {
5252
const tempBuildDir = tempDir.join("build");
5353
await this.fileService.copyDirectoryContents(this.buildDirectory, tempBuildDir);
5454
if (packageSettingsDirectory) {
55-
await this.fileService.copyDirectoryContents(packageSettingsDirectory.join('package-settings'), tempBuildDir.join('package-settings'));
55+
await this.fileService.copyDirectoryContents(packageSettingsDirectory, tempBuildDir.join('package-settings'));
5656
}
5757
return await tempContext.zip(tempBuildDir);
5858
}

0 commit comments

Comments
 (0)