dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: applications API writing to unavailable models

Browse Source 
when $useBuildServer is set, $application->settings model does not yet exist. This change ensures the models exist before accessing them.
This commit is contained in:
SierraJC
2024-12-14 12:58:11 +11:00
parent e7ffeda8e0
commit 00c93aa8b0
3 changed files with 140 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/Http/Controllers/Api/ApplicationsController.php
View File

@@ -938,12 +938,12 @@ class ApplicationsController extends Controller
$application->environment_id = $environment->id; $application->environment_id = $environment->id;
$application->source_type = $githubApp->getMorphClass(); $application->source_type = $githubApp->getMorphClass();
$application->source_id = $githubApp->id; $application->source_id = $githubApp->id;
$application->save();
$application->refresh();
if (isset($useBuildServer)) { if (isset($useBuildServer)) {
$application->settings->is_build_server_enabled = $useBuildServer; $application->settings->is_build_server_enabled = $useBuildServer;
$application->settings->save(); $application->settings->save();
} }
$application->save();
$application->refresh();
if (! $application->settings->is_container_label_readonly_enabled) { if (! $application->settings->is_container_label_readonly_enabled) {
$application->custom_labels = str(implode('|coolify|', generateLabelsApplication($application)))->replace('|coolify|', "\n"); $application->custom_labels = str(implode('|coolify|', generateLabelsApplication($application)))->replace('|coolify|', "\n");
$application->save(); $application->save();
@@ -1034,12 +1034,12 @@ class ApplicationsController extends Controller
$application->destination_id = $destination->id; $application->destination_id = $destination->id;
$application->destination_type = $destination->getMorphClass(); $application->destination_type = $destination->getMorphClass();
$application->environment_id = $environment->id; $application->environment_id = $environment->id;
$application->save();
$application->refresh();
if (isset($useBuildServer)) { if (isset($useBuildServer)) {
$application->settings->is_build_server_enabled = $useBuildServer; $application->settings->is_build_server_enabled = $useBuildServer;
$application->settings->save(); $application->settings->save();
} }
$application->save();
$application->refresh();
if (! $application->settings->is_container_label_readonly_enabled) { if (! $application->settings->is_container_label_readonly_enabled) {
$application->custom_labels = str(implode('|coolify|', generateLabelsApplication($application)))->replace('|coolify|', "\n"); $application->custom_labels = str(implode('|coolify|', generateLabelsApplication($application)))->replace('|coolify|', "\n");
$application->save(); $application->save();
@@ -1120,15 +1120,16 @@ class ApplicationsController extends Controller
$application->destination_id = $destination->id; $application->destination_id = $destination->id;
$application->destination_type = $destination->getMorphClass(); $application->destination_type = $destination->getMorphClass();
$application->environment_id = $environment->id; $application->environment_id = $environment->id;
if (isset($useBuildServer)) {
$application->settings->is_build_server_enabled = $useBuildServer;
$application->settings->save();
}
$application->git_repository = 'coollabsio/coolify'; $application->git_repository = 'coollabsio/coolify';
$application->git_branch = 'main'; $application->git_branch = 'main';
$application->save(); $application->save();
$application->refresh(); $application->refresh();
if (isset($useBuildServer)) {
$application->settings->is_build_server_enabled = $useBuildServer;
$application->settings->save();
}
if (! $application->settings->is_container_label_readonly_enabled) { if (! $application->settings->is_container_label_readonly_enabled) {
$application->custom_labels = str(implode('|coolify|', generateLabelsApplication($application)))->replace('|coolify|', "\n"); $application->custom_labels = str(implode('|coolify|', generateLabelsApplication($application)))->replace('|coolify|', "\n");
$application->save(); $application->save();
@@ -1184,15 +1185,15 @@ class ApplicationsController extends Controller
$application->destination_id = $destination->id; $application->destination_id = $destination->id;
$application->destination_type = $destination->getMorphClass(); $application->destination_type = $destination->getMorphClass();
$application->environment_id = $environment->id; $application->environment_id = $environment->id;
if (isset($useBuildServer)) {
$application->settings->is_build_server_enabled = $useBuildServer;
$application->settings->save();
}
$application->git_repository = 'coollabsio/coolify'; $application->git_repository = 'coollabsio/coolify';
$application->git_branch = 'main'; $application->git_branch = 'main';
$application->save(); $application->save();
$application->refresh(); $application->refresh();
if (isset($useBuildServer)) {
$application->settings->is_build_server_enabled = $useBuildServer;
$application->settings->save();
}
if (! $application->settings->is_container_label_readonly_enabled) { if (! $application->settings->is_container_label_readonly_enabled) {
$application->custom_labels = str(implode('|coolify|', generateLabelsApplication($application)))->replace('|coolify|', "\n"); $application->custom_labels = str(implode('|coolify|', generateLabelsApplication($application)))->replace('|coolify|', "\n");
$application->save(); $application->save();

96
openapi.json
View File

@@ -342,8 +342,20 @@
} }
}, },
"responses": { "responses": {
"200": { "201": {
"description": "Application created successfully." "description": "Application created successfully.",
"content": {
"application\/json": {
"schema": {
"properties": {
"uuid": {
"type": "string"
}
},
"type": "object"
}
}
}
}, },
"401": { "401": {
"$ref": "#\/components\/responses\/401" "$ref": "#\/components\/responses\/401"
@@ -659,8 +671,20 @@
} }
}, },
"responses": { "responses": {
"200": { "201": {
"description": "Application created successfully." "description": "Application created successfully.",
"content": {
"application\/json": {
"schema": {
"properties": {
"uuid": {
"type": "string"
}
},
"type": "object"
}
}
}
}, },
"401": { "401": {
"$ref": "#\/components\/responses\/401" "$ref": "#\/components\/responses\/401"
@@ -976,8 +1000,20 @@
} }
}, },
"responses": { "responses": {
"200": { "201": {
"description": "Application created successfully." "description": "Application created successfully.",
"content": {
"application\/json": {
"schema": {
"properties": {
"uuid": {
"type": "string"
}
},
"type": "object"
}
}
}
}, },
"401": { "401": {
"$ref": "#\/components\/responses\/401" "$ref": "#\/components\/responses\/401"
@@ -1222,8 +1258,20 @@
} }
}, },
"responses": { "responses": {
"200": { "201": {
"description": "Application created successfully." "description": "Application created successfully.",
"content": {
"application\/json": {
"schema": {
"properties": {
"uuid": {
"type": "string"
}
},
"type": "object"
}
}
}
}, },
"401": { "401": {
"$ref": "#\/components\/responses\/401" "$ref": "#\/components\/responses\/401"
@@ -1451,8 +1499,20 @@
} }
}, },
"responses": { "responses": {
"200": { "201": {
"description": "Application created successfully." "description": "Application created successfully.",
"content": {
"application\/json": {
"schema": {
"properties": {
"uuid": {
"type": "string"
}
},
"type": "object"
}
}
}
}, },
"401": { "401": {
"$ref": "#\/components\/responses\/401" "$ref": "#\/components\/responses\/401"
@@ -1533,8 +1593,20 @@
} }
}, },
"responses": { "responses": {
"200": { "201": {
"description": "Application created successfully." "description": "Application created successfully.",
"content": {
"application\/json": {
"schema": {
"properties": {
"uuid": {
"type": "string"
}
},
"type": "object"
}
}
}
}, },
"401": { "401": {
"$ref": "#\/components\/responses\/401" "$ref": "#\/components\/responses\/401"

48
openapi.yaml
View File

@@ -246,8 +246,14 @@ paths:
description: 'Use build server.' description: 'Use build server.'
type: object type: object
responses: responses:
'200': '201':
description: 'Application created successfully.' description: 'Application created successfully.'
content:
application/json:
schema:
properties:
uuid: { type: string }
type: object
'401': '401':
$ref: '#/components/responses/401' $ref: '#/components/responses/401'
'400': '400':
@@ -475,8 +481,14 @@ paths:
description: 'Use build server.' description: 'Use build server.'
type: object type: object
responses: responses:
'200': '201':
description: 'Application created successfully.' description: 'Application created successfully.'
content:
application/json:
schema:
properties:
uuid: { type: string }
type: object
'401': '401':
$ref: '#/components/responses/401' $ref: '#/components/responses/401'
'400': '400':
@@ -704,8 +716,14 @@ paths:
description: 'Use build server.' description: 'Use build server.'
type: object type: object
responses: responses:
'200': '201':
description: 'Application created successfully.' description: 'Application created successfully.'
content:
application/json:
schema:
properties:
uuid: { type: string }
type: object
'401': '401':
$ref: '#/components/responses/401' $ref: '#/components/responses/401'
'400': '400':
@@ -880,8 +898,14 @@ paths:
description: 'Use build server.' description: 'Use build server.'
type: object type: object
responses: responses:
'200': '201':
description: 'Application created successfully.' description: 'Application created successfully.'
content:
application/json:
schema:
properties:
uuid: { type: string }
type: object
'401': '401':
$ref: '#/components/responses/401' $ref: '#/components/responses/401'
'400': '400':
@@ -1047,8 +1071,14 @@ paths:
description: 'Use build server.' description: 'Use build server.'
type: object type: object
responses: responses:
'200': '201':
description: 'Application created successfully.' description: 'Application created successfully.'
content:
application/json:
schema:
properties:
uuid: { type: string }
type: object
'401': '401':
$ref: '#/components/responses/401' $ref: '#/components/responses/401'
'400': '400':
@@ -1105,8 +1135,14 @@ paths:
description: 'Use build server.' description: 'Use build server.'
type: object type: object
responses: responses:
'200': '201':
description: 'Application created successfully.' description: 'Application created successfully.'
content:
application/json:
schema:
properties:
uuid: { type: string }
type: object
'401': '401':
$ref: '#/components/responses/401' $ref: '#/components/responses/401'
'400': '400':