Skip to content

Commit a14c606

Browse files
committed
OCPBUGS-74497: CIO is missing the UserAgent in the telemetry options when authenticating to Azure Cloud
Set policy.TelemetryOptions with ApplicationID for ARM dns RecordSetsClient, PrivateRecordSetsClient, and Azure credential clients."
1 parent dd97cd3 commit a14c606

2 files changed

Lines changed: 16 additions & 0 deletions

File tree

pkg/dns/azure/client/auth.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88

99
"github.com/Azure/azure-sdk-for-go/sdk/azcore"
1010
"github.com/Azure/azure-sdk-for-go/sdk/azcore/cloud"
11+
"github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
1112
"github.com/Azure/azure-sdk-for-go/sdk/azidentity"
1213
"github.com/Azure/go-autorest/autorest/azure"
1314
"github.com/Azure/msi-dataplane/pkg/dataplane"
@@ -58,6 +59,9 @@ func getAzureCredentials(config Config) (azcore.TokenCredential, error) {
5859
if userAssignedIdentityCredentialsFilePath != "" {
5960
options := azcore.ClientOptions{
6061
Cloud: cloudConfig,
62+
Telemetry: policy.TelemetryOptions{
63+
ApplicationID: "[cio-useragent]",
64+
},
6165
}
6266
var err error
6367
cred, err = dataplane.NewUserAssignedIdentityCredential(context.Background(), userAssignedIdentityCredentialsFilePath, dataplane.WithClientOpts(options))
@@ -68,6 +72,9 @@ func getAzureCredentials(config Config) (azcore.TokenCredential, error) {
6872
options := azidentity.WorkloadIdentityCredentialOptions{
6973
ClientOptions: azcore.ClientOptions{
7074
Cloud: cloudConfig,
75+
Telemetry: policy.TelemetryOptions{
76+
ApplicationID: "[cio-useragent]",
77+
},
7178
},
7279
ClientID: config.ClientID,
7380
TenantID: config.TenantID,
@@ -82,6 +89,9 @@ func getAzureCredentials(config Config) (azcore.TokenCredential, error) {
8289
options := azidentity.ClientSecretCredentialOptions{
8390
ClientOptions: azcore.ClientOptions{
8491
Cloud: cloudConfig,
92+
Telemetry: policy.TelemetryOptions{
93+
ApplicationID: "[cio-useragent]",
94+
},
8595
},
8696
}
8797
var err error

pkg/dns/azure/client/client.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,9 @@ func newRecordSetClient(config Config, credential azcore.TokenCredential) (*reco
107107
options := &arm.ClientOptions{
108108
ClientOptions: policy.ClientOptions{
109109
Cloud: cloudConfig,
110+
Telemetry: policy.TelemetryOptions{
111+
ApplicationID: "[cio-useragent]",
112+
},
110113
},
111114
}
112115

@@ -151,6 +154,9 @@ func newPrivateRecordSetClient(config Config, credential azcore.TokenCredential)
151154
options := &arm.ClientOptions{
152155
ClientOptions: policy.ClientOptions{
153156
Cloud: cloudConfig,
157+
Telemetry: policy.TelemetryOptions{
158+
ApplicationID: "[cio-useragent]",
159+
},
154160
},
155161
}
156162

0 commit comments

Comments
 (0)