diff --git a/.idea/runConfigurations/go_build_gitlab_schukai_com_oss_utilities_documentation_manager.xml b/.idea/runConfigurations/go_build_gitlab_schukai_com_oss_utilities_documentation_manager.xml
index cd1de851c09b4e6553cce30c45beaff4f278514c..4a46a1099c0e8d7d9ee0d5e6b6ba9f2808113956 100644
--- a/.idea/runConfigurations/go_build_gitlab_schukai_com_oss_utilities_documentation_manager.xml
+++ b/.idea/runConfigurations/go_build_gitlab_schukai_com_oss_utilities_documentation_manager.xml
@@ -2,6 +2,7 @@
<configuration default="false" name="go build gitlab.schukai.com/oss/utilities/documentation-manager" type="GoApplicationRunConfiguration" factoryName="Go Application" nameIsGenerated="true">
<module name="documentation-manager" />
<working_directory value="$PROJECT_DIR$/" />
+ <parameters value="version" />
<EXTENSION ID="com.fapiko.jetbrains.plugins.better_direnv.runconfigs.GolandRunConfigurationExtension">
<option name="DIRENV_ENABLED" value="false" />
<option name="DIRENV_TRUSTED" value="false" />
diff --git a/flake.nix b/flake.nix
index eb967c9f73cdc5e897182c3536fd6aeb37b13654..fd7e32214af4c8b2ff8707099d613e800f13218b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -63,13 +63,9 @@
#vendorSha256 = "sha256-XdB+u94Rqsb29jVs4miyOq1NEYaVJHWFXg6QebFJzNQ=";
vendorSha256 = "sha256-81IBG8H1jsYKD+tmFeCpAWFdz6cuQDt9r+FV56xboBU=";
- # "-X release.version=$version -X release.build=$(due --iso-8601 | tr -d "-" )"
-
ldflags = [
- "-s"
- "-w"
- "-X release.version=1"
- "-X release.build=2"
+ "-X release.version=${version}"
+ "-X release.build=${build}"
];
buildInputs = [ versionTool.defaultPackage.${system} ];
diff --git a/source/command/definition.go b/source/command/definition.go
index c3d008e2b041a3f01f4d57a1142965324a305d5c..6813fddfa67ef4a95e24b62fb0c664b2fbd6e14e 100644
--- a/source/command/definition.go
+++ b/source/command/definition.go
@@ -1,6 +1,20 @@
package command
type CommandsStruct struct {
- ConfigPath string `long:"config" short:"c" description:"Path to configuration file"`
- Release ReleaseCommand `command:"release" description:"Release commands"`
+ ConfigPath string `long:"config" short:"c" description:"Path to configuration file"`
+ Verbose bool `long:"verbose" short:"v" description:"Verbose output"`
+ Version struct {
+ } `command:"version" description:"Prints the version" call:"PrintReleaseInfo"`
}
+
+//
+//type Definition struct {
+// Verbose bool `short:"v" long:"verbose" description:"Show verbose debug information"`
+// ConfigurationPath string `short:"c" long:"config" description:"Path to the configuration file"`
+// Version struct {
+// } `command:"version" description:"Prints the version" call:"PrintVersion"`
+// Document struct {
+// } `command:"document" description:"Document related commands"`
+// Server struct {
+// } `command:"server" description:"Server related commands"`
+//}
diff --git a/source/command/execute.go b/source/command/execute.go
index 1bd832e794a6679f6052ec918578fdb099a06ccb..ec056b2cd340dc6adc709cb57b7d44f0c7596832 100644
--- a/source/command/execute.go
+++ b/source/command/execute.go
@@ -16,7 +16,7 @@ var helpInfo = "\nYou can use the --help flag to get more information about the
func Execute() {
- instance := xflags.New(os.Args[0], CommandsStruct{})
+ instance = xflags.New(os.Args[0], CommandsStruct{})
if instance.HasErrors() {
for _, msg := range instance.Errors() {
error2.PrintError(msg.Error())
diff --git a/source/config/constraints.go b/source/config/constraints.go
index 249c581ed3ef17ecbd438d4da88135e6491da3bf..8a2fc651304ddaa957090de25552a1ae9089eaa8 100644
--- a/source/config/constraints.go
+++ b/source/config/constraints.go
@@ -3,66 +3,3 @@ package config
func checkConstraints() bool {
return true
}
-
-// func sanitizeMessageEndpoint() {
-// //e := Instance.Client.Endpoints.Messages
-// //
-// //u, err := url.ParseRequestURI(e)
-// //error2.CheckError(err)
-// //
-// //if u.Scheme != "ws" {
-// // u.Scheme = "ws"
-// //}
-// //
-// //if u.Host == "" {
-// // u.Host = Instance.Server.Host
-// // if u.Host == "" {
-// // error2.PrintErrorAndExit("Invalid message endpoint: " + e)
-// // }
-// //}
-// //
-// //Instance.Client.Endpoints.Messages = u.String()
-//
-// }
-//
-// func sanitizeConfigEndpoint() {
-// //e := Instance.Client.Endpoints.Config
-// //
-// //u, err := url.ParseRequestURI(e)
-// //error2.CheckError(err)
-// //
-// //if u.Scheme != "http" {
-// // u.Scheme = "http"
-// //}
-// //
-// //if u.Host == "" {
-// // u.Host = Instance.Server.Host
-// // if u.Host == "" {
-// // error2.PrintErrorAndExit("Invalid config endpoint: " + e)
-// // }
-// //}
-// //
-// //Instance.Client.Endpoints.Config = u.String()
-//
-// cfg := Instance.Config()
-//
-// e := cfg.Client.Endpoints.Config
-//
-// u, err := url.ParseRequestURI(e)
-// error2.CheckError(err)
-//
-// if strings.HasPrefix(u.Scheme, "http") {
-// u.Scheme = "http"
-// }
-//
-// if u.Host == "" {
-// u.Host = cfg.Server.Host
-// if u.Host == "" {
-// error2.PrintErrorAndExit("Invalid message endpoint: " + e)
-// }
-// }
-//
-// cfg.Client.Endpoints.Config = u.String()
-// Instance.SetConfig(cfg)
-//
-// }
diff --git a/source/config/definition.go b/source/config/definition.go
index a37260999f74d8b62eefcbae6ce5365ab4325734..b5480912fb193fc6ba93d7b4d4b865b3a5ab3c63 100644
--- a/source/config/definition.go
+++ b/source/config/definition.go
@@ -3,8 +3,5 @@ package config
type Settings map[string]interface{}
type AppConfig struct {
- Database struct {
- // user:pass@tcp(127.0.0.1:3306)/alvine_platform?charset=utf8mb4&parseTime=True&loc=Local
- DSN string `env:"DATABASE_DSN" yaml:"DSN"`
- } `yaml:"Database"`
+ Verbose bool `env:"DATABASE_DSN" yaml:"DSN"`
}
diff --git a/source/config/setup.go b/source/config/setup.go
index ea48e22e2a69b444e1b6b34883fdf7d753cc6aa5..f9bdf3f30a22f5e734eac2261049f842a8351506 100644
--- a/source/config/setup.go
+++ b/source/config/setup.go
@@ -58,7 +58,7 @@ func SetUp(cfgPath string) {
//preparation.OnChange(once)
preparation.Import()
- if preparation.HasErrors() {
+ if preparation.HasErrors() && Instance.Config().Verbose {
for _, msg := range preparation.Errors() {
error2.PrintError(msg.Error())
}
diff --git a/source/main.go b/source/main.go
index c15195e07efd1dcb582c8e990d401d2638e3177b..0a9d19bbaf3636fd795c639c63584887ff3190a4 100644
--- a/source/main.go
+++ b/source/main.go
@@ -4,10 +4,6 @@ package main
import "gitlab.schukai.com/oss/utilities/documentation-manager/command"
-//var (
-// settings *xflags.Settings[commands.Definition]
-//)
-
func main() {
command.Execute()
diff --git a/source/utils/strings_test.go b/source/utils/strings_test.go
index e2e09f0f9d122e47fba7ad9cf9d2adadaef42e1d..600aa67ddc05d6b0bfe85bcedfb9e1421893b50f 100644
--- a/source/utils/strings_test.go
+++ b/source/utils/strings_test.go
@@ -23,11 +23,7 @@ func TestMaskCodeBlocks(t *testing.T) {
for _, table := range tables {
- //p, _ := os.Getwd()
_, p, _, _ := runtime.Caller(0)
- // p = filepath.Dir(p) // go to parent directory
- //p = filepath.Dir(p) // go to parent directory
- //p = filepath.Dir(p) // go to parent directory
p = filepath.Dir(p) // go to parent directory
p = filepath.Join(p, table.input)