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

fix(bm-profiles): resolved nil pointer on resource type #5354

Merged
merged 2 commits into from
May 16, 2024
Merged

fix(bm-profiles): resolved nil pointer on resource type #5354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b0494d
fix(bm-profiles): resolved nil pointer on resource type
uibm May 15, 2024
50db844
fix(bm-profiles): resolved nil pointer on resource type
uibm May 16, 2024
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
2 changes: 1 addition & 1 deletion ibm/service/vpc/data_source_ibm_is_bare_metal_server_profile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@ func dataSourceIBMISBMSProfileRead(context context.Context, d *schema.ResourceDa
memList = append(memList, m)
d.Set(isBareMetalServerProfileMemory, memList)
}
d.Set(isBareMetalServerProfileRT, *bmsProfile.ResourceType)
d.Set(isBareMetalServerProfileRT, bmsProfile.ResourceType)
if bmsProfile.SupportedTrustedPlatformModuleModes != nil {
list := make([]map[string]interface{}, 0)
var stpmmlist []string
Expand Down
41 changes: 41 additions & 0 deletions ibm/service/vpc/data_source_ibm_is_bare_metal_server_profile_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,40 @@ func TestAccIBMISBMSProfileDataSource_basic(t *testing.T) {
},
})
}
func TestAccIBMISBMSProfileDataSource_EmptyResourceType(t *testing.T) {
resName := "data.ibm_is_bare_metal_server_profile.test1"

resource.Test(t, resource.TestCase{
PreCheck: func() { acc.TestAccPreCheck(t) },
Providers: acc.TestAccProviders,
Steps: []resource.TestStep{
resource.TestStep{
Config: testAccCheckIBMISBMSProfileDataSourceResourceTypeConfig(),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttrSet(resName, "name"),
resource.TestCheckResourceAttrSet(resName, "bandwidth.#"),
resource.TestCheckResourceAttrSet(resName, "console_types.#"),
resource.TestCheckResourceAttrSet(resName, "console_types.0.type"),
resource.TestCheckResourceAttrSet(resName, "console_types.0.values.#"),
resource.TestCheckResourceAttrSet(resName, "cpu_architecture.#"),
resource.TestCheckResourceAttrSet(resName, "cpu_core_count.#"),
resource.TestCheckResourceAttrSet(resName, "cpu_socket_count.#"),
resource.TestCheckResourceAttrSet(resName, "disks.#"),
resource.TestCheckResourceAttrSet(resName, "family"),
resource.TestCheckResourceAttrSet(resName, "href"),
resource.TestCheckResourceAttrSet(resName, "id"),
resource.TestCheckResourceAttrSet(resName, "memory.#"),
resource.TestCheckResourceAttrSet(resName, "network_interface_count.#"),
resource.TestCheckResourceAttrSet(resName, "network_interface_count.0.max"),
resource.TestCheckResourceAttrSet(resName, "network_interface_count.0.min"),
resource.TestCheckResourceAttrSet(resName, "network_interface_count.0.type"),
resource.TestCheckResourceAttrSet(resName, "os_architecture.#"),
resource.TestCheckResourceAttrSet(resName, "supported_trusted_platform_module_modes.#"),
),
},
},
})
}
func TestAccIBMISBMSProfileDataSource_vni(t *testing.T) {
resName := "data.ibm_is_bare_metal_server_profile.test1"

Expand Down Expand Up @@ -102,3 +136,10 @@ func testAccCheckIBMISBMSProfileDataSourceConfig() string {
name = data.ibm_is_bare_metal_server_profiles.testbmsps.profiles.0.name
}`)
}
func testAccCheckIBMISBMSProfileDataSourceResourceTypeConfig() string {
// status filter defaults to empty
return fmt.Sprintf(`
data "ibm_is_bare_metal_server_profile" "test1" {
name = "cx2d-metal-96x192"
}`)
}
2 changes: 1 addition & 1 deletion ibm/service/vpc/data_source_ibm_is_bare_metal_server_profiles.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,7 +551,7 @@ func dataSourceIBMIsBareMetalServerProfilesRead(context context.Context, d *sche
memList = append(memList, m)
l[isBareMetalServerProfileMemory] = memList
}
l[isBareMetalServerProfileRT] = *profile.ResourceType
l[isBareMetalServerProfileRT] = profile.ResourceType
if profile.SupportedTrustedPlatformModuleModes != nil {
list := make([]map[string]interface{}, 0)
var stpmmlist []string
Expand Down
34 changes: 34 additions & 0 deletions ibm/service/vpc/data_source_ibm_is_bare_metal_server_profiles_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,40 @@ func TestAccIBMISBMSProfilesDataSource_basic(t *testing.T) {
},
})
}
func TestAccIBMISBMSProfilesDataSource_ResourceTypeNull(t *testing.T) {
resName := "data.ibm_is_bare_metal_server_profiles.test1"

resource.Test(t, resource.TestCase{
PreCheck: func() { acc.TestAccPreCheck(t) },
Providers: acc.TestAccProviders,
Steps: []resource.TestStep{
{
Config: testAccCheckIBMISBMSProfilesDataSourceConfig(),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttrSet(resName, "profiles.0.name"),
resource.TestCheckResourceAttrSet(resName, "profiles.0.id"),
resource.TestCheckResourceAttrSet(resName, "profiles.0.family"),
resource.TestCheckResourceAttrSet(resName, "profiles.0.bandwidth.#"),
resource.TestCheckResourceAttrSet(resName, "profiles.0.console_types.#"),
resource.TestCheckResourceAttrSet(resName, "profiles.0.console_types.0.type"),
resource.TestCheckResourceAttrSet(resName, "profiles.0.console_types.0.values.#"),
resource.TestCheckResourceAttrSet(resName, "profiles.0.cpu_architecture.#"),
resource.TestCheckResourceAttrSet(resName, "profiles.0.cpu_core_count.#"),
resource.TestCheckResourceAttrSet(resName, "profiles.0.cpu_socket_count.#"),
resource.TestCheckResourceAttrSet(resName, "profiles.0.disks.#"),
resource.TestCheckResourceAttrSet(resName, "profiles.0.href"),
resource.TestCheckResourceAttrSet(resName, "profiles.0.memory.#"),
resource.TestCheckResourceAttrSet(resName, "profiles.0.network_interface_count.#"),
resource.TestCheckResourceAttrSet(resName, "profiles.0.network_interface_count.0.max"),
resource.TestCheckResourceAttrSet(resName, "profiles.0.network_interface_count.0.min"),
resource.TestCheckResourceAttrSet(resName, "profiles.0.network_interface_count.0.type"),
resource.TestCheckResourceAttrSet(resName, "profiles.0.os_architecture.#"),
resource.TestCheckResourceAttrSet(resName, "profiles.0.supported_trusted_platform_module_modes.#"),
),
},
},
})
}
func TestAccIBMISBMSProfilesDataSource_vni(t *testing.T) {
resName := "data.ibm_is_bare_metal_server_profiles.test1"

Expand Down
Loading