Skip to content

Commit 25e59dd

Browse files
tronghntronghn
committed
chore(deps): bump dependencies
1 parent ffdc10f commit 25e59dd

File tree

4 files changed

+171
-63
lines changed

4 files changed

+171
-63
lines changed

‎cmd/azurerator/main.go

+5-2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import (
1616
"k8s.io/client-go/tools/leaderelection/resourcelock"
1717
ctrl "sigs.k8s.io/controller-runtime"
1818
"sigs.k8s.io/controller-runtime/pkg/metrics"
19+
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
1920

2021
"github.com/nais/azureator/controllers/azureadapplication"
2122
"github.com/nais/azureator/pkg/azure/client"
@@ -71,8 +72,10 @@ func run() error {
7172
renewDeadline := 20 * time.Second
7273

7374
mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
74-
Scheme: scheme,
75-
MetricsBindAddress: cfg.MetricsAddr,
75+
Scheme: scheme,
76+
Metrics: metricsserver.Options{
77+
BindAddress: cfg.MetricsAddr,
78+
},
7679
LeaderElection: cfg.LeaderElection.Enabled,
7780
LeaderElectionID: fmt.Sprintf("azurerator.nais.io-%s", cfg.Azure.Tenant.Id),
7881
LeaderElectionNamespace: cfg.LeaderElection.Namespace,

‎controllers/azureadapplication/azureadapplication_controller_test.go

+19-15
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,12 @@ import (
2323
"sigs.k8s.io/controller-runtime/pkg/client"
2424
"sigs.k8s.io/controller-runtime/pkg/envtest"
2525
"sigs.k8s.io/controller-runtime/pkg/log/zap"
26+
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
2627

2728
controller "github.com/nais/azureator/controllers/azureadapplication"
2829
"github.com/nais/azureator/pkg/annotations"
2930
"github.com/nais/azureator/pkg/azure/fake"
30-
client2 "github.com/nais/azureator/pkg/azure/fake/client"
31+
az "github.com/nais/azureator/pkg/azure/fake/client"
3132
"github.com/nais/azureator/pkg/config"
3233
"github.com/nais/azureator/pkg/customresources"
3334
"github.com/nais/azureator/pkg/fixtures"
@@ -50,7 +51,7 @@ const (
5051
)
5152

5253
var cli client.Client
53-
var azureClient = client2.NewFakeAzureClient()
54+
var azureClient = az.NewFakeAzureClient()
5455
var secretDataKeys = secrets.NewSecretDataKeys()
5556

5657
func TestMain(m *testing.M) {
@@ -71,11 +72,11 @@ func TestReconciler_CreateAzureAdApplication(t *testing.T) {
7172
}{
7273
{
7374
"Application already exists in Azure AD",
74-
client2.ApplicationExists,
75+
az.ApplicationExists,
7576
},
7677
{
7778
"Application does not exist in Azure AD",
78-
client2.ApplicationNotExistsName,
79+
az.ApplicationNotExistsName,
7980
},
8081
}
8182
for _, c := range cases {
@@ -136,7 +137,7 @@ func TestReconciler_CreateAzureAdApplication_ShouldNotProcessNonMatchingTenantAn
136137
}
137138

138139
func TestReconciler_UpdateAzureAdApplication_InvalidPreAuthorizedApps_ShouldNotRetry(t *testing.T) {
139-
instance := assertApplicationExists(t, client2.ApplicationExists)
140+
instance := assertApplicationExists(t, az.ApplicationExists)
140141

141142
previousHash := instance.Status.SynchronizationHash
142143
previousSyncTime := instance.Status.SynchronizationTime
@@ -195,7 +196,7 @@ func TestReconciler_UpdateAzureAdApplication_InvalidPreAuthorizedApps_ShouldNotR
195196
}
196197

197198
func TestReconciler_UpdateAzureAdApplication_ResyncAnnotation_ShouldResyncAndNotModifySecrets(t *testing.T) {
198-
instance := assertApplicationExists(t, client2.ApplicationExists)
199+
instance := assertApplicationExists(t, az.ApplicationExists)
199200

200201
previousHash := instance.Status.SynchronizationHash
201202
previousSyncTime := instance.Status.SynchronizationTime
@@ -230,7 +231,7 @@ func TestReconciler_UpdateAzureAdApplication_ResyncAnnotation_ShouldResyncAndNot
230231
}
231232

232233
func TestReconciler_UpdateAzureAdApplication_RotateAnnotation_ShouldRotateSecrets(t *testing.T) {
233-
instance := assertApplicationExists(t, client2.ApplicationExists)
234+
instance := assertApplicationExists(t, az.ApplicationExists)
234235

235236
previousHash := instance.Status.SynchronizationHash
236237
previousSyncTime := instance.Status.SynchronizationTime
@@ -265,7 +266,7 @@ func TestReconciler_UpdateAzureAdApplication_RotateAnnotation_ShouldRotateSecret
265266
}
266267

267268
func TestReconciler_UpdateAzureAdApplication_NewSecretName_ShouldRotateCredentials(t *testing.T) {
268-
instance := assertApplicationExists(t, client2.ApplicationExists)
269+
instance := assertApplicationExists(t, az.ApplicationExists)
269270
assert.NotEmpty(t, instance.Status.SynchronizationSecretRotationTime)
270271

271272
previousSecretName := instance.Spec.SecretName
@@ -300,7 +301,7 @@ func TestReconciler_UpdateAzureAdApplication_NewSecretName_ShouldRotateCredentia
300301
}
301302

302303
func TestReconciler_UpdateAzureAdApplication_SpecChangeAndNotExpiredSecret_ShouldNotRotateCredentials(t *testing.T) {
303-
instance := assertApplicationExists(t, client2.ApplicationExists)
304+
instance := assertApplicationExists(t, az.ApplicationExists)
304305
assert.NotEmpty(t, instance.Status.SynchronizationSecretRotationTime)
305306

306307
previousSecretName := instance.Spec.SecretName
@@ -337,7 +338,7 @@ func TestReconciler_UpdateAzureAdApplication_SpecChangeAndNotExpiredSecret_Shoul
337338
}
338339

339340
func TestReconciler_UpdateAzureAdApplication_SpecChangeAndExpiredSecret_ShouldAddNewCredentials(t *testing.T) {
340-
instance := assertApplicationExists(t, client2.ApplicationExists)
341+
instance := assertApplicationExists(t, az.ApplicationExists)
341342
assert.NotEmpty(t, instance.Status.SynchronizationSecretRotationTime)
342343

343344
previousSecretName := instance.Spec.SecretName
@@ -383,7 +384,7 @@ func TestReconciler_UpdateAzureAdApplication_SpecChangeAndExpiredSecret_ShouldAd
383384
}
384385

385386
func TestReconciler_UpdateAzureAdApplication_NewSecretNameAndExpired_ShouldAddNewCredentials(t *testing.T) {
386-
instance := assertApplicationExists(t, client2.ApplicationExists)
387+
instance := assertApplicationExists(t, az.ApplicationExists)
387388
assert.NotEmpty(t, instance.Status.SynchronizationSecretRotationTime)
388389

389390
previousSecretName := instance.Spec.SecretName
@@ -432,7 +433,7 @@ func TestReconciler_UpdateAzureAdApplication_NewSecretNameAndExpired_ShouldAddNe
432433
}
433434

434435
func TestReconciler_UpdateAzureAdApplication_MissingSecretRotationTimeAndNewSecretName_ShouldRotateCredentials(t *testing.T) {
435-
instance := assertApplicationExists(t, client2.ApplicationExists)
436+
instance := assertApplicationExists(t, az.ApplicationExists)
436437
assert.NotEmpty(t, instance.Status.SynchronizationSecretRotationTime)
437438

438439
previousSecretName := instance.Spec.SecretName
@@ -472,7 +473,7 @@ func TestReconciler_UpdateAzureAdApplication_MissingSecretRotationTimeAndNewSecr
472473
}
473474

474475
func TestReconciler_UpdateAzureAdApplication_MissingSecretRotationTime_ShouldNotRotateCredentials(t *testing.T) {
475-
instance := assertApplicationExists(t, client2.ApplicationExists)
476+
instance := assertApplicationExists(t, az.ApplicationExists)
476477
assert.NotEmpty(t, instance.Status.SynchronizationSecretRotationTime)
477478

478479
previousSecretName := instance.Spec.SecretName
@@ -516,14 +517,14 @@ func TestReconciler_UpdateAzureAdApplication_MissingSecretRotationTime_ShouldNot
516517
}
517518

518519
func TestReconciler_DeleteAzureAdApplication(t *testing.T) {
519-
instance := assertApplicationExists(t, client2.ApplicationExists)
520+
instance := assertApplicationExists(t, az.ApplicationExists)
520521

521522
t.Run("Delete existing AzureAdApplication", func(t *testing.T) {
522523
err := cli.Delete(context.Background(), instance)
523524
assert.NoError(t, err, "deleting existing AzureAdApplication should not return error")
524525

525526
key := client.ObjectKey{
526-
Name: client2.ApplicationExists,
527+
Name: az.ApplicationExists,
527528
Namespace: namespace,
528529
}
529530
assert.Eventually(t, resourceDoesNotExist(key, instance), timeout, interval)
@@ -773,6 +774,9 @@ func setup() (*envtest.Environment, error) {
773774

774775
mgr, err := ctrl.NewManager(cfg, ctrl.Options{
775776
Scheme: scheme.Scheme,
777+
Metrics: metricsserver.Options{
778+
BindAddress: "0",
779+
},
776780
})
777781
if err != nil {
778782
return nil, err

‎go.mod

+47-46
Original file line numberDiff line numberDiff line change
@@ -3,72 +3,73 @@ module github.com/nais/azureator
33
go 1.21
44

55
require (
6-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.1
7-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.0
6+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2
7+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.1
88
github.com/Code-Hex/go-generics-cache v1.3.1
99
github.com/Shopify/sarama v1.38.1
10-
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d
10+
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2
1111
github.com/go-logr/zapr v1.2.4
1212
github.com/google/uuid v1.3.1
13-
github.com/nais/liberator v0.0.0-20230310123448-b928dcaf2230
13+
github.com/nais/liberator v0.0.0-20230919140655-f3c67d98b64e
1414
github.com/nais/msgraph.go v0.1.5
1515
github.com/prometheus/client_golang v1.16.0
1616
github.com/sethvargo/go-retry v0.2.4
1717
github.com/sirupsen/logrus v1.9.3
1818
github.com/spf13/pflag v1.0.5
1919
github.com/spf13/viper v1.16.0
2020
github.com/stretchr/testify v1.8.4
21-
go.uber.org/zap v1.25.0
22-
golang.org/x/oauth2 v0.11.0
23-
google.golang.org/api v0.138.0
21+
go.uber.org/zap v1.26.0
22+
golang.org/x/oauth2 v0.12.0
23+
google.golang.org/api v0.142.0
2424
gopkg.in/square/go-jose.v2 v2.6.0
25-
k8s.io/api v0.28.0
26-
k8s.io/apimachinery v0.28.0
27-
k8s.io/client-go v0.28.0
28-
sigs.k8s.io/controller-runtime v0.15.1
25+
k8s.io/api v0.28.2
26+
k8s.io/apimachinery v0.28.2
27+
k8s.io/client-go v0.28.2
28+
sigs.k8s.io/controller-runtime v0.16.2
2929
)
3030

3131
require (
3232
cloud.google.com/go/compute v1.23.0 // indirect
3333
cloud.google.com/go/compute/metadata v0.2.3 // indirect
3434
github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect
35-
github.com/AzureAD/microsoft-authentication-library-for-go v1.0.0 // indirect
35+
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.0 // indirect
3636
github.com/beorn7/perks v1.0.1 // indirect
3737
github.com/cespare/xxhash/v2 v2.2.0 // indirect
3838
github.com/davecgh/go-spew v1.1.1 // indirect
39-
github.com/eapache/go-resiliency v1.3.0 // indirect
40-
github.com/eapache/go-xerial-snappy v0.0.0-20230111030713-bf00bc1b83b6 // indirect
39+
github.com/eapache/go-resiliency v1.4.0 // indirect
40+
github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 // indirect
4141
github.com/eapache/queue v1.1.0 // indirect
42-
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
43-
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
42+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
43+
github.com/evanphx/json-patch/v5 v5.7.0 // indirect
4444
github.com/fsnotify/fsnotify v1.6.0 // indirect
4545
github.com/go-logr/logr v1.2.4 // indirect
46-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
46+
github.com/go-openapi/jsonpointer v0.20.0 // indirect
4747
github.com/go-openapi/jsonreference v0.20.2 // indirect
48-
github.com/go-openapi/swag v0.22.3 // indirect
48+
github.com/go-openapi/swag v0.22.4 // indirect
4949
github.com/gogo/protobuf v1.3.2 // indirect
5050
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
51+
github.com/golang-jwt/jwt/v5 v5.0.0 // indirect
5152
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5253
github.com/golang/protobuf v1.5.3 // indirect
5354
github.com/golang/snappy v0.0.4 // indirect
5455
github.com/google/gnostic-models v0.6.8 // indirect
5556
github.com/google/go-cmp v0.5.9 // indirect
5657
github.com/google/gofuzz v1.2.0 // indirect
57-
github.com/google/s2a-go v0.1.5 // indirect
58-
github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect
58+
github.com/google/s2a-go v0.1.7 // indirect
59+
github.com/googleapis/enterprise-certificate-proxy v0.3.1 // indirect
5960
github.com/hashicorp/errwrap v1.1.0 // indirect
6061
github.com/hashicorp/go-multierror v1.1.1 // indirect
6162
github.com/hashicorp/go-uuid v1.0.3 // indirect
6263
github.com/hashicorp/hcl v1.0.0 // indirect
63-
github.com/imdario/mergo v0.3.13 // indirect
64+
github.com/imdario/mergo v0.3.16 // indirect
6465
github.com/jcmturner/aescts/v2 v2.0.0 // indirect
6566
github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect
6667
github.com/jcmturner/gofork v1.7.6 // indirect
67-
github.com/jcmturner/gokrb5/v8 v8.4.3 // indirect
68+
github.com/jcmturner/gokrb5/v8 v8.4.4 // indirect
6869
github.com/jcmturner/rpc/v2 v2.0.3 // indirect
6970
github.com/josharian/intern v1.0.0 // indirect
7071
github.com/json-iterator/go v1.1.12 // indirect
71-
github.com/klauspost/compress v1.15.14 // indirect
72+
github.com/klauspost/compress v1.17.0 // indirect
7273
github.com/kylelemons/godebug v1.1.0 // indirect
7374
github.com/magiconair/properties v1.8.7 // indirect
7475
github.com/mailru/easyjson v0.7.7 // indirect
@@ -78,45 +79,45 @@ require (
7879
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7980
github.com/modern-go/reflect2 v1.0.2 // indirect
8081
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
81-
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
82-
github.com/pierrec/lz4/v4 v4.1.17 // indirect
82+
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
83+
github.com/pierrec/lz4/v4 v4.1.18 // indirect
8384
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
8485
github.com/pkg/errors v0.9.1 // indirect
8586
github.com/pmezard/go-difflib v1.0.0 // indirect
8687
github.com/prometheus/client_model v0.4.0 // indirect
87-
github.com/prometheus/common v0.42.0 // indirect
88-
github.com/prometheus/procfs v0.10.1 // indirect
88+
github.com/prometheus/common v0.44.0 // indirect
89+
github.com/prometheus/procfs v0.12.0 // indirect
8990
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
90-
github.com/rickb777/date v1.20.1 // indirect
91+
github.com/rickb777/date v1.20.5 // indirect
9192
github.com/rickb777/plural v1.4.1 // indirect
92-
github.com/spf13/afero v1.9.5 // indirect
93+
github.com/spf13/afero v1.10.0 // indirect
9394
github.com/spf13/cast v1.5.1 // indirect
9495
github.com/spf13/jwalterweatherman v1.1.0 // indirect
95-
github.com/subosito/gotenv v1.4.2 // indirect
96+
github.com/subosito/gotenv v1.6.0 // indirect
9697
go.opencensus.io v0.24.0 // indirect
97-
go.uber.org/multierr v1.10.0 // indirect
98-
golang.org/x/crypto v0.12.0 // indirect
99-
golang.org/x/exp v0.0.0-20230108222341-4b8118a2686a // indirect
100-
golang.org/x/net v0.14.0 // indirect
101-
golang.org/x/sys v0.11.0 // indirect
102-
golang.org/x/term v0.11.0 // indirect
103-
golang.org/x/text v0.12.0 // indirect
98+
go.uber.org/multierr v1.11.0 // indirect
99+
golang.org/x/crypto v0.13.0 // indirect
100+
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
101+
golang.org/x/net v0.15.0 // indirect
102+
golang.org/x/sys v0.12.0 // indirect
103+
golang.org/x/term v0.12.0 // indirect
104+
golang.org/x/text v0.13.0 // indirect
104105
golang.org/x/time v0.3.0 // indirect
105-
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
106-
google.golang.org/appengine v1.6.7 // indirect
107-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230807174057-1744710a1577 // indirect
108-
google.golang.org/grpc v1.57.0 // indirect
106+
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
107+
google.golang.org/appengine v1.6.8 // indirect
108+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 // indirect
109+
google.golang.org/grpc v1.58.2 // indirect
109110
google.golang.org/protobuf v1.31.0 // indirect
110111
gopkg.in/inf.v0 v0.9.1 // indirect
111112
gopkg.in/ini.v1 v1.67.0 // indirect
112113
gopkg.in/yaml.v2 v2.4.0 // indirect
113114
gopkg.in/yaml.v3 v3.0.1 // indirect
114-
k8s.io/apiextensions-apiserver v0.27.2 // indirect
115-
k8s.io/component-base v0.27.2 // indirect
115+
k8s.io/apiextensions-apiserver v0.28.2 // indirect
116+
k8s.io/component-base v0.28.2 // indirect
116117
k8s.io/klog/v2 v2.100.1 // indirect
117-
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
118-
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
118+
k8s.io/kube-openapi v0.0.0-20230918164632-68afd615200d // indirect
119+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
119120
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
120-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
121+
sigs.k8s.io/structured-merge-diff/v4 v4.3.0 // indirect
121122
sigs.k8s.io/yaml v1.3.0 // indirect
122123
)

0 commit comments

Comments
 (0)