Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace deprecated library #42

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+122 −114
Open

Replace deprecated library #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2d9d03a
Correct Dockerfile formatting
VOID404 Feb 4, 2025
36f767c
Initial rewrite
VOID404 Feb 4, 2025
b59727f
Add log message
VOID404 Feb 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile.job
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ COPY go.sum go.sum
RUN CGO_ENABLED=0 go build -o /bin/main ./cmd/subscriptioncleanup/main.go

# Get latest CA certs
FROM alpine:latest as certs
FROM alpine:latest AS certs
RUN apk --update add ca-certificates

# Final image
FROM scratch
LABEL source = git@github.com:kyma-project/control-plane.git
LABEL source=git@github.com:kyma-project/control-plane.git

COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
COPY --from=build /bin/main /bin/main
124 changes: 63 additions & 61 deletions cmd/subscriptioncleanup/cloudprovider/azure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,13 @@ import (
"context"
"fmt"

"github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2019-05-01/resources"
"github.com/Azure/go-autorest/autorest"
"github.com/Azure/go-autorest/autorest/adal"
"github.com/Azure/go-autorest/autorest/azure"
"github.com/Azure/azure-sdk-for-go/sdk/azidentity"
"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources"
log "github.com/sirupsen/logrus"
)

type azureResourceCleaner struct {
azureClient resources.GroupsClient
azureClient *armresources.ResourceGroupsClient
}

type config struct {
Expand Down Expand Up @@ -41,27 +39,36 @@ func NewAzureResourcesCleaner(secretData map[string][]byte) (ResourceCleaner, er

func (ac azureResourceCleaner) Do() error {
ctx := context.Background()
resourceGroups, err := ac.azureClient.List(ctx, "", nil)
if err != nil {
return err
}
pager := ac.azureClient.NewListPager(nil)

for _, resourceGroup := range resourceGroups.Values() {
if resourceGroup.Name != nil {
log.Infof("Deleting resource group '%s'", *resourceGroup.Name)
future, err := ac.azureClient.Delete(ctx, *resourceGroup.Name)
if err != nil {
log.Errorf("failed to init resource group '%s' deletion", *resourceGroup.Name)
continue
}
for pager.More() {
nextResult, err := pager.NextPage(ctx)
if err != nil {
return err
}
if nextResult.ResourceGroupListResult.Value != nil {

err = future.WaitForCompletionRef(ctx, ac.azureClient.Client)
if err != nil {
log.Errorf("failed to remove resource group '%s', %s: ", *resourceGroup.Name, err.Error())
}

for _, resourceGroup := range nextResult.Value {
if resourceGroup.Name != nil {
log.Infof("Deleting resource group '%s'", *resourceGroup.Name)
future, err := ac.azureClient.BeginDelete(ctx, *resourceGroup.Name, nil)
if err != nil {
log.Errorf("failed to init resource group '%s' deletion", *resourceGroup.Name)
continue
}

_, err = future.PollUntilDone(ctx, nil)
if err != nil {
log.Errorf("failed to remove resource group '%s', %s: ", *resourceGroup.Name, err.Error())
}
}
}
}

log.Info("Azure resources cleanup finished successfully!")

return nil
}

Expand Down Expand Up @@ -95,50 +102,45 @@ func toConfig(secretData map[string][]byte) (config, error) {
}, nil
}

func newResourceGroupsClient(config config) (resources.GroupsClient, error) {
azureEnv, err := azure.EnvironmentFromName("AzurePublicCloud") // shouldn't fail
func newResourceGroupsClient(config config) (*armresources.ResourceGroupsClient, error) {
credential, err := azidentity.NewClientSecretCredential(config.tenantID, config.clientID, config.clientSecret, nil)
if err != nil {
return resources.GroupsClient{}, err
}

authorizer, err := getResourceManagementAuthorizer(&config, &azureEnv)
if err != nil {
return resources.GroupsClient{}, err
return nil, err
}

return getGroupsClient(&config, authorizer)
return armresources.NewResourceGroupsClient(config.subscriptionID, credential, nil)
}

// getGroupsClient gets a client for handling of Azure ResourceGroups
func getGroupsClient(config *config, authorizer autorest.Authorizer) (resources.GroupsClient, error) {
client := resources.NewGroupsClient(config.subscriptionID)
client.Authorizer = authorizer

if err := client.AddToUserAgent(config.userAgent); err != nil {
return resources.GroupsClient{}, fmt.Errorf("while adding user agent [%s]: %w", config.userAgent, err)
}

return client, nil
}

func getResourceManagementAuthorizer(config *config, environment *azure.Environment) (autorest.Authorizer, error) {
armAuthorizer, err := getAuthorizerForResource(config, environment)
if err != nil {
return nil, fmt.Errorf("while creating resource authorizer: %w", err)
}

return armAuthorizer, err
}

func getAuthorizerForResource(config *config, environment *azure.Environment) (autorest.Authorizer, error) {
oauthConfig, err := adal.NewOAuthConfig(environment.ActiveDirectoryEndpoint, config.tenantID)
if err != nil {
return nil, err
}

token, err := adal.NewServicePrincipalToken(*oauthConfig, config.clientID, config.clientSecret, environment.ResourceManagerEndpoint)
if err != nil {
return nil, err
}
return autorest.NewBearerAuthorizer(token), err
}
// func getGroupsClient(config *config, authorizer autorest.Authorizer) (resources.GroupsClient, error) {
// client := resources.NewGroupsClient(config.subscriptionID)
// client.Authorizer = authorizer

// if err := client.AddToUserAgent(config.userAgent); err != nil {
// return resources.GroupsClient{}, fmt.Errorf("while adding user agent [%s]: %w", config.userAgent, err)
// }

// return client, nil
// }

// func getResourceManagementAuthorizer(config *config, environment *azure.Environment) (autorest.Authorizer, error) {
// armAuthorizer, err := getAuthorizerForResource(config, environment)
// if err != nil {
// return nil, fmt.Errorf("while creating resource authorizer: %w", err)
// }

// return armAuthorizer, err
// }

// func getAuthorizerForResource(config *config, environment *azure.Environment) (autorest.Authorizer, error) {
// oauthConfig, err := adal.NewOAuthConfig(environment.ActiveDirectoryEndpoint, config.tenantID)
// if err != nil {
// return nil, err
// }

// token, err := adal.NewServicePrincipalToken(*oauthConfig, config.clientID, config.clientSecret, environment.ResourceManagerEndpoint)
// if err != nil {
// return nil, err
// }
// return autorest.NewBearerAuthorizer(token), err
// }
2 changes: 1 addition & 1 deletion cmd/subscriptioncleanup/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ type config struct {
}

func main() {
log.Info("Starting cleanup job!")
log.Info("Starting cleanup job, the void patch!")
cfg := config{}
err := envconfig.InitWithPrefix(&cfg, "APP")
exitOnError(err, "Failed to load application config")
Expand Down
31 changes: 14 additions & 17 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,24 @@ module github.com/kyma-project/subscription-cleanup-job
go 1.21

require (
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible
github.com/Azure/go-autorest/autorest v0.11.29
github.com/Azure/go-autorest/autorest/adal v0.9.23
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.1
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.2.0
github.com/aws/aws-sdk-go-v2 v1.23.5
github.com/aws/aws-sdk-go-v2/credentials v1.16.9
github.com/aws/aws-sdk-go-v2/service/ec2 v1.137.1
github.com/kyma-project/kyma-environment-broker v0.0.0-20231227095843-e35b81fff501
github.com/sirupsen/logrus v1.9.3
github.com/stretchr/testify v1.8.4
github.com/stretchr/testify v1.10.0
github.com/vrischmann/envconfig v1.3.0
k8s.io/api v0.27.4
k8s.io/apimachinery v0.27.7
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
)

require (
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
github.com/Azure/go-autorest/autorest/to v0.4.0 // indirect
github.com/Azure/go-autorest/autorest/validation v0.3.1 // indirect
github.com/Azure/go-autorest/logger v0.2.1 // indirect
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
github.com/AzureAD/microsoft-authentication-library-for-go v1.3.2 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.8 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.8 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.3 // indirect
Expand All @@ -38,29 +34,30 @@ require (
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.4 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt/v4 v4.5.1 // indirect
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/gnostic v0.6.9 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.4.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/imdario/mergo v0.3.16 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/kylelemons/godebug v1.1.0 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/rogpeppe/go-internal v1.12.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/stretchr/objx v0.5.1 // indirect
golang.org/x/crypto v0.31.0 // indirect
golang.org/x/net v0.29.0 // indirect
github.com/stretchr/objx v0.5.2 // indirect
golang.org/x/crypto v0.32.0 // indirect
golang.org/x/net v0.34.0 // indirect
golang.org/x/oauth2 v0.14.0 // indirect
golang.org/x/sys v0.28.0 // indirect
golang.org/x/sys v0.29.0 // indirect
golang.org/x/term v0.27.0 // indirect
golang.org/x/text v0.21.0 // indirect
golang.org/x/time v0.3.0 // indirect
Expand Down
Loading
Loading