Kiu/Semaphore
Kiu/Semaphore
1
0
Fork 0
mirror of https://github.com/semaphoreui/semaphore.git synced 2024-11-21 17:01:04 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

feat(runners): dislay runner detail

Browse Source
This commit is contained in:
Denis Gukov 2024-09-28 20:51:58 +05:00
parent 1520fa0ad5
commit 8352a94218
3 changed files with 71 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
api/router.go
View File

@ -86,15 +86,16 @@ func Route() *mux.Router {
publicAPIRouter.HandleFunc("/auth/oidc/{provider}/redirect", oidcRedirect).Methods("GET")
publicAPIRouter.HandleFunc("/auth/oidc/{provider}/redirect/{redirect_path:.*}", oidcRedirect).Methods("GET")
runnersAPI := r.PathPrefix(webPath + "internal").Subrouter()
internalAPI := r.PathPrefix(webPath + "internal").Subrouter()
runnersAPI.Use(StoreMiddleware, JSONMiddleware)
runnersAPI.HandleFunc("/runners", runners.RegisterRunner).Methods("POST")
internalAPI.Use(StoreMiddleware, JSONMiddleware)
internalAPI.HandleFunc("/runners", runners.RegisterRunner).Methods("POST")
runnersAPI := internalAPI.PathPrefix("/runners").Subrouter()
runnersAPI.Use(runners.RunnerMiddleware)
runnersAPI.Path("/runners/{runner_id}").HandlerFunc(runners.GetRunner).Methods("GET", "HEAD")
runnersAPI.Path("/runners/{runner_id}").HandlerFunc(runners.UpdateRunner).Methods("PUT")
runnersAPI.Path("/runners/{runner_id}").HandlerFunc(runners.UnregisterRunner).Methods("DELETE")
runnersAPI.Path("/{runner_id}").HandlerFunc(runners.GetRunner).Methods("GET", "HEAD")
runnersAPI.Path("/{runner_id}").HandlerFunc(runners.UpdateRunner).Methods("PUT")
runnersAPI.Path("/{runner_id}").HandlerFunc(runners.UnregisterRunner).Methods("DELETE")
publicWebHookRouter := r.PathPrefix(webPath + "api").Subrouter()
publicWebHookRouter.Use(StoreMiddleware, JSONMiddleware)

7
config-runner.json
View File

@ -1,12 +1,7 @@
{
"bolt": {
"host": "/Users/fiftin/go/src/github.com/ansible-semaphore/semaphore/database.boltdb"
},
"dialect": "bolt",
"tmp_path": "/var/folders/x1/d7p_yr4j7g57_r2r8s0ll_1r0000gn/T/semaphore",
"runner": {
"registration_token": "test123",
"config_file": "/tmp/semaphore-runner.json",
"api_url": "http://localhost:3000/internal"
}

74
web/src/views/Runners.vue
View File

@ -20,26 +20,52 @@
</EditDialog>
<EditDialog
max-width="600"
:max-width="600"
v-model="newRunnerTokenDialog"
:save-button-text="null"
:title="$t('newRunnerToken')"
>
<template v-slot:form="{}">
<div>
<div>
<div class="mb-4">
<div>Token:</div>
<code>{{ (newRunner || {}).token }}</code>
<div style="position: relative;">
<code
class="pa-2 mt-2"
style="background: gray; color: white; display: block; font-size: 14px;"
>{{ (newRunner || {}).token }}</code>
<v-btn
style="position: absolute; right: 10px; top: 2px;"
icon
color="white"
@click="copyToClipboard((newRunner || {}).token)"
>
<v-icon>mdi-content-copy</v-icon>
</v-btn>
</div>
</div>
<div>
<div>Usage:</div>
<pre>
SEMAPHORE_RUNNER_API_URL={{ webHost }}/internal \
SEMAPHORE_RUNNER_ID={{ (newRunner || {}).id }} \
SEMAPHORE_RUNNER_TOKEN={{ (newRunner || {}).token }} \
semaphore runner --no-config
</pre>
<div style="position: relative;">
<pre style="white-space: pre-wrap;
background: gray;
color: white;
border-radius: 10px;
margin-top: 5px;"
class="pa-2"
>{{ runnerUsageCommand }}</pre>
<v-btn
style="position: absolute; right: 10px; top: 10px;"
icon
color="white"
@click="copyToClipboard(runnerUsageCommand)"
>
<v-icon>mdi-content-copy</v-icon>
</v-btn>
</div>
</div>
</div>
</template>
@ -135,6 +161,15 @@ export default {
webHost: String,
},
computed: {
runnerUsageCommand() {
return `SEMAPHORE_RUNNER_API_URL=${this.webHost}/internal \\
SEMAPHORE_RUNNER_ID=${(this.newRunner || {}).id} \\
SEMAPHORE_RUNNER_TOKEN=${(this.newRunner || {}).token} \\
semaphore runner --no-config`;
},
},
data() {
return {
newRunnerTokenDialog: null,
@ -144,11 +179,28 @@ export default {
methods: {
async loadItemsAndShowRunnerDetails(e) {
this.newRunnerTokenDialog = true;
this.newRunner = e.item;
if (e.item.token) {
this.newRunnerTokenDialog = true;
this.newRunner = e.item;
}
return this.loadItems();
},
async copyToClipboard(text) {
try {
await window.navigator.clipboard.writeText(text);
EventBus.$emit('i-snackbar', {
color: 'success',
text: 'The command has been copied to the clipboard.',
});
} catch (e) {
EventBus.$emit('i-snackbar', {
color: 'error',
text: `Can't copy the command: ${e.message}`,
});
}
},
async setActive(runnerId, active) {
await axios({
method: 'post',