Merge pull request #19499 from neil-yechenwei/upgradeLighthouseDefini…

…tion Upgrade `managedservices.registrationdefinitions` API version from `2019-06-01` to `2022-10-01`
hashicorp · Dec 2, 2022 · 3a1268c · 3a1268c
2 parents 080e8e7 + 8b9dd54
commit 3a1268c
Show file tree

Hide file tree

Showing 23 changed files with 131 additions and 31 deletions.
diff --git a/internal/services/lighthouse/client/client.go b/internal/services/lighthouse/client/client.go
@@ -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"
 )
 

diff --git a/internal/services/lighthouse/lighthouse_assignment_resource.go b/internal/services/lighthouse/lighthouse_assignment_resource.go
@@ -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"
@@ -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),

diff --git a/internal/services/lighthouse/lighthouse_definition_resource.go b/internal/services/lighthouse/lighthouse_definition_resource.go
@@ -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"

diff --git a/internal/services/lighthouse/lighthouse_definition_resource_test.go b/internal/services/lighthouse/lighthouse_definition_resource_test.go
@@ -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"

diff --git a/...agedservices/2019-06-01/registrationdefinitions/model_registrationdefinitionproperties.go b/...agedservices/2019-06-01/registrationdefinitions/model_registrationdefinitionproperties.go
diff --git a/...9-06-01/registrationdefinitions/README.md → ...2-10-01/registrationdefinitions/README.md b/...9-06-01/registrationdefinitions/README.md → ...2-10-01/registrationdefinitions/README.md
diff --git a/...9-06-01/registrationdefinitions/client.go → ...2-10-01/registrationdefinitions/client.go b/...9-06-01/registrationdefinitions/client.go → ...2-10-01/registrationdefinitions/client.go
diff --git a/...6-01/registrationdefinitions/constants.go → ...0-01/registrationdefinitions/constants.go b/...6-01/registrationdefinitions/constants.go → ...0-01/registrationdefinitions/constants.go
diff --git a/...itions/id_scopedregistrationdefinition.go → ...itions/id_scopedregistrationdefinition.go b/...itions/id_scopedregistrationdefinition.go → ...itions/id_scopedregistrationdefinition.go
diff --git a/...nitions/method_createorupdate_autorest.go → ...nitions/method_createorupdate_autorest.go b/...nitions/method_createorupdate_autorest.go → ...nitions/method_createorupdate_autorest.go
diff --git a/...tiondefinitions/method_delete_autorest.go → ...tiondefinitions/method_delete_autorest.go b/...tiondefinitions/method_delete_autorest.go → ...tiondefinitions/method_delete_autorest.go
diff --git a/...trationdefinitions/method_get_autorest.go → ...trationdefinitions/method_get_autorest.go b/...trationdefinitions/method_get_autorest.go → ...trationdefinitions/method_get_autorest.go
diff --git a/...rationdefinitions/method_list_autorest.go → ...rationdefinitions/method_list_autorest.go b/...rationdefinitions/method_list_autorest.go → ...rationdefinitions/method_list_autorest.go
diff --git a/...trationdefinitions/model_authorization.go → ...trationdefinitions/model_authorization.go b/...trationdefinitions/model_authorization.go → ...trationdefinitions/model_authorization.go
diff --git a/...urce-manager/managedservices/2022-10-01/registrationdefinitions/model_eligibleapprover.go b/...urce-manager/managedservices/2022-10-01/registrationdefinitions/model_eligibleapprover.go
diff --git a/...manager/managedservices/2022-10-01/registrationdefinitions/model_eligibleauthorization.go b/...manager/managedservices/2022-10-01/registrationdefinitions/model_eligibleauthorization.go
diff --git a/...anager/managedservices/2022-10-01/registrationdefinitions/model_justintimeaccesspolicy.go b/...anager/managedservices/2022-10-01/registrationdefinitions/model_justintimeaccesspolicy.go
diff --git a/...-01/registrationdefinitions/model_plan.go → ...-01/registrationdefinitions/model_plan.go b/...-01/registrationdefinitions/model_plan.go → ...-01/registrationdefinitions/model_plan.go
diff --git a/...finitions/model_registrationdefinition.go → ...finitions/model_registrationdefinition.go b/...finitions/model_registrationdefinition.go → ...finitions/model_registrationdefinition.go
diff --git a/...agedservices/2022-10-01/registrationdefinitions/model_registrationdefinitionproperties.go b/...agedservices/2022-10-01/registrationdefinitions/model_registrationdefinitionproperties.go
diff --git a/...-01/registrationdefinitions/predicates.go → ...-01/registrationdefinitions/predicates.go b/...-01/registrationdefinitions/predicates.go → ...-01/registrationdefinitions/predicates.go
diff --git a/...-06-01/registrationdefinitions/version.go → ...-10-01/registrationdefinitions/version.go b/...-06-01/registrationdefinitions/version.go → ...-10-01/registrationdefinitions/version.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -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