Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
ocm-engine
Manage
Activity
Members
Labels
Plan
Issues
27
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Harbor Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
svdh
ocm-engine
Commits
2023d39c
Commit
2023d39c
authored
1 year ago
by
Alexey Lunin
Browse files
Options
Downloads
Plain Diff
merge main
parents
a0e0057f
d4921a80
No related branches found
No related tags found
1 merge request
!44
Preparations for ui
Pipeline
#67447
failed with stages
in 2 minutes and 43 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.env.example
+1
-0
1 addition, 0 deletions
.env.example
CHANGELOG.md
+7
-0
7 additions, 0 deletions
CHANGELOG.md
apps/agent/src/main.ts
+12
-8
12 additions, 8 deletions
apps/agent/src/main.ts
apps/gateway/src/main.ts
+13
-9
13 additions, 9 deletions
apps/gateway/src/main.ts
with
33 additions
and
17 deletions
.env.example
+
1
−
0
View file @
2023d39c
...
...
@@ -35,3 +35,4 @@ ATTESTATION_SERVICE_HOST=0.0.0.0
PROOF_SERVICE_TCP_PORT=8884
PROOF_SERVICE_HOST=0.0.0.0
SWAGGER=false
This diff is collapsed.
Click to expand it.
CHANGELOG.md
+
7
−
0
View file @
2023d39c
...
...
@@ -3,6 +3,13 @@
All notable changes to this project will be documented in this file. See
[
Conventional Commits
](
https://conventionalcommits.org
)
for commit guidelines.
## [1.11.1](https://code.vereign.com/gaiax/ocm/ocm-engine/compare/v1.11.0...v1.11.1) (2023-11-02)
### Bug Fixes
*
separate swagger generation from server run (
[
efb63a9
](
https://code.vereign.com/gaiax/ocm/ocm-engine/commit/efb63a9b791e938df6cc782229f6b2d13a091d87
)
)
## [1.11.0](https://code.vereign.com/gaiax/ocm/ocm-engine/compare/v1.10.0...v1.11.0) (2023-10-09)
...
...
This diff is collapsed.
Click to expand it.
apps/agent/src/main.ts
+
12
−
8
View file @
2023d39c
...
...
@@ -17,15 +17,19 @@ async function bootstrap() {
const
port
=
process
.
env
.
AGENT_PORT
||
3001
;
app
.
enableShutdownHooks
();
const
config
=
new
DocumentBuilder
()
.
setTitle
(
"
Agent
"
)
.
setDescription
(
"
Agent API
"
)
.
setVersion
(
"
1.0
"
)
.
build
();
if
(
process
.
env
.
SWAGGER
===
"
true
"
)
{
const
config
=
new
DocumentBuilder
()
.
setTitle
(
"
Agent
"
)
.
setDescription
(
"
Agent API
"
)
.
setVersion
(
"
1.0
"
)
.
build
();
const
document
=
SwaggerModule
.
createDocument
(
app
,
config
);
fs
.
writeFileSync
(
"
./agent-swagger.json
"
,
JSON
.
stringify
(
document
,
null
,
2
));
SwaggerModule
.
setup
(
"
api
"
,
app
,
document
);
const
document
=
SwaggerModule
.
createDocument
(
app
,
config
);
fs
.
writeFileSync
(
"
./agent-swagger.json
"
,
JSON
.
stringify
(
document
,
null
,
2
));
SwaggerModule
.
setup
(
"
api
"
,
app
,
document
);
Logger
.
log
(
`Swagger file written`
);
return
process
.
kill
(
0
);
}
await
app
.
listen
(
port
,
"
0.0.0.0
"
);
Logger
.
log
(
...
...
This diff is collapsed.
Click to expand it.
apps/gateway/src/main.ts
+
13
−
9
View file @
2023d39c
...
...
@@ -39,17 +39,21 @@ async function bootstrap() {
app
.
enableShutdownHooks
();
const
config
=
new
DocumentBuilder
()
.
setTitle
(
"
OCM Gateway
"
)
.
setDescription
(
"
OCM ENGINE GATEWAY API
"
)
.
setVersion
(
"
1.0
"
)
.
addServer
(
`http://
${
gatewayConfig
.
host
}
:
${
gatewayConfig
.
httpPort
}
`
)
.
build
();
if
(
process
.
env
.
SWAGGER
===
"
true
"
)
{
const
config
=
new
DocumentBuilder
()
.
setTitle
(
"
OCM Gateway
"
)
.
setDescription
(
"
OCM ENGINE GATEWAY API
"
)
.
setVersion
(
"
1.0
"
)
.
addServer
(
`http://
${
gatewayConfig
.
host
}
:
${
gatewayConfig
.
httpPort
}
`
)
.
build
();
const
document
=
SwaggerModule
.
createDocument
(
app
,
config
);
fs
.
writeFileSync
(
"
./gateway-swagger.json
"
,
JSON
.
stringify
(
document
,
null
,
2
));
SwaggerModule
.
setup
(
"
api
"
,
app
,
document
);
const
document
=
SwaggerModule
.
createDocument
(
app
,
config
);
fs
.
writeFileSync
(
"
./gateway-swagger.json
"
,
JSON
.
stringify
(
document
,
null
,
2
));
SwaggerModule
.
setup
(
"
api
"
,
app
,
document
);
Logger
.
log
(
`Swagger file written`
);
return
process
.
kill
(
0
);
}
const
port
=
gatewayConfig
.
httpPort
||
3000
;
await
app
.
listen
(
port
,
gatewayConfig
.
host
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment