Config agg v2 changes (#6218)

* document changes

* Update config_aggregator_settings.html.markdown

* aggregator changes

* Update data_source_ibm_config_aggregator_configurations.go

* remove print statements

* customer issue changes

* address review comments

* review comments

Author: Ramya-c4

examples/ibm-configuration-aggregator/outputs.tf

@@ -4,21 +4,20 @@ locals {
   entries = [
     for config in data.ibm_config_aggregator_configurations.example.configs : {
       about = {
-        account_id               = config.about.account_id
-        config_type              = config.about.config_type
-        last_config_refresh_time  = config.about.last_config_refresh_time
-        location                 = config.about.location
-        resource_crn             = config.about.resource_crn
-        resource_group_id        = config.about.resource_group_id
-        resource_name            = config.about.resource_name
-        service_name             = config.about.service_name
-        tags={}
+        account_id               = jsondecode(config.about).account_id
+        config_type              = jsondecode(config.about).config_type
+        last_config_refresh_time = jsondecode(config.about).last_config_refresh_time
+        location                 = jsondecode(config.about).location
+        resource_crn             = jsondecode(config.about).resource_crn
+        resource_group_id        = jsondecode(config.about).resource_group_id
+        resource_name            = jsondecode(config.about).resource_name
+        service_name             = jsondecode(config.about).service_name
+        tags                     = {}
       }
       config = jsondecode(config.config)
     }
   ]
 }
-
 output "ibm_config_aggregator_configurations" {
   value = {
     configs=local.entries

ibm/conns/config.go

@@ -2479,12 +2479,16 @@ func (c *Config) ClientSession() (interface{}, error) {
 	}
 
 	// Construct an instance of the 'Configuration Aggregator' service.
-	var configBaseURL string
-	configBaseURL = ContructEndpoint(fmt.Sprintf("%s.apprapp", c.Region), cloudEndpoint)
-
+	configBaseURL := ContructEndpoint(fmt.Sprintf("%s", c.Region), fmt.Sprintf("%s.apprapp.", cloudEndpoint))
+	if c.Visibility == "private" || c.Visibility == "public-and-private" {
+		configBaseURL = ContructEndpoint(fmt.Sprintf("%s.private", c.Region), fmt.Sprintf("%s.apprapp", cloudEndpoint))
+	}
+	if fileMap != nil && c.Visibility != "public-and-private" {
+		configBaseURL = fileFallBack(fileMap, c.Visibility, "IBMCLOUD_APP_CONFIG_ENDPOINT", c.Region, configBaseURL)
+	}
 	configurationAggregatorClientOptions := &configurationaggregatorv1.ConfigurationAggregatorV1Options{
 		Authenticator: authenticator,
-		URL:           configBaseURL,
+		URL:           EnvFallBack([]string{"IBMCLOUD_APP_CONFIG_ENDPOINT"}, configBaseURL),
 	}
 
 	// Construct the service client.

ibm/service/configurationaggregator/data_source_ibm_config_aggregator_configurations.go

@@ -215,8 +215,8 @@ func dataSourceIbmConfigAggregatorConfigurationsRead(context context.Context, d
 	d.SetId(dataSourceIbmConfigAggregatorConfigurationsID(d))
 
 	mapSlice := []map[string]interface{}{}
-	for _, modelItem := range allItems {
-		modelMap, err := DataSourceIbmConfigAggregatorConfigurationsConfigToMap(&modelItem)
+	for _, model := range allItems {
+		modelMap, err := DataSourceIbmConfigAggregatorConfigurationsConfigToMap(&model)
 		if err != nil {
 			tfErr := flex.TerraformErrorf(err, err.Error(), "(Data) ibm_config_aggregator_configurations", "read")
 			return tfErr.GetDiag()
@@ -249,18 +249,34 @@ func DataSourceIbmConfigAggregatorConfigurationsPaginatedPreviousToMap(model *co
 }
 
 func DataSourceIbmConfigAggregatorConfigurationsConfigToMap(model *configurationaggregatorv1.Config) (map[string]interface{}, error) {
-	modelMap := make(map[string]interface{})
-	aboutMap, err := DataSourceIbmConfigAggregatorConfigurationsAboutToMap(model.About)
-	if err != nil {
-		return modelMap, err
+	if model == nil {
+		return nil, fmt.Errorf("model is nil")
 	}
-	modelMap["about"] = aboutMap
-	configMap, err := DataSourceIbmConfigAggregatorConfigurationsConfigurationToMap(model.Config)
-	if err != nil {
-		return modelMap, err
+
+	// Convert About struct to JSON string or "{}"
+	aboutStr := "{}"
+	if model.About != nil {
+		bytes, err := json.Marshal(model.About)
+		if err != nil {
+			return nil, fmt.Errorf("failed to marshal About: %v", err)
+		}
+		aboutStr = string(bytes)
 	}
-	modelMap["config"] = configMap
-	return modelMap, nil
+
+	// Convert Config struct to JSON string or "{}"
+	configStr := "{}"
+	if model.Config != nil {
+		bytes, err := json.Marshal(model.Config)
+		if err != nil {
+			return nil, fmt.Errorf("failed to marshal Config: %v", err)
+		}
+		configStr = string(bytes)
+	}
+
+	return map[string]interface{}{
+		"about":  aboutStr,
+		"config": configStr,
+	}, nil
 }
 
 func DataSourceIbmConfigAggregatorConfigurationsAboutToMap(model *configurationaggregatorv1.About) (string, error) {
@@ -293,14 +309,21 @@ func DataSourceIbmConfigAggregatorConfigurationsAboutToMap(model *configurationa
 // }
 
 func DataSourceIbmConfigAggregatorConfigurationsConfigurationToMap(model *configurationaggregatorv1.Configuration) (string, error) {
-	checkMap := model.GetProperties()
-	tryMap := make(map[string]interface{})
-	for i, v := range checkMap {
-		tryMap[i] = v
+	if model == nil {
+		return "", nil
 	}
-	jsonData, err := json.Marshal(tryMap)
-	if err != nil {
-		return "", err
+
+	if len(model.GetProperties()) != 0 {
+		checkMap := model.GetProperties()
+		tryMap := make(map[string]interface{})
+		for i, v := range checkMap {
+			tryMap[i] = v
+		}
+		jsonData, err := json.Marshal(tryMap)
+		if err != nil {
+			return "", err
+		}
+		return string(jsonData), nil
 	}
-	return string(jsonData), nil
+	return "", nil
 }

ibm/service/configurationaggregator/utils.go

@@ -26,12 +26,16 @@ func getConfigurationInstanceRegion(originalClient *configurationaggregatorv1.Co
 }
 
 func getClientWithConfigurationInstanceEndpoint(originalClient *configurationaggregatorv1.ConfigurationAggregatorV1, instanceId string, region string) *configurationaggregatorv1.ConfigurationAggregatorV1 {
-	// build the api endpoint
 	domain := cloudEndpoint
+	prefix := region
+	baseUrl := originalClient.GetServiceURL()
 	if strings.Contains(os.Getenv("IBMCLOUD_IAM_API_ENDPOINT"), "test") {
 		domain = testCloudEndpoint
 	}
-	endpoint := fmt.Sprintf("https://%s.apprapp.%s/apprapp/config_aggregator/v1/instances/%s", region, domain, instanceId)
+	if strings.Contains(baseUrl, "private") {
+		prefix = fmt.Sprintf("private.%s", region)
+	}
+	endpoint := fmt.Sprintf("https://%s.apprapp.%s/apprapp/config_aggregator/v1/instances/%s", prefix, domain, instanceId)
 
 	// clone the client and set endpoint
 	newClient := &configurationaggregatorv1.ConfigurationAggregatorV1{
@@ -42,7 +46,6 @@ func getClientWithConfigurationInstanceEndpoint(originalClient *configurationagg
 
 	return newClient
 }
-
 func AddConfigurationAggregatorInstanceFields(resource *schema.Resource) *schema.Resource {
 	resource.Schema["instance_id"] = &schema.Schema{
 		Type:        schema.TypeString,

website/docs/guides/custom-service-endpoints.html.md

@@ -53,6 +53,7 @@ provider "ibm" {
 |Internet Services|IBMCLOUD_CIS_API_ENDPOINT|
 |Cloud Shell|IBMCLOUD_CLOUD_SHELL_API_ENDPOINT|
 |Compilance (Posture Management)|IBMCLOUD_COMPLIANCE_API_ENDPOINT|
+|Configuration Aggregator|IBMCLOUD_APP_CONFIG_ENDPOINT|
 |Container Registry|IBMCLOUD_CR_API_ENDPOINT|
 |Cloud Logs | IBMCLOUD_LOGS_API_ENDPOINT |
 |Kubernetes Service|IBMCLOUD_CS_API_ENDPOINT|

website/docs/r/config_aggregator_settings.html.markdown

@@ -14,8 +14,8 @@ Create, update, and delete config_aggregator_settingss with this resource.
 
 ```hcl
 resource "ibm_config_aggregator_settings" "config_aggregator_settings_instance" {
-  instance_id=var.instance_id
-  region=var.region
+  instance_id = var.instance_id
+  region = var.region
   additional_scope {
 		type = "Enterprise"
 		enterprise_id = "enterprise_id"
@@ -24,7 +24,7 @@ resource "ibm_config_aggregator_settings" "config_aggregator_settings_instance"
 			trusted_profile_id = "Profile-6bb60124-8fc3-4d18-b63d-0b99560865d3"
 		}
   }
-  resource_collection_regions = us-south
+  resource_collection_regions = ["all"]
   resource_collection_enabled = true
   trusted_profile_id = "Profile-1260aec2-f2fc-44e2-8697-2cc15a447560"
 }
@@ -34,7 +34,7 @@ resource "ibm_config_aggregator_settings" "config_aggregator_settings_instance"
 
 You can specify the following arguments for this resource.
 * `instance_id` - (Required, Forces new resource, String) The GUID of the Configuration Aggregator instance.
-* `resource_collection_regions` - (Optional, Forces new resource, String) The region of the Configuration Aggregator instance. If not provided defaults to the region defined in the IBM provider configuration.
+* `region` - (Optional, Forces new resource, List) The region of the Configuration Aggregator instance. If not provided defaults to the region defined in the IBM provider configuration.
 * `additional_scope` - (Optional, Forces new resource, List) The additional scope that enables resource collection for Enterprise acccounts.
   * Constraints: The maximum length is `10` items. The minimum length is `0` items.
 Nested schema for **additional_scope**:
@@ -48,10 +48,10 @@ Nested schema for **additional_scope**:
 		  * Constraints: The maximum length is `44` characters. The minimum length is `44` characters. The value must match regular expression `/^[a-zA-Z0-9-]*$/`.
 	* `type` - (Optional, String) The type of scope. Currently allowed value is Enterprise.
 	  * Constraints: The maximum length is `64` characters. The minimum length is `0` characters. The value must match regular expression `/[a-zA-Z0-9]/`.
-* `regions` - (Optional, Forces new resource, List) The list of regions across which the resource collection is enabled.
+* `resource_collection_regions` - (Required,List) Regions for which the resource collection is enabled.
   * Constraints: The list items must match regular expression `/^[a-zA-Z0-9-]*$/`. The maximum length is `10` items. The minimum length is `0` items.
-* `resource_collection_enabled` - (Optional, Forces new resource, Boolean) The field denoting if the resource collection is enabled.
-* `trusted_profile_id` - (Optional, Forces new resource, String) The trusted profile id that provides Reader access to the App Configuration instance to collect resource metadata.
+* `resource_collection_enabled` - (Required, Boolean) The field denoting if the resource collection is enabled.
+* `trusted_profile_id` - (Required, String) The trusted profile id that provides Reader access to the App Configuration instance to collect resource metadata.
   * Constraints: The maximum length is `44` characters. The minimum length is `44` characters. The value must match regular expression `/^[a-zA-Z0-9-]*$/`.
 
 ## Attribute Reference