Skip to content
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

Jump to bottom

Scc v1 removal #4689

Merged
merged 4 commits into from
Jul 18, 2023
Merged

Scc v1 removal #4689

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5ea17c7
initial commit
Jul 4, 2023
477c584
removing v1 refereneces
Jul 4, 2023
6b57556
review comments updated
Jul 18, 2023
39c021d
Merge branch 'IBM-Cloud:master' into scc-v1-removal
jayvyas2 Jul 18, 2023
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
40 changes: 0 additions & 40 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -915,12 +915,6 @@ Features
- **Resources**
- ibm_pi_shared_processor_pool
- ibm_pi_spp_placement_group
* Support Security and Compilance
jayvyas2 marked this conversation as resolved.
Show resolved Hide resolved
- **DataSources**
- ibm_scc_posture_profile_import
- ibm_scc_posture_scan_initiate_validation
- **Resources**
- ibm_scc_posture_scan_initiate_validation
* Support App Configuration
- **DataSources**
- ibm_app_config_collection
Expand Down Expand Up @@ -973,12 +967,6 @@ Features
- **Resources**
- ibm_pi_shared_processor_pool
- ibm_pi_shared_processor_pool
* Support Security and Compilance
- **DataSources**
- ibm_scc_posture_profile_import
- ibm_scc_posture_scan_initiate_validation
- **Resources**
- ibm_scc_posture_scan_initiate_validation
* Support App Configuration
- **DataSources**
- ibm_app_config_collection
Expand Down Expand Up @@ -1135,13 +1123,6 @@ Features
- **DataSources**
- ibm_database_task
- ibm_database_tasks
* Support Security and Compilance
- **DataSources**
- ibm_scc_posture_credential
- ibm_scc_posture_collector
- ibm_scc_posture_scope
- ibm_scc_posture_credentials
- ibm_scc_posture_collectors
* Support Virtual Private Cloud
- **DataSources**
- ibm_is_backup_policy
Expand Down Expand Up @@ -1199,13 +1180,6 @@ Features
- **DataSources**
- ibm_database_task
- ibm_database_tasks
* Support Security and Compilance
- **DataSources**
- ibm_scc_posture_credential
- ibm_scc_posture_collector
- ibm_scc_posture_scope
- ibm_scc_posture_credentials
- ibm_scc_posture_collectors
* Support Virtual Private Cloud
- **DataSources**
- ibm_is_backup_policy
Expand Down Expand Up @@ -2061,15 +2035,6 @@ Features
- ibm_pi_image_export
- ibm_pi_placement_group
- ibm_pi_capture
* Support Security and Compliance Center
- **DataSources**
- ibm_scc_posture_profile
- ibm_scc_posture_group_profile
- ibm_scc_posture_scope_correlation
- **Resources**
- ibm_scc_posture_collector
- ibm_scc_posture_scope
- ibm_scc_posture_credential
* Support IAM Authorization Policies
- **Datasources**
- ibm_iam_authorization_policies
Expand Down Expand Up @@ -2423,11 +2388,6 @@ FEATURES:
- ibm_scc_si_note
- ibm_scc_si_notes
- ibm_scc_si_providers
- ibm_scc_posture_scopes
- ibm_scc_posture_latest_scans
- ibm_scc_posture_profiles
- ibm_scc_posture_scan_summary
-ibm_scc_posture_scan_summaries

* Support Event Streams Schema
- **Resources**
Expand Down
51 changes: 0 additions & 51 deletions examples/ibm-scc/posture-management/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,54 +1,3 @@
provider "ibm" {
ibmcloud_api_key = var.ibmcloud_api_key
}

// Create list_scopes data source
data "ibm_scc_posture_scopes" "list_scopes_instance" {
scope_id = var.list_scopes_scope_id
}

// Create list_profiles data source
data "ibm_scc_posture_profiles" "list_profiles_instance" {
profile_id = var.list_profiles_profile_id
}

// Create list_credentials data source
data "ibm_scc_posture_credentials" "list_credentials_instance" {
}

// Create list_collectors data source
data "ibm_scc_posture_collectors" "list_collectors_instance" {
}

// Create list_latest_scans data source
data "ibm_scc_posture_latest_scans" "list_latest_scans_instance" {
scan_id = var.list_latest_scans_scan_id
}

// Create scans_summary data source
data "ibm_scc_posture_scan_summary" "scans_summary_instance" {
scan_id = var.scans_summary_scan_id
profile_id = var.scans_summary_profile_id
}

// Create scan_summaries data source
data "ibm_scc_posture_scan_summaries" "scan_summaries_instance" {
profile_id = var.scan_summaries_profile_id
scope_id = var.scan_summaries_scope_id
scan_id = var.scan_summaries_scan_id
}

// Create scope data source
data "ibm_scc_posture_scope" "scope_instance" {
scope_id = var.scope_id
}

// Create collector data source
data "ibm_scc_posture_collector" "collector_instance" {
collector_id = var.collector_id
}

// Create credential data source
data "ibm_scc_posture_credential" "credential_instance" {
credential_id = var.credential_id
}
85 changes: 0 additions & 85 deletions ibm/acctest/acctest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,22 +206,6 @@ var Scc_resource_group_id string
// Security and Compliance Center, SI
var Scc_si_account string

// Security and Compliance Center, Posture Management
var Scc_posture_scope_id string
var Scc_posture_scan_id string
var Scc_posture_profile_id string
var Scc_posture_group_profile_id string
var Scc_posture_correlation_id string
var Scc_posture_report_setting_id string
var Scc_posture_profile_id_scansummary string
var Scc_posture_scan_id_scansummary string
var Scc_posture_credential_id_scope string
var Scc_posture_credential_id_scope_update string
var Scc_posture_collector_id_scope []string
var Scc_posture_collector_id_scope_update []string
var Scc_posture_collector_id string
var Scc_posture_credential_id string

// ROKS Cluster
var ClusterName string

Expand Down Expand Up @@ -1178,75 +1162,6 @@ func init() {
fmt.Println("[INFO] Set the environment variable SCC_SI_ACCOUNT for testing SCC SI resources resource else tests will fail if this is not set correctly")
}

Scc_posture_scope_id = os.Getenv("SCC_POSTURE_SCOPE_ID")
if Scc_posture_scope_id == "" {
fmt.Println("[INFO] Set the environment variable SCC_POSTURE_SCOPE_ID for testing SCC Posture resources or datasource resource else tests will fail if this is not set correctly")
}

Scc_posture_scan_id = os.Getenv("SCC_POSTURE_SCAN_ID")
if Scc_posture_scan_id == "" {
fmt.Println("[INFO] Set the environment variable SCC_POSTURE_SCAN_ID for testing SCC Posture resource or datasource else tests will fail if this is not set correctly")
}

Scc_posture_profile_id = os.Getenv("SCC_POSTURE_PROFILE_ID")
if Scc_posture_profile_id == "" {
fmt.Println("[INFO] Set the environment variable SCC_POSTURE_PROFILE_ID for testing SCC Posture resource or datasource else tests will fail if this is not set correctly")
}
Scc_posture_group_profile_id = os.Getenv("SCC_POSTURE_GROUP_PROFILE_ID")
if Scc_posture_group_profile_id == "" {
fmt.Println("[INFO] Set the environment variable SCC_POSTURE_GROUP_PROFILE_ID for testing SCC Posture resource or datasource else tests will fail if this is not set correctly")
}

Scc_posture_correlation_id = os.Getenv("SCC_POSTURE_CORRELATION_ID")
if Scc_posture_correlation_id == "" {
fmt.Println("[INFO] Set the environment variable SCC_POSTURE_CORRELATION_ID for testing SCC Posture resource or datasource else tests will fail if this is not set correctly")
}

Scc_posture_report_setting_id = os.Getenv("SCC_POSTURE_REPORT_SETTING_ID")
if Scc_posture_report_setting_id == "" {
fmt.Println("[INFO] Set the environment variable SCC_POSTURE_REPORT_SETTING_ID for testing SCC Posture resource or datasource else tests will fail if this is not set correctly")
}

Scc_posture_profile_id_scansummary = os.Getenv("SCC_POSTURE_PROFILE_ID_SCANSUMMARY")
if Scc_posture_profile_id_scansummary == "" {
fmt.Println("[INFO] Set the environment variable SCC_POSTURE_PROFILE_ID_SCANSUMMARY for testing SCC Posture resource or datasource else tests will fail if this is not set correctly")
}

Scc_posture_scan_id_scansummary = os.Getenv("SCC_POSTURE_SCAN_ID_SCANSUMMARY")
if Scc_posture_scan_id_scansummary == "" {
fmt.Println("[INFO] Set the environment variable SCC_POSTURE_SCAN_ID_SCANSUMMARY for testing SCC Posture resource or datasource else tests will fail if this is not set correctly")
}

Scc_posture_credential_id_scope = os.Getenv("SCC_POSTURE_CREDENTIAL_ID_SCOPE")
if Scc_posture_credential_id_scope == "" {
fmt.Println("[INFO] Set the environment variable SCC_POSTURE_CREDENTIAL_ID_SCOPE for testing SCC Posture resource or datasource else tests will fail if this is not set correctly")
}

Scc_posture_credential_id_scope_update = os.Getenv("SCC_POSTURE_CREDENTIAL_ID_SCOPE_UPDATE")
if Scc_posture_credential_id_scope_update == "" {
fmt.Println("[INFO] Set the environment variable SCC_POSTURE_CREDENTIAL_ID_SCOPE_UPDATE for testing SCC Posture resource or datasource else tests will fail if this is not set correctly")
}

Scc_posture_collector_id_scope = []string{os.Getenv("SCC_POSTURE_COLLECTOR_ID_SCOPE")}
if os.Getenv("SCC_POSTURE_COLLECTOR_ID_SCOPE") == "" {
fmt.Println("[INFO] Set the environment variable SCC_POSTURE_COLLECTOR_ID_SCOPE for testing SCC Posture resource or datasource else tests will fail if this is not set correctly")
}

Scc_posture_collector_id_scope_update = []string{os.Getenv("SCC_POSTURE_COLLECTOR_ID_SCOPE_UPDATE")}
if os.Getenv("SCC_POSTURE_COLLECTOR_ID_SCOPE_UPDATE") == "" {
fmt.Println("[INFO] Set the environment variable SCC_POSTURE_COLLECTOR_ID_SCOPE_UPDATE for testing SCC Posture resource or datasource else tests will fail if this is not set correctly")
}

Scc_posture_collector_id = os.Getenv("SCC_POSTURE_COLLECTOR_ID")
if Scc_posture_collector_id == "" {
fmt.Println("[INFO] Set the environment variable SCC_POSTURE_COLLECTOR_ID for testing SCC Posture resources or datasource resource else tests will fail if this is not set correctly")
}

Scc_posture_credential_id = os.Getenv("SCC_POSTURE_CREDENTIAL_ID")
if Scc_posture_credential_id == "" {
fmt.Println("[INFO] Set the environment variable SCC_POSTURE_CREDENTIAL_ID for testing SCC Posture resources or datasource resource else tests will fail if this is not set correctly")
}

CloudShellAccountID = os.Getenv("IBM_CLOUD_SHELL_ACCOUNT_ID")
if CloudShellAccountID == "" {
fmt.Println("[INFO] Set the environment variable IBM_CLOUD_SHELL_ACCOUNT_ID for ibm-cloud-shell resource or datasource else tests will fail if this is not set correctly")
Expand Down
Loading
Loading