Skip to content

Commit bbdce09

Browse files
dependabot[bot]togashidm
dependabot[bot]
and
togashidm
authored
[gomod] bump github.com/open-edge-platform/infra-core/inventory/v2 from 2.31.1 to 2.32.0 (#180)
Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: togashidm <[email protected]>
1 parent 63b3467 commit bbdce09

File tree

7 files changed

+15
-15
lines changed

7 files changed

+15
-15
lines changed

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ require (
2121
github.com/onsi/ginkgo/v2 v2.27.2
2222
github.com/onsi/gomega v1.38.2
2323
github.com/open-edge-platform/cluster-connect-gateway v1.2.4
24-
github.com/open-edge-platform/infra-core/inventory/v2 v2.31.1
24+
github.com/open-edge-platform/infra-core/inventory/v2 v2.32.0
2525
github.com/open-edge-platform/orch-library/go v0.6.1
2626
github.com/open-policy-agent/opa v1.10.1
2727
github.com/rs/zerolog v1.34.0

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -771,8 +771,8 @@ github.com/onsi/gomega v1.38.2/go.mod h1:W2MJcYxRGV63b418Ai34Ud0hEdTVXq9NW9+Sx6u
771771
github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
772772
github.com/open-edge-platform/cluster-connect-gateway v1.2.4 h1:SBr2xXhMlCOFOrDjZPAvBySEeI5TW6AgqqDcihBhFsc=
773773
github.com/open-edge-platform/cluster-connect-gateway v1.2.4/go.mod h1:QDYeLlziDltMzqLtobbqUZJcxyGl9LmmXx/fUhH1RqQ=
774-
github.com/open-edge-platform/infra-core/inventory/v2 v2.31.1 h1:k2yEmRfqhKABJNYG7bV+D5eJ5CnG50S3j1yZ8sWdZu8=
775-
github.com/open-edge-platform/infra-core/inventory/v2 v2.31.1/go.mod h1:7bHaRxSL+e5XFt2cGCFS3DuI405Nz2u6q0vlMv6/twY=
774+
github.com/open-edge-platform/infra-core/inventory/v2 v2.32.0 h1:u5hVoEpTiD5JL4jTYA1DJ5iXM4t4WULd8Rwn7mfPqSQ=
775+
github.com/open-edge-platform/infra-core/inventory/v2 v2.32.0/go.mod h1:7bHaRxSL+e5XFt2cGCFS3DuI405Nz2u6q0vlMv6/twY=
776776
github.com/open-edge-platform/orch-library/go v0.6.1 h1:IGR2ic73f3obnhlxTRfHcyYMbPbYu7BSqa9UYyEZ78Q=
777777
github.com/open-edge-platform/orch-library/go v0.6.1/go.mod h1:3Tes/GJfwYbnQa/1scbKiLbjZrL4fJEouFk28oo5/c8=
778778
github.com/open-edge-platform/orch-library/go/dazl v0.5.4 h1:Rx/bSAZiLjEEBjUiJEzBvT0fQv5huT5FQ2Ke3IMUhiE=

‎pkg/inventory/inventory_client_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func TestGetHostAndInstanceByHostUUID(t *testing.T) {
5959
SerialNumber: hostSerialNumber,
6060
Instance: &computev1.InstanceResource{
6161
ResourceId: instanceResourceId,
62-
CurrentOs: &osv1.OperatingSystemResource{
62+
Os: &osv1.OperatingSystemResource{
6363
Name: instanceOsName,
6464
},
6565
},
@@ -72,7 +72,7 @@ func TestGetHostAndInstanceByHostUUID(t *testing.T) {
7272
SerialNumber: hostSerialNumber,
7373
Instance: &computev1.InstanceResource{
7474
ResourceId: instanceResourceId,
75-
CurrentOs: &osv1.OperatingSystemResource{
75+
Os: &osv1.OperatingSystemResource{
7676
Name: instanceOsName,
7777
},
7878
},
@@ -94,7 +94,7 @@ func TestGetHostAndInstanceByHostUUID(t *testing.T) {
9494
assert.Equal(t, tc.expectedHost.GetSerialNumber(), host.GetSerialNumber())
9595
require.NotNil(t, host.GetInstance())
9696
assert.Equal(t, tc.expectedHost.GetInstance().GetResourceId(), host.GetInstance().GetResourceId())
97-
assert.Equal(t, tc.expectedHost.GetInstance().GetCurrentOs().GetName(), host.GetInstance().GetCurrentOs().GetName())
97+
assert.Equal(t, tc.expectedHost.GetInstance().GetOs().GetName(), host.GetInstance().GetOs().GetName())
9898
})
9999
}
100100
}
@@ -171,7 +171,7 @@ func TestGetInstance(t *testing.T) {
171171
tenantId: tenantId,
172172
expectedInstance: &computev1.InstanceResource{
173173
ResourceId: instanceResourceId,
174-
CurrentOs: &osv1.OperatingSystemResource{
174+
Os: &osv1.OperatingSystemResource{
175175
Name: instanceOsName,
176176
},
177177
},
@@ -183,7 +183,7 @@ func TestGetInstance(t *testing.T) {
183183
Resource: &inventoryv1.Resource_Instance{
184184
Instance: &computev1.InstanceResource{
185185
ResourceId: instanceResourceId,
186-
CurrentOs: &osv1.OperatingSystemResource{
186+
Os: &osv1.OperatingSystemResource{
187187
Name: instanceOsName,
188188
},
189189
},
@@ -204,7 +204,7 @@ func TestGetInstance(t *testing.T) {
204204
require.Nil(t, err)
205205
require.NotNil(t, out)
206206
assert.Equal(t, out.GetResourceId(), tc.instanceId)
207-
assert.Equal(t, tc.expectedInstance.GetCurrentOs().GetName(), out.GetCurrentOs().GetName())
207+
assert.Equal(t, tc.expectedInstance.GetOs().GetName(), out.GetOs().GetName())
208208
})
209209
}
210210
}

‎pkg/inventory/machine_provider.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ func (n *MachineProvider) GetInstanceByMachineId(in GetInstanceByMachineIdInput)
108108
&Instance{
109109
Id: instance.GetResourceId(),
110110
SerialNo: host.GetSerialNumber(),
111-
Os: instance.GetCurrentOs().GetName(),
111+
Os: instance.GetOs().GetName(),
112112
MachineId: in.MachineId},
113113
nil}
114114
}

‎pkg/inventory/machine_provider_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ func TestGetInstanceByMachineId(t *testing.T) {
305305
SerialNumber: hostSerialNumber,
306306
Instance: &computev1.InstanceResource{
307307
ResourceId: instanceResourceId,
308-
CurrentOs: &osv1.OperatingSystemResource{
308+
Os: &osv1.OperatingSystemResource{
309309
Name: instanceOsName,
310310
},
311311
},

‎test/inventory-stub/inventory_stub.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ func GetStubClient() client.TenantAwareInventoryClient {
324324
Response: &computev1.HostResource{
325325
Instance: &computev1.InstanceResource{
326326
ResourceId: defaultInstanceID,
327-
CurrentOs: &osv1.OperatingSystemResource{
327+
Os: &osv1.OperatingSystemResource{
328328
Name: "Linux",
329329
},
330330
},
@@ -341,7 +341,7 @@ func GetStubClient() client.TenantAwareInventoryClient {
341341
Resource: &inv_v1.Resource_Instance{
342342
Instance: &computev1.InstanceResource{
343343
ResourceId: defaultInstanceID,
344-
CurrentOs: &osv1.OperatingSystemResource{
344+
Os: &osv1.OperatingSystemResource{
345345
Name: "Linux",
346346
},
347347
WorkloadMembers: []*computev1.WorkloadMember{

‎test/inventory-stub/inventory_stub_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ func TestGetHostByUUID(t *testing.T) {
2121
require.NoError(t, err)
2222
require.NotNil(t, host)
2323
assert.Equal(t, defaultInstanceID, host.Instance.ResourceId)
24-
assert.Equal(t, "Linux", host.Instance.CurrentOs.Name)
24+
assert.Equal(t, "Linux", host.Instance.Os.Name)
2525
assert.Equal(t, "SN123456", host.SerialNumber)
2626
}
2727

@@ -31,7 +31,7 @@ func TestGet(t *testing.T) {
3131
require.NoError(t, err)
3232
require.NotNil(t, resp)
3333
assert.Equal(t, defaultInstanceID, resp.Resource.GetInstance().ResourceId)
34-
assert.Equal(t, "Linux", resp.Resource.GetInstance().CurrentOs.Name)
34+
assert.Equal(t, "Linux", resp.Resource.GetInstance().Os.Name)
3535
}
3636

3737
func TestCreate(t *testing.T) {

0 commit comments

Comments
 (0)