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

Jump to bottom

[SCC] Fix: correct ProfileAttachment for Updating a Profile Attachment #5725

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[SCC] Fix: correct ProfileAttachment for Updating a Profile Attachment #5725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 14 additions & 0 deletions ibm/service/scc/resource_ibm_scc_profile_attachment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,13 +267,15 @@ func attachmentParametersSchemaSetFunc(keys ...string) schema.SchemaSetFunc {
}
}
}
log.Printf("[DEBUG] attachmentParameterSchemaSet value %s\n", str.String())

return stringHashcode(str.String())
}
}

func stringHashcode(s string) int {
v := int(crc32.ChecksumIEEE([]byte(s)))
log.Printf("[DEBUG] attachmentParameterSchemaSet value %d\n", v)
if v >= 0 {
return v
}
Expand Down Expand Up @@ -607,6 +609,18 @@ func resourceIbmSccProfileAttachmentUpdate(context context.Context, d *schema.Re
}
replaceProfileAttachmentOptions.SetNotifications(updateNotifications)
}
if replaceProfileAttachmentOptions.AttachmentParameters == nil || d.Get("attachment_parameters") != nil {
attachmentItems := d.Get("attachment_parameters")
attachmentParameters := []securityandcompliancecenterapiv3.AttachmentParameterPrototype{}
for _, attachmentParametersItem := range attachmentItems.(*schema.Set).List() {
attachmentParametersItemModel, err := resourceIbmSccProfileAttachmentMapToAttachmentParameterPrototype(attachmentParametersItem.(map[string]interface{}))
if err != nil {
return diag.FromErr(err)
}
attachmentParameters = append(attachmentParameters, *attachmentParametersItemModel)
}
replaceProfileAttachmentOptions.SetAttachmentParameters(attachmentParameters)
}
if replaceProfileAttachmentOptions.Status == nil {
replaceProfileAttachmentOptions.SetSchedule(d.Get("status").(string))
}
Expand Down
216 changes: 116 additions & 100 deletions ibm/service/scc/resource_ibm_scc_profile_attachment_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ func TestAccIbmSccProfileAttachmentAllArgs(t *testing.T) {
Check: resource.ComposeAggregateTestCheckFunc(
testAccCheckIbmSccProfileAttachmentExists("ibm_scc_profile_attachment.scc_profile_attachment_instance", conf),
resource.TestCheckResourceAttr(
"ibm_scc_profile_attachment.scc_profile_attachment_instance", "attachment_parameters.#", "5"),
"ibm_scc_profile_attachment.scc_profile_attachment_instance", "attachment_parameters.#", "6"),
),
},
resource.TestStep{
Expand All @@ -62,27 +62,27 @@ func TestAccIbmSccProfileAttachmentAllArgs(t *testing.T) {
testAccCheckIbmSccProfileAttachmentExists("ibm_scc_profile_attachment.scc_profile_attachment_instance", conf),
// verify if all attachment_parameters are stored in the state
resource.TestCheckResourceAttr(
"ibm_scc_profile_attachment.scc_profile_attachment_instance", "attachment_parameters.#", "5"),
"ibm_scc_profile_attachment.scc_profile_attachment_instance", "attachment_parameters.#", "6"),
// verify the changes to rule-7c5f6385-67e4-4edf-bec8-c722558b2dec
resource.TestCheckResourceAttr(
"ibm_scc_profile_attachment.scc_profile_attachment_instance", "attachment_parameters.0.assessment_id", "rule-7c5f6385-67e4-4edf-bec8-c722558b2dec"),
resource.TestCheckResourceAttr(
"ibm_scc_profile_attachment.scc_profile_attachment_instance", "attachment_parameters.0.parameter_value", "23"),
// verify the changes to rule-9653d2c7-6290-4128-a5a3-65487ba40370
resource.TestCheckResourceAttr(
"ibm_scc_profile_attachment.scc_profile_attachment_instance", "attachment_parameters.1.assessment_id", "rule-9653d2c7-6290-4128-a5a3-65487ba40370"),
"ibm_scc_profile_attachment.scc_profile_attachment_instance", "attachment_parameters.2.assessment_id", "rule-9653d2c7-6290-4128-a5a3-65487ba40370"),
resource.TestCheckResourceAttr(
"ibm_scc_profile_attachment.scc_profile_attachment_instance", "attachment_parameters.1.parameter_value", "1234"),
"ibm_scc_profile_attachment.scc_profile_attachment_instance", "attachment_parameters.2.parameter_value", "1234"),
// verify the changes to rule-e16fcfea-fe21-4d30-a721-423611481fea
resource.TestCheckResourceAttr(
"ibm_scc_profile_attachment.scc_profile_attachment_instance", "attachment_parameters.2.assessment_id", "rule-e16fcfea-fe21-4d30-a721-423611481fea"),
"ibm_scc_profile_attachment.scc_profile_attachment_instance", "attachment_parameters.3.assessment_id", "rule-e16fcfea-fe21-4d30-a721-423611481fea"),
resource.TestCheckResourceAttr(
"ibm_scc_profile_attachment.scc_profile_attachment_instance", "attachment_parameters.2.parameter_value", "['1.2', '1.3']"),
"ibm_scc_profile_attachment.scc_profile_attachment_instance", "attachment_parameters.3.parameter_value", "['1.2', '1.3']"),
// verify the changes to rule-f1e80ee7-88d5-4bf2-b42f-c863bb24601c
resource.TestCheckResourceAttr(
"ibm_scc_profile_attachment.scc_profile_attachment_instance", "attachment_parameters.3.assessment_id", "rule-f1e80ee7-88d5-4bf2-b42f-c863bb24601c"),
"ibm_scc_profile_attachment.scc_profile_attachment_instance", "attachment_parameters.4.assessment_id", "rule-f1e80ee7-88d5-4bf2-b42f-c863bb24601c"),
resource.TestCheckResourceAttr(
"ibm_scc_profile_attachment.scc_profile_attachment_instance", "attachment_parameters.3.parameter_value", "4000"),
"ibm_scc_profile_attachment.scc_profile_attachment_instance", "attachment_parameters.4.parameter_value", "4000"),
),
},
resource.TestStep{
Expand Down Expand Up @@ -181,102 +181,110 @@ func testAccCheckIbmSccProfileAttachmentConfigBasic(instanceID string) string {

func testAccCheckIbmSccProfileAttachmentConfig(instanceID string) string {
return fmt.Sprintf(`
locals {
scc_profiles_map = tomap(merge([
for i , cl in data.ibm_scc_profiles.scc_profiles.profiles :
{(cl.profile_name) = "${cl.id}"} if cl.latest == true && cl.profile_type == "predefined"
]...))
}
locals {
scc_profiles_map = tomap(merge([
for i , cl in data.ibm_scc_profiles.scc_profiles.profiles :
{(cl.profile_name) = "${cl.id}"} if cl.latest == true && cl.profile_type == "predefined"
]...))
}

data "ibm_scc_profiles" "scc_profiles" {
instance_id = "%s"
}
data "ibm_scc_profiles" "scc_profiles" {
instance_id = "%s"
}

data "ibm_iam_account_settings" "iam_account_settings" {
}

resource "ibm_scc_profile_attachment" "scc_profile_attachment_instance" {
instance_id = "%s"
profile_id = local.scc_profiles_map["CIS IBM Cloud Foundations Benchmark v1.1.0"]
name = "profile_attachment_name"
description = "scc_profile_attachment_description"
scope {
environment = "ibm-cloud"
properties {
name = "scope_id"
value = data.ibm_iam_account_settings.iam_account_settings.account_id
}
properties {
name = "scope_type"
value = "account"
}
}
schedule = "every_30_days"
status = "disabled"
notifications {
enabled = false
controls {
failed_control_ids = []
threshold_limit = 14
}
}
attachment_parameters {
parameter_value = "['1.2', '1.3']"
assessment_id = "rule-e16fcfea-fe21-4d30-a721-423611481fea"
assessment_type = "automated"
parameter_display_name = "IBM Cloud Internet Services TLS version"
parameter_name = "tls_version"
parameter_type = "string_list"
}
attachment_parameters {
parameter_value = "22"
assessment_id = "rule-f9137be8-2490-4afb-8cd5-a201cb167eb2"
assessment_type = "automated"
parameter_display_name = "Network ACL rule for allowed IPs to SSH port"
parameter_name = "ssh_port"
parameter_type = "numeric"
}
attachment_parameters {
parameter_value = "3389"
assessment_id = "rule-9653d2c7-6290-4128-a5a3-65487ba40370"
assessment_type = "automated"
parameter_display_name = "Security group rule RDP allow port number"
parameter_name = "rdp_port"
parameter_type = "numeric"
}
attachment_parameters {
parameter_value = "22"
assessment_id = "rule-7c5f6385-67e4-4edf-bec8-c722558b2dec"
assessment_type = "automated"
parameter_display_name = "Security group rule SSH allow port number"
parameter_name = "ssh_port"
parameter_type = "numeric"
}
attachment_parameters {
parameter_value = "3389"
assessment_id = "rule-f1e80ee7-88d5-4bf2-b42f-c863bb24601c"
assessment_type = "automated"
parameter_display_name = "Disallowed IPs for ingress to RDP port"
parameter_name = "rdp_port"
parameter_type = "numeric"
}
instance_id = "%s"
profile_id = local.scc_profiles_map["CIS IBM Cloud Foundations Benchmark v1.1.0"]
name = "profile_attachment_name"
description = "scc_profile_attachment_description"
scope {
environment = "ibm-cloud"
properties {
name = "scope_id"
value = data.ibm_iam_account_settings.iam_account_settings.account_id
}
properties {
name = "scope_type"
value = "account"
}
}
schedule = "every_30_days"
status = "disabled"
notifications {
enabled = false
controls {
failed_control_ids = []
threshold_limit = 14
}
}
attachment_parameters {
parameter_value = "['1.2', '1.3']"
assessment_id = "rule-e16fcfea-fe21-4d30-a721-423611481fea"
assessment_type = "automated"
parameter_display_name = "IBM Cloud Internet Services TLS version"
parameter_name = "tls_version"
parameter_type = "string_list"
}
attachment_parameters {
parameter_value = "22"
assessment_id = "rule-f9137be8-2490-4afb-8cd5-a201cb167eb2"
assessment_type = "automated"
parameter_display_name = "Network ACL rule for allowed IPs to SSH port"
parameter_name = "ssh_port"
parameter_type = "numeric"
}
attachment_parameters {
parameter_value = "3389"
assessment_id = "rule-9653d2c7-6290-4128-a5a3-65487ba40370"
assessment_type = "automated"
parameter_display_name = "Security group rule RDP allow port number"
parameter_name = "rdp_port"
parameter_type = "numeric"
}
attachment_parameters {
parameter_value = "22"
assessment_id = "rule-7c5f6385-67e4-4edf-bec8-c722558b2dec"
assessment_type = "automated"
parameter_display_name = "Security group rule SSH allow port number"
parameter_name = "ssh_port"
parameter_type = "numeric"
}
attachment_parameters {
parameter_value = "3389"
assessment_id = "rule-f1e80ee7-88d5-4bf2-b42f-c863bb24601c"
assessment_type = "automated"
parameter_display_name = "Disallowed IPs for ingress to RDP port"
parameter_name = "rdp_port"
parameter_type = "numeric"
}
attachment_parameters {
parameter_value = "['default']"
assessment_id = "rule-96527f89-1867-4581-b923-1400e04661e0"
assessment_type = "automated"
parameter_display_name = "Exclude the default security groups"
parameter_name = "exclude_default_security_groups"
parameter_type = "string_list"
}
}
`, instanceID, instanceID)
}

// Returns a terraform change where the attachment_parameters are modified slightly.
func testAccCheckIbmSccProfileAttachmentConfigChange(instanceID string) string {
return fmt.Sprintf(`
locals {
scc_profiles_map = tomap(merge([
for i , cl in data.ibm_scc_profiles.scc_profiles.profiles :
{(cl.profile_name) = "${cl.id}"} if cl.latest == true && cl.profile_type == "predefined"
]...))
}
locals {
scc_profiles_map = tomap(merge([
for i , cl in data.ibm_scc_profiles.scc_profiles.profiles :
{(cl.profile_name) = "${cl.id}"} if cl.latest == true && cl.profile_type == "predefined"
]...))
}

data "ibm_scc_profiles" "scc_profiles" {
instance_id = "%s"
}
data "ibm_scc_profiles" "scc_profiles" {
instance_id = "%s"
}

data "ibm_iam_account_settings" "iam_account_settings" {
}
Expand All @@ -297,19 +305,19 @@ func testAccCheckIbmSccProfileAttachmentConfigChange(instanceID string) string {
value = "account"
}
}
schedule = "every_30_days"
status = "disabled"
notifications {
enabled = false
controls {
failed_control_ids = []
threshold_limit = 14
}
}
schedule = "every_30_days"
status = "disabled"
notifications {
enabled = false
controls {
failed_control_ids = []
threshold_limit = 14
}
}
attachment_parameters {
parameter_value = "['1.2', '1.3']"
assessment_id = "rule-e16fcfea-fe21-4d30-a721-423611481fea"
assessment_type = "automated"
assessment_type = "automated"
parameter_display_name = "IBM Cloud Internet Services TLS version"
parameter_name = "tls_version"
parameter_type = "string_list"
Expand Down Expand Up @@ -346,6 +354,14 @@ func testAccCheckIbmSccProfileAttachmentConfigChange(instanceID string) string {
parameter_name = "rdp_port"
parameter_type = "numeric"
}
attachment_parameters {
parameter_value = "['default']"
assessment_id = "rule-96527f89-1867-4581-b923-1400e04661e0"
assessment_type = "automated"
parameter_display_name = "Exclude the default security groups"
parameter_name = "exclude_default_security_groups"
parameter_type = "string_list"
}
}
`, instanceID, instanceID)
}
Expand Down
Loading