Skip to content

Commit 8e44da0

Browse files
AbdullahAlShaadAbdullahAlShaad
authored
Add Azure resource group deletion (#9)
Signed-off-by: Shaad7 <abdullah.alshaad@appscode.com>
1 parent d2623f0 commit 8e44da0

File tree

314 files changed

+36620
-2265
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

314 files changed

+36620
-2265
lines changed

‎go.mod

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ module go.klusters.dev/docker-machine-operator
33
go 1.20
44

55
require (
6+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.8.0
7+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0
8+
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.1.1
69
github.com/aws/aws-sdk-go v1.45.4
710
github.com/go-logr/logr v1.2.4
811
github.com/onsi/ginkgo/v2 v2.9.1
@@ -21,12 +24,14 @@ require (
2124

2225
require (
2326
cloud.google.com/go v0.97.0 // indirect
27+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect
2428
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
2529
github.com/Azure/go-autorest/autorest v0.11.27 // indirect
2630
github.com/Azure/go-autorest/autorest/adal v0.9.20 // indirect
2731
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
2832
github.com/Azure/go-autorest/logger v0.2.1 // indirect
2933
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
34+
github.com/AzureAD/microsoft-authentication-library-for-go v1.1.1 // indirect
3035
github.com/Masterminds/semver/v3 v3.1.1 // indirect
3136
github.com/PuerkitoBio/purell v1.2.0 // indirect
3237
github.com/beorn7/perks v1.0.1 // indirect
@@ -43,27 +48,30 @@ require (
4348
github.com/go-openapi/swag v0.19.14 // indirect
4449
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
4550
github.com/gogo/protobuf v1.3.2 // indirect
46-
github.com/golang-jwt/jwt/v4 v4.2.0 // indirect
51+
github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
52+
github.com/golang-jwt/jwt/v5 v5.0.0 // indirect
4753
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4854
github.com/golang/protobuf v1.5.3 // indirect
4955
github.com/google/gnostic v0.5.7-v3refs // indirect
5056
github.com/google/go-cmp v0.5.9 // indirect
5157
github.com/google/go-containerregistry v0.13.0 // indirect
5258
github.com/google/gofuzz v1.2.0 // indirect
5359
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
54-
github.com/google/uuid v1.3.0 // indirect
60+
github.com/google/uuid v1.3.1 // indirect
5561
github.com/imdario/mergo v0.3.13 // indirect
5662
github.com/inconshreveable/mousetrap v1.0.1 // indirect
5763
github.com/jmespath/go-jmespath v0.4.0 // indirect
5864
github.com/josharian/intern v1.0.0 // indirect
5965
github.com/json-iterator/go v1.1.12 // indirect
66+
github.com/kylelemons/godebug v1.1.0 // indirect
6067
github.com/mailru/easyjson v0.7.6 // indirect
6168
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
6269
github.com/mitchellh/mapstructure v1.5.0 // indirect
6370
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6471
github.com/modern-go/reflect2 v1.0.2 // indirect
6572
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
6673
github.com/opencontainers/go-digest v1.0.0 // indirect
74+
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
6775
github.com/pkg/errors v0.9.1 // indirect
6876
github.com/prometheus/client_golang v1.12.2 // indirect
6977
github.com/prometheus/client_model v0.2.0 // indirect
@@ -76,11 +84,11 @@ require (
7684
go.uber.org/atomic v1.7.0 // indirect
7785
go.uber.org/multierr v1.6.0 // indirect
7886
go.uber.org/zap v1.21.0 // indirect
79-
golang.org/x/crypto v0.13.0 // indirect
87+
golang.org/x/crypto v0.14.0 // indirect
8088
golang.org/x/net v0.15.0 // indirect
8189
golang.org/x/oauth2 v0.5.0 // indirect
82-
golang.org/x/sys v0.12.0 // indirect
83-
golang.org/x/term v0.12.0 // indirect
90+
golang.org/x/sys v0.13.0 // indirect
91+
golang.org/x/term v0.13.0 // indirect
8492
golang.org/x/text v0.13.0 // indirect
8593
golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9 // indirect
8694
golang.org/x/tools v0.9.1 // indirect

‎go.sum

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,16 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl
4545
cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
4646
cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
4747
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
48+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.8.0 h1:9kDVnTz3vbfweTqAUmk/a/pH5pWFCHtvRpHYC0G/dcA=
49+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.8.0/go.mod h1:3Ug6Qzto9anB6mGlEdgYMDF5zHQ+wwhEaYR4s17PHMw=
50+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0 h1:BMAjVKJM0U/CYF27gA0ZMmXGkOcvfFtD0oHVZ1TIPRI=
51+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0/go.mod h1:1fXstnBMas5kzG+S3q8UoJcmyU6nUeunJcMDHcRYHhs=
52+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 h1:sXr+ck84g/ZlZUOZiNELInmMgOsuGwdjjVkEIde0OtY=
53+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0/go.mod h1:okt5dMMTOFjX/aovMlrjvvXoPMBVSPzk9185BT0+eZM=
54+
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/internal v1.1.2 h1:mLY+pNLjCUeKhgnAJWAKhEUQM+RJQo2H1fuGSw1Ky1E=
55+
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/managementgroups/armmanagementgroups v1.0.0 h1:pPvTJ1dY0sA35JOeFq6TsY2xj6Z85Yo23Pj4wCCvu4o=
56+
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.1.1 h1:7CBQ+Ei8SP2c6ydQTGCCrS35bDxgTMfoP2miAwK++OU=
57+
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.1.1/go.mod h1:c/wcGeGx5FUPbM/JltUYHZcKmigwyVLJlDq+4HdtXaw=
4858
github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs=
4959
github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
5060
github.com/Azure/go-autorest/autorest v0.11.27 h1:F3R3q42aWytozkV8ihzcgMO4OA4cuqr3bNlsEuF6//A=
@@ -61,6 +71,8 @@ github.com/Azure/go-autorest/logger v0.2.1 h1:IG7i4p/mDa2Ce4TRyAO8IHnVhAVF3RFU+Z
6171
github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8=
6272
github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUMfuitfgcfuo=
6373
github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU=
74+
github.com/AzureAD/microsoft-authentication-library-for-go v1.1.1 h1:WpB/QDNLpMw72xHJc34BNNykqSOeEJDAWkhf0u12/Jk=
75+
github.com/AzureAD/microsoft-authentication-library-for-go v1.1.1/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=
6476
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
6577
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
6678
github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc=
@@ -115,6 +127,7 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
115127
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
116128
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
117129
github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
130+
github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI=
118131
github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
119132
github.com/emicklei/go-restful/v3 v3.8.0 h1:eCZ8ulSerjdAiaNpF7GxXIE7ZCMo1moN1qX+S609eVw=
120133
github.com/emicklei/go-restful/v3 v3.8.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
@@ -170,8 +183,11 @@ github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zV
170183
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
171184
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
172185
github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
173-
github.com/golang-jwt/jwt/v4 v4.2.0 h1:besgBTC8w8HjP6NzQdxwKH9Z5oQMZ24ThTrHp3cZ8eU=
174186
github.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
187+
github.com/golang-jwt/jwt/v4 v4.4.2 h1:rcc4lwaZgFMCZ5jxF9ABolDcIHdBytAFgqFPbSJQAYs=
188+
github.com/golang-jwt/jwt/v4 v4.4.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
189+
github.com/golang-jwt/jwt/v5 v5.0.0 h1:1n1XNM9hk7O9mnQoNBGolZvzebBQ7p93ULHRc28XJUE=
190+
github.com/golang-jwt/jwt/v5 v5.0.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
175191
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
176192
github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
177193
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -252,8 +268,8 @@ github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJY
252268
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
253269
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
254270
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
255-
github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
256-
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
271+
github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
272+
github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
257273
github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
258274
github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
259275
github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0=
@@ -324,6 +340,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
324340
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
325341
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
326342
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
343+
github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
344+
github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
327345
github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
328346
github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
329347
github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
@@ -370,6 +388,8 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8
370388
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
371389
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
372390
github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
391+
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 h1:KoWmjvw+nsYOo29YJK9vDA65RGE3NrOnUtO7a+RF9HU=
392+
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI=
373393
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
374394
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
375395
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
@@ -490,8 +510,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
490510
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
491511
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
492512
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
493-
golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck=
494-
golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
513+
golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
514+
golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
495515
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
496516
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
497517
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -657,6 +677,7 @@ golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBc
657677
golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
658678
golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
659679
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
680+
golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
660681
golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
661682
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
662683
golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -667,13 +688,13 @@ golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBc
667688
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
668689
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
669690
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
670-
golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
671-
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
691+
golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
692+
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
672693
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
673694
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
674695
golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
675-
golang.org/x/term v0.12.0 h1:/ZfYdc3zq+q02Rv9vGqTeSItdzZTSNDmfTi0mBAuidU=
676-
golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
696+
golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=
697+
golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
677698
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
678699
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
679700
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

‎pkg/controller/aws.go

Lines changed: 34 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ limitations under the License.
1717
package controller
1818

1919
import (
20+
"context"
2021
"errors"
2122
"fmt"
2223
"strings"
@@ -46,8 +47,31 @@ type awsAuthCredential struct {
4647
accessKey, secretKey, region string
4748
}
4849

49-
func (r *MachineReconciler) getAWSCredentials() (*awsAuthCredential, error) {
50-
authSecret, err := r.getSecret(r.machineObj.Spec.AuthSecret)
50+
func (r *MachineReconciler) getAnnotationsArgsForAWS() []string {
51+
var annotationArgs []string
52+
if r.machineObj.Spec.Driver.Name == AWSDriver {
53+
if r.machineObj.Annotations[awsVPCIDAnnotation] != "" {
54+
annotationArgs = append(annotationArgs, "--amazonec2-vpc-id")
55+
annotationArgs = append(annotationArgs, r.machineObj.Annotations[awsVPCIDAnnotation])
56+
}
57+
if r.machineObj.Annotations[awsSubnetIDAnnotation] != "" {
58+
annotationArgs = append(annotationArgs, "--amazonec2-subnet-id")
59+
annotationArgs = append(annotationArgs, r.machineObj.Annotations[awsSubnetIDAnnotation])
60+
}
61+
}
62+
return annotationArgs
63+
}
64+
65+
func (r *MachineReconciler) cleanupAWSResources(ctx context.Context) error {
66+
c, err := r.awsEC2Client(ctx)
67+
if err != nil {
68+
return err
69+
}
70+
return r.deleteAwsVpc(c, r.machineObj.Annotations[awsVPCIDAnnotation])
71+
}
72+
73+
func (r *MachineReconciler) getAWSCredentials(ctx context.Context) (*awsAuthCredential, error) {
74+
authSecret, err := r.getSecret(ctx, r.machineObj.Spec.AuthSecret)
5175
if err != nil {
5276
return nil, err
5377
}
@@ -67,8 +91,8 @@ func (r *MachineReconciler) getAWSCredentials() (*awsAuthCredential, error) {
6791
return &awsCreds, nil
6892
}
6993

70-
func (r *MachineReconciler) newAWSClientSession() (*session.Session, error) {
71-
cred, err := r.getAWSCredentials()
94+
func (r *MachineReconciler) newAWSClientSession(ctx context.Context) (*session.Session, error) {
95+
cred, err := r.getAWSCredentials(ctx)
7296
if err != nil {
7397
return nil, err
7498
}
@@ -85,8 +109,8 @@ func (r *MachineReconciler) newAWSClientSession() (*session.Session, error) {
85109
return session, nil
86110
}
87111

88-
func (r *MachineReconciler) awsEC2Client() (*ec2.EC2, error) {
89-
sess, err := r.newAWSClientSession()
112+
func (r *MachineReconciler) awsEC2Client(ctx context.Context) (*ec2.EC2, error) {
113+
sess, err := r.newAWSClientSession(ctx)
90114
if err != nil {
91115
return nil, err
92116
}
@@ -210,7 +234,6 @@ func deleteAwsInternetGateway(c *ec2.EC2, gatewayId, vpcId string) error {
210234
return err
211235
}
212236

213-
klog.Infof("internet gateway successfully deleted")
214237
return nil
215238
}
216239

@@ -240,7 +263,7 @@ func (r *MachineReconciler) createAwsSubnet(c *ec2.EC2, vpcID string) error {
240263
return err
241264
}
242265

243-
klog.Infof("aws subnet created with subnet id: %s", *out.Subnet.SubnetId)
266+
r.log.Info("aws subnet created", "subnet id ", *out.Subnet.SubnetId)
244267
return nil
245268
}
246269
func (r *MachineReconciler) deleteAwsSubnet(c *ec2.EC2, subnetId string) error {
@@ -260,7 +283,7 @@ func (r *MachineReconciler) deleteAwsSubnet(c *ec2.EC2, subnetId string) error {
260283
return err
261284
}
262285

263-
klog.Infof("subnet successfully deleted")
286+
r.log.Info("subnet successfully deleted")
264287
return nil
265288
}
266289

@@ -387,12 +410,12 @@ func deleteSecurityGroup(c *ec2.EC2, vpcId string) error {
387410
return nil
388411
}
389412

390-
func (r *MachineReconciler) createAWSEnvironment() error {
413+
func (r *MachineReconciler) createAWSEnvironment(ctx context.Context) error {
391414
if r.machineObj.Annotations[awsVPCIDAnnotation] != "" && r.machineObj.Annotations[awsSubnetIDAnnotation] != "" && r.machineObj.Annotations[awsInternetGatewayIDAnnotation] != "" {
392415
return nil
393416
}
394417

395-
c, err := r.awsEC2Client()
418+
c, err := r.awsEC2Client(ctx)
396419
if err != nil {
397420
return err
398421
}

0 commit comments

Comments
 (0)