Skip to content

Helios reporting apis support #6309

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

Open
IBM-Deeksha wants to merge 15 commits into
base: master
Choose a base branch
from
+5,918 −43
Open

Helios reporting apis support #6309

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
b1b1f92
add getcomponents data source
Jun 26, 2025
c4ef897
add helios sre client and get cluster cluster info
Jun 27, 2025
35096d6
add reporting support
Jul 2, 2025
d1bada1
update code
Jul 11, 2025
c281714
remove reporting api support
IBM-Deeksha Oct 27, 2025
914c4ad
update code
IBM-Deeksha Oct 31, 2025
ab89e83
update docs
IBM-Deeksha Oct 31, 2025
c291fd6
add resources
IBM-Deeksha Nov 3, 2025
d4df85c
update
IBM-Deeksha Sep 4, 2025
d837710
update BRS sdk
IBM-Deeksha Oct 7, 2025
3f66775
Merge branch 'master' into helios-reporting-apis-support
IBM-Deeksha Nov 3, 2025
6e8500a
update code
IBM-Deeksha Nov 4, 2025
f0d20ff
address comments
IBM-Deeksha Nov 20, 2025
70745f3
update code
IBM-Deeksha Dec 7, 2025
808da51
Merge branch 'master' into helios-reporting-apis-support
IBM-Deeksha Dec 7, 2025
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
33 changes: 33 additions & 0 deletions ibm/conns/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,7 @@
ResourceControllerAPIV2() (controllerv2.ResourceControllerAPIV2, error)
BackupRecoveryV1() (*backuprecoveryv1.BackupRecoveryV1, error)
BackupRecoveryV1Connector() (*backuprecoveryv1.BackupRecoveryV1Connector, error)
BackupRecoveryManagerV1() (*backuprecoveryv1.BackupRecoveryManagementSreApiV1, error)

Check failure on line 259 in ibm/conns/config.go

View workflow job for this annotation

GitHub Actions / Build 

undefined: backuprecoveryv1.BackupRecoveryManagementSreApiV1
IBMCloudLogsRoutingV0() (*ibmcloudlogsroutingv0.IBMCloudLogsRoutingV0, error)
SoftLayerSession() *slsession.Session
IBMPISession() (*ibmpisession.IBMPISession, error)
Expand Down Expand Up @@ -594,6 +595,9 @@
backupRecoveryConnectorClient *backuprecoveryv1.BackupRecoveryV1Connector
backupRecoveryConnectorClientErr error

backupRecoveryManagerClient *backuprecoveryv1.BackupRecoveryManagementSreApiV1

Check failure on line 598 in ibm/conns/config.go

View workflow job for this annotation

GitHub Actions / Build 

undefined: backuprecoveryv1.BackupRecoveryManagementSreApiV1
backupRecoveryManagerClientErr error

secretsManagerClient *secretsmanagerv2.SecretsManagerV2
secretsManagerClientErr error

Expand Down Expand Up @@ -1199,6 +1203,10 @@
return session.backupRecoveryConnectorClient, session.backupRecoveryConnectorClientErr
}

func (session clientSession) BackupRecoveryManagerV1() (*backuprecoveryv1.BackupRecoveryManagementSreApiV1, error) {

Check failure on line 1206 in ibm/conns/config.go

View workflow job for this annotation

GitHub Actions / Build 

undefined: backuprecoveryv1.BackupRecoveryManagementSreApiV1
return session.backupRecoveryManagerClient, session.backupRecoveryManagerClientErr
}

// IBM Cloud Secrets Manager V2 Basic API
func (session clientSession) SecretsManagerV2() (*secretsmanagerv2.SecretsManagerV2, error) {
return session.secretsManagerClient, session.secretsManagerClientErr
Expand Down Expand Up @@ -1397,6 +1405,8 @@
session.resourceControllerErr = errEmptyBluemixCredentials
session.backupRecoveryClientErr = errEmptyBluemixCredentials
session.backupRecoveryConnectorClientErr = errEmptyBluemixCredentials
session.backupRecoveryManagerClientErr = errEmptyBluemixCredentials
session.backupRecoveryManagerClientErr = errEmptyBluemixCredentials
session.catalogManagementClientErr = errEmptyBluemixCredentials
session.partnerCenterSellClientErr = errEmptyBluemixCredentials
session.ibmpiConfigErr = errEmptyBluemixCredentials
Expand Down Expand Up @@ -1651,10 +1661,12 @@
// Construct the service options.
var backupRecoveryURL string = "https://default.backup-recovery.cloud.ibm.com/v2"
var backupRecoveryConnectorURL string
var backupRecoveryManagerURL string = "https://manager.backup-recovery.cloud.ibm.com/v2"

if fileMap != nil && c.Visibility != "public-and-private" {
backupRecoveryURL = fileFallBack(fileMap, c.Visibility, "IBMCLOUD_BACKUP_RECOVERY_ENDPOINT", c.Region, backupRecoveryURL)
backupRecoveryConnectorURL = fileFallBack(fileMap, c.Visibility, "IBMCLOUD_BACKUP_RECOVERY_CONNECTOR_ENDPOINT", c.Region, backupRecoveryConnectorURL)
backupRecoveryManagerURL = fileFallBack(fileMap, c.Visibility, "IBMCLOUD_BACKUP_RECOVERY_MANAGER_ENDPOINT", c.Region, backupRecoveryConnectorURL)
}

backupRecoveryClientOptions := &backuprecoveryv1.BackupRecoveryV1Options{
Expand Down Expand Up @@ -1699,6 +1711,27 @@
})
}

var backupRecoveryManagerClientAuthenticator core.Authenticator
backupRecoveryManagerClientAuthenticator = &core.NoAuthAuthenticator{}

backupRecoveryManagerClientOptions := &backuprecoveryv1.BackupRecoveryManagementSreApiV1Options{

Check failure on line 1717 in ibm/conns/config.go

View workflow job for this annotation

GitHub Actions / Build 

undefined: backuprecoveryv1.BackupRecoveryManagementSreApiV1Options
Authenticator: backupRecoveryManagerClientAuthenticator,
URL: EnvFallBack([]string{"IBMCLOUD_BACKUP_RECOVERY_MANAGER_ENDPOINT"}, backupRecoveryManagerURL),
}
// Construct the service client.
session.backupRecoveryManagerClient, err = backuprecoveryv1.NewBackupRecoveryManagementSreApiV1(backupRecoveryManagerClientOptions)

Check failure on line 1722 in ibm/conns/config.go

View workflow job for this annotation

GitHub Actions / Build 

undefined: backuprecoveryv1.NewBackupRecoveryManagementSreApiV1
if err != nil {
session.backupRecoveryManagerClientErr = fmt.Errorf("Error occurred while configuring IBM Backup recovery API service: %q", err)
}
if session.backupRecoveryManagerClient != nil && session.backupRecoveryManagerClient.Service != nil {
// Enable retries for API calls
session.backupRecoveryManagerClient.Service.EnableRetries(c.RetryCount, c.RetryDelay)
// Add custom header for analytics
session.backupRecoveryManagerClient.SetDefaultHeaders(gohttp.Header{
"X-Original-User-Agent": {fmt.Sprintf("terraform-provider-ibm/%s", version.Version)},
})
}

projectEndpoint := project.DefaultServiceURL
// Construct an "options" struct for creating the service client.
if fileMap != nil && c.Visibility != "public-and-private" {
Expand Down
63 changes: 38 additions & 25 deletions ibm/provider/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,31 +266,41 @@ func Provider() *schema.Provider {
"ibm_config_aggregator_resource_collection_status": configurationaggregator.AddConfigurationAggregatorInstanceFields(configurationaggregator.DataSourceIbmConfigAggregatorResourceCollectionStatus()),

// // BackupAndRecovery
"ibm_backup_recovery_agent_upgrade_tasks": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryAgentUpgradeTasks()),
"ibm_backup_recovery_download_agent": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryDownloadAgent()),
"ibm_backup_recovery_search_indexed_object": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoverySearchIndexedObject()),
"ibm_backup_recovery_object_snapshots": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryObjectSnapshots()),
"ibm_backup_recovery_connectors_metadata": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryConnectorsMetadata()),
"ibm_backup_recovery_connector_logs": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryConnectorLogs()),
"ibm_backup_recovery_connector_status": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryConnectorStatus()),
"ibm_backup_recovery_data_source_connections": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryDataSourceConnections()),
"ibm_backup_recovery_data_source_connectors": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryDataSourceConnectors()),
"ibm_backup_recovery_search_objects": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoverySearchObjects()),
"ibm_backup_recovery_search_protected_objects": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoverySearchProtectedObjects()),
"ibm_backup_recovery_protection_group": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryProtectionGroup()),
"ibm_backup_recovery_protection_groups": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryProtectionGroups()),
"ibm_backup_recovery_protection_group_runs": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryProtectionGroupRuns()),
"ibm_backup_recovery_protection_policies": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryProtectionPolicies()),
"ibm_backup_recovery_protection_policy": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryProtectionPolicy()),
"ibm_backup_recovery": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecovery()),
"ibm_backup_recoveries": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveries()),
"ibm_backup_recovery_download_files": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryDownloadFiles()),
"ibm_backup_recovery_source_registrations": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoverySourceRegistrations()),
"ibm_backup_recovery_source_registration": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoverySourceRegistration()),
"ibm_backup_recovery_download_indexed_files": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryDownloadIndexedFiles()),
"ibm_backup_recovery_protection_sources": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryProtectionSources()),
"ibm_backup_recovery_connector_get_users": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryConnectorGetUsers()),
"ibm_backup_recovery_registration_info": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryRegistrationInfo()),
"ibm_backup_recovery_agent_upgrade_tasks": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryAgentUpgradeTasks()),
"ibm_backup_recovery_download_agent": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryDownloadAgent()),
"ibm_backup_recovery_search_indexed_object": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoverySearchIndexedObject()),
"ibm_backup_recovery_object_snapshots": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryObjectSnapshots()),
"ibm_backup_recovery_connectors_metadata": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryConnectorsMetadata()),
"ibm_backup_recovery_connector_logs": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryConnectorLogs()),
"ibm_backup_recovery_connector_status": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryConnectorStatus()),
"ibm_backup_recovery_data_source_connections": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryDataSourceConnections()),
"ibm_backup_recovery_data_source_connectors": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryDataSourceConnectors()),
"ibm_backup_recovery_search_objects": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoverySearchObjects()),
"ibm_backup_recovery_search_protected_objects": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoverySearchProtectedObjects()),
"ibm_backup_recovery_protection_group": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryProtectionGroup()),
"ibm_backup_recovery_protection_groups": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryProtectionGroups()),
"ibm_backup_recovery_protection_group_runs": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryProtectionGroupRuns()),
"ibm_backup_recovery_protection_policies": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryProtectionPolicies()),
"ibm_backup_recovery_protection_policy": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryProtectionPolicy()),
"ibm_backup_recovery": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecovery()),
"ibm_backup_recoveries": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveries()),
"ibm_backup_recovery_download_files": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryDownloadFiles()),
"ibm_backup_recovery_source_registrations": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoverySourceRegistrations()),
"ibm_backup_recovery_source_registration": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoverySourceRegistration()),
"ibm_backup_recovery_download_indexed_files": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryDownloadIndexedFiles()),
"ibm_backup_recovery_protection_sources": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryProtectionSources()),
"ibm_backup_recovery_connector_get_users": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryConnectorGetUsers()),
"ibm_backup_recovery_registration_info": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryRegistrationInfo()),
"ibm_backup_recovery_manager_get_management_alerts": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryManagerGetManagementAlerts()),
"ibm_backup_recovery_manager_get_alerts_stats": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryManagerGetAlertsStats()),
"ibm_backup_recovery_manager_get_alerts_resolution": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryManagerGetAlertsResolution()),
"ibm_backup_recovery_manager_get_alerts_summary": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryManagerGetAlertsSummary()),
"ibm_backup_recovery_manager_get_management_alerts_summary": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryManagerGetManagementAlertsSummary()),
"ibm_backup_recovery_manager_get_alerts": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryManagerGetAlerts()),
"ibm_backup_recovery_manager_get_upgrades_info": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryManagerGetUpgradesInfo()),
"ibm_backup_recovery_manager_get_compatible_clusters": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryManagerGetCompatibleClusters()),
"ibm_backup_recovery_manager_get_cluster_info": backuprecovery.AddInstanceFields(backuprecovery.DataSourceIbmBackupRecoveryManagerGetClusterInfo()),

// // AppID
"ibm_appid_action_url": appid.DataSourceIBMAppIDActionURL(),
"ibm_appid_apm": appid.DataSourceIBMAppIDAPM(),
Expand Down Expand Up @@ -1142,6 +1152,9 @@ func Provider() *schema.Provider {
"ibm_backup_recovery_connector_registration": backuprecovery.AddInstanceFields(backuprecovery.ResourceIbmBackupRecoveryConnectorRegistration()),
"ibm_backup_recovery_connector_access_token": backuprecovery.AddInstanceFields(backuprecovery.ResourceIbmBackupRecoveryConnectorAccessToken()),
"ibm_backup_recovery_connector_update_user": backuprecovery.AddInstanceFields(backuprecovery.ResourceIbmBackupRecoveryConnectorUpdateUser()),
"ibm_backup_recovery_manager_create_cluster_upgrades": backuprecovery.AddInstanceFields(backuprecovery.ResourceIbmBackupRecoveryManagerCreateClusterUpgrades()),
"ibm_backup_recovery_manager_update_cluster_upgrades": backuprecovery.AddInstanceFields(backuprecovery.ResourceIbmBackupRecoveryManagerUpdateClusterUpgrades()),
"ibm_backup_recovery_manager_cancel_cluster_upgrades": backuprecovery.AddInstanceFields(backuprecovery.ResourceIbmBackupRecoveryManagerCancelClusterUpgrades()),

"ibm_app": cloudfoundry.ResourceIBMApp(),
"ibm_app_domain_private": cloudfoundry.ResourceIBMAppDomainPrivate(),
Expand Down
Loading
Loading