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

[multiple_resources] Cleanup refs in resources #1925

Merged
merged 6 commits into from
May 23, 2023
Merged

[multiple_resources] Cleanup refs in resources #1925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
161dbd5
pass structs by ref
skarimo May 19, 2023
4915782
re-record
skarimo May 19, 2023
5d58cb3
more ref cleanup
skarimo May 19, 2023
f3d3bcf
fix
skarimo May 19, 2023
4cfafd7
Merge branch 'master' into sherz/cleanup-refs
nkzou May 22, 2023
a585db4
edit slo query build function to match other F&F query build functions
nkzou May 22, 2023
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
12 changes: 6 additions & 6 deletions datadog/resource_datadog_authn_mapping.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ func resourceDatadogAuthnMappingCreate(ctx context.Context, d *schema.ResourceDa
auth := meta.(*ProviderConfiguration).Auth
authNMapReq := buildAuthNMappingCreateRequest(d)

createResp, httpResponse, err := apiInstances.GetAuthNMappingsApiV2().CreateAuthNMapping(auth, authNMapReq)
createResp, httpResponse, err := apiInstances.GetAuthNMappingsApiV2().CreateAuthNMapping(auth, *authNMapReq)
if err != nil {
return utils.TranslateClientErrorDiag(err, httpResponse, "error creating authn mapping")
}
Expand Down Expand Up @@ -105,7 +105,7 @@ func resourceDatadogAuthnMappingUpdate(ctx context.Context, d *schema.ResourceDa
auth := meta.(*ProviderConfiguration).Auth

req := buildAuthNMappingUpdateRequest(d)
resp, httpResponse, err := apiInstances.GetAuthNMappingsApiV2().UpdateAuthNMapping(auth, d.Id(), req)
resp, httpResponse, err := apiInstances.GetAuthNMappingsApiV2().UpdateAuthNMapping(auth, d.Id(), *req)

if err != nil {
return utils.TranslateClientErrorDiag(err, httpResponse, "error updating role mapping")
Expand Down Expand Up @@ -151,7 +151,7 @@ func updateAuthNMappingState(d *schema.ResourceData, authNMapping *datadogV2.Aut
return nil
}

func buildAuthNMappingCreateRequest(d *schema.ResourceData) datadogV2.AuthNMappingCreateRequest {
func buildAuthNMappingCreateRequest(d *schema.ResourceData) *datadogV2.AuthNMappingCreateRequest {
authNMappingCreateRequest := datadogV2.NewAuthNMappingCreateRequestWithDefaults()
authNMappingCreateData := datadogV2.NewAuthNMappingCreateDataWithDefaults()
authNMappingCreateAttrs := datadogV2.NewAuthNMappingCreateAttributesWithDefaults()
Expand All @@ -171,10 +171,10 @@ func buildAuthNMappingCreateRequest(d *schema.ResourceData) datadogV2.AuthNMappi

// Set AuthN mapping create request
authNMappingCreateRequest.SetData(*authNMappingCreateData)
return *authNMappingCreateRequest
return authNMappingCreateRequest
}

func buildAuthNMappingUpdateRequest(d *schema.ResourceData) datadogV2.AuthNMappingUpdateRequest {
func buildAuthNMappingUpdateRequest(d *schema.ResourceData) *datadogV2.AuthNMappingUpdateRequest {
authNMappingUpdateRequest := datadogV2.NewAuthNMappingUpdateRequestWithDefaults()
authNMappingUpdateData := datadogV2.NewAuthNMappingUpdateDataWithDefaults()
authNMappingUpdateAttrs := datadogV2.NewAuthNMappingUpdateAttributesWithDefaults()
Expand All @@ -195,7 +195,7 @@ func buildAuthNMappingUpdateRequest(d *schema.ResourceData) datadogV2.AuthNMappi

// Set AuthN mapping update request
authNMappingUpdateRequest.SetData(*authNMappingUpdateData)
return *authNMappingUpdateRequest
return authNMappingUpdateRequest
}

func buildRoleRelations(d *schema.ResourceData) *datadogV2.RelationshipToRole {
Expand Down
33 changes: 17 additions & 16 deletions datadog/resource_datadog_cloud_configuration_rule.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ func cloudConfigurationRuleCreateContext(ctx context.Context, d *schema.Resource

ruleCreate := buildRuleCreatePayload(d)

response, httpResponse, err := apiInstances.GetSecurityMonitoringApiV2().CreateSecurityMonitoringRule(auth, ruleCreate)
response, httpResponse, err := apiInstances.GetSecurityMonitoringApiV2().CreateSecurityMonitoringRule(auth, *ruleCreate)
if err != nil {
return utils.TranslateClientErrorDiag(err, httpResponse, "error creating security monitoring rule")
}
Expand All @@ -124,42 +124,43 @@ func cloudConfigurationRuleCreateContext(ctx context.Context, d *schema.Resource
return nil
}

func buildRuleCreatePayload(d *schema.ResourceData) datadogV2.SecurityMonitoringRuleCreatePayload {
func buildRuleCreatePayload(d *schema.ResourceData) *datadogV2.SecurityMonitoringRuleCreatePayload {
payload := datadogV2.NewCloudConfigurationRuleCreatePayloadWithDefaults()
payload.SetName(d.Get(nameField).(string))
payload.SetMessage(d.Get(messageField).(string))
payload.SetIsEnabled(d.Get(enabledField).(bool))
payload.SetOptions(buildRuleCreationOptions(d))
payload.SetComplianceSignalOptions(buildComplianceSignalOptions(d))
payload.SetCases(buildRuleCreationCases(d))
payload.SetComplianceSignalOptions(*buildComplianceSignalOptions(d))
payload.SetCases(*buildRuleCreationCases(d))
payload.SetTags(utils.GetStringSlice(d, tagsField))
payload.SetType(datadogV2.CLOUDCONFIGURATIONRULETYPE_CLOUD_CONFIGURATION)

return datadogV2.CloudConfigurationRuleCreatePayloadAsSecurityMonitoringRuleCreatePayload(payload)
createPayload := datadogV2.CloudConfigurationRuleCreatePayloadAsSecurityMonitoringRuleCreatePayload(payload)
return &createPayload
}

func buildRuleCreationOptions(d *schema.ResourceData) datadogV2.CloudConfigurationRuleOptions {
return *datadogV2.NewCloudConfigurationRuleOptions(*buildComplianceRuleOptions(d))
}

func buildRuleCreationCases(d *schema.ResourceData) []datadogV2.CloudConfigurationRuleCaseCreate {
func buildRuleCreationCases(d *schema.ResourceData) *[]datadogV2.CloudConfigurationRuleCaseCreate {
notifications := utils.GetStringSlice(d, notificationsField)
severity := d.Get(severityField).(string)

ruleCase := datadogV2.NewCloudConfigurationRuleCaseCreate(datadogV2.SecurityMonitoringRuleSeverity(severity))
ruleCase.SetNotifications(notifications)

return []datadogV2.CloudConfigurationRuleCaseCreate{*ruleCase}
return &[]datadogV2.CloudConfigurationRuleCaseCreate{*ruleCase}
}

func buildComplianceSignalOptions(d *schema.ResourceData) datadogV2.CloudConfigurationRuleComplianceSignalOptions {
func buildComplianceSignalOptions(d *schema.ResourceData) *datadogV2.CloudConfigurationRuleComplianceSignalOptions {
groupByFields := utils.GetStringSlice(d, groupByField)

signalOptions := datadogV2.NewCloudConfigurationRuleComplianceSignalOptions()
signalOptions.SetUserActivationStatus(len(groupByFields) > 1)
signalOptions.SetUserGroupByFields(groupByFields)

return *signalOptions
return signalOptions
}

func cloudConfigurationRuleUpdateContext(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
Expand All @@ -168,7 +169,7 @@ func cloudConfigurationRuleUpdateContext(ctx context.Context, d *schema.Resource
auth := providerConf.Auth

ruleUpdate := buildRuleUpdatePayload(d)
response, httpResponse, err := apiInstances.GetSecurityMonitoringApiV2().UpdateSecurityMonitoringRule(auth, d.Id(), ruleUpdate)
response, httpResponse, err := apiInstances.GetSecurityMonitoringApiV2().UpdateSecurityMonitoringRule(auth, d.Id(), *ruleUpdate)
if err != nil {
return utils.TranslateClientErrorDiag(err, httpResponse, "error updating security monitoring rule")
}
Expand All @@ -183,16 +184,16 @@ func cloudConfigurationRuleUpdateContext(ctx context.Context, d *schema.Resource
return nil
}

func buildRuleUpdatePayload(d *schema.ResourceData) datadogV2.SecurityMonitoringRuleUpdatePayload {
func buildRuleUpdatePayload(d *schema.ResourceData) *datadogV2.SecurityMonitoringRuleUpdatePayload {
payload := datadogV2.SecurityMonitoringRuleUpdatePayload{}
payload.SetName(d.Get(nameField).(string))
payload.SetMessage(d.Get(messageField).(string))
payload.SetIsEnabled(d.Get(enabledField).(bool))
payload.SetOptions(buildRuleUpdateOptions(d))
payload.SetComplianceSignalOptions(buildComplianceSignalOptions(d))
payload.SetCases(buildRuleUpdateCases(d))
payload.SetComplianceSignalOptions(*buildComplianceSignalOptions(d))
payload.SetCases(*buildRuleUpdateCases(d))
payload.SetTags(utils.GetStringSlice(d, tagsField))
return payload
return &payload
}

func buildRuleUpdateOptions(d *schema.ResourceData) datadogV2.SecurityMonitoringRuleOptions {
Expand Down Expand Up @@ -222,15 +223,15 @@ func getAllResourceTypes(d *schema.ResourceData) (string, []string, bool) {
return mainResourceType, resourceTypes, len(relatedResourceTypes) > 0
}

func buildRuleUpdateCases(d *schema.ResourceData) []datadogV2.SecurityMonitoringRuleCase {
func buildRuleUpdateCases(d *schema.ResourceData) *[]datadogV2.SecurityMonitoringRuleCase {
notifications := utils.GetStringSlice(d, notificationsField)
severity := d.Get(severityField).(string)

ruleCase := datadogV2.NewSecurityMonitoringRuleCase()
ruleCase.SetStatus(datadogV2.SecurityMonitoringRuleSeverity(severity))
ruleCase.SetNotifications(notifications)

return []datadogV2.SecurityMonitoringRuleCase{*ruleCase}
return &[]datadogV2.SecurityMonitoringRuleCase{*ruleCase}
}

func cloudConfigurationRuleReadContext(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
Expand Down
8 changes: 4 additions & 4 deletions datadog/resource_datadog_cloud_workload_security_agent_rule.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ func resourceDatadogCloudWorkloadSecurityAgentRuleCreate(ctx context.Context, d
return diag.FromErr(err)
}

return updateCloudWorkloadSecurityAgentRuleState(d, response)
return updateCloudWorkloadSecurityAgentRuleState(d, &response)
}

func resourceDatadogCloudWorkloadSecurityAgentRuleRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
Expand All @@ -89,7 +89,7 @@ func resourceDatadogCloudWorkloadSecurityAgentRuleRead(ctx context.Context, d *s
return diag.FromErr(err)
}

return updateCloudWorkloadSecurityAgentRuleState(d, agentRuleResponse)
return updateCloudWorkloadSecurityAgentRuleState(d, &agentRuleResponse)
}

func resourceDatadogCloudWorkloadSecurityAgentRuleUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
Expand All @@ -107,7 +107,7 @@ func resourceDatadogCloudWorkloadSecurityAgentRuleUpdate(ctx context.Context, d
return utils.TranslateClientErrorDiag(err, httpResponse, "error updating cloud workload security agent rule")
}

return updateCloudWorkloadSecurityAgentRuleState(d, agentRuleResponse)
return updateCloudWorkloadSecurityAgentRuleState(d, &agentRuleResponse)
}

func resourceDatadogCloudWorkloadSecurityAgentRuleDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
Expand All @@ -124,7 +124,7 @@ func resourceDatadogCloudWorkloadSecurityAgentRuleDelete(ctx context.Context, d
return nil
}

func updateCloudWorkloadSecurityAgentRuleState(d *schema.ResourceData, agentRuleResponse datadogV2.CloudWorkloadSecurityAgentRuleResponse) diag.Diagnostics {
func updateCloudWorkloadSecurityAgentRuleState(d *schema.ResourceData, agentRuleResponse *datadogV2.CloudWorkloadSecurityAgentRuleResponse) diag.Diagnostics {
data := agentRuleResponse.GetData()
d.SetId(data.GetId())

Expand Down
Loading