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

r/monitor_aad_diagnostic_setting: updating to use hashicorp/go-azure-sdk #22778

Merged
merged 2 commits into from
Aug 2, 2023
+706 −1,262
Merged

r/monitor_aad_diagnostic_setting: updating to use hashicorp/go-azure-sdk #22778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6201b51
r/monitor_aad_diagnostic_setting: porting over to `hashicorp/go-azure…
tombuildsstuff Aug 2, 2023
7d7e3e5
go mod tidy / go mod vendor
tombuildsstuff Aug 2, 2023
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
13 changes: 8 additions & 5 deletions internal/services/monitor/client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ package client
import (
"fmt"

"github.com/Azure/azure-sdk-for-go/services/aad/mgmt/2017-04-01/aad" // nolint: staticcheck
"github.com/Azure/azure-sdk-for-go/services/preview/alertsmanagement/mgmt/2019-06-01-preview/alertsmanagement" // nolint: staticcheck
classic "github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2021-07-01-preview/insights" // nolint: staticcheck
"github.com/hashicorp/go-azure-sdk/resource-manager/alertsmanagement/2021-08-08/alertprocessingrules"
"github.com/hashicorp/go-azure-sdk/resource-manager/alertsmanagement/2023-03-01/prometheusrulegroups"
"github.com/hashicorp/go-azure-sdk/resource-manager/azureactivedirectory/2017-04-01/diagnosticsettings"
"github.com/hashicorp/go-azure-sdk/resource-manager/insights/2016-03-01/logprofiles"
"github.com/hashicorp/go-azure-sdk/resource-manager/insights/2018-03-01/metricalerts"
scheduledqueryrules2018 "github.com/hashicorp/go-azure-sdk/resource-manager/insights/2018-04-16/scheduledqueryrules"
Expand All @@ -31,7 +31,7 @@ import (

type Client struct {
// AAD
AADDiagnosticSettingsClient *aad.DiagnosticSettingsClient
AADDiagnosticSettingsClient *diagnosticsettings.DiagnosticSettingsClient

// Autoscale Settings
AutoscaleSettingsClient *autoscalesettings.AutoScaleSettingsClient
Expand Down Expand Up @@ -62,8 +62,11 @@ type Client struct {
}

func NewClient(o *common.ClientOptions) (*Client, error) {
AADDiagnosticSettingsClient := aad.NewDiagnosticSettingsClientWithBaseURI(o.ResourceManagerEndpoint)
o.ConfigureClient(&AADDiagnosticSettingsClient.Client, o.ResourceManagerAuthorizer)
aadDiagnosticSettingsClient, err := diagnosticsettings.NewDiagnosticSettingsClientWithBaseURI(o.Environment.ResourceManager)
if err != nil {
return nil, fmt.Errorf("building AAD DiagnosticsSettings client: %+v", err)
}
o.Configure(aadDiagnosticSettingsClient.Client, o.Authorizers.ResourceManager)

AutoscaleSettingsClient := autoscalesettings.NewAutoScaleSettingsClientWithBaseURI(o.ResourceManagerEndpoint)
o.ConfigureClient(&AutoscaleSettingsClient.Client, o.ResourceManagerAuthorizer)
Expand Down Expand Up @@ -135,7 +138,7 @@ func NewClient(o *common.ClientOptions) (*Client, error) {
o.ConfigureClient(&WorkspacesClient.Client, o.ResourceManagerAuthorizer)

return &Client{
AADDiagnosticSettingsClient: &AADDiagnosticSettingsClient,
AADDiagnosticSettingsClient: aadDiagnosticSettingsClient,
AutoscaleSettingsClient: &AutoscaleSettingsClient,
ActionRulesClient: &ActionRulesClient,
SmartDetectorAlertRulesClient: &SmartDetectorAlertRulesClient,
Expand Down
Loading