Skip to content

Commit

Permalink
BREAKING CHANGE: deprecating SI (SCC) (#3755)
Browse files Browse the repository at this point in the history
* BREAKING CHANGE: deprecating SI (SCC)

* deprecation docs added

Co-authored-by: Gaurav Goswami <[email protected]>
  • Loading branch information
gary1998 and Gaurav Goswami authored Aug 10, 2022
1 parent 832e1c8 commit 9b27de8
Show file tree
Hide file tree
Showing 26 changed files with 21 additions and 6,783 deletions.
46 changes: 0 additions & 46 deletions ibm/conns/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ import (
resourcecontroller "github.com/IBM/platform-services-go-sdk/resourcecontrollerv2"
resourcemanager "github.com/IBM/platform-services-go-sdk/resourcemanagerv2"
"github.com/IBM/push-notifications-go-sdk/pushservicev1"
"github.com/IBM/scc-go-sdk/findingsv1"
"github.com/IBM/scc-go-sdk/v3/adminserviceapiv1"
"github.com/IBM/scc-go-sdk/v3/configurationgovernancev1"
"github.com/IBM/scc-go-sdk/v3/posturemanagementv2"
Expand Down Expand Up @@ -286,7 +285,6 @@ type ClientSession interface {
AtrackerV1() (*atrackerv1.AtrackerV1, error)
AtrackerV2() (*atrackerv2.AtrackerV2, error)
ESschemaRegistrySession() (*schemaregistryv1.SchemaregistryV1, error)
FindingsV1() (*findingsv1.FindingsV1, error)
AdminServiceApiV1() (*adminserviceapiv1.AdminServiceApiV1, error)
ConfigurationGovernanceV1() (*configurationgovernancev1.ConfigurationGovernanceV1, error)
PostureManagementV1() (*posturemanagementv1.PostureManagementV1, error)
Expand Down Expand Up @@ -580,10 +578,6 @@ type clientSession struct {
esSchemaRegistryClient *schemaregistryv1.SchemaregistryV1
esSchemaRegistryErr error

// Security and Compliance Center (SCC)
findingsClient *findingsv1.FindingsV1
findingsClientErr error

// Security and Compliance Center (SCC) Admin
adminServiceApiClient *adminserviceapiv1.AdminServiceApiV1
adminServiceApiClientErr error
Expand Down Expand Up @@ -1123,14 +1117,6 @@ func (session clientSession) ESschemaRegistrySession() (*schemaregistryv1.Schema
return session.esSchemaRegistryClient, session.esSchemaRegistryErr
}

// Security and Compliance center Findings API
func (session clientSession) FindingsV1() (*findingsv1.FindingsV1, error) {
if session.findingsClientErr != nil {
return session.findingsClient, session.findingsClientErr
}
return session.findingsClient.Clone(), nil
}

//Security and Compliance center Admin API
func (session clientSession) AdminServiceApiV1() (*adminserviceapiv1.AdminServiceApiV1, error) {
return session.adminServiceApiClient, session.adminServiceApiClientErr
Expand Down Expand Up @@ -1646,38 +1632,6 @@ func (c *Config) ClientSession() (interface{}, error) {
session.atrackerClientV2Err = fmt.Errorf("Error occurred while configuring Activity Tracker API Version 2 service: %q", err)
}

// SCC FINDINGS Service
var findingsClientURL string
if c.Visibility == "public" || c.Visibility == "public-and-private" {
findingsClientURL, err = findingsv1.GetServiceURLForRegion(c.Region)
if err != nil {
session.findingsClientErr = fmt.Errorf("[ERROR] Error occurred while configuring Security Insights Findings API service: `%s` region not supported", c.Region)
}
} else {
session.findingsClientErr = fmt.Errorf("[ERROR] Error occurred while configuring Security Insights Findings API service: `%v` visibility not supported", c.Visibility)
}
if fileMap != nil && c.Visibility != "public-and-private" {
findingsClientURL = fileFallBack(fileMap, c.Visibility, "IBMCLOUD_SCC_FINDINGS_API_ENDPOINT", c.Region, findingsClientURL)
}
findingsClientOptions := &findingsv1.FindingsV1Options{
Authenticator: authenticator,
URL: EnvFallBack([]string{"IBMCLOUD_SCC_FINDINGS_API_ENDPOINT"}, findingsClientURL),
AccountID: core.StringPtr(userConfig.UserAccount),
}
// Construct the service client.
session.findingsClient, err = findingsv1.NewFindingsV1(findingsClientOptions)
if err != nil {
session.findingsClientErr = fmt.Errorf("[ERROR] Error occurred while configuring Security Insights Findings API service: %q", err)
}
if session.findingsClient != nil && session.findingsClient.Service != nil {
// Enable retries for API calls
session.findingsClient.Service.EnableRetries(c.RetryCount, c.RetryDelay)
// Add custom header for analytics
session.findingsClient.SetDefaultHeaders(gohttp.Header{
"X-Original-User-Agent": {fmt.Sprintf("terraform-provider-ibm/%s", version.Version)},
})
}

// SCC ADMIN Service
var adminServiceApiClientURL string
if c.Visibility == "private" || c.Visibility == "public-and-private" {
Expand Down
11 changes: 0 additions & 11 deletions ibm/provider/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -625,15 +625,10 @@ func Provider() *schema.Provider {
"ibm_atracker_endpoints": atracker.DataSourceIBMAtrackerEndpoints(),

//Security and Compliance Center
"ibm_scc_si_providers": scc.DataSourceIBMSccSiProviders(),
"ibm_scc_si_note": scc.DataSourceIBMSccSiNote(),
"ibm_scc_si_notes": scc.DataSourceIBMSccSiNotes(),
"ibm_scc_account_location": scc.DataSourceIBMSccAccountLocation(),
"ibm_scc_account_locations": scc.DataSourceIBMSccAccountLocations(),
"ibm_scc_account_location_settings": scc.DataSourceIBMSccAccountLocationSettings(),
"ibm_scc_account_notification_settings": scc.DataSourceIBMSccNotificationSettings(),
"ibm_scc_si_occurrence": scc.DataSourceIBMSccSiOccurrence(),
"ibm_scc_si_occurrences": scc.DataSourceIBMSccSiOccurrences(),

// Compliance Posture Management
"ibm_scc_posture_scopes": scc.DataSourceIBMSccPostureScopes(),
Expand Down Expand Up @@ -1048,9 +1043,7 @@ func Provider() *schema.Provider {
"ibm_atracker_settings": atracker.ResourceIBMAtrackerSettings(),

// //Security and Compliance Center
"ibm_scc_si_note": scc.ResourceIBMSccSiNote(),
"ibm_scc_account_settings": scc.ResourceIBMSccAccountSettings(),
"ibm_scc_si_occurrence": scc.ResourceIBMSccSiOccurrence(),
"ibm_scc_rule": scc.ResourceIBMSccRule(),
"ibm_scc_rule_attachment": scc.ResourceIBMSccRuleAttachment(),
"ibm_scc_template": scc.ResourceIBMSccTemplate(),
Expand Down Expand Up @@ -1252,9 +1245,7 @@ func Validator() validate.ValidatorDict {
"ibm_atracker_route": atracker.ResourceIBMAtrackerRouteValidator(),
"ibm_atracker_settings": atracker.ResourceIBMAtrackerSettingsValidator(),
"ibm_satellite_endpoint": satellite.ResourceIBMSatelliteEndpointValidator(),
"ibm_scc_si_note": scc.ResourceIBMSccSiNoteValidator(),
"ibm_scc_account_settings": scc.ResourceIBMSccAccountSettingsValidator(),
"ibm_scc_si_occurrence": scc.ResourceIBMSccSiOccurrenceValidator(),
"ibm_scc_posture_collector": scc.ResourceIBMSccPostureCollectorsValidator(),
"ibm_scc_posture_scope": scc.ResourceIBMSccPostureScopesValidator(),
"ibm_scc_posture_credential": scc.ResourceIBMSccPostureCredentialsValidator(),
Expand Down Expand Up @@ -1311,8 +1302,6 @@ func Validator() validate.ValidatorDict {

"ibm_is_vpc": vpc.DataSourceIBMISVpcValidator(),
"ibm_is_volume": vpc.DataSourceIBMISVolumeValidator(),
"ibm_scc_si_notes": scc.DataSourceIBMSccSiNotesValidator(),
"ibm_scc_si_occurrences": scc.DataSourceIBMSccSiOccurrencesValidator(),
"ibm_secrets_manager_secret": secretsmanager.DataSourceIBMSecretsManagerSecretValidator(),
"ibm_secrets_manager_secrets": secretsmanager.DataSourceIBMSecretsManagerSecretsValidator(),
},
Expand Down
Loading

0 comments on commit 9b27de8

Please sign in to comment.