From e03488a19fb9707282b2fa3a595d403904a4a6e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maiti=C3=BA=20=C3=93=20Ciar=C3=A1in?= Date: Wed, 31 Jan 2024 17:45:17 +0100 Subject: [PATCH] Fix import ordering --- pkg/util/mocks/env/core.go | 5 +++-- python/az/aro/azext_aro/aaz/__init__.py | 3 +++ python/az/aro/azext_aro/aaz/latest/__init__.py | 3 +++ python/az/aro/azext_aro/aaz/latest/network/__cmd_group.py | 3 +++ python/az/aro/azext_aro/aaz/latest/network/__init__.py | 3 +++ .../az/aro/azext_aro/aaz/latest/network/vnet/__cmd_group.py | 3 +++ python/az/aro/azext_aro/aaz/latest/network/vnet/__init__.py | 3 +++ python/az/aro/azext_aro/aaz/latest/network/vnet/_show.py | 3 +++ .../azext_aro/aaz/latest/network/vnet/subnet/__cmd_group.py | 3 +++ .../aro/azext_aro/aaz/latest/network/vnet/subnet/__init__.py | 3 +++ .../az/aro/azext_aro/aaz/latest/network/vnet/subnet/_show.py | 3 +++ test/e2e/helpers.go | 2 +- 12 files changed, 34 insertions(+), 3 deletions(-) diff --git a/pkg/util/mocks/env/core.go b/pkg/util/mocks/env/core.go index 8129b642cad..844bc378538 100644 --- a/pkg/util/mocks/env/core.go +++ b/pkg/util/mocks/env/core.go @@ -8,12 +8,13 @@ import ( context "context" reflect "reflect" - azureclient "github.com/Azure/ARO-RP/pkg/util/azureclient" - liveconfig "github.com/Azure/ARO-RP/pkg/util/liveconfig" azcore "github.com/Azure/azure-sdk-for-go/sdk/azcore" autorest "github.com/Azure/go-autorest/autorest" gomock "github.com/golang/mock/gomock" logrus "github.com/sirupsen/logrus" + + azureclient "github.com/Azure/ARO-RP/pkg/util/azureclient" + liveconfig "github.com/Azure/ARO-RP/pkg/util/liveconfig" ) // MockCore is a mock of Core interface. diff --git a/python/az/aro/azext_aro/aaz/__init__.py b/python/az/aro/azext_aro/aaz/__init__.py index 5757aea3175..1ec1c0d56ca 100644 --- a/python/az/aro/azext_aro/aaz/__init__.py +++ b/python/az/aro/azext_aro/aaz/__init__.py @@ -1,3 +1,6 @@ +# Copyright (c) Microsoft Corporation. +# Licensed under the Apache License 2.0. + # -------------------------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. See License.txt in the project root for license information. diff --git a/python/az/aro/azext_aro/aaz/latest/__init__.py b/python/az/aro/azext_aro/aaz/latest/__init__.py index 5757aea3175..1ec1c0d56ca 100644 --- a/python/az/aro/azext_aro/aaz/latest/__init__.py +++ b/python/az/aro/azext_aro/aaz/latest/__init__.py @@ -1,3 +1,6 @@ +# Copyright (c) Microsoft Corporation. +# Licensed under the Apache License 2.0. + # -------------------------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. See License.txt in the project root for license information. diff --git a/python/az/aro/azext_aro/aaz/latest/network/__cmd_group.py b/python/az/aro/azext_aro/aaz/latest/network/__cmd_group.py index 7582bb60b24..99c11b81c40 100644 --- a/python/az/aro/azext_aro/aaz/latest/network/__cmd_group.py +++ b/python/az/aro/azext_aro/aaz/latest/network/__cmd_group.py @@ -1,3 +1,6 @@ +# Copyright (c) Microsoft Corporation. +# Licensed under the Apache License 2.0. + # -------------------------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. See License.txt in the project root for license information. diff --git a/python/az/aro/azext_aro/aaz/latest/network/__init__.py b/python/az/aro/azext_aro/aaz/latest/network/__init__.py index 5a9d61963d6..2638efedc40 100644 --- a/python/az/aro/azext_aro/aaz/latest/network/__init__.py +++ b/python/az/aro/azext_aro/aaz/latest/network/__init__.py @@ -1,3 +1,6 @@ +# Copyright (c) Microsoft Corporation. +# Licensed under the Apache License 2.0. + # -------------------------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. See License.txt in the project root for license information. diff --git a/python/az/aro/azext_aro/aaz/latest/network/vnet/__cmd_group.py b/python/az/aro/azext_aro/aaz/latest/network/vnet/__cmd_group.py index 4099513f8aa..799c32ccee6 100644 --- a/python/az/aro/azext_aro/aaz/latest/network/vnet/__cmd_group.py +++ b/python/az/aro/azext_aro/aaz/latest/network/vnet/__cmd_group.py @@ -1,3 +1,6 @@ +# Copyright (c) Microsoft Corporation. +# Licensed under the Apache License 2.0. + # -------------------------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. See License.txt in the project root for license information. diff --git a/python/az/aro/azext_aro/aaz/latest/network/vnet/__init__.py b/python/az/aro/azext_aro/aaz/latest/network/vnet/__init__.py index 3bf9906f2f3..aabb0e8937f 100644 --- a/python/az/aro/azext_aro/aaz/latest/network/vnet/__init__.py +++ b/python/az/aro/azext_aro/aaz/latest/network/vnet/__init__.py @@ -1,3 +1,6 @@ +# Copyright (c) Microsoft Corporation. +# Licensed under the Apache License 2.0. + # -------------------------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. See License.txt in the project root for license information. diff --git a/python/az/aro/azext_aro/aaz/latest/network/vnet/_show.py b/python/az/aro/azext_aro/aaz/latest/network/vnet/_show.py index cb097da9151..dd902b56dda 100644 --- a/python/az/aro/azext_aro/aaz/latest/network/vnet/_show.py +++ b/python/az/aro/azext_aro/aaz/latest/network/vnet/_show.py @@ -1,3 +1,6 @@ +# Copyright (c) Microsoft Corporation. +# Licensed under the Apache License 2.0. + # -------------------------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. See License.txt in the project root for license information. diff --git a/python/az/aro/azext_aro/aaz/latest/network/vnet/subnet/__cmd_group.py b/python/az/aro/azext_aro/aaz/latest/network/vnet/subnet/__cmd_group.py index 33a5960d8ee..fa54d66e46d 100644 --- a/python/az/aro/azext_aro/aaz/latest/network/vnet/subnet/__cmd_group.py +++ b/python/az/aro/azext_aro/aaz/latest/network/vnet/subnet/__cmd_group.py @@ -1,3 +1,6 @@ +# Copyright (c) Microsoft Corporation. +# Licensed under the Apache License 2.0. + # -------------------------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. See License.txt in the project root for license information. diff --git a/python/az/aro/azext_aro/aaz/latest/network/vnet/subnet/__init__.py b/python/az/aro/azext_aro/aaz/latest/network/vnet/subnet/__init__.py index 28d5f355813..005542dc42f 100644 --- a/python/az/aro/azext_aro/aaz/latest/network/vnet/subnet/__init__.py +++ b/python/az/aro/azext_aro/aaz/latest/network/vnet/subnet/__init__.py @@ -1,3 +1,6 @@ +# Copyright (c) Microsoft Corporation. +# Licensed under the Apache License 2.0. + # -------------------------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. See License.txt in the project root for license information. diff --git a/python/az/aro/azext_aro/aaz/latest/network/vnet/subnet/_show.py b/python/az/aro/azext_aro/aaz/latest/network/vnet/subnet/_show.py index 06f3fbc00d9..145d8523fce 100644 --- a/python/az/aro/azext_aro/aaz/latest/network/vnet/subnet/_show.py +++ b/python/az/aro/azext_aro/aaz/latest/network/vnet/subnet/_show.py @@ -1,3 +1,6 @@ +# Copyright (c) Microsoft Corporation. +# Licensed under the Apache License 2.0. + # -------------------------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. See License.txt in the project root for license information. diff --git a/test/e2e/helpers.go b/test/e2e/helpers.go index f424b8ffd92..537d799eb57 100644 --- a/test/e2e/helpers.go +++ b/test/e2e/helpers.go @@ -10,9 +10,9 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + projectv1 "github.com/openshift/api/project/v1" projectclient "github.com/openshift/client-go/project/clientset/versioned" - authorizationv1 "k8s.io/api/authorization/v1" corev1 "k8s.io/api/core/v1" kerrors "k8s.io/apimachinery/pkg/api/errors"