Skip to content

Commit 69296ac

Browse files
authored
Merge pull request #4992 from continuedev/nate/alwaysUseProxy
option to always use proxy
2 parents 7d939e9 + fb94c08 commit 69296ac

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

extensions/intellij/gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ pluginGroup=com.github.continuedev.continueintellijextension
33
pluginName=continue-intellij-extension
44
pluginRepositoryUrl=https://github.com/continuedev/continue
55
# SemVer format -> https://semver.org
6-
pluginVersion=1.0.11
6+
pluginVersion=1.0.12
77
# Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
88
pluginSinceBuild=223
99
# IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension

extensions/vscode/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "continue",
33
"icon": "media/icon.png",
44
"author": "Continue Dev, Inc",
5-
"version": "1.1.20",
5+
"version": "1.1.21",
66
"repository": {
77
"type": "git",
88
"url": "https://github.com/continuedev/continue"

packages/config-yaml/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@continuedev/config-yaml",
3-
"version": "1.0.71",
3+
"version": "1.0.72",
44
"description": "",
55
"main": "dist/index.js",
66
"types": "dist/index.d.ts",

packages/config-yaml/src/load/unroll.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ function extractFQSNMap(
146146
async function extractRenderedSecretsMap(
147147
rawContent: string,
148148
platformClient: PlatformClient,
149+
alwaysUseProxy: boolean = false,
149150
): Promise<Record<string, string>> {
150151
// Get all template variables
151152
const templateVars = getTemplateVariables(rawContent);
@@ -165,7 +166,7 @@ async function extractRenderedSecretsMap(
165166
}
166167

167168
// User secrets are rendered
168-
if ("value" in secretResult) {
169+
if ("value" in secretResult && !alwaysUseProxy) {
169170
map[encodeFQSN(secretResult.fqsn)] = secretResult.value;
170171
} else {
171172
// Other secrets are rendered as secret locations and then converted to proxy types later
@@ -187,6 +188,7 @@ export interface RenderSecretsUnrollAssistantOptions {
187188
currentUserSlug: string;
188189
platformClient: PlatformClient;
189190
onPremProxyUrl: string | null;
191+
alwaysUseProxy?: boolean;
190192
}
191193

192194
export type UnrollAssistantOptions =
@@ -256,6 +258,7 @@ export async function unrollAssistantFromContent(
256258
const secrets = await extractRenderedSecretsMap(
257259
templatedYaml,
258260
options.platformClient,
261+
options.alwaysUseProxy,
259262
);
260263
const renderedYaml = renderTemplateData(templatedYaml, {
261264
secrets,

0 commit comments

Comments
 (0)