diff --git a/cmd/docs/docs.go b/cmd/docs/docs.go index 46889ac..cbfeeac 100644 --- a/cmd/docs/docs.go +++ b/cmd/docs/docs.go @@ -9,7 +9,7 @@ import ( func main() { app := cmd.NewApp() - md, err := docs.ToTabularMarkdown(app , "openstatus") + md, err := docs.ToTabularMarkdown(app, "openstatus") if err != nil { panic(err) } diff --git a/docs/openstatus-docs.md b/docs/openstatus-docs.md index c11c426..e616c00 100644 --- a/docs/openstatus-docs.md +++ b/docs/openstatus-docs.md @@ -44,46 +44,6 @@ The following flags are supported: | `--access-token="…"` (`-t`) | OpenStatus API Access Token | | `OPENSTATUS_API_TOKEN` | | `--auto-accept` (`-y`) | Automatically accept the prompt | `false` | *none* | -### `monitors create` subcommand - -Create monitors (beta). - -> openstatus monitors create [options] - -Create the monitors defined in the openstatus.yaml file. - -Usage: - -```bash -$ openstatus [GLOBAL FLAGS] monitors create [COMMAND FLAGS] [ARGUMENTS...] -``` - -The following flags are supported: - -| Name | Description | Default value | Environment variables | -|-----------------------------|-------------------------------------------------------|:-----------------:|:----------------------:| -| `--config="…"` (`-c`) | The configuration file containing monitor information | `openstatus.yaml` | *none* | -| `--access-token="…"` (`-t`) | OpenStatus API Access Token | | `OPENSTATUS_API_TOKEN` | -| `--auto-accept` (`-y`) | Automatically accept the prompt | `false` | *none* | - -### `monitors delete` subcommand - -Delete a monitor. - -> openstatus monitors delete [MonitorID] [options] - -Usage: - -```bash -$ openstatus [GLOBAL FLAGS] monitors delete [COMMAND FLAGS] [ARGUMENTS...] -``` - -The following flags are supported: - -| Name | Description | Default value | Environment variables | -|-----------------------------|---------------------------------|:-------------:|:----------------------:| -| `--access-token="…"` (`-t`) | OpenStatus API Access Token | | `OPENSTATUS_API_TOKEN` | -| `--auto-accept` (`-y`) | Automatically accept the prompt | `false` | *none* | ### `monitors import` subcommand diff --git a/docs/openstatus.1 b/docs/openstatus.1 index 87cca5b..e5e0671 100644 --- a/docs/openstatus.1 +++ b/docs/openstatus.1 @@ -82,109 +82,6 @@ T}@T{ \f[I]none\f[R] T} .TE -.SS \f[CR]monitors create\f[R] subcommand -Create monitors (beta). -.RS -.PP -openstatus monitors create [options] -.RE -.PP -Create the monitors defined in the openstatus.yaml file. -.PP -Usage: -.IP -.EX -$ openstatus [GLOBAL FLAGS] monitors create [COMMAND FLAGS] [ARGUMENTS...] -.EE -.PP -The following flags are supported: -.PP -.TS -tab(@); -lw(16.0n) lw(30.3n) cw(10.5n) cw(13.2n). -T{ -Name -T}@T{ -Description -T}@T{ -Default value -T}@T{ -Environment variables -T} -_ -T{ -\f[CR]\-\-config=\(dq\&...\(dq\f[R] (\f[CR]\-c\f[R]) -T}@T{ -The configuration file containing monitor information -T}@T{ -\f[CR]openstatus.yaml\f[R] -T}@T{ -\f[I]none\f[R] -T} -T{ -\f[CR]\-\-access\-token=\(dq\&...\(dq\f[R] (\f[CR]\-t\f[R]) -T}@T{ -OpenStatus API Access Token -T}@T{ -T}@T{ -\f[CR]OPENSTATUS_API_TOKEN\f[R] -T} -T{ -\f[CR]\-\-auto\-accept\f[R] (\f[CR]\-y\f[R]) -T}@T{ -Automatically accept the prompt -T}@T{ -\f[CR]false\f[R] -T}@T{ -\f[I]none\f[R] -T} -.TE -.SS \f[CR]monitors delete\f[R] subcommand -Delete a monitor. -.RS -.PP -openstatus monitors delete [MonitorID] [options] -.RE -.PP -Usage: -.IP -.EX -$ openstatus [GLOBAL FLAGS] monitors delete [COMMAND FLAGS] [ARGUMENTS...] -.EE -.PP -The following flags are supported: -.PP -.TS -tab(@); -lw(20.1n) lw(22.9n) cw(10.4n) cw(16.6n). -T{ -Name -T}@T{ -Description -T}@T{ -Default value -T}@T{ -Environment variables -T} -_ -T{ -\f[CR]\-\-access\-token=\(dq\&...\(dq\f[R] (\f[CR]\-t\f[R]) -T}@T{ -OpenStatus API Access Token -T}@T{ -T}@T{ -\f[CR]OPENSTATUS_API_TOKEN\f[R] -T} -T{ -\f[CR]\-\-auto\-accept\f[R] (\f[CR]\-y\f[R]) -T}@T{ -Automatically accept the prompt -T}@T{ -\f[CR]false\f[R] -T}@T{ -\f[I]none\f[R] -T} -.TE .SS \f[CR]monitors import\f[R] subcommand Import all your monitors. .RS diff --git a/internal/config/lock.go b/internal/config/lock.go index c0217df..750fc34 100644 --- a/internal/config/lock.go +++ b/internal/config/lock.go @@ -9,10 +9,9 @@ import ( "github.com/knadh/koanf/v2" ) - type Lock struct { Monitor Monitor `yaml:"monitor"` - ID int `yaml:"id"` + ID int `yaml:"id"` } type MonitorsLock map[string]Lock @@ -27,7 +26,6 @@ func ReadLockFile(filename string) (MonitorsLock, error) { file := file.Provider(filename) var k = koanf.New(".") - err := k.Load(file, yaml.Parser()) if err != nil { diff --git a/internal/config/lock_test.go b/internal/config/lock_test.go index 7cf8467..94cb736 100644 --- a/internal/config/lock_test.go +++ b/internal/config/lock_test.go @@ -4,8 +4,8 @@ import ( "os" "testing" - "github.com/openstatusHQ/cli/internal/config" "github.com/google/go-cmp/cmp" + "github.com/openstatusHQ/cli/internal/config" ) var lockfile = ` @@ -54,28 +54,28 @@ func Test_getMonitorTrigger(t *testing.T) { t.Fatal(err) } - expect := config.MonitorsLock{ + expect := config.MonitorsLock{ "test-monitor": { ID: 1, Monitor: config.Monitor{ - Active: true, - Name:"Uptime Monitor", - Description:"Uptime monitoring example", - Frequency:"10m", - Kind:config.HTTP, - Retry:3, - Public:false, - Regions: []config.Region{ config.Iad,config.Ams,config.Syd, config.Jnb, config.Gru}, + Active: true, + Name: "Uptime Monitor", + Description: "Uptime monitoring example", + Frequency: "10m", + Kind: config.HTTP, + Retry: 3, + Public: false, + Regions: []config.Region{config.Iad, config.Ams, config.Syd, config.Jnb, config.Gru}, Request: config.Request{ - URL: "https://openstat.us", - Method: config.Get, + URL: "https://openstat.us", + Method: config.Get, Headers: map[string]string{"User-Agent": "OpenStatus"}, }, Assertions: []config.Assertion{ { Compare: config.Eq, - Kind: config.StatusCode, - Target: 200, + Kind: config.StatusCode, + Target: 200, }, }, }, @@ -95,7 +95,7 @@ func Test_getMonitorTrigger(t *testing.T) { t.Fatal(err) } - expect := config.MonitorsLock{} + expect := config.MonitorsLock{} equal := cmp.Equal(expect, out) if !equal { diff --git a/internal/config/openstatus.go b/internal/config/openstatus.go index 2bd8f91..7974188 100644 --- a/internal/config/openstatus.go +++ b/internal/config/openstatus.go @@ -38,8 +38,7 @@ func ReadOpenStatus(path string) (Monitors, error) { return out, nil } - -func ParseConfigMonitorsToMonitor(monitors Monitors) ([]Monitor){ +func ParseConfigMonitorsToMonitor(monitors Monitors) []Monitor { var monitor []Monitor for _, value := range monitors { for _, assertion := range value.Assertions { @@ -53,7 +52,5 @@ func ParseConfigMonitorsToMonitor(monitors Monitors) ([]Monitor){ monitor = append(monitor, value) } - - return monitor } diff --git a/internal/monitors/monitor_create.go b/internal/monitors/monitor_create.go index 46f65f0..0ffa069 100644 --- a/internal/monitors/monitor_create.go +++ b/internal/monitors/monitor_create.go @@ -48,10 +48,13 @@ func CreateMonitor(httpClient *http.Client, apiKey string, monitor config.Monito func GetMonitorCreateCmd() *cli.Command { monitorInfoCmd := cli.Command{ - Name: "create", - Usage: "Create monitors (beta)", - Description: "Create the monitors defined in the openstatus.yaml file", - UsageText: "openstatus monitors create [options]", + Name: "create", + Usage: "Create monitors (beta)", + Hidden: true, + HideHelp: true, + HideHelpCommand: true, + Description: "Create the monitors defined in the openstatus.yaml file", + UsageText: "openstatus monitors create [options]", Action: func(ctx context.Context, cmd *cli.Command) error { diff --git a/internal/monitors/monitor_delete.go b/internal/monitors/monitor_delete.go index 86f25bc..004c177 100644 --- a/internal/monitors/monitor_delete.go +++ b/internal/monitors/monitor_delete.go @@ -47,9 +47,12 @@ func DeleteMonitor(httpClient *http.Client, apiKey string, monitorId string) err func GetMonitorDeleteCmd() *cli.Command { monitorsCmd := cli.Command{ - Name: "delete", - Usage: "Delete a monitor", - UsageText: "openstatus monitors delete [MonitorID] [options]", + Name: "delete", + Usage: "Delete a monitor", + Hidden: true, + HideHelpCommand: true, + HideHelp: true, + UsageText: "openstatus monitors delete [MonitorID] [options]", Flags: []cli.Flag{ &cli.StringFlag{ diff --git a/internal/monitors/monitor_import.go b/internal/monitors/monitor_import.go index 55feca5..249aada 100644 --- a/internal/monitors/monitor_import.go +++ b/internal/monitors/monitor_import.go @@ -38,7 +38,7 @@ func ExportMonitor(httpClient *http.Client, apiKey string, path string) error { } t := map[string]config.Monitor{} - lock := make(map[string]config.Lock,len(monitors)) + lock := make(map[string]config.Lock, len(monitors)) file, err := os.OpenFile(path, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0600) if err != nil { @@ -108,11 +108,11 @@ func ExportMonitor(httpClient *http.Client, apiKey string, path string) error { Description: monitor.Description, DegradedAfter: int64(monitor.DegradedAfter), Frequency: config.Frequency(monitor.Periodicity), - Request: request, - Kind: config.CoordinateKind(monitor.JobType), - Retry: int64(monitor.Retry), - Regions: regions, - Assertions: assertions, + Request: request, + Kind: config.CoordinateKind(monitor.JobType), + Retry: int64(monitor.Retry), + Regions: regions, + Assertions: assertions, } } y, err := yaml.Marshal(&t) @@ -156,7 +156,6 @@ func ExportMonitor(httpClient *http.Client, apiKey string, path string) error { return cli.Exit("Failed to apply change", 1) } - return nil } diff --git a/internal/monitors/monitor_info.go b/internal/monitors/monitor_info.go index 28bec75..bf0c4b6 100644 --- a/internal/monitors/monitor_info.go +++ b/internal/monitors/monitor_info.go @@ -46,7 +46,6 @@ func GetMonitorInfo(httpClient *http.Client, apiKey string, monitorId string) er return err } - fmt.Println(aurora.Bold("Monitor:")) table := tablewriter.NewTable(os.Stdout, tablewriter.WithRenderer(renderer.NewBlueprint()), diff --git a/internal/monitors/monitor_update.go b/internal/monitors/monitor_update.go index 9c6d9ed..849e617 100644 --- a/internal/monitors/monitor_update.go +++ b/internal/monitors/monitor_update.go @@ -10,11 +10,9 @@ import ( "github.com/openstatusHQ/cli/internal/config" ) - func UpdateMonitor(httpClient *http.Client, apiKey string, id int, monitor config.Monitor) (Monitor, error) { - url := fmt.Sprintf("https://api.openstatus.dev/v1/monitor/%s/%d",monitor.Kind, id) - + url := fmt.Sprintf("https://api.openstatus.dev/v1/monitor/%s/%d", monitor.Kind, id) payloadBuf := new(bytes.Buffer) json.NewEncoder(payloadBuf).Encode(monitor)