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

Upgrade managedservices.registrationdefinitions API version from 2019-06-01 to 2022-10-01 #19499

Merged
merged 2 commits into from
Dec 2, 2022
Merged

Upgrade managedservices.registrationdefinitions API version from 2019-06-01 to 2022-10-01 #19499

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
4407ff2
Upgrade managedservices.registrationdefinitions API version from 2019…
neil-yechenwei Nov 30, 2022
8b9dd54
update code
neil-yechenwei Dec 2, 2022
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
2 changes: 1 addition & 1 deletion internal/services/lighthouse/client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package client

import (
"github.com/hashicorp/go-azure-sdk/resource-manager/managedservices/2019-06-01/registrationassignments"
"github.com/hashicorp/go-azure-sdk/resource-manager/managedservices/2019-06-01/registrationdefinitions"
"github.com/hashicorp/go-azure-sdk/resource-manager/managedservices/2022-10-01/registrationdefinitions"
"github.com/hashicorp/terraform-provider-azurerm/internal/common"
)

Expand Down
7 changes: 6 additions & 1 deletion internal/services/lighthouse/lighthouse_assignment_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@ import (
"github.com/hashicorp/go-azure-helpers/lang/response"
"github.com/hashicorp/go-azure-helpers/resourcemanager/commonids"
"github.com/hashicorp/go-azure-sdk/resource-manager/managedservices/2019-06-01/registrationassignments"
"github.com/hashicorp/go-azure-sdk/resource-manager/managedservices/2019-06-01/registrationdefinitions"
"github.com/hashicorp/go-azure-sdk/resource-manager/managedservices/2022-10-01/registrationdefinitions"
"github.com/hashicorp/go-uuid"
"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation"
Expand Down Expand Up @@ -87,6 +88,10 @@ func resourceLighthouseAssignmentCreate(d *pluginsdk.ResourceData, meta interfac
}
}

if !response.WasNotFound(existing.HttpResponse) {
return tf.ImportAsExistsError("azurerm_lighthouse_assignment", id.ID())
}

parameters := registrationassignments.RegistrationAssignment{
Properties: &registrationassignments.RegistrationAssignmentProperties{
RegistrationDefinitionId: d.Get("lighthouse_definition_id").(string),
Expand Down
2 changes: 1 addition & 1 deletion internal/services/lighthouse/lighthouse_definition_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/hashicorp/go-azure-helpers/lang/response"
"github.com/hashicorp/go-azure-helpers/resourcemanager/commonids"
"github.com/hashicorp/go-azure-sdk/resource-manager/managedservices/2019-06-01/registrationdefinitions"
"github.com/hashicorp/go-azure-sdk/resource-manager/managedservices/2022-10-01/registrationdefinitions"
"github.com/hashicorp/go-uuid"
"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
Expand Down
2 changes: 1 addition & 1 deletion internal/services/lighthouse/lighthouse_definition_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"testing"

"github.com/google/uuid"
"github.com/hashicorp/go-azure-sdk/resource-manager/managedservices/2019-06-01/registrationdefinitions"
"github.com/hashicorp/go-azure-sdk/resource-manager/managedservices/2022-10-01/registrationdefinitions"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
Expand Down
13 changes: 0 additions & 13 deletions ...agedservices/2019-06-01/registrationdefinitions/model_registrationdefinitionproperties.go
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions ...9-06-01/registrationdefinitions/README.md → ...2-10-01/registrationdefinitions/README.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...9-06-01/registrationdefinitions/client.go → ...2-10-01/registrationdefinitions/client.go
View file
Open in desktop
File renamed without changes.
28 changes: 28 additions & 0 deletions ...6-01/registrationdefinitions/constants.go → ...0-01/registrationdefinitions/constants.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...itions/id_scopedregistrationdefinition.go → ...itions/id_scopedregistrationdefinition.go
View file
Open in desktop
File renamed without changes.
0 ...nitions/method_createorupdate_autorest.go → ...nitions/method_createorupdate_autorest.go
View file
Open in desktop
File renamed without changes.
0 ...tiondefinitions/method_delete_autorest.go → ...tiondefinitions/method_delete_autorest.go
View file
Open in desktop
File renamed without changes.
0 ...trationdefinitions/method_get_autorest.go → ...trationdefinitions/method_get_autorest.go
View file
Open in desktop
File renamed without changes.
43 changes: 36 additions & 7 deletions ...rationdefinitions/method_list_autorest.go → ...rationdefinitions/method_list_autorest.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...trationdefinitions/model_authorization.go → ...trationdefinitions/model_authorization.go
View file
Open in desktop
File renamed without changes.
9 changes: 9 additions & 0 deletions ...urce-manager/managedservices/2022-10-01/registrationdefinitions/model_eligibleapprover.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions ...manager/managedservices/2022-10-01/registrationdefinitions/model_eligibleauthorization.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions ...anager/managedservices/2022-10-01/registrationdefinitions/model_justintimeaccesspolicy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...-01/registrationdefinitions/model_plan.go → ...-01/registrationdefinitions/model_plan.go
View file
Open in desktop
File renamed without changes.
5 changes: 5 additions & 0 deletions ...finitions/model_registrationdefinition.go → ...finitions/model_registrationdefinition.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions ...agedservices/2022-10-01/registrationdefinitions/model_registrationdefinitionproperties.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...-01/registrationdefinitions/predicates.go → ...-01/registrationdefinitions/predicates.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...-06-01/registrationdefinitions/version.go → ...-10-01/registrationdefinitions/version.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ github.com/hashicorp/go-azure-sdk/resource-manager/maintenance/2021-05-01/public
github.com/hashicorp/go-azure-sdk/resource-manager/managedidentity/2022-01-31-preview
github.com/hashicorp/go-azure-sdk/resource-manager/managedidentity/2022-01-31-preview/managedidentities
github.com/hashicorp/go-azure-sdk/resource-manager/managedservices/2019-06-01/registrationassignments
github.com/hashicorp/go-azure-sdk/resource-manager/managedservices/2019-06-01/registrationdefinitions
github.com/hashicorp/go-azure-sdk/resource-manager/managedservices/2022-10-01/registrationdefinitions
github.com/hashicorp/go-azure-sdk/resource-manager/maps/2021-02-01/accounts
github.com/hashicorp/go-azure-sdk/resource-manager/maps/2021-02-01/creators
github.com/hashicorp/go-azure-sdk/resource-manager/mariadb/2018-06-01/configurations
Expand Down