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

feat: adding the fields region and instance_id in the service scc #4823

Merged
merged 12 commits into from
Sep 28, 2023
Merged

feat: adding the fields region and instance_id in the service scc #4823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
646a7eb
adding the utility file for generic use
tyao117 Sep 26, 2023
1f1524e
adding the usage of instanceID to control library, profile, profile a…
tyao117 Sep 26, 2023
3a26e04
updated all testing
tyao117 Sep 27, 2023
7c12616
Adding the ability to change the URL from provider field, and updated…
tyao117 Sep 27, 2023
75c7b7f
updated the docs with the usage of instance_id
tyao117 Sep 27, 2023
3d2e19f
added instance_id to the examples
tyao117 Sep 27, 2023
ab3721f
Using the new version of scc-go-sdk
tyao117 Sep 27, 2023
e29c2fe
Formatting the docs and added the warn in acctest
tyao117 Sep 27, 2023
303c258
modifying the PreCheck for Tests
tyao117 Sep 27, 2023
f9540d3
adding the additional line for accPreCheck
tyao117 Sep 27, 2023
6431b2f
Took out os from the testing packages.
tyao117 Sep 27, 2023
eaf5fc2
Upgrading scc-go-sdk to 5.1.2 and updated functions
tyao117 Sep 27, 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
1 change: 1 addition & 0 deletions examples/ibm-scc/control_library/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
resource "ibm_scc_control_library" "scc_demo_control_library" {
instance_id = "00000000-1111-2222-3333-444444444444"
control_library_name = var.scc_control_library_name
control_library_description = var.scc_control_library_description
control_library_type = "custom"
Expand Down
1 change: 1 addition & 0 deletions examples/ibm-scc/integration/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
resource "ibm_scc_provider_type_instance" "scc_provider_type_instance_instance" {
instance_id = "00000000-1111-2222-3333-444444444444"
provider_type_id = var.scc_provider_type_id
name = var.scc_provider_type_instance_instance
attributes = var.scc_provider_type_instance_attributes
Expand Down
2 changes: 2 additions & 0 deletions examples/ibm-scc/profile/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ data "ibm_scc_control_library" "scc_control_library" {
}

resource "ibm_scc_profile" "scc_demo_profile" {
instance_id = "00000000-1111-2222-3333-444444444444"
profile_type = "custom"
profile_description = var.ibm_scc_profile_description
profile_name = var.ibm_scc_profile_name
Expand All @@ -15,6 +16,7 @@ resource "ibm_scc_profile" "scc_demo_profile" {
}

resource "ibm_scc_profile_attachment" "scc_demo_profile_attachment" {
instance_id = "00000000-1111-2222-3333-444444444444"
profile_id = resource.ibm_scc_profile.scc_demo_profile.id
name = var.ibm_scc_profile_attachment_name
description = var.ibm_scc_profile_attachment_description
Expand Down
8 changes: 8 additions & 0 deletions examples/ibm-scc/report/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,40 @@
data "ibm_scc_latest_reports" "scc_latest_reports_instance" {
instance_id = "00000000-1111-2222-3333-444444444444"
sort = "profile_name"
}

data "ibm_scc_report_rule" "scc_report_rule_instance" {
instance_id = "00000000-1111-2222-3333-444444444444"
report_id = var.scc_report_id
rule_id = var.scc_rule_id
}

data "ibm_scc_report_tags" "scc_report_tags_instance" {
instance_id = "00000000-1111-2222-3333-444444444444"
report_id = var.scc_report_id
}

data "ibm_scc_report_evaluations" "scc_report_evaluations_instance" {
instance_id = "00000000-1111-2222-3333-444444444444"
report_id = var.scc_report_id
}

data "ibm_scc_report_controls" "scc_report_controls_instance" {
instance_id = "00000000-1111-2222-3333-444444444444"
report_id = var.scc_report_id
}

data "ibm_scc_report_summary" "scc_report_summary_instance" {
instance_id = "00000000-1111-2222-3333-444444444444"
report_id = var.scc_report_id
}

data "ibm_scc_report_violation_drift" "scc_report_violation_drift_instance" {
instance_id = "00000000-1111-2222-3333-444444444444"
report_id = var.scc_report_id
}

data "ibm_scc_report" "scc_report_instance" {
instance_id = "00000000-1111-2222-3333-444444444444"
report_id = var.scc_report_id
}
1 change: 1 addition & 0 deletions examples/ibm-scc/rule/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// Provision scc_rule resource instance
resource "ibm_scc_rule" "scc_rule_tf_demo" {
instance_id = "00000000-1111-2222-3333-444444444444"
description = var.scc_description
target {
service_name = "cloud-object-storage"
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ require (
github.com/IBM/platform-services-go-sdk v0.48.1
github.com/IBM/project-go-sdk v0.0.10
github.com/IBM/push-notifications-go-sdk v0.0.0-20210310100607-5790b96c47f5
github.com/IBM/scc-go-sdk/v5 v5.0.2
github.com/IBM/scc-go-sdk/v5 v5.1.2
github.com/IBM/schematics-go-sdk v0.2.1
github.com/IBM/secrets-manager-go-sdk/v2 v2.0.0
github.com/IBM/vpc-beta-go-sdk v0.6.0
Expand Down
6 changes: 2 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,6 @@ github.com/IBM/code-engine-go-sdk v0.0.0-20230606173928-4863db061918 h1:RfHezAVs
github.com/IBM/code-engine-go-sdk v0.0.0-20230606173928-4863db061918/go.mod h1:IP6U/1NxgxzPeYdyiEwMaZyzelTw82JGHWl7bY78eQM=
github.com/IBM/container-registry-go-sdk v1.1.0 h1:sYyknIod8R4RJZQqAheiduP6wbSTphE9Ag8ho28yXjc=
github.com/IBM/container-registry-go-sdk v1.1.0/go.mod h1:4TwsCnQtVfZ4Vkapy/KPvQBKFc3VOyUZYkwRU4FTPrs=
github.com/IBM/continuous-delivery-go-sdk v1.1.2 h1:UHwwak2RVTSZGtIV+SjH0vALqSvA+Vwkd1PHAbGgGrc=
github.com/IBM/continuous-delivery-go-sdk v1.1.2/go.mod h1:A9rI1HPbccBBFgwJxXB999yXXpj1l+MnlE+rsxKtxw0=
github.com/IBM/continuous-delivery-go-sdk v1.2.0 h1:FcgB5EvVrZLUnyR4S/mBocHHo9gJ5IQkSlCa6nqmr2A=
github.com/IBM/continuous-delivery-go-sdk v1.2.0/go.mod h1:oW51tS5/MDCcEM7lUvjK1H9GFC/oKsRbyYfmvGyMGmw=
github.com/IBM/event-notifications-go-admin-sdk v0.2.4 h1:WWUxwrKQxvExEK+xaAQOs6gP54LvJDPi3KatDTMfwh0=
Expand Down Expand Up @@ -164,8 +162,8 @@ github.com/IBM/project-go-sdk v0.0.10 h1:vHSuemwZ4S4c6BEb22tzsEcPTs/5LnZ0yKpP3GG
github.com/IBM/project-go-sdk v0.0.10/go.mod h1:lqe0M4cKvABI1iHR1b+KfasVcxQL6nl2VJ8eOyQs8Ig=
github.com/IBM/push-notifications-go-sdk v0.0.0-20210310100607-5790b96c47f5 h1:NPUhkoOCRuv3OFWt19PmwjXGGTKlvmbuPg9fUrBUNe4=
github.com/IBM/push-notifications-go-sdk v0.0.0-20210310100607-5790b96c47f5/go.mod h1:b07XHUVh0XYnQE9s2mqgjYST1h9buaQNqN4EcKhOsX0=
github.com/IBM/scc-go-sdk/v5 v5.0.2 h1:OUqkzLfJqozp2aqylNurwaJd1SmY8o7KturFse6R2xM=
github.com/IBM/scc-go-sdk/v5 v5.0.2/go.mod h1:YtAVlzq10bwR82QX4ZavhDIwa1s85RuVO9N/KmXVcuk=
github.com/IBM/scc-go-sdk/v5 v5.1.2 h1:9axGtNlP3bHhoE9yJgCuc+g5/VdyhYqfhZ5oS3ovCFI=
github.com/IBM/scc-go-sdk/v5 v5.1.2/go.mod h1:YtAVlzq10bwR82QX4ZavhDIwa1s85RuVO9N/KmXVcuk=
github.com/IBM/schematics-go-sdk v0.2.1 h1:byATysGD+Z1k/wdtNqQmKALcAPjgSLuSyzcabh1jRAw=
github.com/IBM/schematics-go-sdk v0.2.1/go.mod h1:Tw2OSAPdpC69AxcwoyqcYYaGTTW6YpERF9uNEU+BFRQ=
github.com/IBM/secrets-manager-go-sdk/v2 v2.0.0 h1:Lx4Bvim/MfoHEYR+n312bty5DirAJypBGGS9YZo3zCw=
Expand Down
Loading