Skip to content

Commit c52fa36

Browse files
Fix tests
1 parent 92a215c commit c52fa36

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

v2/cmd/asoctl/pkg/importresources/import_factory_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func Test_selectVersionFromGK_givenGK_returnsExpectedVersion(t *testing.T) {
2727
"Batch Account": {
2828
group: "batch.azure.com",
2929
kind: "BatchAccount",
30-
expectedVersion: "v1api20210101",
30+
expectedVersion: "v20240701",
3131
},
3232
"Managed Cluster": {
3333
group: "containerservice.azure.com",

v2/internal/testcommon/scheme.go

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@ import (
99
v1 "k8s.io/api/core/v1"
1010
"k8s.io/apimachinery/pkg/runtime"
1111

12-
batch "github.com/Azure/azure-service-operator/v2/api/batch/v1api20210101"
13-
batchstorage "github.com/Azure/azure-service-operator/v2/api/batch/v1api20210101/storage"
12+
batch_v20210101 "github.com/Azure/azure-service-operator/v2/api/batch/v1api20210101"
13+
batch_v20210101s "github.com/Azure/azure-service-operator/v2/api/batch/v1api20210101/storage"
14+
batch_v20240701 "github.com/Azure/azure-service-operator/v2/api/batch/v20240701"
15+
batch_v20240701s "github.com/Azure/azure-service-operator/v2/api/batch/v20240701/storage"
1416
dbforpostgresqlpreview "github.com/Azure/azure-service-operator/v2/api/dbforpostgresql/v1api20230601preview"
1517
dbforpostgresql "github.com/Azure/azure-service-operator/v2/api/dbforpostgresql/v1api20240801"
1618
dbforpostgresqlstorage "github.com/Azure/azure-service-operator/v2/api/dbforpostgresql/v1api20240801/storage"
@@ -22,8 +24,10 @@ func CreateScheme() (*runtime.Scheme, error) {
2224
scheme := runtime.NewScheme()
2325

2426
addToScheme := []func(scheme *runtime.Scheme) error{
25-
batch.AddToScheme,
26-
batchstorage.AddToScheme,
27+
batch_v20210101.AddToScheme,
28+
batch_v20210101s.AddToScheme,
29+
batch_v20240701.AddToScheme,
30+
batch_v20240701s.AddToScheme,
2731
resources.AddToScheme,
2832
resourcesstorage.AddToScheme,
2933
dbforpostgresqlpreview.AddToScheme,

v2/pkg/tests/convertible_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import (
1212

1313
"k8s.io/apimachinery/pkg/runtime"
1414

15-
batch "github.com/Azure/azure-service-operator/v2/api/batch/v1api20210101"
16-
batchstorage "github.com/Azure/azure-service-operator/v2/api/batch/v1api20210101/storage"
15+
batch "github.com/Azure/azure-service-operator/v2/api/batch/v20240701"
16+
batchstorage "github.com/Azure/azure-service-operator/v2/api/batch/v20240701/storage"
1717
"github.com/Azure/azure-service-operator/v2/pkg/genruntime"
1818
)
1919

0 commit comments

Comments
 (0)