chore: bump inventory/v2 (#224)

Author: togashidm

go.mod

@@ -18,7 +18,7 @@ require (
 	github.com/onsi/ginkgo/v2 v2.27.2
 	github.com/onsi/gomega v1.38.2
 	github.com/open-edge-platform/cluster-api-provider-intel v1.2.6
-	github.com/open-edge-platform/infra-core/inventory/v2 v2.31.1
+	github.com/open-edge-platform/infra-core/inventory/v2 v2.33.0
 	github.com/open-edge-platform/orch-library/go v0.6.1
 	github.com/open-edge-platform/orch-utils/tenancy-datamodel v1.2.2
 	github.com/rancher/cluster-api-provider-rke2 v0.21.0

go.sum

@@ -400,8 +400,8 @@ github.com/onsi/gomega v1.38.2 h1:eZCjf2xjZAqe+LeWvKb5weQ+NcPwX84kqJ0cZNxok2A=
 github.com/onsi/gomega v1.38.2/go.mod h1:W2MJcYxRGV63b418Ai34Ud0hEdTVXq9NW9+Sx6uXf3k=
 github.com/open-edge-platform/cluster-api-provider-intel v1.2.6 h1:7PGTWe81hp+j6hppO9bAcvMITaeJ9Xtkk53stpF7DIA=
 github.com/open-edge-platform/cluster-api-provider-intel v1.2.6/go.mod h1:Ix3pqvAbazFwwOUHPibXOh7iMtDy5CHgoji6PZ9rVcg=
-github.com/open-edge-platform/infra-core/inventory/v2 v2.31.1 h1:k2yEmRfqhKABJNYG7bV+D5eJ5CnG50S3j1yZ8sWdZu8=
-github.com/open-edge-platform/infra-core/inventory/v2 v2.31.1/go.mod h1:7bHaRxSL+e5XFt2cGCFS3DuI405Nz2u6q0vlMv6/twY=
+github.com/open-edge-platform/infra-core/inventory/v2 v2.33.0 h1:O4Po4HotscUoXtAuqRiayTGEI8yMpbn3mozIfY/DT/4=
+github.com/open-edge-platform/infra-core/inventory/v2 v2.33.0/go.mod h1:wqp3Ai89I7FgEBUauiRwunxb6AJaS1rf8rgI3Rbt4Yo=
 github.com/open-edge-platform/orch-library/go v0.6.1 h1:IGR2ic73f3obnhlxTRfHcyYMbPbYu7BSqa9UYyEZ78Q=
 github.com/open-edge-platform/orch-library/go v0.6.1/go.mod h1:3Tes/GJfwYbnQa/1scbKiLbjZrL4fJEouFk28oo5/c8=
 github.com/open-edge-platform/orch-library/go/dazl v0.5.4 h1:Rx/bSAZiLjEEBjUiJEzBvT0fQv5huT5FQ2Ke3IMUhiE=

internal/inventory/grpc.go

@@ -97,13 +97,13 @@ func (c *InventoryClient) IsImmutable(ctx context.Context, tenantId, hostUuid st
 		return false, errors.New("host instance is nil")
 	}
 
-	if host.Instance.DesiredOs == nil {
-		return false, errors.New("host instance desired os is nil")
+	if host.Instance.Os == nil {
+		return false, errors.New("host instance os is nil")
 	}
 
 	// The expectation is when the host OS is immutable, we expect the k3s packages to be bundled as part of the
 	// OS image. So, we assume that the cluster is installed in air-gap mode.
-	// return host.Instance.DesiredOs.OsType == osv1.OsType_OS_TYPE_IMMUTABLE, nil
+	// return host.Instance.Os.OsType == osv1.OsType_OS_TYPE_IMMUTABLE, nil
 	// Always return false for now as we don't support immutable EMT with pre-installed K3s packages yet
 	return false, nil
 }

internal/inventory/inventory_test/grpc_test.go

@@ -151,10 +151,10 @@ func TestIsImmutable(t *testing.T) {
 		return mockClient, nil
 	}
 
-	immutableHost := &computev1.HostResource{Instance: &computev1.InstanceResource{DesiredOs: &osv1.OperatingSystemResource{OsType: osv1.OsType_OS_TYPE_IMMUTABLE}}}
-	mutableHost := &computev1.HostResource{Instance: &computev1.InstanceResource{DesiredOs: &osv1.OperatingSystemResource{OsType: osv1.OsType_OS_TYPE_MUTABLE}}}
+	immutableHost := &computev1.HostResource{Instance: &computev1.InstanceResource{Os: &osv1.OperatingSystemResource{OsType: osv1.OsType_OS_TYPE_IMMUTABLE}}}
+	mutableHost := &computev1.HostResource{Instance: &computev1.InstanceResource{Os: &osv1.OperatingSystemResource{OsType: osv1.OsType_OS_TYPE_MUTABLE}}}
 	nilInstance := &computev1.HostResource{Instance: nil}
-	desiredOsNil := &computev1.HostResource{Instance: &computev1.InstanceResource{DesiredOs: nil}}
+	osNil := &computev1.HostResource{Instance: &computev1.InstanceResource{Os: nil}}
 
 	cases := []struct {
 		name        string
@@ -203,12 +203,12 @@ func TestIsImmutable(t *testing.T) {
 			expectedErr: errors.New("host instance is nil"),
 		},
 		{
-			name: "desired OS nil",
+			name: "os nil",
 			mock: func() {
-				mockClient.EXPECT().GetHostByUUID(mock.Anything, mock.Anything, mock.Anything).Return(desiredOsNil, nil).Once()
+				mockClient.EXPECT().GetHostByUUID(mock.Anything, mock.Anything, mock.Anything).Return(osNil, nil).Once()
 			},
 			expectedVal: false,
-			expectedErr: errors.New("host instance desired os is nil"),
+			expectedErr: errors.New("host instance os is nil"),
 		},
 		{
 			name: "error fetching host",