diff --git a/ibm/service/cis/data_source_ibm_cis_ruleset_entrypoint_version.go b/ibm/service/cis/data_source_ibm_cis_ruleset_entrypoint_version.go index 73297cea16e..2fbadd26c33 100644 --- a/ibm/service/cis/data_source_ibm_cis_ruleset_entrypoint_version.go +++ b/ibm/service/cis/data_source_ibm_cis_ruleset_entrypoint_version.go @@ -117,6 +117,7 @@ func dataIBMCISRulesetEntrypointVersionsRead(d *schema.ResourceData, meta interf rulesetOutput[CISRulesetsPhase] = *rulesetObj.Phase rulesetOutput[CISRulesetsLastUpdatedAt] = *rulesetObj.LastUpdated rulesetOutput[CISRulesetsVersion] = *rulesetObj.Version + rulesetOutput[CISRulesetsId] = *&rulesetObj.ID rulesetList = append(rulesetList, rulesetOutput) @@ -143,6 +144,7 @@ func dataIBMCISRulesetEntrypointVersionsRead(d *schema.ResourceData, meta interf rulesetOutput[CISRulesetsPhase] = *rulesetObj.Phase rulesetOutput[CISRulesetsLastUpdatedAt] = *rulesetObj.LastUpdated rulesetOutput[CISRulesetsVersion] = *rulesetObj.Version + rulesetOutput[CISRulesetsId] = *&rulesetObj.ID rulesetList = append(rulesetList, rulesetOutput) @@ -167,7 +169,7 @@ func dataIBMCISRulesetEntrypointVersionsRead(d *schema.ResourceData, meta interf rulesetObj := flattenCISRulesets(*result.Result) d.SetId(dataSourceCISRulesetsCheckID(d)) - d.Set(CISRulesetsListOutput, rulesetObj) + d.Set(CISRulesetsEntryPointOutput, rulesetObj) d.Set(cisID, crn) } else { @@ -181,7 +183,7 @@ func dataIBMCISRulesetEntrypointVersionsRead(d *schema.ResourceData, meta interf rulesetObj := flattenCISRulesets(*result.Result) d.SetId(dataSourceCISRulesetsCheckID(d)) - d.Set(CISRulesetsListOutput, rulesetObj) + d.Set(CISRulesetsEntryPointOutput, rulesetObj) d.Set(cisID, crn) } @@ -198,7 +200,7 @@ func dataIBMCISRulesetEntrypointVersionsRead(d *schema.ResourceData, meta interf rulesetObj := flattenCISRulesets(*result.Result) d.SetId(dataSourceCISRulesetsCheckID(d)) - d.Set(CISRulesetsListOutput, rulesetObj) + d.Set(CISRulesetsEntryPointOutput, rulesetObj) d.Set(cisID, crn) } else { @@ -212,7 +214,7 @@ func dataIBMCISRulesetEntrypointVersionsRead(d *schema.ResourceData, meta interf rulesetObj := flattenCISRulesets(*result.Result) d.SetId(dataSourceCISRulesetsCheckID(d)) - d.Set(CISRulesetsListOutput, rulesetObj) + d.Set(CISRulesetsEntryPointOutput, rulesetObj) d.Set(cisID, crn) } } diff --git a/ibm/service/cis/data_source_ibm_cis_ruleset_versions.go b/ibm/service/cis/data_source_ibm_cis_ruleset_versions.go index 9646ca4186a..bc2ae58267e 100644 --- a/ibm/service/cis/data_source_ibm_cis_ruleset_versions.go +++ b/ibm/service/cis/data_source_ibm_cis_ruleset_versions.go @@ -105,7 +105,7 @@ func dataIBMCISRulesetVersionsRead(d *schema.ResourceData, meta interface{}) err rulesetObj := flattenCISRulesets(*result.Result) d.SetId(dataSourceCISRulesetsCheckID(d)) - d.Set(CISRulesetsListOutput, rulesetObj) + d.Set(CISRulesetsObjectOutput, rulesetObj) d.Set(cisID, crn) } else { @@ -149,7 +149,7 @@ func dataIBMCISRulesetVersionsRead(d *schema.ResourceData, meta interface{}) err rulesetObj := flattenCISRulesets(*result.Result) d.SetId(dataSourceCISRulesetsCheckID(d)) - d.Set(CISRulesetsListOutput, rulesetObj) + d.Set(CISRulesetsObjectOutput, rulesetObj) d.Set(cisID, crn) } else { diff --git a/ibm/service/cis/data_source_ibm_cis_rulesets.go b/ibm/service/cis/data_source_ibm_cis_rulesets.go index 55f42693b8d..36f8bc382b9 100644 --- a/ibm/service/cis/data_source_ibm_cis_rulesets.go +++ b/ibm/service/cis/data_source_ibm_cis_rulesets.go @@ -467,6 +467,7 @@ func flattenCISRulesets(rulesetObj rulesetsv1.RulesetDetails) interface{} { rulesetOutput[CISRulesetsPhase] = *rulesetObj.Phase rulesetOutput[CISRulesetsLastUpdatedAt] = *rulesetObj.LastUpdated rulesetOutput[CISRulesetsVersion] = *rulesetObj.Version + rulesetOutput[CISRulesetsId] = *&rulesetObj.ID ruleDetailsList := make([]map[string]interface{}, 0) for _, ruleDetailsObj := range rulesetObj.Rules { diff --git a/website/docs/d/cis_ruleset_entrypoint_version.html.markdown b/website/docs/d/cis_ruleset_entrypoint_versions.html.markdown similarity index 100% rename from website/docs/d/cis_ruleset_entrypoint_version.html.markdown rename to website/docs/d/cis_ruleset_entrypoint_versions.html.markdown diff --git a/website/docs/d/cis_ruleset_versions.html.markdown b/website/docs/d/cis_ruleset_versions.html.markdown index 10f55e75a4d..dccca7c35e3 100644 --- a/website/docs/d/cis_ruleset_versions.html.markdown +++ b/website/docs/d/cis_ruleset_versions.html.markdown @@ -1,19 +1,19 @@ --- subcategory: "Internet services" layout: "ibm" -page_title: "IBM: ibm_cis_versions" +page_title: "IBM: ibm_cis_ruleset_versions" description: |- Get information on an IBM Cloud Internet Services ruleset version. --- -# ibm_cis_versions +# ibm_cis_ruleset_versions Retrieve information about an IBM Cloud Internet Services Instance/Zone ruleset's version data sources. For more information, see [IBM Cloud Internet Services]. ## Example usage ```terraform -data "ibm_cis_versions" "tests" { +data "ibm_cis_ruleset_versions" "tests" { cis_id = ibm_cis.instance.id domain_id = data.ibm_cis_domain.cis_domain.domain_id ruleset_id = data.ibm_cis_ruleset.cis_ruleset.ruleset_id diff --git a/website/docs/r/cis_ruleset.html.markdown b/website/docs/r/cis_ruleset.html.markdown index bf994a55b9c..beb2f89ab11 100644 --- a/website/docs/r/cis_ruleset.html.markdown +++ b/website/docs/r/cis_ruleset.html.markdown @@ -7,7 +7,7 @@ description: |- Provides a IBM CIS ruleset resource. --- -# ibm_cis_rulesets +# ibm_cis_ruleset Provides an IBM Cloud Internet Services ruleset resource, to update and delete the ruleset of an Instance or Domain. For more information about IBM Cloud Internet Services ruleset, see [ruleset instance](https://cloud.ibm.com/docs/cis?topic=cis-managed-rules-overview). **As there is no option to create a ruleset resource, it is required to use import module to generate the respective resource configurations([Reference](https://test.cloud.ibm.com/docs/cis?topic=cis-terraform-generating-configuration)) and use the import command to populate the state file, as stated at the end of this page.** @@ -65,7 +65,8 @@ Review the argument references that you can specify for your resource. - `rules` (optional, list) Rules which are required to be added/modified. Nested scheme of `rules` - - `action` (String). Action of the rule. + - `id` (Required, String) ID of the rule. + - `action` (Required, String). Action of the rule. - `description` (Optional, String) Description of the rule. - `enable` (Optional, Boolean) Enables/Disables the rule. - `expression` (Optional, String) Expression used by the rule to match the incoming request. diff --git a/website/docs/r/cis_ruleset_version_detach.html.markdown b/website/docs/r/cis_ruleset_version_detach.html.markdown index 9c3bbf1f638..60d8639a3cf 100644 --- a/website/docs/r/cis_ruleset_version_detach.html.markdown +++ b/website/docs/r/cis_ruleset_version_detach.html.markdown @@ -2,12 +2,12 @@ subcategory: "Internet services" layout: "ibm" -page_title: "IBM: ibm_cis_version_detach" +page_title: "IBM: ibm_cis_ruleset_version_detach" description: |- Provides an IBM CIS ruleset version resource. --- -# ibm_cis_version_detach +# ibm_cis_ruleset_version_detach Provides an IBM Cloud Internet Services ruleset version resource of an instance or domain to be detached. This allow ruleset version to delete. For more information about IBM Cloud Internet Services ruleset version detach, see [ruleset instance](https://cloud.ibm.com/docs/cis?topic=cis-managed-rules-overview). ## Example usage @@ -15,7 +15,7 @@ Provides an IBM Cloud Internet Services ruleset version resource of an instance ```terraform # delete ruleset of a domain or instance -resource "ibm_cis_version_detach" "tests" { +resource "ibm_cis_ruleset_version_detach" "tests" { cis_id = ibm_cis.instance.id domain_id = data.ibm_cis_domain.cis_domain.domain_id ruleset_id = ""