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.

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

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
62 changes: 62 additions & 0 deletions ibm/conns/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,8 @@
ResourceControllerAPIV2() (controllerv2.ResourceControllerAPIV2, error)
BackupRecoveryV1() (*backuprecoveryv1.BackupRecoveryV1, error)
BackupRecoveryV1Connector() (*backuprecoveryv1.BackupRecoveryV1Connector, error)
BackupRecoveryManagerV1() (*backuprecoveryv1.HeliosReportingServiceApIsV1, error)

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

View workflow job for this annotation

GitHub Actions / Build

undefined: backuprecoveryv1.HeliosReportingServiceApIsV1
BackupRecoveryManagerSreV1() (*backuprecoveryv1.HeliosSreApiV2, error)

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

View workflow job for this annotation

GitHub Actions / Build

undefined: backuprecoveryv1.HeliosSreApiV2
IBMCloudLogsRoutingV0() (*ibmcloudlogsroutingv0.IBMCloudLogsRoutingV0, error)
SoftLayerSession() *slsession.Session
IBMPISession() (*ibmpisession.IBMPISession, error)
Expand Down Expand Up @@ -579,6 +581,12 @@
backupRecoveryConnectorClient *backuprecoveryv1.BackupRecoveryV1Connector
backupRecoveryConnectorClientErr error

backupRecoveryManagerClient *backuprecoveryv1.HeliosReportingServiceApIsV1

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

View workflow job for this annotation

GitHub Actions / Build

undefined: backuprecoveryv1.HeliosReportingServiceApIsV1
backupRecoveryManagerClientErr error

backupRecoveryManagerSreClient *backuprecoveryv1.HeliosSreApiV2

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

View workflow job for this annotation

GitHub Actions / Build

undefined: backuprecoveryv1.HeliosSreApiV2
backupRecoveryManagerSreClientErr error

secretsManagerClient *secretsmanagerv2.SecretsManagerV2
secretsManagerClientErr error

Expand Down Expand Up @@ -1176,6 +1184,14 @@
return session.backupRecoveryConnectorClient, session.backupRecoveryConnectorClientErr
}

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

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

View workflow job for this annotation

GitHub Actions / Build

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

func (session clientSession) BackupRecoveryManagerSreV1() (*backuprecoveryv1.HeliosSreApiV2, error) {

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

View workflow job for this annotation

GitHub Actions / Build

undefined: backuprecoveryv1.HeliosSreApiV2
return session.backupRecoveryManagerSreClient, session.backupRecoveryManagerSreClientErr
}

// IBM Cloud Secrets Manager V2 Basic API
func (session clientSession) SecretsManagerV2() (*secretsmanagerv2.SecretsManagerV2, error) {
return session.secretsManagerClient, session.secretsManagerClientErr
Expand Down Expand Up @@ -1374,6 +1390,8 @@
session.resourceControllerErr = errEmptyBluemixCredentials
session.backupRecoveryClientErr = errEmptyBluemixCredentials
session.backupRecoveryConnectorClientErr = errEmptyBluemixCredentials
session.backupRecoveryManagerClientErr = errEmptyBluemixCredentials
session.backupRecoveryManagerSreClientErr = errEmptyBluemixCredentials
session.catalogManagementClientErr = errEmptyBluemixCredentials
session.partnerCenterSellClientErr = errEmptyBluemixCredentials
session.ibmpiConfigErr = errEmptyBluemixCredentials
Expand Down Expand Up @@ -1640,6 +1658,8 @@
// Construct the service options.
var backupRecoveryURL string
var backupRecoveryConnectorURL string
var backupRecoveryManagerURL string
var backupRecoveryManagerSreURL string

if fileMap != nil && c.Visibility != "public-and-private" {
backupRecoveryURL = fileFallBack(fileMap, c.Visibility, "IBMCLOUD_BACKUP_RECOVERY_ENDPOINT", c.Region, backupRecoveryURL)
Expand Down Expand Up @@ -1689,6 +1709,48 @@
})
}

backupRecoveryManagerClientOptions := &backuprecoveryv1.HeliosReportingServiceApIsV1Options{

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

View workflow job for this annotation

GitHub Actions / Build

undefined: backuprecoveryv1.HeliosReportingServiceApIsV1Options
Authenticator: authenticator,
URL: EnvFallBack([]string{"IBMCLOUD_BACKUP_RECOVERY_MANAGER_ENDPOINT"}, backupRecoveryManagerURL),
}
if backupRecoveryManagerClientOptions.URL == "" {
session.backupRecoveryManagerClientErr = fmt.Errorf("IBMCLOUD_BACKUP_RECOVERY_MANAGER_ENDPOINT not set in env or endpoints file")
}
// Construct the service client.
session.backupRecoveryManagerClient, err = backuprecoveryv1.NewHeliosReportingServiceApIsV1(backupRecoveryManagerClientOptions)

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

View workflow job for this annotation

GitHub Actions / Build

undefined: backuprecoveryv1.NewHeliosReportingServiceApIsV1
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)},
})
}

backupRecoveryManagerSreClientOptions := &backuprecoveryv1.HeliosSreApiV2Options{

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

View workflow job for this annotation

GitHub Actions / Build

undefined: backuprecoveryv1.HeliosSreApiV2Options
Authenticator: authenticator,
URL: EnvFallBack([]string{"IBMCLOUD_BACKUP_RECOVERY_MANAGER_SRE_ENDPOINT"}, backupRecoveryManagerSreURL),
}
if backupRecoveryManagerSreClientOptions.URL == "" {
session.backupRecoveryManagerSreClientErr = fmt.Errorf("IBMCLOUD_BACKUP_RECOVERY_MANAGER_SRE_ENDPOINT not set in env or endpoints file")
}
// Construct the service client.
session.backupRecoveryManagerSreClient, err = backuprecoveryv1.NewHeliosSreApiV2(backupRecoveryManagerSreClientOptions)

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

View workflow job for this annotation

GitHub Actions / Build

undefined: backuprecoveryv1.NewHeliosSreApiV2
if err != nil {
session.backupRecoveryManagerSreClientErr = fmt.Errorf("Error occurred while configuring IBM Backup recovery API service: %q", err)
}
if session.backupRecoveryManagerSreClient != nil && session.backupRecoveryManagerSreClient.Service != nil {
// Enable retries for API calls
session.backupRecoveryManagerSreClient.Service.EnableRetries(c.RetryCount, c.RetryDelay)
// Add custom header for analytics
session.backupRecoveryManagerSreClient.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
57 changes: 33 additions & 24 deletions ibm/provider/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -250,30 +250,39 @@ func Provider() *schema.Provider {
"ibm_config_aggregator_resource_collection_status": configurationaggregator.AddConfigurationAggregatorInstanceFields(configurationaggregator.DataSourceIbmConfigAggregatorResourceCollectionStatus()),

// // BackupAndRecovery
"ibm_backup_recovery_agent_upgrade_tasks": backuprecovery.DataSourceIbmBackupRecoveryAgentUpgradeTasks(),
"ibm_backup_recovery_download_agent": backuprecovery.DataSourceIbmBackupRecoveryDownloadAgent(),
"ibm_backup_recovery_search_indexed_object": backuprecovery.DataSourceIbmBackupRecoverySearchIndexedObject(),
"ibm_backup_recovery_object_snapshots": backuprecovery.DataSourceIbmBackupRecoveryObjectSnapshots(),
"ibm_backup_recovery_connectors_metadata": backuprecovery.DataSourceIbmBackupRecoveryConnectorsMetadata(),
"ibm_backup_recovery_connector_logs": backuprecovery.DataSourceIbmBackupRecoveryConnectorLogs(),
"ibm_backup_recovery_connector_status": backuprecovery.DataSourceIbmBackupRecoveryConnectorStatus(),
"ibm_backup_recovery_data_source_connections": backuprecovery.DataSourceIbmBackupRecoveryDataSourceConnections(),
"ibm_backup_recovery_data_source_connectors": backuprecovery.DataSourceIbmBackupRecoveryDataSourceConnectors(),
"ibm_backup_recovery_search_objects": backuprecovery.DataSourceIbmBackupRecoverySearchObjects(),
"ibm_backup_recovery_search_protected_objects": backuprecovery.DataSourceIbmBackupRecoverySearchProtectedObjects(),
"ibm_backup_recovery_protection_group": backuprecovery.DataSourceIbmBackupRecoveryProtectionGroup(),
"ibm_backup_recovery_protection_groups": backuprecovery.DataSourceIbmBackupRecoveryProtectionGroups(),
"ibm_backup_recovery_protection_group_runs": backuprecovery.DataSourceIbmBackupRecoveryProtectionGroupRuns(),
"ibm_backup_recovery_protection_policies": backuprecovery.DataSourceIbmBackupRecoveryProtectionPolicies(),
"ibm_backup_recovery_protection_policy": backuprecovery.DataSourceIbmBackupRecoveryProtectionPolicy(),
"ibm_backup_recovery": backuprecovery.DataSourceIbmBackupRecovery(),
"ibm_backup_recoveries": backuprecovery.DataSourceIbmBackupRecoveries(),
"ibm_backup_recovery_download_files": backuprecovery.DataSourceIbmBackupRecoveryDownloadFiles(),
"ibm_backup_recovery_source_registrations": backuprecovery.DataSourceIbmBackupRecoverySourceRegistrations(),
"ibm_backup_recovery_source_registration": backuprecovery.DataSourceIbmBackupRecoverySourceRegistration(),
"ibm_backup_recovery_download_indexed_files": backuprecovery.DataSourceIbmBackupRecoveryDownloadIndexedFiles(),
"ibm_backup_recovery_protection_sources": backuprecovery.DataSourceIbmBackupRecoveryProtectionSources(),
"ibm_backup_recovery_connector_get_users": backuprecovery.DataSourceIbmBackupRecoveryConnectorGetUsers(),
"ibm_backup_recovery_agent_upgrade_tasks": backuprecovery.DataSourceIbmBackupRecoveryAgentUpgradeTasks(),
"ibm_backup_recovery_download_agent": backuprecovery.DataSourceIbmBackupRecoveryDownloadAgent(),
"ibm_backup_recovery_search_indexed_object": backuprecovery.DataSourceIbmBackupRecoverySearchIndexedObject(),
"ibm_backup_recovery_object_snapshots": backuprecovery.DataSourceIbmBackupRecoveryObjectSnapshots(),
"ibm_backup_recovery_connectors_metadata": backuprecovery.DataSourceIbmBackupRecoveryConnectorsMetadata(),
"ibm_backup_recovery_connector_logs": backuprecovery.DataSourceIbmBackupRecoveryConnectorLogs(),
"ibm_backup_recovery_connector_status": backuprecovery.DataSourceIbmBackupRecoveryConnectorStatus(),
"ibm_backup_recovery_data_source_connections": backuprecovery.DataSourceIbmBackupRecoveryDataSourceConnections(),
"ibm_backup_recovery_data_source_connectors": backuprecovery.DataSourceIbmBackupRecoveryDataSourceConnectors(),
"ibm_backup_recovery_search_objects": backuprecovery.DataSourceIbmBackupRecoverySearchObjects(),
"ibm_backup_recovery_search_protected_objects": backuprecovery.DataSourceIbmBackupRecoverySearchProtectedObjects(),
"ibm_backup_recovery_protection_group": backuprecovery.DataSourceIbmBackupRecoveryProtectionGroup(),
"ibm_backup_recovery_protection_groups": backuprecovery.DataSourceIbmBackupRecoveryProtectionGroups(),
"ibm_backup_recovery_protection_group_runs": backuprecovery.DataSourceIbmBackupRecoveryProtectionGroupRuns(),
"ibm_backup_recovery_protection_policies": backuprecovery.DataSourceIbmBackupRecoveryProtectionPolicies(),
"ibm_backup_recovery_protection_policy": backuprecovery.DataSourceIbmBackupRecoveryProtectionPolicy(),
"ibm_backup_recovery": backuprecovery.DataSourceIbmBackupRecovery(),
"ibm_backup_recoveries": backuprecovery.DataSourceIbmBackupRecoveries(),
"ibm_backup_recovery_download_files": backuprecovery.DataSourceIbmBackupRecoveryDownloadFiles(),
"ibm_backup_recovery_source_registrations": backuprecovery.DataSourceIbmBackupRecoverySourceRegistrations(),
"ibm_backup_recovery_source_registration": backuprecovery.DataSourceIbmBackupRecoverySourceRegistration(),
"ibm_backup_recovery_download_indexed_files": backuprecovery.DataSourceIbmBackupRecoveryDownloadIndexedFiles(),
"ibm_backup_recovery_protection_sources": backuprecovery.DataSourceIbmBackupRecoveryProtectionSources(),
"ibm_backup_recovery_connector_get_users": backuprecovery.DataSourceIbmBackupRecoveryConnectorGetUsers(),
"ibm_backup_recovery_manager_get_component": backuprecovery.DataSourceIbmBackupRecoveryManagerGetComponent(),
"ibm_backup_recovery_manager_get_components": backuprecovery.DataSourceIbmBackupRecoveryManagerGetComponents(),
"ibm_backup_recovery_manager_export_report": backuprecovery.DataSourceIbmBackupRecoveryManagerExportReport(),
"ibm_backup_recovery_manager_get_report": backuprecovery.DataSourceIbmBackupRecoveryManagerGetReport(),
"ibm_backup_recovery_manager_get_report_preview": backuprecovery.DataSourceIbmBackupRecoveryManagerGetReportPreview(),
"ibm_backup_recovery_manager_get_report_type": backuprecovery.DataSourceIbmBackupRecoveryManagerGetReportType(),
"ibm_backup_recovery_manager_get_reports": backuprecovery.DataSourceIbmBackupRecoveryManagerGetReports(),
"ibm_backup_recovery_manager_get_resources": backuprecovery.DataSourceIbmBackupRecoveryManagerGetResources(),
"ibm_backup_recovery_manager_sre_get_cluster_info": backuprecovery.DataSourceIbmBackupRecoveryManagerSreGetClusterInfo(),

// // AppID
"ibm_appid_action_url": appid.DataSourceIBMAppIDActionURL(),
Expand Down
Loading
Loading