Skip to content

Commit f4f9e05

Browse files
tyao117tyao117
authored
SCC Update Jan 2024 (#5032)
* init commit * Updates: - Added ENV_VARS needed to run ACC tests - Added a validator for the resource scc_instance_settings - Allow the ability for the scc_instance_settings to be imported - Completed the functional testing for resource ibm_scc_instance_settings - Added documentation for scc_instance - Added documentation for scc_instance_settings * adding updates to scc_instance docs * Changed the format of the website documentation * Change the details of the NOTE for scc_instance * Modifying scc test runs --------- Co-authored-by: Timothy-Yao <[email protected]>
1 parent 9911f5c commit f4f9e05

13 files changed

+668
-88
lines changed

‎.secrets.baseline‎

Lines changed: 6 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"files": "go.mod|go.sum|.*.map|^.secrets.baseline$",
44
"lines": null
55
},
6-
"generated_at": "2023-12-26T12:35:45Z",
6+
"generated_at": "2024-01-16T23:03:03Z",
77
"plugins_used": [
88
{
99
"name": "AWSKeyDetector"
@@ -760,23 +760,23 @@
760760
"hashed_secret": "731438016c5ab94431f61820f35e3ae5f8ad6004",
761761
"is_secret": false,
762762
"is_verified": false,
763-
"line_number": 428,
763+
"line_number": 436,
764764
"type": "Secret Keyword",
765765
"verified_result": null
766766
},
767767
{
768768
"hashed_secret": "12da2e35d6b50c902c014f1ab9e3032650368df7",
769769
"is_secret": false,
770770
"is_verified": false,
771-
"line_number": 434,
771+
"line_number": 442,
772772
"type": "Secret Keyword",
773773
"verified_result": null
774774
},
775775
{
776776
"hashed_secret": "813274ccae5b6b509379ab56982d862f7b5969b6",
777777
"is_secret": false,
778778
"is_verified": false,
779-
"line_number": 1157,
779+
"line_number": 1165,
780780
"type": "Base64 High Entropy String",
781781
"verified_result": null
782782
}
@@ -864,15 +864,15 @@
864864
"hashed_secret": "c8b6f5ef11b9223ac35a5663975a466ebe7ebba9",
865865
"is_secret": false,
866866
"is_verified": false,
867-
"line_number": 1838,
867+
"line_number": 1840,
868868
"type": "Secret Keyword",
869869
"verified_result": null
870870
},
871871
{
872872
"hashed_secret": "8abf4899c01104241510ba87685ad4de76b0c437",
873873
"is_secret": false,
874874
"is_verified": false,
875-
"line_number": 1844,
875+
"line_number": 1846,
876876
"type": "Secret Keyword",
877877
"verified_result": null
878878
}
@@ -3105,36 +3105,6 @@
31053105
"verified_result": null
31063106
}
31073107
],
3108-
"ibm/service/scc/data_source_ibm_scc_provider_type_instance_test.go": [
3109-
{
3110-
"hashed_secret": "83747cea2b26d7652ed39218ddcdb1461c570535",
3111-
"is_secret": false,
3112-
"is_verified": false,
3113-
"line_number": 79,
3114-
"type": "Hex High Entropy String",
3115-
"verified_result": null
3116-
}
3117-
],
3118-
"ibm/service/scc/data_source_ibm_scc_provider_type_test.go": [
3119-
{
3120-
"hashed_secret": "83747cea2b26d7652ed39218ddcdb1461c570535",
3121-
"is_secret": false,
3122-
"is_verified": false,
3123-
"line_number": 43,
3124-
"type": "Hex High Entropy String",
3125-
"verified_result": null
3126-
}
3127-
],
3128-
"ibm/service/scc/resource_ibm_scc_provider_type_instance_test.go": [
3129-
{
3130-
"hashed_secret": "83747cea2b26d7652ed39218ddcdb1461c570535",
3131-
"is_secret": false,
3132-
"is_verified": false,
3133-
"line_number": 94,
3134-
"type": "Hex High Entropy String",
3135-
"verified_result": null
3136-
}
3137-
],
31383108
"ibm/service/schematics/data_source_ibm_schematics_action.go": [
31393109
{
31403110
"hashed_secret": "49f3bb8f759241df51c899d3725d877bad58f66e",
@@ -3831,24 +3801,6 @@
38313801
"verified_result": null
38323802
}
38333803
],
3834-
"ibm/service/secretsmanager/resource_ibm_sm_service_credentilas_secret.go": [
3835-
{
3836-
"hashed_secret": "3046d9f6cfaaeea6eed9bb7a4ab010fe49b0cfd4",
3837-
"is_secret": false,
3838-
"is_verified": false,
3839-
"line_number": 190,
3840-
"type": "Secret Keyword",
3841-
"verified_result": null
3842-
},
3843-
{
3844-
"hashed_secret": "b732fb611fd46a38e8667f9972e0cde777fbe37f",
3845-
"is_secret": false,
3846-
"is_verified": false,
3847-
"line_number": 443,
3848-
"type": "Secret Keyword",
3849-
"verified_result": null
3850-
}
3851-
],
38523804
"ibm/service/secretsmanager/resource_ibm_sm_username_password_secret.go": [
38533805
{
38543806
"hashed_secret": "3046d9f6cfaaeea6eed9bb7a4ab010fe49b0cfd4",

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ require (
2727
github.com/IBM/platform-services-go-sdk v0.55.0
2828
github.com/IBM/project-go-sdk v0.1.6
2929
github.com/IBM/push-notifications-go-sdk v0.0.0-20210310100607-5790b96c47f5
30-
github.com/IBM/scc-go-sdk/v5 v5.1.3
30+
github.com/IBM/scc-go-sdk/v5 v5.1.4
3131
github.com/IBM/schematics-go-sdk v0.2.3
3232
github.com/IBM/secrets-manager-go-sdk/v2 v2.0.2
3333
github.com/IBM/vpc-beta-go-sdk v0.6.0
@@ -210,7 +210,7 @@ require (
210210
golang.org/x/net v0.19.0 // indirect
211211
golang.org/x/oauth2 v0.7.0 // indirect
212212
golang.org/x/sync v0.5.0 // indirect
213-
golang.org/x/sys v0.15.0 // indirect
213+
golang.org/x/sys v0.16.0 // indirect
214214
golang.org/x/term v0.15.0 // indirect
215215
golang.org/x/text v0.14.0 // indirect
216216
golang.org/x/time v0.3.0 // indirect

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,8 @@ github.com/IBM/push-notifications-go-sdk v0.0.0-20210310100607-5790b96c47f5 h1:N
166166
github.com/IBM/push-notifications-go-sdk v0.0.0-20210310100607-5790b96c47f5/go.mod h1:b07XHUVh0XYnQE9s2mqgjYST1h9buaQNqN4EcKhOsX0=
167167
github.com/IBM/sarama v1.41.2 h1:ZDBZfGPHAD4uuAtSv4U22fRZBgst0eEwGFzLj0fb85c=
168168
github.com/IBM/sarama v1.41.2/go.mod h1:xdpu7sd6OE1uxNdjYTSKUfY8FaKkJES9/+EyjSgiGQk=
169-
github.com/IBM/scc-go-sdk/v5 v5.1.3 h1:8zqJx/HgChTlMaC21HzthIR4HbFkuJ3dR/D68254jRg=
170-
github.com/IBM/scc-go-sdk/v5 v5.1.3/go.mod h1:YtAVlzq10bwR82QX4ZavhDIwa1s85RuVO9N/KmXVcuk=
169+
github.com/IBM/scc-go-sdk/v5 v5.1.4 h1:+HoeUJCyGAJpQv2hBskKdMC1I6K617zbHF5lpbK5VYI=
170+
github.com/IBM/scc-go-sdk/v5 v5.1.4/go.mod h1:YtAVlzq10bwR82QX4ZavhDIwa1s85RuVO9N/KmXVcuk=
171171
github.com/IBM/schematics-go-sdk v0.2.3 h1:lgTt0Sbudii3cuSk1YSQgrtiZAXDbBABAoVj3eQuBrU=
172172
github.com/IBM/schematics-go-sdk v0.2.3/go.mod h1:Tw2OSAPdpC69AxcwoyqcYYaGTTW6YpERF9uNEU+BFRQ=
173173
github.com/IBM/secrets-manager-go-sdk/v2 v2.0.2 h1:+Svh1OmoFxMBnZQSOUtp2UUzrOGFsSQlE5TFL/ptJco=
@@ -1903,8 +1903,8 @@ golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
19031903
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
19041904
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
19051905
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1906-
golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
1907-
golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
1906+
golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
1907+
golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
19081908
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
19091909
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
19101910
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=

‎ibm/acctest/acctest.go‎

Lines changed: 43 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -268,9 +268,13 @@ var Snapshot_month string
268268
// Secuity and Complinace Center
269269
var (
270270
SccApiEndpoint string
271+
SccEventNotificationsCRN string
272+
SccInstanceID string
273+
SccObjectStorageCRN string
274+
SccObjectStorageBucket string
271275
SccProviderTypeAttributes string
276+
SccProviderTypeID string
272277
SccReportID string
273-
SccInstanceID string
274278
)
275279

276280
// ROKS Cluster
@@ -1415,6 +1419,26 @@ func init() {
14151419
fmt.Println("[WARN] Set the environment variable IBMCLOUD_SCC_PROVIDER_TYPE_ATTRIBUTES with a VALID SCC PROVIDER TYPE ATTRIBUTE")
14161420
}
14171421

1422+
SccProviderTypeID = os.Getenv("IBMCLOUD_SCC_PROVIDER_TYPE_ID")
1423+
if SccProviderTypeID == "" {
1424+
fmt.Println("[WARN] Set the environment variable IBMCLOUD_SCC_PROVIDER_TYPE_ID with a VALID SCC PROVIDER TYPE ID")
1425+
}
1426+
1427+
SccEventNotificationsCRN = os.Getenv("IBMCLOUD_SCC_EVENT_NOTIFICATION_CRN")
1428+
if SccEventNotificationsCRN == "" {
1429+
fmt.Println("[WARN] Set the environment variable IBMCLOUD_SCC_EVENT_NOTIFICATION_CRN")
1430+
}
1431+
1432+
SccObjectStorageCRN = os.Getenv("IBMCLOUD_SCC_OBJECT_STORAGE_CRN")
1433+
if SccObjectStorageCRN == "" {
1434+
fmt.Println("[WARN] Set the environment variable IBMCLOUD_SCC_OBJECT_STORAGE_CRN with a valid cloud object storage crn")
1435+
}
1436+
1437+
SccObjectStorageBucket = os.Getenv("IBMCLOUD_SCC_OBJECT_STORAGE_BUCKET")
1438+
if SccObjectStorageBucket == "" {
1439+
fmt.Println("[WARN] Set the environment variable IBMCLOUD_SCC_OBJECT_STORAGE_BUCKET with a valid cloud object storage bucket")
1440+
}
1441+
14181442
HostPoolID = os.Getenv("IBM_CONTAINER_DEDICATEDHOST_POOL_ID")
14191443
if HostPoolID == "" {
14201444
fmt.Println("[INFO] Set the environment variable IBM_CONTAINER_DEDICATEDHOST_POOL_ID for ibm_container_vpc_cluster resource to test dedicated host functionality")
@@ -1834,15 +1858,31 @@ func TestAccPreCheckScc(t *testing.T) {
18341858
}
18351859

18361860
if SccProviderTypeAttributes == "" {
1837-
t.Fatal("IBMCLOUD_SCC_PROVIDER_TYPE_ATTRIBUTES missing. Set the environment variable IBMCLOUD_SCC_PROVIDER_TYPE_ATTRIBUTES with a VALID ATTRIBUTE")
1861+
t.Fatal("IBMCLOUD_SCC_PROVIDER_TYPE_ATTRIBUTES missing. Set the environment variable IBMCLOUD_SCC_PROVIDER_TYPE_ATTRIBUTES with a VALID SCC provider_type JSON object")
1862+
}
1863+
1864+
if SccProviderTypeID == "" {
1865+
t.Fatal("IBMCLOUD_SCC_PROVIDER_TYPE_ID missing. Set the environment variable IBMCLOUD_SCC_PROVIDER_TYPE_ID with a VALID SCC provider_type ID")
18381866
}
18391867

18401868
if SccInstanceID == "" {
18411869
t.Fatal("IBMCLOUD_SCC_INSTANCE_ID missing. Set the environment variable IBMCLOUD_SCC_INSTANCE_ID with a VALID SCC INSTANCE ID")
18421870
}
18431871

18441872
if SccReportID == "" {
1845-
t.Fatal("IBMCLOUD_SCC_REPORT_ID missing. Set the environment variable IBMCLOUD_SCC_REPORT_ID with a VALID REPORT_ID")
1873+
t.Fatal("IBMCLOUD_SCC_REPORT_ID missing. Set the environment variable IBMCLOUD_SCC_REPORT_ID with a VALID SCC REPORT_ID")
1874+
}
1875+
1876+
if SccEventNotificationsCRN == "" {
1877+
t.Fatal("IBMCLOUD_SCC_EVENT_NOTIFICATION_CRN missing. Set the environment variable IBMCLOUD_SCC_EVENT_NOTIFICATION_CRN with a valid EN CRN")
1878+
}
1879+
1880+
if SccObjectStorageCRN == "" {
1881+
t.Fatal("IBMCLOUD_SCC_OBJECT_STORAGE_CRN missing. Set the environment variable IBMCLOUD_SCC_OBJECT_STORAGE_CRN with a valid COS CRN")
1882+
}
1883+
1884+
if SccObjectStorageBucket == "" {
1885+
t.Fatal("IBMCLOUD_SCC_OBJECT_STORAGE_CRN missing. Set the environment variable IBMCLOUD_SCC_OBJECT_STORAGE_BUCKET with a valid COS bucket")
18461886
}
18471887
}
18481888

‎ibm/provider/provider.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1307,6 +1307,7 @@ func Provider() *schema.Provider {
13071307
"ibm_scc_template_attachment": scc.ResourceIBMSccTemplateAttachment(),
13081308

13091309
// Security and Compliance Center
1310+
"ibm_scc_instance_settings": scc.ResourceIbmSccInstanceSettings(),
13101311
"ibm_scc_rule": scc.ResourceIbmSccRule(),
13111312
"ibm_scc_control_library": scc.ResourceIbmSccControlLibrary(),
13121313
"ibm_scc_profile": scc.ResourceIbmSccProfile(),
@@ -1578,6 +1579,7 @@ func Validator() validate.ValidatorDict {
15781579
"ibm_satellite_host": satellite.ResourceIBMSatelliteHostValidator(),
15791580

15801581
// Added for SCC
1582+
"ibm_scc_instance_settings": scc.ResourceIbmSccInstanceSettingsValidator(),
15811583
"ibm_scc_rule": scc.ResourceIbmSccRuleValidator(),
15821584
"ibm_scc_control_library": scc.ResourceIbmSccControlLibraryValidator(),
15831585
"ibm_scc_profile": scc.ResourceIbmSccProfileValidator(),

‎ibm/service/scc/data_source_ibm_scc_provider_type.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
)
1818

1919
func DataSourceIbmSccProviderType() *schema.Resource {
20-
return &schema.Resource{
20+
return AddSchemaData(&schema.Resource{
2121
ReadContext: dataSourceIbmSccProviderTypeRead,
2222

2323
Schema: map[string]*schema.Schema{
@@ -109,7 +109,7 @@ func DataSourceIbmSccProviderType() *schema.Resource {
109109
Description: "Time at which resource was updated.",
110110
},
111111
},
112-
}
112+
})
113113
}
114114

115115
func dataSourceIbmSccProviderTypeRead(context context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
@@ -120,6 +120,7 @@ func dataSourceIbmSccProviderTypeRead(context context.Context, d *schema.Resourc
120120

121121
getProviderTypeByIdOptions := &securityandcompliancecenterapiv3.GetProviderTypeByIdOptions{}
122122

123+
getProviderTypeByIdOptions.SetInstanceID(d.Get("instance_id").(string))
123124
getProviderTypeByIdOptions.SetProviderTypeID(d.Get("provider_type_id").(string))
124125

125126
providerTypeItem, response, err := securityAndComplianceCenterApIsClient.GetProviderTypeByIDWithContext(context, getProviderTypeByIdOptions)

‎ibm/service/scc/data_source_ibm_scc_provider_type_instance_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ func TestAccIbmSccProviderTypeInstanceDataSourceBasic(t *testing.T) {
2020
Providers: acc.TestAccProviders,
2121
Steps: []resource.TestStep{
2222
{
23-
Config: testAccCheckIbmSccProviderTypeInstanceDataSourceConfigBasic(acc.SccInstanceID, providerTypeInstanceName, acc.SccProviderTypeAttributes),
23+
Config: testAccCheckIbmSccProviderTypeInstanceDataSourceConfigBasic(acc.SccInstanceID, providerTypeInstanceName, acc.SccProviderTypeAttributes, acc.SccProviderTypeID),
2424
Check: resource.ComposeTestCheckFunc(
2525
resource.TestCheckResourceAttrSet("data.ibm_scc_provider_type_instance.scc_provider_type_instance_tf", "id"),
2626
resource.TestCheckResourceAttrSet("data.ibm_scc_provider_type_instance.scc_provider_type_instance_tf", "provider_type_id"),
@@ -39,7 +39,7 @@ func TestAccIbmSccProviderTypeInstanceDataSourceAllArgs(t *testing.T) {
3939
Providers: acc.TestAccProviders,
4040
Steps: []resource.TestStep{
4141
{
42-
Config: testAccCheckIbmSccProviderTypeInstanceDataSourceConfig(acc.SccInstanceID, providerTypeInstanceName, acc.SccProviderTypeAttributes),
42+
Config: testAccCheckIbmSccProviderTypeInstanceDataSourceConfig(acc.SccInstanceID, providerTypeInstanceName, acc.SccProviderTypeAttributes, acc.SccProviderTypeID),
4343
Check: resource.ComposeTestCheckFunc(
4444
resource.TestCheckResourceAttrSet("data.ibm_scc_provider_type_instance.scc_provider_type_instance_tf", "id"),
4545
resource.TestCheckResourceAttrSet("data.ibm_scc_provider_type_instance.scc_provider_type_instance_tf", "provider_type_id"),
@@ -55,11 +55,11 @@ func TestAccIbmSccProviderTypeInstanceDataSourceAllArgs(t *testing.T) {
5555
})
5656
}
5757

58-
func testAccCheckIbmSccProviderTypeInstanceDataSourceConfigBasic(instanceID string, providerTypeInstanceName string, providerTypeInstanceAttributes string) string {
58+
func testAccCheckIbmSccProviderTypeInstanceDataSourceConfigBasic(instanceID, providerTypeInstanceName, providerTypeInstanceAttributes, providerTypeInstanceID string) string {
5959
return fmt.Sprintf(`
6060
resource "ibm_scc_provider_type_instance" "scc_provider_type_instance" {
6161
instance_id = "%s"
62-
provider_type_id = "afa2476ecfa5f09af248492fe991b4d1"
62+
provider_type_id = "%s"
6363
name = "%s"
6464
attributes = %s
6565
}
@@ -69,14 +69,14 @@ func testAccCheckIbmSccProviderTypeInstanceDataSourceConfigBasic(instanceID stri
6969
provider_type_id = ibm_scc_provider_type_instance.scc_provider_type_instance.provider_type_id
7070
provider_type_instance_id = ibm_scc_provider_type_instance.scc_provider_type_instance.provider_type_instance_id
7171
}
72-
`, instanceID, providerTypeInstanceName, providerTypeInstanceAttributes)
72+
`, instanceID, providerTypeInstanceID, providerTypeInstanceName, providerTypeInstanceAttributes)
7373
}
7474

75-
func testAccCheckIbmSccProviderTypeInstanceDataSourceConfig(instanceID string, providerTypeInstanceName string, providerTypeInstanceAttributes string) string {
75+
func testAccCheckIbmSccProviderTypeInstanceDataSourceConfig(instanceID, providerTypeInstanceName, providerTypeInstanceAttributes, providerTypeInstanceID string) string {
7676
return fmt.Sprintf(`
7777
resource "ibm_scc_provider_type_instance" "scc_provider_type_instance" {
7878
instance_id = "%s"
79-
provider_type_id = "afa2476ecfa5f09af248492fe991b4d1"
79+
provider_type_id = "%s"
8080
name = "%s"
8181
attributes = %s
8282
}
@@ -86,5 +86,5 @@ func testAccCheckIbmSccProviderTypeInstanceDataSourceConfig(instanceID string, p
8686
provider_type_id = ibm_scc_provider_type_instance.scc_provider_type_instance.provider_type_id
8787
provider_type_instance_id = ibm_scc_provider_type_instance.scc_provider_type_instance.provider_type_instance_id
8888
}
89-
`, instanceID, providerTypeInstanceName, providerTypeInstanceAttributes)
89+
`, instanceID, providerTypeInstanceID, providerTypeInstanceName, providerTypeInstanceAttributes)
9090
}

‎ibm/service/scc/data_source_ibm_scc_provider_type_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ func TestAccIbmSccProviderTypeDataSourceBasic(t *testing.T) {
1818
Providers: acc.TestAccProviders,
1919
Steps: []resource.TestStep{
2020
resource.TestStep{
21-
Config: testAccCheckIbmSccProviderTypeDataSourceConfigBasic(),
21+
Config: testAccCheckIbmSccProviderTypeDataSourceConfigBasic(acc.SccInstanceID, acc.SccProviderTypeID),
2222
Check: resource.ComposeTestCheckFunc(
2323
resource.TestCheckResourceAttrSet("data.ibm_scc_provider_type.scc_provider_type_instance", "id"),
2424
resource.TestCheckResourceAttrSet("data.ibm_scc_provider_type.scc_provider_type_instance", "provider_type_id"),
@@ -30,17 +30,17 @@ func TestAccIbmSccProviderTypeDataSourceBasic(t *testing.T) {
3030
resource.TestCheckResourceAttrSet("data.ibm_scc_provider_type.scc_provider_type_instance", "mode"),
3131
resource.TestCheckResourceAttrSet("data.ibm_scc_provider_type.scc_provider_type_instance", "data_type"),
3232
resource.TestCheckResourceAttrSet("data.ibm_scc_provider_type.scc_provider_type_instance", "icon"),
33-
resource.TestCheckResourceAttrSet("data.ibm_scc_provider_type.scc_provider_type_instance", "attributes.%"),
3433
),
3534
},
3635
},
3736
})
3837
}
3938

40-
func testAccCheckIbmSccProviderTypeDataSourceConfigBasic() string {
39+
func testAccCheckIbmSccProviderTypeDataSourceConfigBasic(instanceID, providerTypeID string) string {
4140
return fmt.Sprintf(`
4241
data "ibm_scc_provider_type" "scc_provider_type_instance" {
43-
provider_type_id = "afa2476ecfa5f09af248492fe991b4d1"
42+
instance_id = "%s"
43+
provider_type_id = "%s"
4444
}
45-
`)
45+
`, instanceID, providerTypeID)
4646
}

0 commit comments

Comments
 (0)