Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
89 changes: 67 additions & 22 deletions src/components/NewDeploymentModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -439,6 +439,35 @@
</Transition>
</div>
</template>

<Transition name="collapse">
<div
v-if="existingCredentials.length > 0 && composeServiceNames.length > 1"
class="per-service-credentials"
>
<div class="form-field">
<label>Per-service credentials (optional)</label>
<div class="per-service-list">
<div v-for="svc in composeServiceNames" :key="svc" class="per-service-row">
<span class="per-service-name">{{ svc }}</span>
<select
:value="form.registry.serviceCredentials[svc] || ''"
class="form-select"
@change="setServiceCredential(svc, ($event.target as HTMLSelectElement).value)"
>
<option value="">Use default</option>
<option v-for="cred in existingCredentials" :key="cred.id" :value="cred.id">
{{ cred.name }} ({{ cred.registry_type_slug }})
</option>
</select>
</div>
</div>
<span class="hint">
Override the default credential for individual services pulling from other registries.
</span>
</div>
</div>
</Transition>
</div>
</Transition>

Expand Down Expand Up @@ -1356,6 +1385,7 @@ import { oneDark } from "@codemirror/theme-one-dark";
import BaseModal from "@/components/base/BaseModal.vue";
import { deploymentsApi, templatesApi, settingsApi, containersApi, composeApi, credentialsApi } from "@/services/api";
import type { RegistryCredential } from "@/types";
import { extractComposeServiceNames } from "@/utils/compose";
import { useNotificationsStore } from "@/stores/notifications";

interface TemplateMount {
Expand Down Expand Up @@ -1422,6 +1452,16 @@ const showRegistryPassword = ref(false);
const existingCredentials = ref<RegistryCredential[]>([]);
const loadingCredentials = ref(false);

const composeServiceNames = computed(() => extractComposeServiceNames(form.composeContent));

const setServiceCredential = (service: string, credentialId: string) => {
if (!credentialId) {
delete form.registry.serviceCredentials[service];
} else {
form.registry.serviceCredentials[service] = credentialId;
}
};

const advancedOptions = reactive({
multiDomain: false,
multiDatabase: false,
Expand Down Expand Up @@ -1604,6 +1644,7 @@ const form = reactive({
password: "",
saveCredential: false,
credentialName: "",
serviceCredentials: {} as Record<string, string>,
},
});

Expand Down Expand Up @@ -2238,6 +2279,7 @@ watch(
password: "",
saveCredential: false,
credentialName: "",
serviceCredentials: {},
};
showRegistryPassword.value = false;
existingDbContainers.value = [];
Expand Down Expand Up @@ -2384,6 +2426,10 @@ const handleCreate = async () => {
credential_name: form.registry.credentialName || `${form.name}-registry`,
};
}
const serviceCreds = Object.fromEntries(Object.entries(form.registry.serviceCredentials).filter(([, id]) => id));
if (Object.keys(serviceCreds).length > 0) {
payload.service_credentials = serviceCreds;
}
}

const mapDbToPayload = (db: DatabaseFormConfig) => ({
Expand Down Expand Up @@ -2430,9 +2476,8 @@ const handleCreate = async () => {
payload.databases = databases;
}

const domainsArray = [];
if (finalDomain) {
const domainsArray = [];

domainsArray.push({
id: "primary",
domain: finalDomain,
Expand All @@ -2458,28 +2503,28 @@ const handleCreate = async () => {
}
}
}

payload.metadata = {
name: form.name,
type: "web",
networking: {
expose: true,
domain: finalDomain,
container_port: form.networking.ports[0]?.containerPort || 80,
protocol: form.networking.protocol || "http",
},
ssl: {
enabled: form.ssl.enabled,
auto_cert: form.ssl.autoCert,
},
healthcheck: {
path: "/health",
interval: "30s",
},
domains: domainsArray.length > 1 ? domainsArray : undefined,
};
}

payload.metadata = {
name: form.name,
type: "web",
networking: {
expose: Boolean(finalDomain),
domain: finalDomain || "",
container_port: form.networking.ports[0]?.containerPort || 80,
protocol: form.networking.protocol || "http",
},
ssl: {
enabled: form.ssl.enabled,
auto_cert: form.ssl.autoCert,
},
healthcheck: {
path: "/health",
interval: "30s",
},
domains: domainsArray.length > 1 ? domainsArray : undefined,
};

await deploymentsApi.create(payload);
emit("created");
} catch (e: any) {
Expand Down
3 changes: 3 additions & 0 deletions src/services/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ export interface ServiceMetadata {
interval: string;
};
credential_id?: string;
service_credentials?: Record<string, string>;
}

export interface EnvVar {
Expand Down Expand Up @@ -631,6 +632,7 @@ export const credentialsApi = {
create: (data: {
name: string;
registry_type_slug: string;
registry_url?: string;
username: string;
password: string;
email?: string;
Expand All @@ -640,6 +642,7 @@ export const credentialsApi = {
id: string,
data: {
name?: string;
registry_url?: string;
username?: string;
password?: string;
email?: string;
Expand Down
2 changes: 2 additions & 0 deletions src/types/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ export interface ServiceMetadata {
quick_actions?: QuickAction[];
security?: DeploymentSecurityConfig;
credential_id?: string;
service_credentials?: Record<string, string>;
domains?: DomainConfig[];
databases?: DatabaseConfig[];
}
Expand Down Expand Up @@ -167,6 +168,7 @@ export interface RegistryCredential {
id: string;
name: string;
registry_type_slug: string;
registry_url?: string;
username: string;
email?: string;
is_default: boolean;
Expand Down
37 changes: 37 additions & 0 deletions src/utils/compose.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
export function extractComposeServiceNames(content: string): string[] {
if (!content) return [];
const lines = content.split(/\r?\n/);
let inServices = false;
let childIndent = -1;
const names: string[] = [];

for (const raw of lines) {
if (/^\s*#/.test(raw) || raw.trim() === "") continue;

const indent = raw.match(/^\s*/)?.[0].length ?? 0;

if (!inServices) {
if (/^services\s*:\s*$/.test(raw)) {
inServices = true;
childIndent = -1;
}
continue;
}

if (indent === 0) {
inServices = false;
continue;
}

if (childIndent === -1) {
childIndent = indent;
}

if (indent !== childIndent) continue;

const match = raw.match(/^\s*([A-Za-z0-9_.-]+)\s*:\s*$/);
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This regex only matches service names that are immediately followed by a colon. While common, it may fail if there are comments on the same line or unusual formatting (though valid YAML). It also doesn't handle double-quoted service names containing special characters.

Suggested change
const match = raw.match(/^\s*([A-Za-z0-9_.-]+)\s*:\s*$/);
const match = raw.match(/^\s*["']?([A-Za-z0-9_.-]+)["']?\s*:\s*(?:#.*)?$/);

if (match) names.push(match[1]);
}

return names;
}
4 changes: 4 additions & 0 deletions src/views/DeploymentDetailView.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,10 @@ vi.mock("@/services/api", () => ({
write: vi.fn().mockResolvedValue({ data: { message: "Written" } }),
getContent: vi.fn().mockResolvedValue({ data: { content: "" } }),
},
credentialsApi: {
list: vi.fn().mockResolvedValue({ data: { credentials: [] } }),
get: vi.fn().mockResolvedValue({ data: { credential: null } }),
},
}));

vi.mock("@/composables/useNotifications", () => ({
Expand Down
Loading
Loading