From ccce9dd9f3fc381dbd610e52c1d7e45040428336 Mon Sep 17 00:00:00 2001 From: tschneid Date: Thu, 16 Nov 2023 14:37:06 -0600 Subject: [PATCH] fix imports and add license headers --- .../admin_openshiftcluster_delete_managedresource.go | 2 +- .../admin_openshiftcluster_delete_managedresource_test.go | 2 +- pkg/frontend/adminactions/delete_managedresource.go | 6 +++++- pkg/frontend/adminactions/delete_managedresource_test.go | 3 +++ pkg/util/loadbalancer/loadbalancer.go | 3 +++ pkg/util/loadbalancer/loadbalancer_test.go | 3 +++ 6 files changed, 16 insertions(+), 3 deletions(-) diff --git a/pkg/frontend/admin_openshiftcluster_delete_managedresource.go b/pkg/frontend/admin_openshiftcluster_delete_managedresource.go index 671ac4f7dd4..fc636976247 100644 --- a/pkg/frontend/admin_openshiftcluster_delete_managedresource.go +++ b/pkg/frontend/admin_openshiftcluster_delete_managedresource.go @@ -9,13 +9,13 @@ import ( "path/filepath" "strings" + "github.com/Azure/go-autorest/autorest" "github.com/go-chi/chi/v5" "github.com/sirupsen/logrus" "github.com/Azure/ARO-RP/pkg/api" "github.com/Azure/ARO-RP/pkg/database/cosmosdb" "github.com/Azure/ARO-RP/pkg/frontend/middleware" - "github.com/Azure/go-autorest/autorest" ) func (f *frontend) postAdminOpenShiftDeleteManagedResource(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/frontend/admin_openshiftcluster_delete_managedresource_test.go b/pkg/frontend/admin_openshiftcluster_delete_managedresource_test.go index 44d9b6be51c..b83689bd5ec 100644 --- a/pkg/frontend/admin_openshiftcluster_delete_managedresource_test.go +++ b/pkg/frontend/admin_openshiftcluster_delete_managedresource_test.go @@ -10,6 +10,7 @@ import ( "strings" "testing" + "github.com/Azure/go-autorest/autorest" "github.com/golang/mock/gomock" "github.com/sirupsen/logrus" @@ -19,7 +20,6 @@ import ( "github.com/Azure/ARO-RP/pkg/metrics/noop" mock_adminactions "github.com/Azure/ARO-RP/pkg/util/mocks/adminactions" testdatabase "github.com/Azure/ARO-RP/test/database" - "github.com/Azure/go-autorest/autorest" ) func TestAdminDeleteManagedResource(t *testing.T) { diff --git a/pkg/frontend/adminactions/delete_managedresource.go b/pkg/frontend/adminactions/delete_managedresource.go index 0924cd591ed..2b8d93aea12 100644 --- a/pkg/frontend/adminactions/delete_managedresource.go +++ b/pkg/frontend/adminactions/delete_managedresource.go @@ -1,12 +1,16 @@ package adminactions +// Copyright (c) Microsoft Corporation. +// Licensed under the Apache License 2.0. + import ( "context" "strings" + "github.com/Azure/go-autorest/autorest/azure" + "github.com/Azure/ARO-RP/pkg/util/azureclient" "github.com/Azure/ARO-RP/pkg/util/loadbalancer" - "github.com/Azure/go-autorest/autorest/azure" ) func (a *azureActions) ResourceDeleteAndWait(ctx context.Context, resourceID string) error { diff --git a/pkg/frontend/adminactions/delete_managedresource_test.go b/pkg/frontend/adminactions/delete_managedresource_test.go index 6c75b68e92a..4cfd6c9d6a6 100644 --- a/pkg/frontend/adminactions/delete_managedresource_test.go +++ b/pkg/frontend/adminactions/delete_managedresource_test.go @@ -1,5 +1,8 @@ package adminactions +// Copyright (c) Microsoft Corporation. +// Licensed under the Apache License 2.0. + import ( "context" "fmt" diff --git a/pkg/util/loadbalancer/loadbalancer.go b/pkg/util/loadbalancer/loadbalancer.go index adceeb33011..cefdd518cce 100644 --- a/pkg/util/loadbalancer/loadbalancer.go +++ b/pkg/util/loadbalancer/loadbalancer.go @@ -1,5 +1,8 @@ package loadbalancer +// Copyright (c) Microsoft Corporation. +// Licensed under the Apache License 2.0. + import ( "fmt" "strings" diff --git a/pkg/util/loadbalancer/loadbalancer_test.go b/pkg/util/loadbalancer/loadbalancer_test.go index ac2c9017de4..abd9f42d1a6 100644 --- a/pkg/util/loadbalancer/loadbalancer_test.go +++ b/pkg/util/loadbalancer/loadbalancer_test.go @@ -1,5 +1,8 @@ package loadbalancer +// Copyright (c) Microsoft Corporation. +// Licensed under the Apache License 2.0. + import ( "fmt" "testing"