Skip to content

Commit e136ad9

Browse files
author
Ben Lucas
authored
update for consistency between resource and data source (#347)
1 parent 6bb1dfa commit e136ad9

File tree

6 files changed

+17
-16
lines changed

6 files changed

+17
-16
lines changed

sysdig/data_source_sysdig_secure_rule_file_system.go renamed to sysdig/data_source_sysdig_secure_rule_filesystem.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ import (
99
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1010
)
1111

12-
func dataSourceSysdigSecureRuleFileSystem() *schema.Resource {
12+
func dataSourceSysdigSecureRuleFilesystem() *schema.Resource {
1313
timeout := 5 * time.Minute
1414

1515
return &schema.Resource{
16-
ReadContext: dataSourceSysdigRuleFileSystemRead,
16+
ReadContext: dataSourceSysdigRuleFilesystemRead,
1717

1818
Timeouts: &schema.ResourceTimeout{
1919
Read: schema.DefaultTimeout(timeout),
@@ -62,14 +62,14 @@ func dataSourceSysdigSecureRuleFileSystem() *schema.Resource {
6262
}
6363
}
6464

65-
func dataSourceSysdigRuleFileSystemRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
65+
func dataSourceSysdigRuleFilesystemRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
6666
client, err := getSecureRuleClient(meta.(SysdigClients))
6767
if err != nil {
6868
return diag.FromErr(err)
6969
}
7070

7171
ruleName := d.Get("name").(string)
72-
ruleType := v2.RuleTypeFileSystem
72+
ruleType := v2.RuleTypeFilesystem
7373

7474
rules, err := client.GetRuleGroup(ctx, ruleName, ruleType)
7575
if err != nil {

sysdig/data_source_sysdig_secure_rules_file_system_test.go renamed to sysdig/data_source_sysdig_secure_rule_filesystem_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"github.com/draios/terraform-provider-sysdig/sysdig"
1515
)
1616

17-
func TestAccRuleFileSystemDataSource(t *testing.T) {
17+
func TestAccRuleFilesystemDataSource(t *testing.T) {
1818
rText := func() string { return acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum) }
1919

2020
resource.ParallelTest(t, resource.TestCase{
@@ -30,17 +30,17 @@ func TestAccRuleFileSystemDataSource(t *testing.T) {
3030
},
3131
Steps: []resource.TestStep{
3232
{
33-
Config: ruleFileSystemDataSource(rText()),
33+
Config: ruleFilesystemDataSource(rText()),
3434
},
3535
},
3636
})
3737
}
3838

39-
func ruleFileSystemDataSource(name string) string {
39+
func ruleFilesystemDataSource(name string) string {
4040
return fmt.Sprintf(`
4141
%s
4242
43-
data "sysdig_secure_rule_file_system" "data_sample" {
43+
data "sysdig_secure_rule_filesystem" "data_sample" {
4444
name = "TERRAFORM TEST %s"
4545
depends_on = [ sysdig_secure_rule_filesystem.foo ]
4646
}

sysdig/internal/client/v2/model.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ type Rule struct {
260260

261261
const (
262262
RuleTypeContainer = "CONTAINER"
263-
RuleTypeFileSystem = "FILESYSTEM"
263+
RuleTypeFilesystem = "FILESYSTEM"
264264
)
265265

266266
type Details struct {

sysdig/provider.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ func Provider() *schema.Provider {
131131
"sysdig_secure_managed_policy": dataSourceSysdigSecureManagedPolicy(),
132132
"sysdig_secure_managed_ruleset": dataSourceSysdigSecureManagedRuleset(),
133133
"sysdig_secure_rule_container": dataSourceSysdigSecureRuleContainer(),
134-
"sysdig_secure_rule_file_system": dataSourceSysdigSecureRuleFileSystem(),
134+
"sysdig_secure_rule_filesystem": dataSourceSysdigSecureRuleFilesystem(),
135135

136136
"sysdig_current_user": dataSourceSysdigCurrentUser(),
137137
"sysdig_user": dataSourceSysdigUser(),

sysdig/resource_sysdig_secure_rule_filesystem.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@ package sysdig
22

33
import (
44
"context"
5-
v2 "github.com/draios/terraform-provider-sysdig/sysdig/internal/client/v2"
65
"strconv"
76
"time"
87

8+
v2 "github.com/draios/terraform-provider-sysdig/sysdig/internal/client/v2"
9+
910
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
1011

1112
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -185,7 +186,7 @@ func resourceSysdigRuleFilesystemDelete(ctx context.Context, d *schema.ResourceD
185186

186187
func resourceSysdigRuleFilesystemFromResourceData(d *schema.ResourceData) (rule v2.Rule, err error) {
187188
rule = ruleFromResourceData(d)
188-
rule.Details.RuleType = v2.RuleTypeFileSystem
189+
rule.Details.RuleType = v2.RuleTypeFilesystem
189190

190191
rule.Details.ReadPaths = &v2.ReadPaths{
191192
MatchItems: true,
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
---
22
subcategory: "Sysdig Secure"
33
layout: "sysdig"
4-
page_title: "Sysdig: sysdig_secure_rule_file_system"
4+
page_title: "Sysdig: sysdig_secure_rule_filesystem"
55
description: |-
6-
Retrieves a Sysdig Secure File System Rule.
6+
Retrieves a Sysdig Secure Filesystem Rule.
77
---
88

9-
# Data Source: sysdig_secure_rule_file_system
9+
# Data Source: sysdig_secure_rule_filesystem
1010

11-
Retrieves the information of an existing Sysdig Secure File System Rule.
11+
Retrieves the information of an existing Sysdig Secure Filesystem Rule.
1212

1313
-> **Note:** Sysdig Terraform Provider is under rapid development at this point. If you experience any issue or discrepancy while using it, please make sure you have the latest version. If the issue persists, or you have a Feature Request to support an additional set of resources, please open a [new issue](https://github.com/sysdiglabs/terraform-provider-sysdig/issues/new) in the GitHub repository.
1414

0 commit comments

Comments
 (0)