show id in ruleset data source

z0za · Jul 11, 2024 · d41a95b · d41a95b
1 parent 2a11fe9
commit d41a95b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
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
@@ -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_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 {