tools/importer-rest-api-specs: moving the commonids into a subpac…

…kage There's a bunch of these, and whilst these'll get replaced in time with #4017 but for now this cleans this up
hashicorp · Oct 1, 2024 · d66f58a · d66f58a
1 parent 16086d0
commit d66f58a
Show file tree

Hide file tree

Showing 71 changed files with 238 additions and 231 deletions.
diff --git a/tools/importer-rest-api-specs/components/parser/resourceids/common_ids.go b/tools/importer-rest-api-specs/components/parser/resourceids/common_ids.go
@@ -6,116 +6,18 @@ package resourceids
 import (
 	"github.com/hashicorp/pandora/tools/data-api-sdk/v1/helpers"
 	sdkModels "github.com/hashicorp/pandora/tools/data-api-sdk/v1/models"
+	"github.com/hashicorp/pandora/tools/importer-rest-api-specs/components/parser/resourceids/commonids"
 )
 
-type commonIdMatcher interface {
-	// id returns the Resource ID for this Common ID
-	id() sdkModels.ResourceID
-}
-
-var commonIdTypes = []commonIdMatcher{
-	commonIdManagementGroupMatcher{},
-	commonIdResourceGroupMatcher{},
-	commonIdSubscriptionMatcher{},
-	commonIdScopeMatcher{},
-	commonIdUserAssignedIdentity{},
-
-	// Network ids
-	// "Core"
-	commonIdNetworkInterface{},
-	commonIdPublicIPAddress{},
-	commonIdSubnet{},
-	commonIdVirtualNetwork{},
-	commonIdVPNConnection{},
-
-	// Kusto
-	commonIdKustoCluster{},
-	commonIdKustoDatabase{},
-
-	// RP Specific
-	commonIdCloudServicesIPConfiguration{},
-	commonIdCloudServicesPublicIPAddress{},
-	commonIdExpressRouteCircuitPeering{},
-	commonIdNetworkInterfaceIPConfiguration{},
-	//commonIdP2sVPNGateway{},
-	commonIdVirtualHubBGPConnection{},
-	commonIdVirtualHubIPConfiguration{},
-	commonIdVirtualMachineScaleSetIPConfiguration{},
-	commonIdVirtualMachineScaleSetNetworkInterface{},
-	commonIdVirtualMachineScaleSetPublicIPAddress{},
-	commonIdVirtualRouterPeering{},
-	commonIdVirtualWANP2SVPNGateway{},
-
-	// https://github.com/hashicorp/pandora/pull/1962#issuecomment-1375005199
-	commonIdHyperVSiteJob{},
-	commonIdHyperVSiteMachine{},
-	commonIdHyperVSiteRunAsAccount{},
-	commonIdVMwareSiteJob{},
-	commonIdVMwareSiteMachine{},
-	commonIdVMwareSiteRunAsAccount{},
-
-	// Misc data fixes
-	commonIdAutomationCompilationJob{}, // (@stephybun) CompilationJobId segment is defined in three different ways `jobId`, `compilationJobId` and `compilationJobName`
-	commonIdProvisioningService{},      // (@jackofallops): Inconsistent user specified fields in the swagger - `provisioningServices/{resourceName}` vs `provisioningServices/{provisioningServiceName}`
-
-	// Bot Service
-	commonIdBotService{},
-	commonIdBotServiceChannel{},
-
-	// Chaos
-	commonIdChaosStudioCapability{},
-	commonIdChaosStudioTarget{},
-
-	// Compute
-	commonIdAvailabilitySet{},
-	commonIdDedicatedHost{},
-	commonIdDedicatedHostGroup{},
-	commonIdDiskEncryptionSet{},
-	commonIdManagedDisk{},
-	commonIdSharedImageGallery{},
-
-	// HDInsight
-	commonIdHDInsightCluster{},
-
-	// Key Vault
-	commonIdKeyVault{},
-	commonIdKeyVaultKey{},
-	commonIdKeyVaultKeyVersion{},
-	commonIdKeyVaultPrivateEndpointConnection{},
-
-	// Kubernetes
-	commonIdKubernetesCluster{},
-	//commonIdKubernetesFleet{},
-
-	// SQL
-	commonIdSqlDatabase{},
-	commonIdSqlElasticPool{},
-	commonIdSqlManagedInstance{},
-	commonIdSqlManagedInstanceDatabase{},
-	commonIdSqlServer{},
-
-	// Spring Cloud
-	commonIdSpringCloudService{},
-
-	// Storage
-	commonIdStorageAccount{},
-	commonIdStorageContainer{},
-
-	// Web / App Service
-	commonIdAppService{},
-	commonIdAppServiceEnvironment{},
-	commonIdAppServicePlan{},
-}
-
 func switchOutCommonResourceIDsAsNeeded(input []sdkModels.ResourceID) []sdkModels.ResourceID {
 	output := make([]sdkModels.ResourceID, 0)
 
 	for _, value := range input {
 		// TODO: we should expose a `[]CommonIDs` function from `hashicorp/go-azure-helpers` so that we can reuse these
 		// the types (intentionally) don't align but we have enough information here to map the data across
-		for _, commonId := range commonIdTypes {
-			if ResourceIdsMatch(commonId.id(), value) {
-				value = commonId.id()
+		for _, commonId := range commonids.CommonIDTypes {
+			if ResourceIdsMatch(commonId.ID(), value) {
+				value = commonId.ID()
 				value.ExampleValue = helpers.DisplayValueForResourceID(value)
 				break
 			}

diff --git a/...rser/resourceids/common_id_app_service.go → ...rceids/commonids/common_id_app_service.go b/...rser/resourceids/common_id_app_service.go → ...rceids/commonids/common_id_app_service.go
@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-package resourceids
+package commonids
 
 import (
 	sdkModels "github.com/hashicorp/pandora/tools/data-api-sdk/v1/models"
@@ -11,7 +11,7 @@ var _ commonIdMatcher = commonIdAppService{}
 
 type commonIdAppService struct{}
 
-func (c commonIdAppService) id() sdkModels.ResourceID {
+func (c commonIdAppService) ID() sdkModels.ResourceID {
 	name := "AppService"
 	return sdkModels.ResourceID{
 		CommonIDAlias: &name,

diff --git a/...eids/common_id_app_service_environment.go → ...nids/common_id_app_service_environment.go b/...eids/common_id_app_service_environment.go → ...nids/common_id_app_service_environment.go
@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-package resourceids
+package commonids
 
 import (
 	sdkModels "github.com/hashicorp/pandora/tools/data-api-sdk/v1/models"
@@ -11,7 +11,7 @@ var _ commonIdMatcher = commonIdAppServiceEnvironment{}
 
 type commonIdAppServiceEnvironment struct{}
 
-func (c commonIdAppServiceEnvironment) id() sdkModels.ResourceID {
+func (c commonIdAppServiceEnvironment) ID() sdkModels.ResourceID {
 	name := "AppServiceEnvironment"
 	return sdkModels.ResourceID{
 		CommonIDAlias: &name,

diff --git a/...resourceids/common_id_app_service_plan.go → ...s/commonids/common_id_app_service_plan.go b/...resourceids/common_id_app_service_plan.go → ...s/commonids/common_id_app_service_plan.go
@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-package resourceids
+package commonids
 
 import (
 	sdkModels "github.com/hashicorp/pandora/tools/data-api-sdk/v1/models"
@@ -11,7 +11,7 @@ var _ commonIdMatcher = commonIdAppServicePlan{}
 
 type commonIdAppServicePlan struct{}
 
-func (c commonIdAppServicePlan) id() sdkModels.ResourceID {
+func (c commonIdAppServicePlan) ID() sdkModels.ResourceID {
 	name := "AppServicePlan"
 	return sdkModels.ResourceID{
 		CommonIDAlias: &name,

diff --git a/...s/common_id_automation_compilation_job.go → ...s/common_id_automation_compilation_job.go b/...s/common_id_automation_compilation_job.go → ...s/common_id_automation_compilation_job.go
@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-package resourceids
+package commonids
 
 import (
 	sdkModels "github.com/hashicorp/pandora/tools/data-api-sdk/v1/models"
@@ -11,7 +11,7 @@ var _ commonIdMatcher = commonIdAutomationCompilationJob{}
 
 type commonIdAutomationCompilationJob struct{}
 
-func (c commonIdAutomationCompilationJob) id() sdkModels.ResourceID {
+func (c commonIdAutomationCompilationJob) ID() sdkModels.ResourceID {
 	name := "AutomationCompilationJob"
 	return sdkModels.ResourceID{
 		CommonIDAlias: &name,

diff --git a/...resourceids/common_id_availability_set.go → ...s/commonids/common_id_availability_set.go b/...resourceids/common_id_availability_set.go → ...s/commonids/common_id_availability_set.go
@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-package resourceids
+package commonids
 
 import (
 	sdkModels "github.com/hashicorp/pandora/tools/data-api-sdk/v1/models"
@@ -11,7 +11,7 @@ var _ commonIdMatcher = commonIdAvailabilitySet{}
 
 type commonIdAvailabilitySet struct{}
 
-func (c commonIdAvailabilitySet) id() sdkModels.ResourceID {
+func (c commonIdAvailabilitySet) ID() sdkModels.ResourceID {
 	name := "AvailabilitySet"
 	return sdkModels.ResourceID{
 		CommonIDAlias: &name,

diff --git a/...rser/resourceids/common_id_bot_service.go → ...rceids/commonids/common_id_bot_service.go b/...rser/resourceids/common_id_bot_service.go → ...rceids/commonids/common_id_bot_service.go
@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-package resourceids
+package commonids
 
 import (
 	sdkModels "github.com/hashicorp/pandora/tools/data-api-sdk/v1/models"
@@ -11,7 +11,7 @@ var _ commonIdMatcher = commonIdBotService{}
 
 type commonIdBotService struct{}
 
-func (commonIdBotService) id() sdkModels.ResourceID {
+func (commonIdBotService) ID() sdkModels.ResourceID {
 	name := "BotService"
 	return sdkModels.ResourceID{
 		CommonIDAlias: &name,

diff --git a/...ourceids/common_id_bot_service_channel.go → ...ommonids/common_id_bot_service_channel.go b/...ourceids/common_id_bot_service_channel.go → ...ommonids/common_id_bot_service_channel.go
@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-package resourceids
+package commonids
 
 import (
 	sdkModels "github.com/hashicorp/pandora/tools/data-api-sdk/v1/models"
@@ -11,7 +11,7 @@ var _ commonIdMatcher = commonIdBotServiceChannel{}
 
 type commonIdBotServiceChannel struct{}
 
-func (commonIdBotServiceChannel) id() sdkModels.ResourceID {
+func (commonIdBotServiceChannel) ID() sdkModels.ResourceID {
 	name := "BotServiceChannel"
 	return sdkModels.ResourceID{
 		CommonIDAlias: &name,

diff --git a/...eids/common_id_chaos_studio_capability.go → ...nids/common_id_chaos_studio_capability.go b/...eids/common_id_chaos_studio_capability.go → ...nids/common_id_chaos_studio_capability.go
@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-package resourceids
+package commonids
 
 import (
 	sdkModels "github.com/hashicorp/pandora/tools/data-api-sdk/v1/models"
@@ -11,7 +11,7 @@ var _ commonIdMatcher = commonIdChaosStudioCapability{}
 
 type commonIdChaosStudioCapability struct{}
 
-func (commonIdChaosStudioCapability) id() sdkModels.ResourceID {
+func (commonIdChaosStudioCapability) ID() sdkModels.ResourceID {
 	name := "ChaosStudioCapability"
 	return sdkModels.ResourceID{
 		CommonIDAlias: &name,

diff --git a/...ourceids/common_id_chaos_studio_target.go → ...ommonids/common_id_chaos_studio_target.go b/...ourceids/common_id_chaos_studio_target.go → ...ommonids/common_id_chaos_studio_target.go
@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-package resourceids
+package commonids
 
 import (
 	sdkModels "github.com/hashicorp/pandora/tools/data-api-sdk/v1/models"
@@ -11,7 +11,7 @@ var _ commonIdMatcher = commonIdChaosStudioTarget{}
 
 type commonIdChaosStudioTarget struct{}
 
-func (commonIdChaosStudioTarget) id() sdkModels.ResourceID {
+func (commonIdChaosStudioTarget) ID() sdkModels.ResourceID {
 	name := "ChaosStudioTarget"
 	return sdkModels.ResourceID{
 		CommonIDAlias: &name,

diff --git a/...mon_id_cloud_services_ip_configuration.go → ...mon_id_cloud_services_ip_configuration.go b/...mon_id_cloud_services_ip_configuration.go → ...mon_id_cloud_services_ip_configuration.go
@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-package resourceids
+package commonids
 
 import (
 	sdkModels "github.com/hashicorp/pandora/tools/data-api-sdk/v1/models"
@@ -11,7 +11,7 @@ var _ commonIdMatcher = commonIdCloudServicesIPConfiguration{}
 
 type commonIdCloudServicesIPConfiguration struct{}
 
-func (c commonIdCloudServicesIPConfiguration) id() sdkModels.ResourceID {
+func (c commonIdCloudServicesIPConfiguration) ID() sdkModels.ResourceID {
 	name := "CloudServicesIPConfiguration"
 	return sdkModels.ResourceID{
 		CommonIDAlias: &name,

diff --git a/...on_id_cloud_services_public_ip_address.go → ...on_id_cloud_services_public_ip_address.go b/...on_id_cloud_services_public_ip_address.go → ...on_id_cloud_services_public_ip_address.go
@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-package resourceids
+package commonids
 
 import (
 	sdkModels "github.com/hashicorp/pandora/tools/data-api-sdk/v1/models"
@@ -11,7 +11,7 @@ var _ commonIdMatcher = commonIdCloudServicesPublicIPAddress{}
 
 type commonIdCloudServicesPublicIPAddress struct{}
 
-func (c commonIdCloudServicesPublicIPAddress) id() sdkModels.ResourceID {
+func (c commonIdCloudServicesPublicIPAddress) ID() sdkModels.ResourceID {
 	name := "CloudServicesPublicIPAddress"
 	return sdkModels.ResourceID{
 		CommonIDAlias: &name,

diff --git a/...r/resourceids/common_id_dedicated_host.go → ...ids/commonids/common_id_dedicated_host.go b/...r/resourceids/common_id_dedicated_host.go → ...ids/commonids/common_id_dedicated_host.go
@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-package resourceids
+package commonids
 
 import (
 	sdkModels "github.com/hashicorp/pandora/tools/data-api-sdk/v1/models"
@@ -11,7 +11,7 @@ var _ commonIdMatcher = commonIdDedicatedHost{}
 
 type commonIdDedicatedHost struct{}
 
-func (c commonIdDedicatedHost) id() sdkModels.ResourceID {
+func (c commonIdDedicatedHost) ID() sdkModels.ResourceID {
 	name := "DedicatedHost"
 	return sdkModels.ResourceID{
 		CommonIDAlias: &name,

diff --git a/...urceids/common_id_dedicated_host_group.go → ...mmonids/common_id_dedicated_host_group.go b/...urceids/common_id_dedicated_host_group.go → ...mmonids/common_id_dedicated_host_group.go
@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-package resourceids
+package commonids
 
 import (
 	sdkModels "github.com/hashicorp/pandora/tools/data-api-sdk/v1/models"
@@ -11,7 +11,7 @@ var _ commonIdMatcher = commonIdDedicatedHostGroup{}
 
 type commonIdDedicatedHostGroup struct{}
 
-func (c commonIdDedicatedHostGroup) id() sdkModels.ResourceID {
+func (c commonIdDedicatedHostGroup) ID() sdkModels.ResourceID {
 	name := "DedicatedHostGroup"
 	return sdkModels.ResourceID{
 		CommonIDAlias: &name,

diff --git a/...ourceids/common_id_disk_encryption_set.go → ...ommonids/common_id_disk_encryption_set.go b/...ourceids/common_id_disk_encryption_set.go → ...ommonids/common_id_disk_encryption_set.go
@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-package resourceids
+package commonids
 
 import (
 	sdkModels "github.com/hashicorp/pandora/tools/data-api-sdk/v1/models"
@@ -11,7 +11,7 @@ var _ commonIdMatcher = commonIdDiskEncryptionSet{}
 
 type commonIdDiskEncryptionSet struct{}
 
-func (c commonIdDiskEncryptionSet) id() sdkModels.ResourceID {
+func (c commonIdDiskEncryptionSet) ID() sdkModels.ResourceID {
 	name := "DiskEncryptionSet"
 	return sdkModels.ResourceID{
 		CommonIDAlias: &name,

diff --git a/...common_id_expressroute_circuit_peering.go → ...common_id_expressroute_circuit_peering.go b/...common_id_expressroute_circuit_peering.go → ...common_id_expressroute_circuit_peering.go
@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-package resourceids
+package commonids
 
 import (
 	sdkModels "github.com/hashicorp/pandora/tools/data-api-sdk/v1/models"
@@ -11,7 +11,7 @@ var _ commonIdMatcher = commonIdExpressRouteCircuitPeering{}
 
 type commonIdExpressRouteCircuitPeering struct{}
 
-func (c commonIdExpressRouteCircuitPeering) id() sdkModels.ResourceID {
+func (c commonIdExpressRouteCircuitPeering) ID() sdkModels.ResourceID {
 	name := "ExpressRouteCircuitPeering"
 	return sdkModels.ResourceID{
 		CommonIDAlias: &name,