Fix API response to return fqdn instead of non-existent domains attribute (#7546)
This commit is contained in:
commit
7c552e8a6a
3 changed files with 40 additions and 5 deletions
|
|
@ -1127,7 +1127,7 @@ private function create_application(Request $request, $type)
|
||||||
|
|
||||||
return response()->json(serializeApiResponse([
|
return response()->json(serializeApiResponse([
|
||||||
'uuid' => data_get($application, 'uuid'),
|
'uuid' => data_get($application, 'uuid'),
|
||||||
'domains' => data_get($application, 'domains'),
|
'domains' => data_get($application, 'fqdn'),
|
||||||
]))->setStatusCode(201);
|
]))->setStatusCode(201);
|
||||||
} elseif ($type === 'private-gh-app') {
|
} elseif ($type === 'private-gh-app') {
|
||||||
$validationRules = [
|
$validationRules = [
|
||||||
|
|
@ -1287,7 +1287,7 @@ private function create_application(Request $request, $type)
|
||||||
|
|
||||||
return response()->json(serializeApiResponse([
|
return response()->json(serializeApiResponse([
|
||||||
'uuid' => data_get($application, 'uuid'),
|
'uuid' => data_get($application, 'uuid'),
|
||||||
'domains' => data_get($application, 'domains'),
|
'domains' => data_get($application, 'fqdn'),
|
||||||
]))->setStatusCode(201);
|
]))->setStatusCode(201);
|
||||||
} elseif ($type === 'private-deploy-key') {
|
} elseif ($type === 'private-deploy-key') {
|
||||||
|
|
||||||
|
|
@ -1421,7 +1421,7 @@ private function create_application(Request $request, $type)
|
||||||
|
|
||||||
return response()->json(serializeApiResponse([
|
return response()->json(serializeApiResponse([
|
||||||
'uuid' => data_get($application, 'uuid'),
|
'uuid' => data_get($application, 'uuid'),
|
||||||
'domains' => data_get($application, 'domains'),
|
'domains' => data_get($application, 'fqdn'),
|
||||||
]))->setStatusCode(201);
|
]))->setStatusCode(201);
|
||||||
} elseif ($type === 'dockerfile') {
|
} elseif ($type === 'dockerfile') {
|
||||||
$validationRules = [
|
$validationRules = [
|
||||||
|
|
@ -1516,7 +1516,7 @@ private function create_application(Request $request, $type)
|
||||||
|
|
||||||
return response()->json(serializeApiResponse([
|
return response()->json(serializeApiResponse([
|
||||||
'uuid' => data_get($application, 'uuid'),
|
'uuid' => data_get($application, 'uuid'),
|
||||||
'domains' => data_get($application, 'domains'),
|
'domains' => data_get($application, 'fqdn'),
|
||||||
]))->setStatusCode(201);
|
]))->setStatusCode(201);
|
||||||
} elseif ($type === 'dockerimage') {
|
} elseif ($type === 'dockerimage') {
|
||||||
$validationRules = [
|
$validationRules = [
|
||||||
|
|
@ -1614,7 +1614,7 @@ private function create_application(Request $request, $type)
|
||||||
|
|
||||||
return response()->json(serializeApiResponse([
|
return response()->json(serializeApiResponse([
|
||||||
'uuid' => data_get($application, 'uuid'),
|
'uuid' => data_get($application, 'uuid'),
|
||||||
'domains' => data_get($application, 'domains'),
|
'domains' => data_get($application, 'fqdn'),
|
||||||
]))->setStatusCode(201);
|
]))->setStatusCode(201);
|
||||||
} elseif ($type === 'dockercompose') {
|
} elseif ($type === 'dockercompose') {
|
||||||
$allowedFields = ['project_uuid', 'environment_name', 'environment_uuid', 'server_uuid', 'destination_uuid', 'type', 'name', 'description', 'instant_deploy', 'docker_compose_raw', 'force_domain_override'];
|
$allowedFields = ['project_uuid', 'environment_name', 'environment_uuid', 'server_uuid', 'destination_uuid', 'type', 'name', 'description', 'instant_deploy', 'docker_compose_raw', 'force_domain_override'];
|
||||||
|
|
|
||||||
20
openapi.json
20
openapi.json
|
|
@ -361,6 +361,10 @@
|
||||||
"force_domain_override": {
|
"force_domain_override": {
|
||||||
"type": "boolean",
|
"type": "boolean",
|
||||||
"description": "Force domain usage even if conflicts are detected. Default is false."
|
"description": "Force domain usage even if conflicts are detected. Default is false."
|
||||||
|
},
|
||||||
|
"autogenerate_domain": {
|
||||||
|
"type": "boolean",
|
||||||
|
"description": "If true and domains is empty, auto-generate a domain using the server's wildcard domain or sslip.io fallback. Default: true."
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"type": "object"
|
"type": "object"
|
||||||
|
|
@ -771,6 +775,10 @@
|
||||||
"force_domain_override": {
|
"force_domain_override": {
|
||||||
"type": "boolean",
|
"type": "boolean",
|
||||||
"description": "Force domain usage even if conflicts are detected. Default is false."
|
"description": "Force domain usage even if conflicts are detected. Default is false."
|
||||||
|
},
|
||||||
|
"autogenerate_domain": {
|
||||||
|
"type": "boolean",
|
||||||
|
"description": "If true and domains is empty, auto-generate a domain using the server's wildcard domain or sslip.io fallback. Default: true."
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"type": "object"
|
"type": "object"
|
||||||
|
|
@ -1181,6 +1189,10 @@
|
||||||
"force_domain_override": {
|
"force_domain_override": {
|
||||||
"type": "boolean",
|
"type": "boolean",
|
||||||
"description": "Force domain usage even if conflicts are detected. Default is false."
|
"description": "Force domain usage even if conflicts are detected. Default is false."
|
||||||
|
},
|
||||||
|
"autogenerate_domain": {
|
||||||
|
"type": "boolean",
|
||||||
|
"description": "If true and domains is empty, auto-generate a domain using the server's wildcard domain or sslip.io fallback. Default: true."
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"type": "object"
|
"type": "object"
|
||||||
|
|
@ -1520,6 +1532,10 @@
|
||||||
"force_domain_override": {
|
"force_domain_override": {
|
||||||
"type": "boolean",
|
"type": "boolean",
|
||||||
"description": "Force domain usage even if conflicts are detected. Default is false."
|
"description": "Force domain usage even if conflicts are detected. Default is false."
|
||||||
|
},
|
||||||
|
"autogenerate_domain": {
|
||||||
|
"type": "boolean",
|
||||||
|
"description": "If true and domains is empty, auto-generate a domain using the server's wildcard domain or sslip.io fallback. Default: true."
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"type": "object"
|
"type": "object"
|
||||||
|
|
@ -1842,6 +1858,10 @@
|
||||||
"force_domain_override": {
|
"force_domain_override": {
|
||||||
"type": "boolean",
|
"type": "boolean",
|
||||||
"description": "Force domain usage even if conflicts are detected. Default is false."
|
"description": "Force domain usage even if conflicts are detected. Default is false."
|
||||||
|
},
|
||||||
|
"autogenerate_domain": {
|
||||||
|
"type": "boolean",
|
||||||
|
"description": "If true and domains is empty, auto-generate a domain using the server's wildcard domain or sslip.io fallback. Default: true."
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"type": "object"
|
"type": "object"
|
||||||
|
|
|
||||||
15
openapi.yaml
15
openapi.yaml
|
|
@ -265,6 +265,9 @@ paths:
|
||||||
force_domain_override:
|
force_domain_override:
|
||||||
type: boolean
|
type: boolean
|
||||||
description: 'Force domain usage even if conflicts are detected. Default is false.'
|
description: 'Force domain usage even if conflicts are detected. Default is false.'
|
||||||
|
autogenerate_domain:
|
||||||
|
type: boolean
|
||||||
|
description: "If true and domains is empty, auto-generate a domain using the server's wildcard domain or sslip.io fallback. Default: true."
|
||||||
type: object
|
type: object
|
||||||
responses:
|
responses:
|
||||||
'201':
|
'201':
|
||||||
|
|
@ -531,6 +534,9 @@ paths:
|
||||||
force_domain_override:
|
force_domain_override:
|
||||||
type: boolean
|
type: boolean
|
||||||
description: 'Force domain usage even if conflicts are detected. Default is false.'
|
description: 'Force domain usage even if conflicts are detected. Default is false.'
|
||||||
|
autogenerate_domain:
|
||||||
|
type: boolean
|
||||||
|
description: "If true and domains is empty, auto-generate a domain using the server's wildcard domain or sslip.io fallback. Default: true."
|
||||||
type: object
|
type: object
|
||||||
responses:
|
responses:
|
||||||
'201':
|
'201':
|
||||||
|
|
@ -797,6 +803,9 @@ paths:
|
||||||
force_domain_override:
|
force_domain_override:
|
||||||
type: boolean
|
type: boolean
|
||||||
description: 'Force domain usage even if conflicts are detected. Default is false.'
|
description: 'Force domain usage even if conflicts are detected. Default is false.'
|
||||||
|
autogenerate_domain:
|
||||||
|
type: boolean
|
||||||
|
description: "If true and domains is empty, auto-generate a domain using the server's wildcard domain or sslip.io fallback. Default: true."
|
||||||
type: object
|
type: object
|
||||||
responses:
|
responses:
|
||||||
'201':
|
'201':
|
||||||
|
|
@ -1010,6 +1019,9 @@ paths:
|
||||||
force_domain_override:
|
force_domain_override:
|
||||||
type: boolean
|
type: boolean
|
||||||
description: 'Force domain usage even if conflicts are detected. Default is false.'
|
description: 'Force domain usage even if conflicts are detected. Default is false.'
|
||||||
|
autogenerate_domain:
|
||||||
|
type: boolean
|
||||||
|
description: "If true and domains is empty, auto-generate a domain using the server's wildcard domain or sslip.io fallback. Default: true."
|
||||||
type: object
|
type: object
|
||||||
responses:
|
responses:
|
||||||
'201':
|
'201':
|
||||||
|
|
@ -1214,6 +1226,9 @@ paths:
|
||||||
force_domain_override:
|
force_domain_override:
|
||||||
type: boolean
|
type: boolean
|
||||||
description: 'Force domain usage even if conflicts are detected. Default is false.'
|
description: 'Force domain usage even if conflicts are detected. Default is false.'
|
||||||
|
autogenerate_domain:
|
||||||
|
type: boolean
|
||||||
|
description: "If true and domains is empty, auto-generate a domain using the server's wildcard domain or sslip.io fallback. Default: true."
|
||||||
type: object
|
type: object
|
||||||
responses:
|
responses:
|
||||||
'201':
|
'201':
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue