Skip to content

Commit d499861

Browse files
authored
Merge pull request #279 from SumoLogic/emichaeli-make-policies-required-to-be-more-explicit
Make all policies required in policies resource
2 parents afe6fc3 + 2f7bd11 commit d499861

File tree

4 files changed

+20
-112
lines changed

4 files changed

+20
-112
lines changed

CHANGELOG.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,12 @@ FEATURES:
44

55
* **New Resource:** sumologic_hierarchy (GH-260)
66
* **New Resource:** sumologic_cse_network_block (GH-271)
7-
=======
7+
8+
POTENTIALLY BREAKING CHANGES:
9+
10+
* resource/sumologic_policies: Changed all policies to be required. Configurations might need to be updated in
11+
case some policies were not specified previously. (GH-279)
12+
813
DEPRECATIONS:
914

1015
* resource/sumologic_monitor: Deprecated `triggers` in favor of `trigger_conditions` (GH-267)

sumologic/resource_sumologic_policies.go

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,39 +26,33 @@ func resourceSumologicPolicies() *schema.Resource {
2626
Schema: map[string]*schema.Schema{
2727
"audit": {
2828
Type: schema.TypeBool,
29-
Optional: true,
30-
Default: DefaultPolicies.Audit.Enabled,
29+
Required: true,
3130
},
3231
"data_access_level": {
3332
Type: schema.TypeBool,
34-
Optional: true,
35-
Default: DefaultPolicies.DataAccessLevel.Enabled,
33+
Required: true,
3634
},
3735
"max_user_session_timeout": {
3836
Type: schema.TypeString,
39-
Optional: true,
40-
Default: DefaultPolicies.MaxUserSessionTimeout.MaxUserSessionTimeout,
37+
Required: true,
4138
},
4239
"search_audit": {
4340
Type: schema.TypeBool,
44-
Optional: true,
45-
Default: DefaultPolicies.SearchAudit.Enabled,
41+
Required: true,
4642
},
4743
"share_dashboards_outside_organization": {
4844
Type: schema.TypeBool,
49-
Optional: true,
50-
Default: DefaultPolicies.ShareDashboardsOutsideOrganization.Enabled,
45+
Required: true,
5146
},
5247
"user_concurrent_sessions_limit": {
5348
Type: schema.TypeList,
54-
Optional: true,
49+
Required: true,
5550
MaxItems: 1,
5651
Elem: &schema.Resource{
5752
Schema: map[string]*schema.Schema{
5853
"enabled": {
5954
Type: schema.TypeBool,
60-
Optional: true,
61-
Default: DefaultPolicies.UserConcurrentSessionsLimit.Enabled,
55+
Required: true,
6256
},
6357
"max_concurrent_sessions": {
6458
Type: schema.TypeInt,

website/docs/README.md

Lines changed: 0 additions & 91 deletions
This file was deleted.

website/docs/r/policies.html.markdown

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@ resource "sumologic_policies" "example_policies" {
3636

3737
The following arguments are supported:
3838

39-
- `audit` - (Optional) Whether the [Audit Policy][1] is enabled. Defaults to `false`.
40-
- `data_access_level` - (Optional) Whether the [Data Access Level Policy][2] is enabled. Defaults to `false`.
41-
- `max_user_session_timeout` - (Optional) The [maximum web session timeout][3] users are able to configure within their user preferences. Defaults to `7d`.
42-
- `search_audit` - (Optional) Whether the [Search Audit Policy][4] is enabled. Defaults to `false`.
43-
- `share_dashboards_outside_organization` - (Optional) Whether the [Share a Dashboard Outside Organization Policy][5] is enabled. Defaults to `false`.
44-
- `user_concurrent_sessions_limit` - (Block List, Max: 1, Optional) The [User Concurrent Sessions Limit Policy][6]. See [user_concurrent_sessions_limit schema](#user_concurrent_sessions_limit) for details.
39+
- `audit` - (Required) Whether the [Audit Policy][1] is enabled.
40+
- `data_access_level` - (Required) Whether the [Data Access Level Policy][2] is enabled.
41+
- `max_user_session_timeout` - (Required) The [maximum web session timeout][3] users are able to configure within their user preferences.
42+
- `search_audit` - (Required) Whether the [Search Audit Policy][4] is enabled.
43+
- `share_dashboards_outside_organization` - (Required) Whether the [Share a Dashboard Outside Organization Policy][5] is enabled.
44+
- `user_concurrent_sessions_limit` - (Block List, Max: 1, Required) The [User Concurrent Sessions Limit Policy][6]. See [user_concurrent_sessions_limit schema](#user_concurrent_sessions_limit) for details.
4545

4646
### Schema for `user_concurrent_sessions_limit`
47-
- `enabled` - (Optional) Whether the [User Concurrent Sessions Limit Policy][6] is enabled. Defaults to `false`.
47+
- `enabled` - (Required) Whether the [User Concurrent Sessions Limit Policy][6] is enabled.
4848
- `max_concurrent_sessions` - (Optional) Maximum number of concurrent sessions a user may have. Defaults to `100`.
4949

5050
## Import

0 commit comments

Comments
 (0)