Skip to content
This repository was archived by the owner on Mar 7, 2023. It is now read-only.

Commit 7bde4c8

Browse files
Unix4evertalos-bot
authored andcommitted
fix: cobra command was initialized but not actually used
Now it's being used properly. Signed-off-by: Artem Chernyshev <[email protected]>
1 parent 04624c9 commit 7bde4c8

File tree

8 files changed

+31
-26
lines changed

8 files changed

+31
-26
lines changed

.babelrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
//
3-
// Generated on 2021-05-07T20:00:58Z by kres a7a00ec-dirty.
3+
// Generated on 2021-05-20T11:44:59Z by kres 2cb907a-dirty.
44

55
module.exports = {
66
presets: [

.dockerignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2021-05-06T10:08:52Z by kres 4bbb5a5-dirty.
3+
# Generated on 2021-05-20T11:44:59Z by kres 2cb907a-dirty.
44

55
**
66
!frontend/src

.jestrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
//
3-
// Generated on 2021-05-07T20:00:58Z by kres a7a00ec-dirty.
3+
// Generated on 2021-05-20T11:44:59Z by kres 2cb907a-dirty.
44

55
module.exports = {
66
preset: '@vue/cli-plugin-unit-jest/presets/typescript-and-babel/',

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
44
#
5-
# Generated on 2021-05-07T20:00:58Z by kres a7a00ec-dirty.
5+
# Generated on 2021-05-20T11:44:59Z by kres 2cb907a-dirty.
66

77
ARG JS_TOOLCHAIN
88
ARG TOOLCHAIN

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ js: ## Prepare js base toolchain.
103103

104104
.PHONY: unit-tests-frontend
105105
unit-tests-frontend: ## Performs unit tests
106-
@$(MAKE) local-$@ DEST=$(ARTIFACTS)
106+
@$(MAKE) target-$@
107107

108108
lint-eslint: ## Runs eslint linter.
109109
@$(MAKE) target-$@

cmd/theila/main.go

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"errors"
1010
"log"
1111
"net/http"
12+
"os"
1213
"os/signal"
1314
"syscall"
1415

@@ -24,6 +25,26 @@ var rootCmd = &cobra.Command{
2425
Use: "theila",
2526
Short: "Talos and Sidero frontend",
2627
Long: ``,
28+
Run: func(cmd *cobra.Command, args []string) {
29+
config := zap.NewDevelopmentConfig()
30+
config.EncoderConfig.EncodeLevel = zapcore.CapitalColorLevelEncoder
31+
32+
logger, err := config.Build()
33+
if err != nil {
34+
log.Fatalf("failed to set up logging %s", err)
35+
}
36+
37+
server, err := backend.NewServer(rootCmdArgs.address, rootCmdArgs.port)
38+
if err != nil {
39+
logger.Fatal("failed to create server", zap.Error(err))
40+
}
41+
42+
ctx, _ := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)
43+
44+
if err := server.Run(ctx); err != nil && !errors.Is(err, http.ErrServerClosed) {
45+
logger.Fatal("failed to run server", zap.Error(err))
46+
}
47+
},
2748
}
2849

2950
var rootCmdArgs struct {
@@ -32,23 +53,9 @@ var rootCmdArgs struct {
3253
}
3354

3455
func main() {
35-
config := zap.NewDevelopmentConfig()
36-
config.EncoderConfig.EncodeLevel = zapcore.CapitalColorLevelEncoder
37-
38-
logger, err := config.Build()
39-
if err != nil {
40-
log.Fatalf("failed to set up logging %s", err)
41-
}
42-
43-
server, err := backend.NewServer(rootCmdArgs.address, rootCmdArgs.port)
44-
if err != nil {
45-
logger.Fatal("failed to create server", zap.Error(err))
46-
}
47-
48-
ctx, _ := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)
49-
50-
if err := server.Run(ctx); err != nil && !errors.Is(err, http.ErrServerClosed) {
51-
logger.Fatal("failed to run server", zap.Error(err))
56+
if err := rootCmd.Execute(); err != nil {
57+
log.Printf("execute error %s", err)
58+
os.Exit(1)
5259
}
5360
}
5461

frontend/src/components/TDropdown.vue

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
55
-->
66
<template>
77
<div>
8-
<Menu as="div">
8+
<Menu as="div" class="relative">
99
<menu-button as="template">
1010
<t-button :xs="xs" :small="small">
1111
{{ title }}
@@ -21,13 +21,11 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
2121
leave-from-class="transform scale-100 opacity-100"
2222
leave-to-class="transform scale-95 opacity-0"
2323
>
24-
<div class="relative">
2524
<menu-items class="absolute right-0 w-56 mt-2 origin-top-right bg-white border border-transparent rounded-md shadow-lg dark:bg-talos-gray-800 dark:border-talos-gray-600 dark:border-opacity-50 ring-1 ring-black ring-opacity-5 focus:outline-none" style="z-index: 100">
2625
<div class="px-1 py-1">
2726
<slot></slot>
2827
</div>
2928
</menu-items>
30-
</div>
3129
</transition>
3230
</Menu>
3331
</div>

internal/frontend/frontend.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
// THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
66
//
7-
// Generated on 2021-05-07T20:00:58Z by kres a7a00ec-dirty.
7+
// Generated on 2021-05-20T11:44:59Z by kres 2cb907a-dirty.
88

99
package frontend
1010

0 commit comments

Comments
 (0)