Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(conformity_custom_rule): support for slug parameter #84

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

feat(conformity_custom_rule): support for slug parameter #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
edb78d5
added slug to resource definition
9albi Jul 22, 2024
57cf2f1
added slug to api model
9albi Jul 22, 2024
cd5ebee
Merge branch 'trendmicro:main' into main
9albi Jul 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 19 additions & 8 deletions conformity/resource_conformity_custom_rule.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ func resourceConformityCustomRule() *schema.Resource {
Type: schema.TypeString,
Required: true,
},
"slug": {
Type: schema.TypeString,
Optional: true,
},
"cloud_provider": {
Type: schema.TypeString,
Required: true,
Expand Down Expand Up @@ -168,8 +172,7 @@ func resourceConformityCustomRule() *schema.Resource {
func resourceConformityCustomRuleCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {

client := m.(*cloudconformity.Client)
// Warning or errors can be collected in a slice type
var diags diag.Diagnostics

payload := cloudconformity.CustomRuleRequest{}

// Required fields
Expand All @@ -188,8 +191,11 @@ func resourceConformityCustomRuleCreate(ctx context.Context, d *schema.ResourceD
processInputCustomRuleRules(&payload, d)
}
// Optional fields
if d.Get("remediation_notes") != "" {
payload.RemediationNotes = d.Get("remediation_notes").(string)
if v, ok := d.GetOk("remediation_notes"); ok{
payload.RemediationNotes = v.(string)
}
if v, ok := d.GetOk("slug"); ok{
payload.Slug = v.(string)
}

customRule, err := client.CreateConformityCustomRule(payload)
Expand All @@ -198,8 +204,7 @@ func resourceConformityCustomRuleCreate(ctx context.Context, d *schema.ResourceD
}
d.SetId(customRule.ID)

resourceConformityCustomRuleRead(ctx, d, m)
return diags
return resourceConformityCustomRuleRead(ctx, d, m)
}

func resourceConformityCustomRuleRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
Expand All @@ -223,6 +228,9 @@ func resourceConformityCustomRuleRead(ctx context.Context, d *schema.ResourceDat
if err := d.Set("name", rule.Attributes.Name); err != nil {
return diag.FromErr(err)
}
if err := d.Set("slug", rule.Attributes.Slug); err != nil {
return diag.FromErr(err)
}
if err := d.Set("cloud_provider", rule.Attributes.Provider); err != nil {
return diag.FromErr(err)
}
Expand Down Expand Up @@ -283,8 +291,11 @@ func resourceConformityCustomRuleUpdate(ctx context.Context, d *schema.ResourceD
processInputCustomRuleRules(&payload, d)
}
// Optional fields
if d.Get("remediation_notes") != "" {
payload.RemediationNotes = d.Get("remediation_notes").(string)
if value, exist := d.GetOk("remediation_notes"); exist{
payload.RemediationNotes = value.(string)
}
if value, exist := d.GetOk("slug"); exist{
payload.Slug = value.(string)
}
id := d.Id()
_, err := client.UpdateCustomRule(id, payload)
Expand Down
3 changes: 3 additions & 0 deletions pkg/cloudconformity/models.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -610,6 +610,7 @@ type GcpProjectsResponse struct {
type CustomRule struct {
ID string `json:"id"`
Name string `json:"name"`
Slug string `json:"slug,omitempty"`
Description string `json:"description"`
RemediationNotes string `json:"remediationNotes,omitempty"`
Service string `json:"service"`
Expand All @@ -624,6 +625,7 @@ type CustomRule struct {

type CustomRuleRequest struct {
Name string `json:"name"`
Slug string `json:"slug,omitempty"`
Description string `json:"description"`
RemediationNotes string `json:"remediationNotes,omitempty"`
Service string `json:"service"`
Expand Down Expand Up @@ -674,6 +676,7 @@ type CustomRuleResponse struct {
ID string `json:"id"`
Attributes struct {
Name string `json:"name"`
Slug string `json:"slug,omitempty"`
Description string `json:"description"`
Service string `json:"service"`
ResourceType string `json:"resourceType"`
Expand Down