Skip to content

Commit

Permalink
Add .gitignore and handle "all" value for PlaceField
Browse files Browse the repository at this point in the history
Created a `.gitignore` file to exclude common build and IDE files. Modified resource check files to handle cases where `PlaceField` is "all" by setting `entities` to an empty list. Also updated `HttpMethodField` constant in `check_fields.go`.
  • Loading branch information
Aidaho12 committed Nov 6, 2024
1 parent 4841666 commit bd0073d
Show file tree
Hide file tree
Showing 8 changed files with 65 additions and 7 deletions.
28 changes: 28 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# If you prefer the allow list template instead of the deny list, see community template:
# https://github.com/github/gitignore/blob/main/community/Golang/Go.AllowList.gitignore
#

.idea/
# Binaries for programs and plugins
*.exe
*.exe~
*.dll
*.so
*.dylib

# Test binary, built with `go test -c`
*.test
*.tfstate*

# Output of the go coverage tool, specifically when used with LiteIDE
*.out

# Test directories (remove the comment below to include it)
test/

# Binary directories
bin/

# Go workspace file
go.work
go.work.sum
2 changes: 1 addition & 1 deletion rmon/check_fields.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const (
PacketSizeField = "packet_size"
ResolverField = "resolver"
RecordTypeField = "record_type"
HttpMethodField = "http_method"
HttpMethodField = "method"
IgnoreSslErrorField = "ignore_ssl_error"
AcceptedStatusCodesField = "accepted_status_codes"
BodyField = "body"
Expand Down
7 changes: 6 additions & 1 deletion rmon/resource_rmon_check_dns.go
Original file line number Diff line number Diff line change
Expand Up @@ -197,14 +197,19 @@ func resourceCheckDnsRead(ctx context.Context, d *schema.ResourceData, m interfa
return diag.FromErr(err)
}

entities := result[EntitiesField].([]interface{})
if result[PlaceField] == "all" {
entities = []interface{}{}
}

description := strings.ReplaceAll(result[DescriptionField].(string), "'", "")
name := strings.ReplaceAll(result[NameField].(string), "'", "")
d.Set(DescriptionField, description)
d.Set(EnabledField, intToBool(result[EnabledField].(float64)))
d.Set(NameField, name)
d.Set(CheckGroupIdFiled, result[CheckGroupIdFiled])
d.Set(PlaceField, result[PlaceField])
d.Set(EntitiesField, result[EntitiesField])
d.Set(EntitiesField, entities)
d.Set(IntervalField, result[IntervalField])
d.Set(TimeoutField, result[TimeoutField])
d.Set(TelegramField, result[TelegramField])
Expand Down
7 changes: 6 additions & 1 deletion rmon/resource_rmon_check_http.go
Original file line number Diff line number Diff line change
Expand Up @@ -214,14 +214,19 @@ func resourceCheckHttpRead(ctx context.Context, d *schema.ResourceData, m interf
return diag.FromErr(err)
}

entities := result[EntitiesField].([]interface{})
if result[PlaceField] == "all" {
entities = []interface{}{}
}

description := strings.ReplaceAll(result[DescriptionField].(string), "'", "")
name := strings.ReplaceAll(result[NameField].(string), "'", "")
d.Set(DescriptionField, description)
d.Set(EnabledField, intToBool(result[EnabledField].(float64)))
d.Set(NameField, name)
d.Set(CheckGroupIdFiled, result[CheckGroupIdFiled])
d.Set(PlaceField, result[PlaceField])
d.Set(EntitiesField, result[EntitiesField])
d.Set(EntitiesField, entities)
d.Set(IntervalField, result[IntervalField])
d.Set(TimeoutField, result[TimeoutField])
d.Set(TelegramField, result[TelegramField])
Expand Down
7 changes: 6 additions & 1 deletion rmon/resource_rmon_check_ping.go
Original file line number Diff line number Diff line change
Expand Up @@ -173,14 +173,19 @@ func resourceCheckPingRead(ctx context.Context, d *schema.ResourceData, m interf
return diag.FromErr(err)
}

entities := result[EntitiesField].([]interface{})
if result[PlaceField] == "all" {
entities = []interface{}{}
}

description := strings.ReplaceAll(result[DescriptionField].(string), "'", "")
name := strings.ReplaceAll(result[NameField].(string), "'", "")
d.Set(DescriptionField, description)
d.Set(EnabledField, intToBool(result[EnabledField].(float64)))
d.Set(NameField, name)
d.Set(CheckGroupIdFiled, result[CheckGroupIdFiled])
d.Set(PlaceField, result[PlaceField])
d.Set(EntitiesField, result[EntitiesField])
d.Set(EntitiesField, entities)
d.Set(IntervalField, result[IntervalField])
d.Set(TimeoutField, result[TimeoutField])
d.Set(TelegramField, result[TelegramField])
Expand Down
7 changes: 6 additions & 1 deletion rmon/resource_rmon_check_rabbitmq.go
Original file line number Diff line number Diff line change
Expand Up @@ -192,14 +192,19 @@ func resourceCheckRabbitmqRead(ctx context.Context, d *schema.ResourceData, m in
return diag.FromErr(err)
}

entities := result[EntitiesField].([]interface{})
if result[PlaceField] == "all" {
entities = []interface{}{}
}

description := strings.ReplaceAll(result[DescriptionField].(string), "'", "")
name := strings.ReplaceAll(result[NameField].(string), "'", "")
d.Set(DescriptionField, description)
d.Set(EnabledField, intToBool(result[EnabledField].(float64)))
d.Set(NameField, name)
d.Set(CheckGroupIdFiled, result[CheckGroupIdFiled])
d.Set(PlaceField, result[PlaceField])
d.Set(EntitiesField, result[EntitiesField])
d.Set(EntitiesField, entities)
d.Set(IntervalField, result[IntervalField])
d.Set(TimeoutField, result[TimeoutField])
d.Set(TelegramField, result[TelegramField])
Expand Down
7 changes: 6 additions & 1 deletion rmon/resource_rmon_check_smtp.go
Original file line number Diff line number Diff line change
Expand Up @@ -193,14 +193,19 @@ func resourceCheckSmtpRead(ctx context.Context, d *schema.ResourceData, m interf
return diag.FromErr(err)
}

entities := result[EntitiesField].([]interface{})
if result[PlaceField] == "all" {
entities = []interface{}{}
}

description := strings.ReplaceAll(result[DescriptionField].(string), "'", "")
name := strings.ReplaceAll(result[NameField].(string), "'", "")
d.Set(DescriptionField, description)
d.Set(EnabledField, intToBool(result[EnabledField].(float64)))
d.Set(NameField, name)
d.Set(CheckGroupIdFiled, result[CheckGroupIdFiled])
d.Set(PlaceField, result[PlaceField])
d.Set(EntitiesField, result[EntitiesField])
d.Set(EntitiesField, entities)
d.Set(IntervalField, result[IntervalField])
d.Set(TimeoutField, result[TimeoutField])
d.Set(TelegramField, result[TelegramField])
Expand Down
7 changes: 6 additions & 1 deletion rmon/resource_rmon_check_tcp.go
Original file line number Diff line number Diff line change
Expand Up @@ -173,14 +173,19 @@ func resourceCheckTcpRead(ctx context.Context, d *schema.ResourceData, m interfa
return diag.FromErr(err)
}

entities := result[EntitiesField].([]interface{})
if result[PlaceField] == "all" {
entities = []interface{}{}
}

description := strings.ReplaceAll(result[DescriptionField].(string), "'", "")
name := strings.ReplaceAll(result[NameField].(string), "'", "")
d.Set(DescriptionField, description)
d.Set(EnabledField, intToBool(result[EnabledField].(float64)))
d.Set(NameField, name)
d.Set(CheckGroupIdFiled, result[CheckGroupIdFiled])
d.Set(PlaceField, result[PlaceField])
d.Set(EntitiesField, result[EntitiesField])
d.Set(EntitiesField, entities)
d.Set(IntervalField, result[IntervalField])
d.Set(TimeoutField, result[TimeoutField])
d.Set(TelegramField, result[TelegramField])
Expand Down

0 comments on commit bd0073d

Please sign in to comment.